From 204323213a88742d1c86fb113abb1f49f7268406 Mon Sep 17 00:00:00 2001
From: Phil Ewington <phil.ewington@snyk.io>
Date: Tue, 9 Nov 2021 09:47:21 +0000
Subject: [PATCH] feat: Improve output for dockerfile instructions

This commit allows for use of the installCommand extracted
from a RUN instruction in newer versions of the SDP.

[CAP-280]
---
 src/lib/snyk-test/run-test.ts                    | 2 +-
 test/acceptance/cli-test/cli-test.docker.spec.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/snyk-test/run-test.ts b/src/lib/snyk-test/run-test.ts
index f9aac67044..d0bcfbecf3 100644
--- a/src/lib/snyk-test/run-test.ts
+++ b/src/lib/snyk-test/run-test.ts
@@ -445,7 +445,7 @@ async function parseRes(
       const dockerfilePackage = dockerfilePackages[vuln.name.split('/')[0]];
       if (dockerfilePackage) {
         (vuln as DockerIssue).dockerfileInstruction =
-          dockerfilePackage.instruction;
+          dockerfilePackage.installCommand;
       }
       (vuln as DockerIssue).dockerBaseImage = res.docker!.baseImage;
       return vuln;
diff --git a/test/acceptance/cli-test/cli-test.docker.spec.ts b/test/acceptance/cli-test/cli-test.docker.spec.ts
index bfe5824c92..f476994ecf 100644
--- a/test/acceptance/cli-test/cli-test.docker.spec.ts
+++ b/test/acceptance/cli-test/cli-test.docker.spec.ts
@@ -649,7 +649,7 @@ export const DockerTests: AcceptanceTests = {
                   data: {
                     dockerfilePackages: {
                       bzip2: {
-                        instruction: 'RUN test instruction',
+                        installCommand: 'test installCommand',
                       },
                     },
                   },
@@ -678,7 +678,7 @@ export const DockerTests: AcceptanceTests = {
         t.fail('should have found vuln');
       } catch (err) {
         const msg = err.message;
-        t.match(msg, "Image layer: 'RUN test instruction'");
+        t.match(msg, "Image layer: 'test installCommand'");
       }
     },
 
@@ -697,7 +697,7 @@ export const DockerTests: AcceptanceTests = {
                   data: {
                     dockerfilePackages: {
                       bzip2: {
-                        instruction: 'RUN test instruction',
+                        installCommand: 'test installCommand',
                       },
                     },
                   },
@@ -726,7 +726,7 @@ export const DockerTests: AcceptanceTests = {
         t.fail('should have found vuln');
       } catch (err) {
         const msg = err.message;
-        t.match(msg, "Image layer: 'RUN test instruction'");
+        t.match(msg, "Image layer: 'test installCommand'");
       }
     },