Merge pull request #589 from himku/fix-issue-559

fix: some commands do not need the -f parameter #559

Author: daniel-hutao

cmd/devstream/apply.go

@@ -25,3 +25,8 @@ func applyCMDFunc(cmd *cobra.Command, args []string) {
 	}
 	log.Success("Apply finished.")
 }
+func init() {
+	applyCMD.Flags().StringVarP(&configFile, "config-file", "f", "config.yaml", "config file")
+	applyCMD.Flags().StringVarP(&pluginDir, "plugin-dir", "d", pluginengine.DefaultPluginDir, "plugins directory")
+	applyCMD.Flags().BoolVarP(&continueDirectly, "yes", "y", false, "apply directly without confirmation")
+}

cmd/devstream/common.go

@@ -0,0 +1,7 @@
+package main
+
+var (
+	configFile       string
+	pluginDir        string
+	continueDirectly bool
+)

cmd/devstream/delete.go

@@ -9,6 +9,8 @@ import (
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
+var isForceDelete bool
+
 var deleteCMD = &cobra.Command{
 	Use:   "delete",
 	Short: "Delete DevOps tools according to DevStream configuration file",
@@ -28,5 +30,8 @@ func deleteCMDFunc(cmd *cobra.Command, args []string) {
 }
 
 func init() {
-	deleteCMD.PersistentFlags().BoolVarP(&isForceDelete, "force", "", false, "force delete by config")
+	deleteCMD.Flags().BoolVarP(&isForceDelete, "force", "", false, "force delete by config")
+	deleteCMD.Flags().StringVarP(&configFile, "config-file", "f", "config.yaml", "config file")
+	deleteCMD.Flags().StringVarP(&pluginDir, "plugin-dir", "d", pluginengine.DefaultPluginDir, "plugins directory")
+	deleteCMD.Flags().BoolVarP(&continueDirectly, "yes", "y", false, "delete directly without confirmation")
 }

cmd/devstream/destroy.go

@@ -24,3 +24,8 @@ func destroyCMDFunc(cmd *cobra.Command, args []string) {
 	}
 	log.Success("Destroy finished.")
 }
+
+func init() {
+	destroyCMD.Flags().StringVarP(&configFile, "config-file", "f", "config.yaml", "config file")
+	destroyCMD.Flags().BoolVarP(&continueDirectly, "yes", "y", false, "destroy directly without confirmation")
+}

cmd/devstream/init.go

@@ -4,6 +4,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/devstream-io/devstream/internal/pkg/configloader"
+	"github.com/devstream-io/devstream/internal/pkg/pluginengine"
 	"github.com/devstream-io/devstream/internal/pkg/pluginmanager"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
@@ -30,3 +31,8 @@ func initCMDFunc(cmd *cobra.Command, args []string) {
 
 	log.Success("Initialize finished.")
 }
+
+func init() {
+	initCMD.Flags().StringVarP(&configFile, "config-file", "f", "config.yaml", "config file")
+	initCMD.Flags().StringVarP(&pluginDir, "plugin-dir", "d", pluginengine.DefaultPluginDir, "plugins directory")
+}

cmd/devstream/main.go

@@ -7,17 +7,11 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/devstream-io/devstream/internal/pkg/pluginengine"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
 var (
-	configFile       string
-	pluginDir        string
-	continueDirectly bool
-	isDebug          bool
-	isForceDelete    bool
-
+	isDebug bool
 	rootCMD = &cobra.Command{
 		Use:   "dtm",
 		Short: `DevStream is an open-source DevOps toolchain manager`,
@@ -39,10 +33,6 @@ var (
 
 func init() {
 	cobra.OnInitialize(initConfig)
-
-	rootCMD.PersistentFlags().StringVarP(&configFile, "config-file", "f", "config.yaml", "config file")
-	rootCMD.PersistentFlags().StringVarP(&pluginDir, "plugin-dir", "d", pluginengine.DefaultPluginDir, "plugins directory")
-	rootCMD.PersistentFlags().BoolVarP(&continueDirectly, "yes", "y", false, "apply/delete directly without confirmation")
 	rootCMD.PersistentFlags().BoolVarP(&isDebug, "debug", "", false, "debug level log")
 	rootCMD.AddCommand(versionCMD)
 	rootCMD.AddCommand(initCMD)
@@ -90,6 +80,9 @@ func initConfig() {
 	if err := viper.BindPFlags(showStatusCMD.Flags()); err != nil {
 		log.Fatal(err)
 	}
+	if err := viper.BindPFlags(initCMD.Flags()); err != nil {
+		log.Fatal(err)
+	}
 }
 
 func initLog() {

cmd/devstream/show.go

@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/devstream-io/devstream/internal/pkg/pluginengine"
 	"github.com/devstream-io/devstream/internal/pkg/show/config"
 	"github.com/devstream-io/devstream/internal/pkg/show/status"
 	"github.com/devstream-io/devstream/pkg/util/log"
@@ -56,8 +57,11 @@ func init() {
 	showCMD.AddCommand(showConfigCMD)
 	showCMD.AddCommand(showStatusCMD)
 
-	showConfigCMD.PersistentFlags().StringVarP(&plugin, "plugin", "p", "", "specify name with the plugin")
-	showStatusCMD.PersistentFlags().StringVarP(&plugin, "plugin", "p", "", "specify name with the plugin")
-	showStatusCMD.PersistentFlags().StringVarP(&instanceID, "id", "i", "", "specify id with the plugin instance")
-	showStatusCMD.PersistentFlags().BoolVarP(&statusAllFlag, "all", "a", false, "show all instances of all plugins status")
+	showConfigCMD.Flags().StringVarP(&plugin, "plugin", "p", "", "specify name with the plugin")
+
+	showStatusCMD.Flags().StringVarP(&plugin, "plugin", "p", "", "specify name with the plugin")
+	showStatusCMD.Flags().StringVarP(&instanceID, "id", "i", "", "specify id with the plugin instance")
+	showStatusCMD.Flags().BoolVarP(&statusAllFlag, "all", "a", false, "show all instances of all plugins status")
+	showStatusCMD.Flags().StringVarP(&pluginDir, "plugin-dir", "d", pluginengine.DefaultPluginDir, "plugins directory")
+	showStatusCMD.Flags().StringVarP(&configFile, "config-file", "f", "config.yaml", "config file")
 }

cmd/devstream/verify.go

@@ -22,3 +22,8 @@ func verifyCMDFunc(cmd *cobra.Command, args []string) {
 		log.Info("Verify finished.")
 	}
 }
+
+func init() {
+	verifyCMD.Flags().StringVarP(&configFile, "config-file", "f", "config.yaml", "config file")
+	verifyCMD.Flags().StringVarP(&pluginDir, "plugin-dir", "d", pluginengine.DefaultPluginDir, "plugins directory")
+}