Merge pull request #25198 from chaodaiG/cloneutils-verbose

Cloneref logs full command + env + dir

prow/pod-utils/clone/clone.go

@@ -383,9 +383,9 @@ func (c cloneCommand) run() (string, string, error) {
 	cmd.Stdout = &output
 	cmd.Stderr = &output
 	err := cmd.Run()
-	return strings.Join(append([]string{c.command}, c.args...), " "), output.String(), err
+	return c.String(), output.String(), err
 }
 
 func (c cloneCommand) String() string {
-	return fmt.Sprintf("PWD=%s %s %s %s", c.dir, strings.Join(c.env, " "), c.command, strings.Join(c.env, " "))
+	return fmt.Sprintf("PWD=%s %s %s %s", c.dir, strings.Join(c.env, " "), c.command, strings.Join(c.args, " "))
 }

prow/pod-utils/clone/clone_test.go

@@ -933,3 +933,37 @@ func TestGitFetch(t *testing.T) {
 		})
 	}
 }
+
+func TestCloneCommandString(t *testing.T) {
+	tests := []struct {
+		name string
+		cc   cloneCommand
+		want string
+	}{
+		{
+			name: "empty",
+			cc:   cloneCommand{},
+			want: "PWD=   ",
+		},
+		{
+			name: "base",
+			cc: cloneCommand{
+				dir:     "abc",
+				env:     []string{"d=e", "f=g"},
+				command: "echo",
+				args:    []string{"hij klm"},
+			},
+			want: "PWD=abc d=e f=g echo hij klm",
+		},
+	}
+
+	for _, tc := range tests {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			want, got := tc.want, tc.cc.String()
+			if diff := cmp.Diff(want, got); diff != "" {
+				t.Errorf("mismatch. want(-), got(+):\n%s", diff)
+			}
+		})
+	}
+}