add cli tests for source flag

Author: wagoodman

.goreleaser.yaml

@@ -67,6 +67,7 @@ dockers:
     use: buildx
     goarch: amd64
     image_templates:
+      - docker.io/wagoodman/dive:latest
       - docker.io/wagoodman/dive:v{{.Version}}-amd64
     build_flag_templates:
       - "--build-arg=DOCKER_CLI_VERSION={{.Env.DOCKER_CLI_VERSION}}"

Taskfile.yaml

@@ -202,7 +202,7 @@ tasks:
       - |
         docker run \
           --rm \
-          -t \
+          -ti \
           -v /var/run/docker.sock:/var/run/docker.sock \
           'docker.io/wagoodman/dive:latest' \
             '{{ .TEST_IMAGE }}' \
@@ -213,6 +213,7 @@ tasks:
     cmds:
       - |
         docker run \
+          --platform linux/amd64 \
           -v /var/run/docker.sock:/var/run/docker.sock \
           -v /${PWD}:/src \
           -w /src \
@@ -234,6 +235,7 @@ tasks:
     cmds:
       - |
         docker run \
+          --platform linux/amd64 \
           -v /var/run/docker.sock:/var/run/docker.sock \
           -v /${PWD}:/src \
           -w /src \
@@ -326,6 +328,7 @@ tasks:
     deps: [tools, tmpdir]
     sources:
       - "**/*.go"
+      - ".goreleaser.yaml"
     method: checksum
     cmds:
       - silent: true

cmd/dive/cli/cli_fetch_test.go

@@ -8,44 +8,67 @@ import (
 	"testing"
 )
 
