From 39a8798a874d588da63645b026b21d14c873943b Mon Sep 17 00:00:00 2001 From: Gongpu Zhu Date: Tue, 1 Sep 2020 22:40:03 -0700 Subject: [PATCH] Add --log-steps flag --- cmd/config/internal/commands/run-fns.go | 8 +++++++- cmd/config/internal/commands/run_test.go | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cmd/config/internal/commands/run-fns.go b/cmd/config/internal/commands/run-fns.go index 2ae82adae..dc987e8cd 100644 --- a/cmd/config/internal/commands/run-fns.go +++ b/cmd/config/internal/commands/run-fns.go @@ -9,11 +9,13 @@ import ( "strings" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/fn/runtime/runtimeutil" "sigs.k8s.io/kustomize/kyaml/runfn" "sigs.k8s.io/kustomize/kyaml/yaml" + + "sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands" ) // GetCatRunner returns a RunFnRunner. @@ -65,6 +67,8 @@ func GetRunFnRunner(name string) *RunFnRunner { r.Command.Flags().StringArrayVar( &r.Mounts, "mount", []string{}, "a list of storage options read from the filesystem") + r.Command.Flags().BoolVar( + &r.LogSteps, "log-steps", false, "log steps to stderr") return r } @@ -91,6 +95,7 @@ type RunFnRunner struct { Network bool NetworkName string Mounts []string + LogSteps bool } func (r *RunFnRunner) runE(c *cobra.Command, args []string) error { @@ -305,6 +310,7 @@ func (r *RunFnRunner) preRunE(c *cobra.Command, args []string) error { EnableExec: r.EnableExec, StorageMounts: storageMounts, ResultsDir: r.ResultsDir, + LogSteps: r.LogSteps, } // don't consider args for the function diff --git a/cmd/config/internal/commands/run_test.go b/cmd/config/internal/commands/run_test.go index 7a3bf6939..094a6e6eb 100644 --- a/cmd/config/internal/commands/run_test.go +++ b/cmd/config/internal/commands/run_test.go @@ -11,6 +11,7 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/assert" + "sigs.k8s.io/kustomize/kyaml/runfn" ) @@ -283,6 +284,16 @@ apiVersion: v1 args: []string{"run", "dir", "--image", "foo:bar", "--", "a=b", "c", "e=f"}, err: "must have keys and values separated by", }, + { + name: "log steps", + args: []string{"run", "dir", "--log-steps"}, + path: "dir", + expectedStruct: &runfn.RunFns{ + Path: "dir", + NetworkName: "bridge", + LogSteps: true, + }, + }, } for i := range tests { @@ -385,5 +396,4 @@ apiVersion: v1 }) } - }