Merge pull request #112 from glours/use_container_test

Use snyk container test command instead of snyk test --docker one to …

Author: glours

e2e/scan_test.go

@@ -37,7 +37,8 @@ import (
 
 const (
 	ImageWithVulnerabilities      = "alpine:3.10.0"
-	ImageWithoutVulnerabilities   = "dockerscanci/scratch:1.0"          // FROM scratch
+	ImageWithoutVulnerabilities   = "hello-world"
+	InvalidImage                  = "dockerscanci/scratch:1.0"          // FROM scratch
 	ImageBaseImageVulnerabilities = "dockerscanci/base-image-vulns:1.0" // FROM alpine:3.10.0
 )
 
@@ -124,6 +125,12 @@ func TestScanWithSnyk(t *testing.T) {
 			exitCode: 0,
 			contains: "no vulnerable paths found",
 		},
+		{
+			name:     "invalid-docker-archive",
+			image:    InvalidImage,
+			exitCode: 2,
+			contains: "Invalid Docker archive",
+		},
 		{
 			name:     "image-with-vulnerabilities",
 			image:    ImageWithVulnerabilities,
@@ -134,7 +141,7 @@ func TestScanWithSnyk(t *testing.T) {
 			name:     "invalid-image-name",
 			image:    "scratch",
 			exitCode: 2,
-			contains: "image was not found locally and pulling failed",
+			contains: "manifest unknown",
 		},
 	}
 	for _, testCase := range testCases {
@@ -170,6 +177,12 @@ func TestScanJsonOutput(t *testing.T) {
 			exitCode: 0,
 			isEmpty:  true,
 		},
+		{
+			name:     "invalid-docker-archive",
+			image:    InvalidImage,
+			exitCode: 2,
+			isEmpty:  true,
+		},
 		{
 			name:     "image-with-vulnerabilities",
 			image:    ImageWithVulnerabilities,

internal/provider/snyk.go

@@ -45,7 +45,7 @@ type snykProvider struct {
 // NewSnykProvider returns a Snyk implementation of scan provider
 func NewSnykProvider(ops ...SnykProviderOps) (Provider, error) {
 	provider := snykProvider{
-		flags: []string{"test", "--docker"},
+		flags: []string{"container", "test"},
 	}
 	for _, op := range ops {
 		if err := op(&provider); err != nil {