Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trivy stage maintenance #1152

Merged
merged 4 commits into from
Sep 2, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update tests
BraisVQ committed Aug 30, 2024

Verified

This commit was signed with the committer’s verified signature.
ConnorJC3 ConnorJC
commit ee4cdc931f1ba52b04099fbb7b5907b62a406829
6 changes: 3 additions & 3 deletions test/groovy/org/ods/services/TrivyServiceSpec.groovy
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ class TrivyServiceSpec extends PipelineSpockTestBase {
])

when:
def result = service.scanViaCli("vuln,config,secret,license", "os,library",
def result = service.scanViaCli("vuln,misconfig,secret,license", "os,library",
"cyclonedx", "--debug --timeout=10m", "trivy-sbom.json", "docker-group-ods", "openshift-domain.com")

then:
@@ -26,8 +26,8 @@ class TrivyServiceSpec extends PipelineSpockTestBase {
assert it.script.toString().contains('--db-repository docker-group-ods.openshift-domain.com/aquasecurity/trivy-db')
assert it.script.toString().contains('--java-db-repository docker-group-ods.openshift-domain.com/aquasecurity/trivy-java-db')
assert it.script.toString().contains('--cache-dir /tmp/.cache')
assert it.script.toString().contains('--scanners vuln,config,secret,license')
assert it.script.toString().contains('--vuln-type os,library')
assert it.script.toString().contains('--scanners vuln,misconfig,secret,license')
assert it.script.toString().contains('--pkg-types os,library')
assert it.script.toString().contains('--format cyclonedx')
assert it.script.toString().contains('--output trivy-sbom.json')
assert it.script.toString().contains('--license-full')