builder/remotecontext: format code with gofumpt

Formatting the code with https://github.com/mvdan/gofumpt

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

builder/remotecontext/detect_test.go

@@ -31,7 +31,6 @@ func extractFilenames(files []os.DirEntry) []string {
 
 func checkDirectory(t *testing.T, dir string, expectedFiles []string) {
 	files, err := os.ReadDir(dir)
-
 	if err != nil {
 		t.Fatalf("Could not read directory: %s", err)
 	}
@@ -55,7 +54,6 @@ func executeProcess(t *testing.T, contextDir string) {
 	modifiableCtx := &stubRemote{root: contextDir}
 
 	err := removeDockerfile(modifiableCtx, builder.DefaultDockerfileName)
-
 	if err != nil {
 		t.Fatalf("Error when executing Process: %s", err)
 	}
@@ -65,9 +63,9 @@ func TestProcessShouldRemoveDockerfileDockerignore(t *testing.T) {
 	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerignore-process-test")
 	defer cleanup()
 
-	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0777)
-	createTestTempFile(t, contextDir, dockerignoreFilename, "Dockerfile\n.dockerignore", 0777)
-	createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0777)
+	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0o777)
+	createTestTempFile(t, contextDir, dockerignoreFilename, "Dockerfile\n.dockerignore", 0o777)
+	createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0o777)
 
 	executeProcess(t, contextDir)
 
@@ -78,8 +76,8 @@ func TestProcessNoDockerignore(t *testing.T) {
 	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerignore-process-test")
 	defer cleanup()
 
-	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0777)
-	createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0777)
+	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0o777)
+	createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0o777)
 
 	executeProcess(t, contextDir)
 
@@ -90,9 +88,9 @@ func TestProcessShouldLeaveAllFiles(t *testing.T) {
 	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerignore-process-test")
 	defer cleanup()
 
-	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0777)
-	createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0777)
-	createTestTempFile(t, contextDir, dockerignoreFilename, "input1\ninput2", 0777)
+	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0o777)
+	createTestTempFile(t, contextDir, builder.DefaultDockerfileName, dockerfileContents, 0o777)
+	createTestTempFile(t, contextDir, dockerignoreFilename, "input1\ninput2", 0o777)
 
 	executeProcess(t, contextDir)
 
