Fix gofmt issues.

These weren't caught yet because they fall under the "-s" simplify flag. I borrowed the bash magic from digitalocean/godo@ea2c971
google · May 28, 2024 · aaa603b · aaa603b
1 parent 8478fed
commit aaa603b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/internal/verifier/attestation_test.go b/internal/verifier/attestation_test.go
@@ -48,7 +48,7 @@ func TestCreateAttestations(t *testing.T) {
 		BuildEnd:    must(time.Parse(time.RFC3339, "2024-01-01T00:00:00Z")),
 		BuildImages: map[string]string{"gcr.io/foo/bar": "abcd"},
 		Steps: []*cloudbuild.BuildStep{
-			&cloudbuild.BuildStep{
+			{
 				Name:       "gcr.io/foo/bar",
 				Script:     "./bar",
 				Status:     "SUCCESS",

diff --git a/pkg/rebuild/rebuild/rebuildremote.go b/pkg/rebuild/rebuild/rebuildremote.go
@@ -91,23 +91,23 @@ func makeBuild(t Target, dockerfile, imageUploadPath, rebuildUploadPath string,
 		Options:        &cloudbuild.BuildOptions{Logging: "GCS_ONLY"},
 		ServiceAccount: opts.BuildServiceAccount,
 		Steps: []*cloudbuild.BuildStep{
-			&cloudbuild.BuildStep{
+			{
 				Name:   "gcr.io/cloud-builders/docker",
 				Script: "cat <<'EOS' | docker buildx build --tag=img -\n" + dockerfile + "\nEOS",
 			},
-			&cloudbuild.BuildStep{
+			{
 				Name: "gcr.io/cloud-builders/docker",
 				Args: []string{"run", "--name=container", "img"},
 			},
-			&cloudbuild.BuildStep{
+			{
 				Name: "gcr.io/cloud-builders/docker",
 				Args: []string{"cp", "container:" + path.Join("/out", t.Artifact), path.Join("/workspace", t.Artifact)},
 			},
-			&cloudbuild.BuildStep{
+			{
 				Name:   "gcr.io/cloud-builders/docker",
 				Script: "docker save img | gzip > /workspace/image.tgz",
 			},
-			&cloudbuild.BuildStep{
+			{
 				Name: "gcr.io/cloud-builders/gsutil",
 				Script: fmt.Sprintf(
 					"gsutil cp -P gs://%s/gsutil_writeonly . && ./gsutil_writeonly %s && ./gsutil_writeonly %s",

diff --git a/pkg/rebuild/rebuild/rebuildremote_test.go b/pkg/rebuild/rebuild/rebuildremote_test.go
@@ -180,15 +180,15 @@ func TestDoCloudBuild(t *testing.T) {
 			Id:     "build-id",
 			Status: "QUEUED",
 			Steps: []*cloudbuild.BuildStep{
-				&cloudbuild.BuildStep{Name: "gcr.io/foo/bar", Script: "./bar"},
+				{Name: "gcr.io/foo/bar", Script: "./bar"},
 			},
 		}
 		afterBuild := &cloudbuild.Build{
 			Id:         "build-id",
 			Status:     "SUCCESS",
 			FinishTime: "2024-05-08T15:23:00Z",
 			Steps: []*cloudbuild.BuildStep{
-				&cloudbuild.BuildStep{Name: "gcr.io/foo/bar", Script: "./bar"},
+				{Name: "gcr.io/foo/bar", Script: "./bar"},
 			},
 			Results: &cloudbuild.Results{BuildStepImages: []string{"sha256:abcd"}},
 		}
@@ -241,23 +241,23 @@ func TestMakeBuild(t *testing.T) {
 			Options:        &cloudbuild.BuildOptions{Logging: "GCS_ONLY"},
 			ServiceAccount: "test-service-account",
 			Steps: []*cloudbuild.BuildStep{
-				&cloudbuild.BuildStep{
+				{
 					Name:   "gcr.io/cloud-builders/docker",
 					Script: "cat <<'EOS' | docker buildx build --tag=img -\nFROM alpine:3.19\nEOS",
 				},
-				&cloudbuild.BuildStep{
+				{
 					Name: "gcr.io/cloud-builders/docker",
 					Args: []string{"run", "--name=container", "img"},
 				},
-				&cloudbuild.BuildStep{
+				{
 					Name: "gcr.io/cloud-builders/docker",
 					Args: []string{"cp", "container:/out/pkg-version.tgz", "/workspace/pkg-version.tgz"},
 				},
-				&cloudbuild.BuildStep{
+				{
 					Name:   "gcr.io/cloud-builders/docker",
 					Script: "docker save img | gzip > /workspace/image.tgz",
 				},
-				&cloudbuild.BuildStep{
+				{
 					Name: "gcr.io/cloud-builders/gsutil",
 					Script: ("" +
 						"gsutil cp -P gs://test-bootstrap/gsutil_writeonly . && " +