feat: forward platform parameter to snyk-docker-pull UNIFY-163

lib/analyzer/image-inspector.ts

@@ -111,6 +111,7 @@ async function pullFromContainerRegistry(
   imageSavePath: string,
   username: string | undefined,
   password: string | undefined,
+  platform: string | undefined,
 ): Promise<DockerPullResult> {
   const { hostname, imageName, tag } = extractImageDetails(targetImage);
   debug(
@@ -124,6 +125,7 @@ async function pullFromContainerRegistry(
       imageSavePath,
       username,
       password,
+      platform,
     );
   } catch (err) {
     handleDockerPullError(err.message);
@@ -160,6 +162,7 @@ async function pullImage(
     imageSavePath,
     username,
     password,
+    platform,
   );
 
   const imageName = new ImageName(targetImage, {

lib/docker.ts

@@ -41,12 +41,30 @@ class Docker {
     imageSavePath: string,
     username?: string,
     password?: string,
+    platform?: string,
   ): Promise<DockerPullResult> {
     const dockerPull = new DockerPull();
+    const platformTokens = platform ? platform.split("/") : undefined;
+    let os: string = "linux";
+    let architecture: string = "amd64";
+    let variant: string | undefined;
+
+    if (platformTokens) {
+      const platformTokensLen = platformTokens.length;
+      if (platformTokensLen <= 1) {
+        throw Error(
+          "Invalid platform string. Please provide a platform name that follows os/arch[/variant] format.",
+        );
+      }
+      os = platformTokens[0];
+      architecture = platformTokens[1];
+      variant = platformTokens[2];
+    }
     const opt: DockerPullOptions = {
       username,
       password,
       loadImage: false,
+      platform: platformTokens ? { os, architecture, variant } : undefined,
       imageSavePath,
       reqOptions: {
         acceptManifest: [

package.json

@@ -30,9 +30,9 @@
   "dependencies": {
     "@snyk/composer-lockfile-parser": "^1.4.1",
     "@snyk/dep-graph": "^2.8.1",
-    "@snyk/docker-registry-v2-client": "^2.11.0",
+    "@snyk/docker-registry-v2-client": "2.15.0",
     "@snyk/rpm-parser": "3.1.0",
-    "@snyk/snyk-docker-pull": "^3.11.0",
+    "@snyk/snyk-docker-pull": "3.13.0",
     "@swimlane/docker-reference": "^2.0.1",
     "adm-zip": "^0.5.5",
     "chalk": "^2.4.2",

test/lib/analyzer/image-inspector.spec.ts

@@ -362,6 +362,7 @@ describe("getImageArchive", () => {
         imageSavePath,
         username,
         password,
+        undefined,
       );
       expect(archiveLocation.path).toEqual(
         path.join(imageSavePath, "image.tar"),