dockerfile: add tests for error suggestions

Signed-off-by: Tonis Tiigi <[email protected]>
moby · Jul 2, 2021 · e203c7c · e203c7c
1 parent 7662c7a
commit e203c7c
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 0 deletions.
diff --git a/frontend/dockerfile/dockerfile_mount_test.go b/frontend/dockerfile/dockerfile_mount_test.go
@@ -24,6 +24,7 @@ var mountTests = []integration.Test{
 	testMountEnvAcrossStages,
 	testMountMetaArg,
 	testMountFromError,
+	testMountInvalid,
 }
 
 func init() {
@@ -88,6 +89,77 @@ RUN [ ! -f /mytmp/foo ]
 	require.NoError(t, err)
 }
 
+func testMountInvalid(t *testing.T, sb integration.Sandbox) {
+	f := getFrontend(t, sb)
+
+	dockerfile := []byte(`
+FROM scratch
+RUN --mont=target=/mytmp,type=tmpfs /bin/true
+`)
+
+	dir, err := tmpdir(
+		fstest.CreateFile("Dockerfile", dockerfile, 0600),
+	)
+	require.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	c, err := client.New(sb.Context(), sb.Address())
+	require.NoError(t, err)
+	defer c.Close()
+
+	_, err = f.Solve(sb.Context(), c, client.SolveOpt{
+		LocalDirs: map[string]string{
+			builder.DefaultLocalNameDockerfile: dir,
+			builder.DefaultLocalNameContext:    dir,
+		},
+	}, nil)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "unknown flag: mont")
+	require.Contains(t, err.Error(), "did you mean mount?")
+
+	dockerfile = []byte(`
+	FROM scratch
+	RUN --mount=typ=tmpfs /bin/true
+	`)
+
+	dir, err = tmpdir(
+		fstest.CreateFile("Dockerfile", dockerfile, 0600),
+	)
+	require.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	_, err = f.Solve(sb.Context(), c, client.SolveOpt{
+		LocalDirs: map[string]string{
+			builder.DefaultLocalNameDockerfile: dir,
+			builder.DefaultLocalNameContext:    dir,
+		},
+	}, nil)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "unexpected key 'typ'")
+	require.Contains(t, err.Error(), "did you mean type?")
+
+	dockerfile = []byte(`
+	FROM scratch
+	RUN --mount=type=tmp /bin/true
+	`)
+
+	dir, err = tmpdir(
+		fstest.CreateFile("Dockerfile", dockerfile, 0600),
+	)
+	require.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	_, err = f.Solve(sb.Context(), c, client.SolveOpt{
+		LocalDirs: map[string]string{
+			builder.DefaultLocalNameDockerfile: dir,
+			builder.DefaultLocalNameContext:    dir,
+		},
+	}, nil)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "unsupported mount type \"tmp\"")
+	require.Contains(t, err.Error(), "did you mean tmpfs?")
+}
+
 func testMountRWCache(t *testing.T, sb integration.Sandbox) {
 	f := getFrontend(t, sb)
 

diff --git a/frontend/dockerfile/dockerfile_test.go b/frontend/dockerfile/dockerfile_test.go
@@ -110,6 +110,7 @@ var allTests = []integration.Test{
 	testDockerfileLowercase,
 	testExportCacheLoop,
 	testWildcardRenameCache,
+	testDockerfileInvalidInstruction,
 }
 
 var fileOpTests = []integration.Test{
@@ -2152,6 +2153,37 @@ func testDockerfileInvalidCommand(t *testing.T, sb integration.Sandbox) {
 	require.Contains(t, stdout.String(), "did not complete successfully")
 }
 
+func testDockerfileInvalidInstruction(t *testing.T, sb integration.Sandbox) {
+	skipDockerd(t, sb)
+	f := getFrontend(t, sb)
+	f.RequiresBuildctl(t)
+	dockerfile := []byte(`
+	FROM scratch
+	FNTRYPOINT ["/bin/sh", "-c", "echo invalidinstruction"]
+`)
+
+	dir, err := tmpdir(
+		fstest.CreateFile("Dockerfile", dockerfile, 0600),
+	)
+	require.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	c, err := client.New(sb.Context(), sb.Address())
+	require.NoError(t, err)
+	defer c.Close()
+
+	_, err = f.Solve(sb.Context(), c, client.SolveOpt{
+		LocalDirs: map[string]string{
+			builder.DefaultLocalNameDockerfile: dir,
+			builder.DefaultLocalNameContext:    dir,
+		},
+	}, nil)
+
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "unknown instruction: FNTRYPOINT")
+	require.Contains(t, err.Error(), "did you mean ENTRYPOINT?")
+}
+
 func testDockerfileADDFromURL(t *testing.T, sb integration.Sandbox) {
 	skipDockerd(t, sb)
 	f := getFrontend(t, sb)