fix issue when scanning a local image with the snyk containerized pro… (#152)

* fix issue when scanning a local image with the Snyk containerized provider
* Update e2e/scan_test.go

Co-authored-by: Chris Crone <christopher.crone@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

Author: glours

e2e/scan_test.go

@@ -41,6 +41,7 @@ const (
 	ImageWithoutVulnerabilities   = "hello-world"
 	InvalidImage                  = "dockerscanci/scratch:1.0"          // FROM scratch
 	ImageBaseImageVulnerabilities = "dockerscanci/base-image-vulns:1.0" // FROM alpine:3.10.0
+	LocalBuildImage               = "local:build"
 )
 
 func TestScanFailsNoAuthentication(t *testing.T) {
@@ -369,7 +370,7 @@ func TestScanWithContainerizedSnyk(t *testing.T) {
 			name:     "invalid-docker-archive",
 			image:    InvalidImage,
 			exitCode: 1,
-			contains: "Invalid Docker archive",
+			contains: "(HTTP code 500) server error - empty export - not implemented",
 		},
 		{
 			name:     "image-with-vulnerabilities",
@@ -394,6 +395,27 @@ func TestScanWithContainerizedSnyk(t *testing.T) {
 	}
 }
 
+func TestScanLocalImageWithContainerizedSnyk(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("Can't run on this ci platform (windows containers or no engine installed)")
+	}
+	homeDir, cleanFunction := createSnykConfFile(t, os.Getenv("E2E_TEST_AUTH_TOKEN"))
+	defer cleanFunction()
+
+	cmd, configDir, cleanup := dockerCli.createTestCmd()
+	defer cleanup()
+	createScanConfigFileOptinAndPath(t, configDir, true, "")
+
+	// Build a local image
+	cmd.Command = dockerCli.Command("build", "-f", "./testdata/Dockerfile", "-t", LocalBuildImage, ".")
+	cmd.Env = append(cmd.Env, fmt.Sprintf("HOME=%s", homeDir.Path()))
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	cmd.Command = dockerCli.Command("scan", LocalBuildImage)
+	output := icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 1}).Combined()
+	assert.Assert(t, strings.Contains(output, "vulnerability found"))
+}
+
 func createSnykConfDirectories(t *testing.T, withConfFile bool, token string) (*fs.Dir, func()) {
 	content := fmt.Sprintf(`{"api" : "%s"}`, token)
 	var confFiles []fs.PathOp

e2e/version_test.go

@@ -105,7 +105,7 @@ func TestVersionWithoutSnykOrConfig(t *testing.T) {
 		expected := fmt.Sprintf(`Version:    %s
 Git commit: %s
 Provider:   %s
-`, internal.Version, internal.GitCommit, "Snyk (1.461.0 (standalone))")
+`, internal.Version, internal.GitCommit, getProviderVersion("SNYK_DESKTOP_VERSION"))
 		res.Assert(t, icmd.Expected{
 			ExitCode: 0,
 			Out:      expected,

vars.mk

@@ -1,9 +1,9 @@
 # Pinned Versions
-SNYK_DESKTOP_VERSION=1.461.0
+SNYK_DESKTOP_VERSION=1.563.0
 SNYK_USER_VERSION=1.460.0
 SNYK_OLD_VERSION=1.382.1
-# Digest of the 1.461.0 snyk/snyk:alpine image
-SNYK_IMAGE_DIGEST=sha256:b0353b1e0530a10c854f0ddeb871749490301c57c17ff1229fab3cd0b96cff23
+# Digest of the 1.563.0 snyk/snyk:docker image
+SNYK_IMAGE_DIGEST=sha256:defb5ba5517a29a78736d919d3dc0568f555980a43daefe1ac8a1e7fc0924f25
 GO_VERSION=1.15.0
 CLI_VERSION=19.03.9
 ALPINE_VERSION=3.12.0