@@ -111,9 +109,11 @@ func (r *stubRemote) Hash(path string) (string, error) {
 func (r *stubRemote) Root() string {
 	return r.root
 }
+
 func (r *stubRemote) Close() error {
 	return errors.New("not implemented")
 }
+
 func (r *stubRemote) Remove(p string) error {
 	return os.Remove(filepath.Join(r.root, p))
 }

builder/remotecontext/git/gitutils.go

@@ -35,7 +35,6 @@ func WithIsolatedConfig(v bool) CloneOption {
 // will be under "docker-build-git"
 func Clone(remoteURL string, opts ...CloneOption) (string, error) {
 	repo, err := parseRemoteURL(remoteURL)
-
 	if err != nil {
 		return "", err
 	}

builder/remotecontext/git/gitutils_test.go

@@ -239,11 +239,11 @@ func TestCheckoutGit(t *testing.T) {
 	must(gitRepo{}.gitWithinDir(root, "-c", "init.defaultBranch=master", "init", gitDir))
 	must(gitRepo{}.gitWithinDir(gitDir, "config", "user.email", "test@docker.com"))
 	must(gitRepo{}.gitWithinDir(gitDir, "config", "user.name", "Docker test"))
-	assert.NilError(t, os.WriteFile(filepath.Join(gitDir, "Dockerfile"), []byte("FROM scratch"), 0644))
+	assert.NilError(t, os.WriteFile(filepath.Join(gitDir, "Dockerfile"), []byte("FROM scratch"), 0o644))
 
 	subDir := filepath.Join(gitDir, "subdir")
-	assert.NilError(t, os.Mkdir(subDir, 0755))
-	assert.NilError(t, os.WriteFile(filepath.Join(subDir, "Dockerfile"), []byte("FROM scratch\nEXPOSE 5000"), 0644))
+	assert.NilError(t, os.Mkdir(subDir, 0o755))
+	assert.NilError(t, os.WriteFile(filepath.Join(subDir, "Dockerfile"), []byte("FROM scratch\nEXPOSE 5000"), 0o644))
 
 	if runtime.GOOS != "windows" {
 		assert.NilError(t, os.Symlink("../subdir", filepath.Join(gitDir, "parentlink")))
@@ -254,8 +254,8 @@ func TestCheckoutGit(t *testing.T) {
 	must(gitRepo{}.gitWithinDir(gitDir, "commit", "-am", "First commit"))
 	must(gitRepo{}.gitWithinDir(gitDir, "checkout", "-b", "test"))
 
-	assert.NilError(t, os.WriteFile(filepath.Join(gitDir, "Dockerfile"), []byte("FROM scratch\nEXPOSE 3000"), 0644))
-	assert.NilError(t, os.WriteFile(filepath.Join(subDir, "Dockerfile"), []byte("FROM busybox\nEXPOSE 5000"), 0644))
+	assert.NilError(t, os.WriteFile(filepath.Join(gitDir, "Dockerfile"), []byte("FROM scratch\nEXPOSE 3000"), 0o644))
+	assert.NilError(t, os.WriteFile(filepath.Join(subDir, "Dockerfile"), []byte("FROM busybox\nEXPOSE 5000"), 0o644))
 
 	must(gitRepo{}.gitWithinDir(gitDir, "add", "-A"))
 	must(gitRepo{}.gitWithinDir(gitDir, "commit", "-am", "Branch commit"))
@@ -267,7 +267,7 @@ func TestCheckoutGit(t *testing.T) {
 	must(gitRepo{}.gitWithinDir(subrepoDir, "config", "user.email", "test@docker.com"))
 	must(gitRepo{}.gitWithinDir(subrepoDir, "config", "user.name", "Docker test"))
 
-	assert.NilError(t, os.WriteFile(filepath.Join(subrepoDir, "subfile"), []byte("subcontents"), 0644))
+	assert.NilError(t, os.WriteFile(filepath.Join(subrepoDir, "subfile"), []byte("subcontents"), 0o644))
 
 	must(gitRepo{}.gitWithinDir(subrepoDir, "add", "-A"))
 	must(gitRepo{}.gitWithinDir(subrepoDir, "commit", "-am", "Subrepo initial"))

builder/remotecontext/remote_test.go

@@ -196,7 +196,7 @@ func TestDownloadRemote(t *testing.T) {
 }
 
 func TestGetWithStatusError(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		err          error
 		statusCode   int
 		expectedErr  string

builder/remotecontext/tarsum_test.go

@@ -49,12 +49,11 @@ func TestHashFile(t *testing.T) {
 	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
 	defer cleanup()
 
-	createTestTempFile(t, contextDir, filename, contents, 0755)
+	createTestTempFile(t, contextDir, filename, contents, 0o755)
 
 	tarSum := makeTestArchiveContext(t, contextDir)
 
 	sum, err := tarSum.Hash(filename)
-
 	if err != nil {
 		t.Fatalf("Error when executing Stat: %s", err)
 	}
@@ -75,23 +74,21 @@ func TestHashSubdir(t *testing.T) {
 	defer cleanup()
 
 	contextSubdir := filepath.Join(contextDir, "builder-tarsum-test-subdir")
-	err := os.Mkdir(contextSubdir, 0755)
+	err := os.Mkdir(contextSubdir, 0o755)
 	if err != nil {
 		t.Fatalf("Failed to make directory: %s", contextSubdir)
 	}
 
-	testFilename := createTestTempFile(t, contextSubdir, filename, contents, 0755)
+	testFilename := createTestTempFile(t, contextSubdir, filename, contents, 0o755)
 
 	tarSum := makeTestArchiveContext(t, contextDir)
 
 	relativePath, err := filepath.Rel(contextDir, testFilename)
-
 	if err != nil {
 		t.Fatalf("Error when getting relative path: %s", err)
 	}
 
 	sum, err := tarSum.Hash(relativePath)
-
 	if err != nil {
 		t.Fatalf("Error when executing Stat: %s", err)
 	}
@@ -114,7 +111,6 @@ func TestRemoveDirectory(t *testing.T) {
 	contextSubdir := createTestTempSubdir(t, contextDir, "builder-tarsum-test-subdir")
 
 	relativePath, err := filepath.Rel(contextDir, contextSubdir)
-
 	if err != nil {
 		t.Fatalf("Error when getting relative path: %s", err)
 	}

builder/remotecontext/utils_test.go

@@ -11,7 +11,6 @@ import (
 // When an error occurs, it terminates the test.
 func createTestTempDir(t *testing.T, dir, prefix string) (string, func()) {
 	path, err := os.MkdirTemp(dir, prefix)
-
 	if err != nil {
 		t.Fatalf("Error when creating directory %s with prefix %s: %s", dir, prefix, err)
 	}
@@ -32,7 +31,6 @@ func createTestTempDir(t *testing.T, dir, prefix string) (string, func()) {
 // When an error occurs, it terminates the test.
 func createTestTempSubdir(t *testing.T, dir, prefix string) string {
 	path, err := os.MkdirTemp(dir, prefix)
-
 	if err != nil {
 		t.Fatalf("Error when creating directory %s with prefix %s: %s", dir, prefix, err)
 	}
@@ -45,7 +43,6 @@ func createTestTempSubdir(t *testing.T, dir, prefix string) string {
 func createTestTempFile(t *testing.T, dir, filename, contents string, perm os.FileMode) string {
 	filePath := filepath.Join(dir, filename)
 	err := os.WriteFile(filePath, []byte(contents), perm)
-
 	if err != nil {
 		t.Fatalf("Error when creating %s file: %s", filename, err)
 	}