Merge pull request kubernetes-sigs#2112 from pwittrock/master

drop short-hand flags from `config run` command

cmd/config/internal/commands/run-fns.go

@@ -34,11 +34,11 @@ func GetRunFnRunner(name string) *RunFnRunner {
 		&r.DryRun, "dry-run", false, "print results to stdout")
 	r.Command.Flags().BoolVar(
 		&r.GlobalScope, "global-scope", false, "set global scope for functions.")
-	r.Command.Flags().StringSliceVarP(
-		&r.FnPaths, "fn-path", "p", []string{},
+	r.Command.Flags().StringSliceVar(
+		&r.FnPaths, "fn-path", []string{},
 		"read functions from these directories instead of the configuration directory.")
-	r.Command.Flags().StringVarP(
-		&r.Image, "image", "i", "",
+	r.Command.Flags().StringVar(
+		&r.Image, "image", "",
 		"run this image as a function instead of discovering them.")
 	return r
 }

cmd/config/internal/commands/run_test.go

@@ -90,7 +90,7 @@ apiVersion: v1
 		},
 		{
 			name: "custom kind",
-			args: []string{"run", "dir", "-i", "foo:bar", "--", "Foo", "g=h"},
+			args: []string{"run", "dir", "--image", "foo:bar", "--", "Foo", "g=h"},
 			path: "dir",
 			expected: `
 metadata:
@@ -105,7 +105,7 @@ apiVersion: v1
 		},
 		{
 			name: "custom kind '=' in data",
-			args: []string{"run", "dir", "-i", "foo:bar", "--", "Foo", "g=h", "i=j=k"},
+			args: []string{"run", "dir", "--image", "foo:bar", "--", "Foo", "g=h", "i=j=k"},
 			path: "dir",
 			expected: `
 metadata:
@@ -120,14 +120,14 @@ apiVersion: v1
 		},
 		{
 			name:          "function paths",
-			args:          []string{"run", "dir", "-p", "path1", "--fn-path", "path2"},
+			args:          []string{"run", "dir", "--fn-path", "path1", "--fn-path", "path2"},
 			path:          "dir",
 			functionPaths: []string{"path1", "path2"},
 		},
 		{
 			name: "custom kind with function paths",
 			args: []string{
-				"run", "dir", "-p", "path", "-i", "foo:bar", "--", "Foo", "g=h", "i=j=k"},
+				"run", "dir", "--fn-path", "path", "--image", "foo:bar", "--", "Foo", "g=h", "i=j=k"},
 			path:          "dir",
 			functionPaths: []string{"path"},
 			expected: `