Merge pull request #4552 from snyk/feat/support_oci

feat: upgrade deps to support oci images
snyk · Apr 12, 2023 · 3b256e5 · 3b256e5
2 parents 6d434de + 5b42613
commit 3b256e5
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "@snyk/cloud-config-parser": "^1.14.5",
     "@snyk/code-client": "^4.18.1",
     "@snyk/dep-graph": "^1.27.1",
-    "@snyk/docker-registry-v2-client": "^2.7.3",
+    "@snyk/docker-registry-v2-client": "^2.9.0",
     "@snyk/fix": "file:packages/snyk-fix",
     "@snyk/gemfile": "1.2.0",
     "@snyk/snyk-cocoapods-plugin": "2.5.3",
@@ -114,7 +114,7 @@
     "semver": "^6.0.0",
     "snyk-config": "4.0.0",
     "snyk-cpp-plugin": "2.22.0",
-    "snyk-docker-plugin": "6.2.0",
+    "snyk-docker-plugin": "^6.3.0",
     "snyk-go-plugin": "^1.19.5",
     "snyk-gradle-plugin": "3.26.3",
     "snyk-module": "3.1.0",

diff --git a/test/jest/acceptance/snyk-container/container.spec.ts b/test/jest/acceptance/snyk-container/container.spec.ts
@@ -28,4 +28,13 @@ describe('snyk container', () => {
     );
     await expect(cli).toDisplay(`yum @ 4.9.0`, { timeout: 60 * 1000 });
   });
+
+  it('finds dependencies in oci image (library/ubuntu)', async () => {
+    cli = await startSnykCLI(
+      'container test library/ubuntu@sha256:7a57c69fe1e9d5b97c5fe649849e79f2cfc3bf11d10bbd5218b4eb61716aebe6 --print-deps',
+    );
+    await expect(cli).toDisplay(`coreutils @ 8.32-4.1ubuntu1`, {
+      timeout: 60 * 1000,
+    });
+  });
 });