Merge branch 'main' into release-1.30

pfnet · Sep 21, 2024 · af52df0 · af52df0
2 parents 572d23b + 80c4033
commit af52df0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/internal/cmd/init.go b/internal/cmd/init.go
@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func newInitCmd(cfg tester.CmdConfig) *cobra.Command {
+func newInitCmd(cfg *tester.CmdConfig) *cobra.Command {
 	return &cobra.Command{
 		Use:   "init [path to admission policy file]",
 		Short: "Generate skeleton manifests for writing tests",
@@ -32,7 +32,7 @@ func newInitCmd(cfg tester.CmdConfig) *cobra.Command {
 				return fmt.Errorf("path is required")
 			}
 			targetFilePath := args[0]
-			return tester.RunInit(cfg, targetFilePath)
+			return tester.RunInit(*cfg, targetFilePath)
 		},
 	}
 }
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -41,10 +41,12 @@ func newRootCmd() *cobra.Command {
 	cmd.PersistentFlags().BoolVarP(&cfg.Verbose, "verbose", "v", false, "Verbose output")
 	cmd.PersistentFlags().BoolVarP(&cfg.Debug, "debug", "d", false, "Debug output")
 
-	initLog(cfg)
+	cobra.OnInitialize(func() {
+		initLog(cfg)
+	})
 
-	cmd.AddCommand(newInitCmd(cfg))
-	cmd.AddCommand(newRunCmd(cfg))
+	cmd.AddCommand(newInitCmd(&cfg))
+	cmd.AddCommand(newRunCmd(&cfg))
 	cmd.AddCommand(newVersionCmd())
 	return cmd
 }

diff --git a/internal/cmd/run.go b/internal/cmd/run.go
@@ -23,15 +23,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func newRunCmd(cfg tester.CmdConfig) *cobra.Command {
+func newRunCmd(cfg *tester.CmdConfig) *cobra.Command {
 	return &cobra.Command{
 		Use:   "run [path to test manifest]...",
 		Short: "Run the tests of ValidatingAdmissionPolicy",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) == 0 {
 				return fmt.Errorf("path is required")
 			}
-			return tester.Run(cfg, args)
+			return tester.Run(*cfg, args)
 		},
 	}
 }
diff --git a/internal/tester/result.go b/internal/tester/result.go
@@ -84,12 +84,11 @@ func (r *policyEvalResult) String(verbose bool) string {
 	}
 	summary += fmt.Sprintf(" - %s ==> %s", strings.ToUpper(string(r.TestCase.Expect)), strings.ToUpper(string(r.Result)))
 
-	if !verbose {
-		return summary
-	}
-
 	out := []string{summary}
 	for _, d := range r.Decisions {
+		if r.Pass() && !verbose {
+			continue
+		}
 		// Workaround to handle the case where the evaluation is not set
 		// TODO remove this workaround after htcps://github.com/kubernetes/kubernetes/pull/126867 is released
 		if d.Evaluation == "" {