Fix race conditions

Signed-off-by: David Gageot <[email protected]>

cmd/skaffold/app/cmd/cmd.go

@@ -38,29 +38,36 @@ var (
 	v            string
 	defaultColor int
 	overwrite    bool
-
-	updateMsg = make(chan string)
 )
 
-var rootCmd = &cobra.Command{
-	Use:   "skaffold",
-	Short: "A tool that facilitates continuous development for Kubernetes applications.",
-}
-
 func NewSkaffoldCommand(out, err io.Writer) *cobra.Command {
+	updateMsg := make(chan string)
+
+	rootCmd := &cobra.Command{
+		Use:           "skaffold",
+		Short:         "A tool that facilitates continuous development for Kubernetes applications.",
+		SilenceErrors: true,
+	}
+
 	rootCmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
 		if err := SetUpLogs(err, v); err != nil {
 			return err
 		}
+
 		rootCmd.SilenceUsage = true
 		logrus.Infof("Skaffold %+v", version.Get())
-		go func() {
-			if err := updateCheck(updateMsg); err != nil {
-				logrus.Infof("update check failed: %s", err)
-			}
-		}()
-
 		color.OverwriteDefault(color.Color(defaultColor))
+
+		if quietFlag {
+			logrus.Debugf("Update check is disabled because of quiet mode")
+		} else {
+			go func() {
+				if err := updateCheck(updateMsg); err != nil {
+					logrus.Infof("update check failed: %s", err)
+				}
+			}()
+		}
+
 		return nil
 	}
 
@@ -72,7 +79,6 @@ func NewSkaffoldCommand(out, err io.Writer) *cobra.Command {
 		}
 	}
 
-	rootCmd.SilenceErrors = true
 	rootCmd.SetOutput(out)
 	rootCmd.AddCommand(NewCmdCompletion(out))
 	rootCmd.AddCommand(NewCmdVersion(out))
@@ -95,10 +101,6 @@ func NewSkaffoldCommand(out, err io.Writer) *cobra.Command {
 }
 
 func updateCheck(ch chan string) error {
-	if quietFlag {
-		logrus.Debugf("Update check is disabled because of quiet mode")
-		return nil
-	}
 	if !update.IsUpdateCheckEnabled() {
 		logrus.Debugf("Update check not enabled, skipping.")
 		return nil

cmd/skaffold/app/cmd/completion.go

@@ -218,38 +218,44 @@ _complete skaffold 2>/dev/null
 `
 )
 
-var completionCmd = &cobra.Command{
-	Use: "completion SHELL",
-	Args: func(cmd *cobra.Command, args []string) error {
-		if len(args) != 1 {
-			return fmt.Errorf("requires 1 arg, found %d", len(args))
-		}
-		return cobra.OnlyValidArgs(cmd, args)
-	},
-	ValidArgs: []string{"bash", "zsh"},
-	Short:     "Output shell completion for the given shell (bash or zsh)",
-	Long:      longDescription,
-	Run:       completion,
-}
-
-func completion(_cmd *cobra.Command, args []string) {
+func completion(cmd *cobra.Command, args []string) {
 	switch args[0] {
 	case "bash":
-		rootCmd.GenBashCompletion(os.Stdout)
+		rootCmd(cmd).GenBashCompletion(os.Stdout)
 	case "zsh":
-		runCompletionZsh(os.Stdout)
+		runCompletionZsh(cmd, os.Stdout)
 	}
 }
 
 // NewCmdCompletion returns the cobra command that outputs shell completion code
 func NewCmdCompletion(out io.Writer) *cobra.Command {
-	return completionCmd
+	return &cobra.Command{
+		Use: "completion SHELL",
+		Args: func(cmd *cobra.Command, args []string) error {
+			if len(args) != 1 {
+				return fmt.Errorf("requires 1 arg, found %d", len(args))
+			}
+			return cobra.OnlyValidArgs(cmd, args)
+		},
+		ValidArgs: []string{"bash", "zsh"},
+		Short:     "Output shell completion for the given shell (bash or zsh)",
+		Long:      longDescription,
+		Run:       completion,
+	}
 }
 
-func runCompletionZsh(out io.Writer) {
+func runCompletionZsh(cmd *cobra.Command, out io.Writer) {
 	io.WriteString(out, zshInitialization)
 	buf := new(bytes.Buffer)
-	rootCmd.GenBashCompletion(buf)
+	rootCmd(cmd).GenBashCompletion(buf)
 	out.Write(buf.Bytes())
 	io.WriteString(out, zshTail)
 }
+
+func rootCmd(cmd *cobra.Command) *cobra.Command {
+	parent := cmd
+	for parent.HasParent() {
+		parent = parent.Parent()
+	}
+	return parent
+}