chore: make SetPluginDir function more clear

cmd/devstream/init.go

@@ -12,9 +12,9 @@ import (
 	"github.com/devstream-io/devstream/cmd/devstream/list"
 	"github.com/devstream-io/devstream/internal/pkg/completion"
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
+	"github.com/devstream-io/devstream/internal/pkg/pluginengine"
 	"github.com/devstream-io/devstream/internal/pkg/pluginmanager"
 	"github.com/devstream-io/devstream/internal/pkg/version"
-	"github.com/devstream-io/devstream/pkg/util/file"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
@@ -71,7 +71,7 @@ func GetPluginsAndPluginDirFromConfig() (tools []configmanager.Tool, pluginDir s
 	}
 
 	// combine plugin dir from config file and flag
-	if err := file.SetPluginDir(cfg.PluginDir); err != nil {
+	if err = pluginengine.SetPluginDir(cfg.PluginDir); err != nil {
 		return nil, "", err
 	}
 
@@ -116,7 +116,7 @@ func GetPluginsAndPluginDirFromFlags() (tools []configmanager.Tool, pluginDir st
 	}
 
 	// 2. handle plugin dir
-	if err := file.SetPluginDir(""); err != nil {
+	if err = pluginengine.SetPluginDir(""); err != nil {
 		return nil, "", err
 	}
 

cmd/devstream/list.go

@@ -12,7 +12,7 @@ var (
 
 var listCMD = &cobra.Command{
 	Use:   "list",
-	Short: "This command only supports listing plugins now.",
+	Short: "This command only supports listing plugins now",
 }
 
 var listPluginsCMD = &cobra.Command{
@@ -27,7 +27,7 @@ Examples:
 	Run: listPluginsCMDFunc,
 }
 
-func listPluginsCMDFunc(cmd *cobra.Command, args []string) {
+func listPluginsCMDFunc(_ *cobra.Command, _ []string) {
 	list.List(pluginFilter)
 }
 

cmd/devstream/show.go

@@ -16,7 +16,7 @@ var template string
 
 var showCMD = &cobra.Command{
 	Use:   "show",
-	Short: "Show is used to print plugins' configuration templates or status.",
+	Short: "Show is used to print plugins' configuration templates or status",
 }
 
 var showConfigCMD = &cobra.Command{

internal/pkg/configmanager/configmanager.go

@@ -20,6 +20,8 @@ var (
 
 // Config records rendered config values and is used as a general config in DevStream.
 type Config struct {
+	// Command line flag have a higher priority than the config file.
+	// If you used the `--plugin-dir` flag with `dtm`, then the "pluginDir" in the config file will be ignored.
 	PluginDir string
 	Tools     []Tool `yaml:"tools"`
 	State     *State

internal/pkg/pluginengine/cmd_apply.go

@@ -7,18 +7,19 @@ import (
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
 	"github.com/devstream-io/devstream/internal/pkg/pluginmanager"
 	"github.com/devstream-io/devstream/internal/pkg/statemanager"
-	"github.com/devstream-io/devstream/pkg/util/file"
 	"github.com/devstream-io/devstream/pkg/util/interact"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
+const askUserIfContinue string = "Continue? [y/n]"
+
 func Apply(configFile string, continueDirectly bool) error {
 	cfg, err := configmanager.NewManager(configFile).LoadConfig()
 	if err != nil {
 		return err
 	}
 
-	if err := file.SetPluginDir(cfg.PluginDir); err != nil {
+	if err = SetPluginDir(cfg.PluginDir); err != nil {
 		log.Errorf("Error: %s.", err)
 	}
 

internal/pkg/pluginengine/cmd_delete.go

@@ -7,7 +7,6 @@ import (
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
 	"github.com/devstream-io/devstream/internal/pkg/pluginmanager"
 	"github.com/devstream-io/devstream/internal/pkg/statemanager"
-	"github.com/devstream-io/devstream/pkg/util/file"
 	"github.com/devstream-io/devstream/pkg/util/interact"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
@@ -18,7 +17,7 @@ func Remove(configFile string, continueDirectly bool, isForceDelete bool) error
 		return err
 	}
 
-	if err := file.SetPluginDir(cfg.PluginDir); err != nil {
+	if err = SetPluginDir(cfg.PluginDir); err != nil {
 		log.Errorf("Error: %s.", err)
 	}
 

internal/pkg/pluginengine/cmd_destroy.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
 	"github.com/devstream-io/devstream/internal/pkg/statemanager"
-	"github.com/devstream-io/devstream/pkg/util/file"
 	"github.com/devstream-io/devstream/pkg/util/interact"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
@@ -21,7 +20,7 @@ func Destroy(configFile string, continueDirectly bool, isForceDestroy bool) erro
 		return fmt.Errorf("failed to load the config file")
 	}
 
-	if err := file.SetPluginDir(cfg.PluginDir); err != nil {
+	if err = SetPluginDir(cfg.PluginDir); err != nil {
 		log.Errorf("Error: %s.", err)
 	}
 

internal/pkg/pluginengine/cmd_verify.go

@@ -4,7 +4,6 @@ import (
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
 	"github.com/devstream-io/devstream/internal/pkg/pluginmanager"
 	"github.com/devstream-io/devstream/internal/pkg/statemanager"
-	"github.com/devstream-io/devstream/pkg/util/file"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
@@ -20,7 +19,7 @@ func Verify(configFile string) bool {
 		return false
 	}
 
-	if err := file.SetPluginDir(cfg.PluginDir); err != nil {
+	if err = SetPluginDir(cfg.PluginDir); err != nil {
 		log.Errorf("Error: %s.", err)
 	}
 

internal/pkg/pluginengine/plugin.go

@@ -1,11 +1,16 @@
 package pluginengine
 
 import (
-	"github.com/spf13/viper"
+	"os"
+	"path/filepath"
+	"strings"
 
-	"github.com/devstream-io/devstream/internal/pkg/statemanager"
+	"github.com/mitchellh/go-homedir"
+	"github.com/spf13/viper"
 
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
+	"github.com/devstream-io/devstream/internal/pkg/statemanager"
+	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
 // DevStreamPlugin is a struct, on which Create/Read/Update/Delete interfaces are defined.
@@ -64,3 +69,50 @@ func Delete(tool *configmanager.Tool) (bool, error) {
 func renderInstanceIDtoOptions(tool *configmanager.Tool) {
 	tool.Options["instanceID"] = interface{}(tool.InstanceID)
 }
+
+func SetPluginDir(conf string) error {
+	pluginDir, err := getPluginDir(conf)
+	if err != nil {
+		return err
+	}
+	viper.Set("plugin-dir", pluginDir)
+	return nil
+}
+
+func getPluginDir(conf string) (string, error) {
+	pluginDir := viper.GetString("plugin-dir")
+	if pluginDir == "" {
+		pluginDir = conf
+	}
+
+	if pluginDir == "" {
+		homeDir, err := homedir.Dir()
+		if err != nil {
+			return "", err
+		}
+		defaultPluginDir := filepath.Join(homeDir, ".devstream", "plugins")
+		return defaultPluginDir, nil
+	}
+
+	pluginRealDir, err := handlePathWithHome(pluginDir)
+	if err != nil {
+		return "", err
+	}
+	return pluginRealDir, nil
+}
+
+// handlePathWithHome deal with "~" in the filePath
+func handlePathWithHome(filePath string) (string, error) {
+	if !strings.Contains(filePath, "~") {
+		return filePath, nil
+	}
+
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return "", err
+	}
+	retPath := filepath.Join(homeDir, strings.TrimPrefix(filePath, "~"))
+	log.Debugf("real path: %s.", retPath)
+
+	return retPath, nil
+}

internal/pkg/show/status/status.go

@@ -10,7 +10,6 @@ import (
 	"github.com/devstream-io/devstream/internal/pkg/configmanager"
 	"github.com/devstream-io/devstream/internal/pkg/pluginengine"
 	"github.com/devstream-io/devstream/internal/pkg/statemanager"
-	"github.com/devstream-io/devstream/pkg/util/file"
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
@@ -36,7 +35,7 @@ func Show(configFile string) error {
 		return fmt.Errorf("failed to load the config file")
 	}
 
-	if err := file.SetPluginDir(cfg.PluginDir); err != nil {
+	if err = pluginengine.SetPluginDir(cfg.PluginDir); err != nil {
 		log.Errorf("Error: %s.", err)
 	}
 

pkg/util/file/file.go

@@ -3,67 +3,10 @@ package file
 import (
 	"io"
 	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/mitchellh/go-homedir"
-	"github.com/spf13/viper"
 
 	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
-var DefaultPluginDir string
-
-func init() {
-	homeDir, err := homedir.Dir()
-	if err != nil {
-		log.Fatalf("failed to get home dir: %s", err)
-	}
-	DefaultPluginDir = filepath.Join(homeDir, ".devstream", "plugins")
-}
-
-func GetPluginDir(conf string) (string, error) {
-	pluginDir := viper.GetString("plugin-dir")
-	if pluginDir == "" {
-		pluginDir = conf
-	}
-
-	if pluginDir == "" {
-		return DefaultPluginDir, nil
-	}
-
-	pluginRealDir, err := HandlePathWithHome(pluginDir)
-	if err != nil {
-		return "", err
-	}
-	return pluginRealDir, nil
-}
-
-// HandlePathWithHome deal with "~" in the filePath
-func HandlePathWithHome(filePath string) (string, error) {
-	if !strings.Contains(filePath, "~") {
-		return filePath, nil
-	}
-
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		return "", err
-	}
-	retPath := filepath.Join(homeDir, strings.TrimPrefix(filePath, "~"))
-	log.Debugf("real path: %s.", retPath)
-
-	return retPath, nil
-}
-
-func SetPluginDir(conf string) error {
-	pluginDir, err := GetPluginDir(conf)
-	if err != nil {
-		return err
-	}
-	viper.Set("plugin-dir", pluginDir)
-	return nil
-}
-
 func CopyFile(srcFile, dstFile string) (err error) {
 	// prepare source file
 	sFile, err := os.Open(srcFile)