84 Commits

Author SHA1 Message Date
Alfredo Deza
fb6bc116e0 tests: verify carriage returns are parsed in distro files
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-16 17:20:30 -04:00
Alfredo Deza
5edcae13b3 distro: remove unwanted chars from os distro files
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-16 17:19:57 -04:00
Alfredo Deza
a05d58686e resolvers: do not join paths, it is assumed they are already joined
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-16 13:14:03 -04:00
Alfredo Deza
d82a0872c9 tests: verify MultipleFileContentsByRef gets contents from the right path
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-16 13:14:03 -04:00
Alfredo Deza
d982ad6345 lib: implement a NewScope to produce scopes from inputs
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 10:15:58 -04:00
Alfredo Deza
f418c99a3b remove old text support files
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 10:15:58 -04:00
Alfredo Deza
45b5fa82c8 presenters: abstract into text only
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 10:15:58 -04:00
Alfredo Deza
e7518ad998 tests: move img-based tests and fixtures
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 09:59:40 -04:00
Alfredo Deza
a6e1866cdb cmd: do not default for images, handle it specifically
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 09:59:40 -04:00
Alfredo Deza
2f626bf9fd directory resolver should join path and target directory for retrieving contents
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 09:59:40 -04:00
Alfredo Deza
69b01caba7 update scope tests to use new generic scope
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:28 -04:00
Alfredo Deza
c56b82e529 resolvers: add a directory resolver
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:28 -04:00
Alfredo Deza
5cee2668e3 resolvers: satisfy interface with multiple file contents by ref
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:28 -04:00
Alfredo Deza
6e9171e8a6 presenter: use new scoped source
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:27 -04:00
Alfredo Deza
4b69758f2c scope: create a new generic Resolver interface
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:27 -04:00
Alfredo Deza
b35a412467 scope: use a generic scope struct instead of specific to images
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:27 -04:00
Alfredo Deza
145bb95a2d lib: use scope instead of requiring images
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:27 -04:00
Alfredo Deza
d22c1d0838 distro: identify uses the scope resolvers now, not images
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:27 -04:00
Alfredo Deza
923d220a90 controller: use new scope.Resolver interface
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-15 07:53:27 -04:00
Alex Goodman
66a16a67fd
Add support for detecting nested java archives (#77)
* with sb build app

* test nested jar support

* pin jdk version during parse test (but dont compare version)
2020-07-15 07:42:35 -04:00
Alex Goodman
3f090f9647
fix java cache key for CI; fix circle docker api version (#79) 2020-07-13 12:11:11 -04:00
Alex Goodman
502e2afd06
fix linting issue 2020-07-10 07:45:13 -04:00
Alex Goodman
15ff94b56b
tweak java manifest version processing 2020-07-10 07:41:13 -04:00
Alex Goodman
4c7d9ccef7
simplify unzip; update java error statements 2020-07-09 11:53:52 -04:00
Alex Goodman
0f8dcf3f17
Update imgbom/cataloger/java/pom_properties.go
Co-authored-by: Alfredo Deza <adeza@anchore.com>
2020-07-09 11:38:02 -04:00
Alex Goodman
c9bfc0aecd
Update imgbom/cataloger/java/pom_properties.go
Co-authored-by: Alfredo Deza <adeza@anchore.com>
2020-07-09 11:37:45 -04:00
Alex Goodman
40f8e3a7de
Update imgbom/cataloger/java/java_manifest.go
Co-authored-by: Alfredo Deza <adeza@anchore.com>
2020-07-09 11:31:23 -04:00
Alex Goodman
1f89d26902
reduce java packages to java-archive and jenkins-plugin 2020-07-09 10:46:28 -04:00
Alex Goodman
e55db9247e
add java cataloger 2020-07-08 16:16:01 -04:00
Alex Goodman
1896831c39
add rpmdb support; enhance integration tests 2020-07-06 12:55:11 -04:00
Alfredo Deza
3548c7b132 tests for scope.go
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 16:09:55 -04:00
Alfredo Deza
3eedb86a1f tests for protocol.go
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 16:09:55 -04:00
Alfredo Deza
c35108b00d tests: reorganize text img files to match new layout
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 16:09:55 -04:00
Alfredo Deza
f49ca8107a tests: add verification for dirs and imgs
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 16:09:55 -04:00
Alfredo Deza
96d86fa214 tests: move existing json tests to json/imgs
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 16:09:55 -04:00
Alfredo Deza
7544330bc2 json img presenter needs to degrade nicely when file metadata is not present
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
ec52e91301 scope: create interface for content and file resolvers
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
b2d7bd3b1a scope: add directory-based scoping
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
e38e3e9ff4 create text-based presenters for dirs and imgs
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
268cfef0ee re-organize json-based presenters for dirs and imgs
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
312c8acfbe presenter can pick text-dir, text-img, json-text, or json-img for reporting
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
69a0376f99 distro: add note to replace with MultipleFileContents in the future
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
507a6b69cb catalog controller uses scope to determine file resolvers
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
faf21a67a6 lib: return a protocol-based scope (dir or img)
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 15:12:48 -04:00
Alfredo Deza
678a2c1dcb create a protocol-parsing package to distinguish dir,docker, etc...
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-02 13:04:19 -04:00
Alfredo Deza
4d31655908 allow root command to catalog a directory
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-07-01 07:35:01 -04:00
Alex Goodman
926b5f2a50
add and use event bus for UI progress 2020-06-25 10:39:11 -04:00
Alfredo Deza
2e6aef17e1 implement a text presenter
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-06-22 11:09:00 -04:00
Alfredo Deza
72f9091493 presenter: allow a text presenter option
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-06-19 15:46:31 -04:00
Alfredo Deza
acbeea9800 option: add a Text-based presenter
Signed-off-by: Alfredo Deza <adeza@anchore.com>
2020-06-19 15:45:58 -04:00