Merge pull request #5563 from snyk/fix/deps-do-not-overwrite-values

fix(container): support --exclude-app-vulns with oauth
snyk · Nov 4, 2024 · b854d95 · b854d95
2 parents 91ae38e + 8d1b12c
commit b854d95
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 117 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -960,14 +960,14 @@ jobs:
       - restore_cache:
           name: Restore npm cache
           keys:
-            - prepare-build-npm-deps-{{ checksum "package-lock.json" }}
-            - prepare-build-npm-deps
+            - prepare-v1-build-npm-deps-{{ checksum "package-lock.json" }}
+            - prepare-v1-build-npm-deps
       - run:
           name: Installing dependencies
           command: npm ci --no-audit --no-progress --cache .npm --prefer-offline
       - save_cache:
           name: Save npm cache
-          key: prepare-build-npm-deps-{{ checksum "package-lock.json" }}
+          key: prepare-v1-build-npm-deps-{{ checksum "package-lock.json" }}
           paths:
             - .npm
       - run:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -116,7 +116,7 @@
     "semver": "^6.0.0",
     "snyk-config": "^5.0.0",
     "snyk-cpp-plugin": "2.24.0",
-    "snyk-docker-plugin": "6.13.2",
+    "snyk-docker-plugin": "6.13.11",
     "snyk-go-plugin": "1.23.0",
     "snyk-gradle-plugin": "4.6.0",
     "snyk-module": "3.1.0",

diff --git a/test/jest/acceptance/snyk-test/app-vuln-container-project.spec.ts b/test/jest/acceptance/snyk-test/app-vuln-container-project.spec.ts
@@ -163,7 +163,7 @@ describe('container test projects behavior with --json flag', () => {
 
     const jsonOutput = JSON.parse(stdout);
     expect(Array.isArray(jsonOutput)).toBeTruthy();
-    expect(jsonOutput).toHaveLength(3);
+    expect(jsonOutput).toHaveLength(2);
     expect(code).toEqual(0);
   });
 });