Merge pull request kubernetes-sigs#11 from monopole/dropMinusFFromDiff

drop unnecessary -f from diff

Author: monopole

demos/ldap/integration_test.sh

@@ -28,13 +28,6 @@
 
 set -x
 
-target=$1
-
-echo Kustomizing: \"$target\"
-ls $target
-
-tmpDir=$(mktemp -d)
-
 function configureCluster {
   kustomize build $target > $tmpDir/my.yaml
   [[ $? -eq 0 ]] || { exitWith "Failed to kustomize build"; }
@@ -115,6 +108,13 @@ function deleteAddedUser {
     "cn=The Postmaster,dc=example,dc=org"
 }
 
+target=$1
+
+echo Kustomizing: \"$target\"
+ls $target
+
+tmpDir=$(mktemp -d)
+
 configureCluster
 
 podName=`getPodField '{.items[0].metadata.name}'`

pkg/commands/build.go

@@ -17,9 +17,7 @@ limitations under the License.
 package commands
 
 import (
-	"fmt"
 	"io"
-	"os"
 	"path/filepath"
 
 	"github.com/spf13/cobra"
@@ -46,17 +44,12 @@ func newCmdBuild(out, errOut io.Writer, fs fs.FileSystem) *cobra.Command {
 		Short: "Print current configuration per contents of " + constants.KustomizationFileName,
 		Example: "Use the file somedir/" + constants.KustomizationFileName +
 			" to generate a set of api resources:\nbuild somedir/",
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			err := o.Validate(args)
 			if err != nil {
-				fmt.Fprintf(errOut, "error: %v\n", err)
-				os.Exit(1)
-			}
-			err = o.RunBuild(out, errOut, fs)
-			if err != nil {
-				fmt.Fprintf(errOut, "error: %v\n", err)
-				os.Exit(1)
+				return err
 			}
+			return o.RunBuild(out, errOut, fs)
 		},
 	}
 	return cmd

pkg/commands/diff.go

@@ -40,43 +40,29 @@ func newCmdDiff(out, errOut io.Writer, fs fs.FileSystem) *cobra.Command {
 	var o diffOptions
 
 	cmd := &cobra.Command{
-		Use:     "diff",
-		Short:   "diff between transformed resources and untransformed resources",
-		Long:    "diff between transformed resources and untransformed resources and the subpackages are all transformed.",
-		Example: `diff -f .`,
+		Use:   "diff [path]",
+		Short: "diff between customized resources and uncustomized resources",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			err := o.Validate(cmd, args)
 			if err != nil {
 				return err
 			}
-			err = o.Complete(cmd, args)
-			if err != nil {
-				return err
-			}
 			return o.RunDiff(out, errOut, fs)
 		},
 	}
-
-	cmd.Flags().StringVarP(
-		&o.kustomizationPath,
-		"filename",
-		"f",
-		"",
-		"Specify a directory containing "+constants.KustomizationFileName)
-	cmd.MarkFlagRequired("filename")
 	return cmd
 }
 
 // Validate validates diff command.
 func (o *diffOptions) Validate(cmd *cobra.Command, args []string) error {
-	if len(args) > 0 {
-		return errors.New("The diff command takes no arguments.")
+	if len(args) > 1 {
+		return errors.New("specify one path to " + constants.KustomizationFileName)
 	}
-	return nil
-}
-
-// Complete completes diff command.
-func (o *diffOptions) Complete(cmd *cobra.Command, args []string) error {
+	if len(args) == 0 {
+		o.kustomizationPath = "./"
+		return nil
+	}
+	o.kustomizationPath = args[0]
 	return nil
 }