-func Test_FetchImage(t *testing.T) {
+func Test_LoadImage(t *testing.T) {
+	image := "busybox:1.37.0@sha256:ad9fa4d07136a83e69a54ef00102f579d04eba431932de3b0f098cc5d5948f9f"
+	archive := repoPath(t, ".data/test-docker-image.tar")
 
-	t.Run("fetch from docker engine", func(t *testing.T) {
-		rootCmd := getTestCommand(t, "docker://busybox:1.37.0@sha256:ad9fa4d07136a83e69a54ef00102f579d04eba431932de3b0f098cc5d5948f9f")
-		combined := Capture().WithStdout().WithStderr().Run(t, func() {
-			require.NoError(t, rootCmd.Execute())
-		})
+	t.Run("from docker engine", func(t *testing.T) {
+		runWithCombinedOutput(t, fmt.Sprintf("docker://%s", image))
+	})
 
-		assert.Contains(t, combined, "Loading image")
-		assert.Contains(t, combined, "Analyzing image")
-		assert.Contains(t, combined, "Evaluating image")
+	t.Run("from docker engine (flag)", func(t *testing.T) {
 
-		snaps.MatchSnapshot(t, combined)
+		runWithCombinedOutput(t, fmt.Sprintf("--source docker %s", image))
 	})
 
-	t.Run("fetch from podman engine", func(t *testing.T) {
+	t.Run("from podman engine", func(t *testing.T) {
 		if _, err := exec.LookPath("podman"); err != nil {
 			t.Skip("podman not installed, skipping test")
 		}
+		// pull the image from podman first
+		require.NoError(t, exec.Command("podman", "pull", image).Run())
+
+		runWithCombinedOutput(t, fmt.Sprintf("podman://%s", image))
+	})
 
-		image := "busybox:1.37.0@sha256:ad9fa4d07136a83e69a54ef00102f579d04eba431932de3b0f098cc5d5948f9f"
+	t.Run("from podman engine (flag)", func(t *testing.T) {
+		if _, err := exec.LookPath("podman"); err != nil {
+			t.Skip("podman not installed, skipping test")
+		}
 
 		// pull the image from podman first
 		require.NoError(t, exec.Command("podman", "pull", image).Run())
 
-		rootCmd := getTestCommand(t, fmt.Sprintf("podman://%s", image))
-		combined := Capture().WithStdout().WithStderr().Run(t, func() {
-			require.NoError(t, rootCmd.Execute())
-		})
+		runWithCombinedOutput(t, fmt.Sprintf("--source podman %s", image))
+	})
 
-		assert.Contains(t, combined, "Loading image")
-		assert.Contains(t, combined, "Analyzing image")
-		assert.Contains(t, combined, "Evaluating image")
+	t.Run("from archive", func(t *testing.T) {
+		runWithCombinedOutput(t, fmt.Sprintf("docker-archive://%s", archive))
+	})
 
-		snaps.MatchSnapshot(t, combined)
+	t.Run("from archive (flag)", func(t *testing.T) {
+		runWithCombinedOutput(t, fmt.Sprintf("--source docker-archive %s", archive))
 	})
 }
 
+func runWithCombinedOutput(t testing.TB, cmd string) {
+	t.Helper()
+	rootCmd := getTestCommand(t, cmd)
+	combined := Capture().WithStdout().WithStderr().Run(t, func() {
+		require.NoError(t, rootCmd.Execute())
+	})
+
+	assertLoadOutput(t, combined)
+}
+
+func assertLoadOutput(t testing.TB, combined string) {
+	t.Helper()
+	assert.Contains(t, combined, "Loading image")
+	assert.Contains(t, combined, "Analyzing image")
+	assert.Contains(t, combined, "Evaluating image")
+	snaps.MatchSnapshot(t, combined)
+}
+
 func Test_FetchFailure(t *testing.T) {
 	t.Run("nonexistent image", func(t *testing.T) {
 		rootCmd := getTestCommand(t, "docker:wagoodman/nonexistent/image:tag")

cmd/dive/cli/internal/options/analysis.go

@@ -29,7 +29,7 @@ func DefaultAnalysis() Analysis {
 	return Analysis{
 		ContainerEngine:           defaultContainerEngine,
 		IgnoreErrors:              false,
-		AvailableContainerEngines: []string{"docker", "podman"},
+		AvailableContainerEngines: dive.ImageSources,
 	}
 }
 

cmd/dive/cli/testdata/snapshots/cli_fetch_test.snap

@@ -1,5 +1,15 @@
 
-[Test_FetchImage/fetch_from_docker_engine - 1]
+[Test_FetchFailure/nonexistent_image - 1]
+Loading image                 docker:wagoodman/nonexistent/image:tag
+
+---
+
+[Test_FetchFailure/invalid_image_name - 1]
+Loading image                 /wagoodman/invalid:image:format
+
+---
+
+[Test_LoadImage/from_docker_engine - 1]
 Loading image                 busybox:1.37.0@sha256:ad9fa4d07136a83e69a54ef00102f579d04eba431932de3b0f098cc5d5948f9f
 Analyzing image               [layers:1 files:441 size:4.3 MB]
 Evaluating image              [rules: 3]
@@ -20,17 +30,53 @@ PASS [pass:3]
 
 ---
 
-[Test_FetchFailure/nonexistent_image - 1]
-Loading image                 docker:wagoodman/nonexistent/image:tag
+[Test_LoadImage/from_podman_engine - 1]
+Loading image                 busybox:1.37.0@sha256:ad9fa4d07136a83e69a54ef00102f579d04eba431932de3b0f098cc5d5948f9f
+Analyzing image               [layers:1 files:441 size:4.3 MB]
+Evaluating image              [rules: 3]
+
+Analysis:
+  efficiency:        100.00 %
+  wastedBytes:       0 bytes 
+  userWastedPercent: 0 %
+
+Inefficient Files: (None)
+
+Evaluation:
+  PASS  highestUserWastedPercent (0.90)
+  PASS  highestWastedBytes (20MB)
+  PASS  lowestEfficiency (0.9)
+
+PASS [pass:3]
 
 ---
 
-[Test_FetchFailure/invalid_image_name - 1]
-Loading image                 /wagoodman/invalid:image:format
+[Test_LoadImage/from_archive - 1]
+Loading image                 /Users/wagoodman/code/dive/.data/test-docker-image.tar
+Analyzing image               [layers:14 files:451 size:1.2 MB]
+Evaluating image              [rules: 3]
+
+Analysis:
+  efficiency:        98.44 %
+  wastedBytes:       32025 bytes (32 kB)
+  userWastedPercent: 48.35 %
+
+Inefficient Files:
+  Count  Wasted Space  File Path
+  2      13 kB         /root/saved.txt
+  2      13 kB         /root/example/somefile1.txt
+  2      6.4 kB        /root/example/somefile3.txt
+
+Evaluation:
+  PASS  highestUserWastedPercent (0.90)
+  PASS  highestWastedBytes (20MB)
+  PASS  lowestEfficiency (0.9)
+
+PASS [pass:3]
 
 ---
 
-[Test_FetchImage/fetch_from_podman_engine - 1]
+[Test_LoadImage/from_docker_engine_(flag) - 1]
 Loading image                 busybox:1.37.0@sha256:ad9fa4d07136a83e69a54ef00102f579d04eba431932de3b0f098cc5d5948f9f
 Analyzing image               [layers:1 files:441 size:4.3 MB]
 Evaluating image              [rules: 3]
@@ -50,3 +96,49 @@ Evaluation:
 PASS [pass:3]
 
 ---
+
+[Test_LoadImage/from_podman_engine_(flag) - 1]
+Loading image                 busybox:1.37.0@sha256:ad9fa4d07136a83e69a54ef00102f579d04eba431932de3b0f098cc5d5948f9f
+Analyzing image               [layers:1 files:441 size:4.3 MB]
+Evaluating image              [rules: 3]
+
+Analysis:
+  efficiency:        100.00 %
+  wastedBytes:       0 bytes 
+  userWastedPercent: 0 %
+
+Inefficient Files: (None)
+
+Evaluation:
+  PASS  highestUserWastedPercent (0.90)
+  PASS  highestWastedBytes (20MB)
+  PASS  lowestEfficiency (0.9)
+
+PASS [pass:3]
+
+---
+
+[Test_LoadImage/from_archive_(flag) - 1]
+Loading image                 /Users/wagoodman/code/dive/.data/test-docker-image.tar
+Analyzing image               [layers:14 files:451 size:1.2 MB]
+Evaluating image              [rules: 3]
+
+Analysis:
+  efficiency:        98.44 %
+  wastedBytes:       32025 bytes (32 kB)
+  userWastedPercent: 48.35 %
+
+Inefficient Files:
+  Count  Wasted Space  File Path
+  2      13 kB         /root/saved.txt
+  2      13 kB         /root/example/somefile1.txt
+  2      6.4 kB        /root/example/somefile3.txt
+
+Evaluation:
+  PASS  highestUserWastedPercent (0.90)
+  PASS  highestWastedBytes (20MB)
+  PASS  lowestEfficiency (0.9)
+
+PASS [pass:3]
+
+---