fix: revert changes

tilt-dev#6158 (comment) > i think this one needs to be reverted, because the typo is upstream Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
suzuki-shunsuke · Jun 30, 2023 · c53ca21 · c53ca21
1 parent 7df00cb
commit c53ca21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/build/docker_builder.go b/internal/build/docker_builder.go
@@ -307,7 +307,7 @@ func (d *DockerBuilder) getDigestFromBuildOutput(ctx context.Context, reader io.
 }
 
 var dockerBuildCleanupRexes = []*regexp.Regexp{
-	// the "runc did not determinate successfully" just seems redundant on top of "executor failed running"
+	// the "runc did not determinate sucessfully" just seems redundant on top of "executor failed running"
 	// nolint
 	regexp.MustCompile("(executor failed running.*): runc did not terminate sucessfully"), // sucessfully (sic)
 	// when a file is missing, it generates an error like "failed to compute cache key: foo.txt not found: not found"

diff --git a/internal/build/docker_builder_test.go b/internal/build/docker_builder_test.go
@@ -117,15 +117,15 @@ func TestCleanUpBuildKitErrors(t *testing.T) {
 		// actual error currently emitted by buildkit when a `RUN` fails
 		{
 			//nolint
-			buildKitError:     "failed to solve with frontend dockerfile.v0: failed to build LLB: executor failed running [/bin/sh -c go install github.com/tilt-dev/servantes/vigoda]: runc did not terminate successfully",
+			buildKitError:     "failed to solve with frontend dockerfile.v0: failed to build LLB: executor failed running [/bin/sh -c go install github.com/tilt-dev/servantes/vigoda]: runc did not terminate sucessfully",
 			expectedTiltError: "executor failed running [/bin/sh -c go install github.com/tilt-dev/servantes/vigoda]",
 		},
 		//nolint
-		// artificial error - in case docker for some reason doesn't have "executor failed running", don't trim "runc did not terminate successfully"
+		// artificial error - in case docker for some reason doesn't have "executor failed running", don't trim "runc did not terminate sucessfully"
 		{
 			//nolint
-			buildKitError:     "failed to solve with frontend dockerfile.v0: failed to build LLB: [/bin/sh -c go install github.com/tilt-dev/servantes/vigoda]: runc did not terminate successfully",
-			expectedTiltError: "[/bin/sh -c go install github.com/tilt-dev/servantes/vigoda]: runc did not terminate successfully",
+			buildKitError:     "failed to solve with frontend dockerfile.v0: failed to build LLB: [/bin/sh -c go install github.com/tilt-dev/servantes/vigoda]: runc did not terminate sucessfully",
+			expectedTiltError: "[/bin/sh -c go install github.com/tilt-dev/servantes/vigoda]: runc did not terminate sucessfully",
 		},
 		// actual error currently emitted by buildkit when an `ADD` file is missing
 		{
@@ -158,7 +158,7 @@ func TestCleanUpBuildKitErrors(t *testing.T) {
 			// Error message when using
 			// # syntax=docker/dockerfile:experimental
 			//nolint
-			buildKitError:     "failed to solve with frontend dockerfile.v0: failed to solve with frontend gateway.v0: rpc error: code = Unknown desc = failed to build LLB: executor failed running [/bin/sh -c pip install python-dateutil]: runc did not terminate successfully",
+			buildKitError:     "failed to solve with frontend dockerfile.v0: failed to solve with frontend gateway.v0: rpc error: code = Unknown desc = failed to build LLB: executor failed running [/bin/sh -c pip install python-dateutil]: runc did not terminate sucessfully",
 			expectedTiltError: "executor failed running [/bin/sh -c pip install python-dateutil]",
 		},
 	} {