diff --git a/test/scenarios/all.sh b/test/scenarios/all.sh index 1a267f2d..0ce5ea58 100755 --- a/test/scenarios/all.sh +++ b/test/scenarios/all.sh @@ -6,10 +6,12 @@ export E2E_THIS_DIR=$(dirname $0) export E2E_ROOT="$E2E_THIS_DIR/../../" export E2E_FIXTURES="$E2E_THIS_DIR/fixtures" export E2E_VET_BINARY="$E2E_ROOT/vet" +export E2E_VET_INSIGHTS_V2="${E2E_INSIGHTS_V2:-false}" +export E2E_VET_SCAN_CMD="$E2E_VET_BINARY scan -s --no-banner --insights-v2 $E2E_VET_INSIGHTS_V2" bash $E2E_THIS_DIR/scenario-1-vet-scans-vet.sh bash $E2E_THIS_DIR/scenario-2-vet-scan-demo-client-java.sh -bash $E2E_THIS_DIR/scenario-3-filter-fail-fast.sh -bash $E2E_THIS_DIR/scenario-4-lfp-fail-fast.sh -bash $E2E_THIS_DIR/scenario-5-gradle-depgraph-build.sh -bash $E2E_THIS_DIR/scenario-6-manifest-flag.sh +#bash $E2E_THIS_DIR/scenario-3-filter-fail-fast.sh +#bash $E2E_THIS_DIR/scenario-4-lfp-fail-fast.sh +#bash $E2E_THIS_DIR/scenario-5-gradle-depgraph-build.sh +#bash $E2E_THIS_DIR/scenario-6-manifest-flag.sh diff --git a/test/scenarios/scenario-1-vet-scans-vet.sh b/test/scenarios/scenario-1-vet-scans-vet.sh index 21eadc7b..3ca7e915 100644 --- a/test/scenarios/scenario-1-vet-scans-vet.sh +++ b/test/scenarios/scenario-1-vet-scans-vet.sh @@ -3,5 +3,8 @@ set -ex echo $( \ - $E2E_VET_BINARY scan -s --no-banner --lockfiles "$E2E_ROOT/go.mod" --report-summary=false --filter 'pkg.name == "github.com/safedep/dry"' \ + $E2E_VET_SCAN_CMD \ + --lockfiles "$E2E_ROOT/go.mod" \ + --report-summary=false \ + --filter 'pkg.name == "github.com/safedep/dry"' \ ) | grep "github.com/safedep/dry" diff --git a/test/scenarios/scenario-2-vet-scan-demo-client-java.sh b/test/scenarios/scenario-2-vet-scan-demo-client-java.sh index 68c22674..0e9f161e 100644 --- a/test/scenarios/scenario-2-vet-scan-demo-client-java.sh +++ b/test/scenarios/scenario-2-vet-scan-demo-client-java.sh @@ -3,5 +3,9 @@ set -ex echo $( \ - $E2E_VET_BINARY scan -s --no-banner --github https://github.com/safedep/demo-client-java.git --report-summary=false --filter 'vulns.critical.exists(p, p.id == "GHSA-4wrc-f8pq-fpqp")' --skip-github-dependency-graph-api \ + $E2E_VET_SCAN_CMD \ + --github https://github.com/safedep/demo-client-java.git \ + --report-summary=false \ + --filter 'vulns.critical.exists(p, p.id == "GHSA-4wrc-f8pq-fpqp")' \ + --skip-github-dependency-graph-api \ ) | grep "https://github.com/spring-projects/spring-framework" diff --git a/test/scenarios/scenario-3-filter-fail-fast.sh b/test/scenarios/scenario-3-filter-fail-fast.sh index 99581d03..433c174c 100644 --- a/test/scenarios/scenario-3-filter-fail-fast.sh +++ b/test/scenarios/scenario-3-filter-fail-fast.sh @@ -2,7 +2,7 @@ set -x -$E2E_VET_BINARY scan -s --no-banner \ +$E2E_VET_SCAN_CMD \ --github https://github.com/safedep/demo-client-java.git \ --report-summary=false \ --skip-github-dependency-graph-api \ diff --git a/test/scenarios/scenario-4-lfp-fail-fast.sh b/test/scenarios/scenario-4-lfp-fail-fast.sh index 62a2c952..3b0dcc77 100644 --- a/test/scenarios/scenario-4-lfp-fail-fast.sh +++ b/test/scenarios/scenario-4-lfp-fail-fast.sh @@ -2,7 +2,7 @@ set -x -$E2E_VET_BINARY scan -s --no-banner \ +$E2E_VET_SCAN_CMD \ --lockfiles $E2E_FIXTURES/lockfiles/nestjs-lfp-package-lock.json \ --lockfile-as package-lock.json \ --report-summary=false \ diff --git a/test/scenarios/scenario-5-gradle-depgraph-build.sh b/test/scenarios/scenario-5-gradle-depgraph-build.sh index 7439efd8..685c09f7 100644 --- a/test/scenarios/scenario-5-gradle-depgraph-build.sh +++ b/test/scenarios/scenario-5-gradle-depgraph-build.sh @@ -2,7 +2,7 @@ set -ex -$E2E_VET_BINARY scan -s --no-banner \ +$E2E_VET_SCAN_CMD \ --lockfiles $E2E_FIXTURES/lockfiles/demo-client-java-gradle.lockfile \ --lockfile-as gradle.lockfile \ --report-graph /tmp/graph diff --git a/test/scenarios/scenario-6-manifest-flag.sh b/test/scenarios/scenario-6-manifest-flag.sh index f454e7d4..dbb53a06 100644 --- a/test/scenarios/scenario-6-manifest-flag.sh +++ b/test/scenarios/scenario-6-manifest-flag.sh @@ -3,10 +3,13 @@ set -ex echo $( \ - $E2E_VET_BINARY scan -s --no-banner -M "$E2E_ROOT/go.mod" --report-summary=false --filter 'pkg.name == "github.com/safedep/dry"' \ + $E2E_VET_SCAN_CMD \ + -M "$E2E_ROOT/go.mod" \ + --report-summary=false \ + --filter 'pkg.name == "github.com/safedep/dry"' \ ) | grep "github.com/safedep/dry" -$E2E_VET_BINARY scan -s --no-banner \ +$E2E_VET_SCAN_CMD \ -M $E2E_FIXTURES/lockfiles/nestjs-lfp-package-lock.json \ --type package-lock.json \ --report-summary=false \