fix: fail to get base dir when config is a directory

Signed-off-by: Bird <[email protected]>

Author: aFlyBird0

internal/pkg/configmanager/configmanager.go

@@ -2,10 +2,10 @@ package configmanager
 
 import (
 	"fmt"
-	"path/filepath"
 	"strings"
 
 	"github.com/devstream-io/devstream/pkg/util/file"
+	"github.com/devstream-io/devstream/pkg/util/log"
 )
 
 // Manager is used to load the config file from the ConfigFilePath and finally get the Config object.
@@ -96,7 +96,12 @@ func (m *Manager) getConfigFromFileWithGlobalVars() (*Config, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get coreConfig from config file. Error: %w", err)
 	}
-	coreConfig.State.BaseDir = filepath.Dir(m.ConfigFilePath)
+
+	coreConfig.State.BaseDir, err = file.GetFileAbsDirPathOrDirItself(m.ConfigFilePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get base dir of config. Error: %w", err)
+	}
+	log.Debugf("baseDir of config and state is %s", coreConfig.State.BaseDir)
 
 	return &Config{
 		Config: *coreConfig,

pkg/util/file/file.go

@@ -78,3 +78,23 @@ func GetFileAbsDirPath(fileLoc string) (string, error) {
 	}
 	return filepath.Dir(fileAbs), nil
 }
+
+// GetFileAbsDirPathOrDirItself will return abs dir path,
+// for file: return its parent directory
+// for directory: return dir itself
+func GetFileAbsDirPathOrDirItself(fileLoc string) (string, error) {
+	fileAbs, err := filepath.Abs(fileLoc)
+	if err != nil {
+		return "", fmt.Errorf("%s not exists", fileLoc)
+	}
+	file, err := os.Stat(fileAbs)
+	if err != nil {
+		return "", fmt.Errorf("%s not exists", fileLoc)
+	}
+	// if it is a directory, return itself
+	if file.IsDir() {
+		return fileAbs, nil
+	}
+	// if it is a file, return its parent directory
+	return filepath.Dir(fileAbs), nil
+}

pkg/util/file/file_test.go

@@ -83,3 +83,30 @@ var _ = Describe("GetFileAbsDirPath func", func() {
 		})
 	})
 })
+
+var _ = Describe("GetFileAbsDirPathOrDirItself func", func() {
+	var baseDir, fileName string
+	When("param if file", func() {
+		BeforeEach(func() {
+			baseDir = GinkgoT().TempDir()
+			testFile, err := os.CreateTemp(baseDir, "test")
+			Expect(err).Error().ShouldNot(HaveOccurred())
+			fileName = filepath.Base(testFile.Name())
+		})
+		It("should return parent directory of file", func() {
+			path, err := file.GetFileAbsDirPathOrDirItself(filepath.Join(baseDir, fileName))
+			Expect(err).Error().ShouldNot(HaveOccurred())
+			Expect(path).Should(Equal(baseDir))
+		})
+	})
+	When("param is dir", func() {
+		BeforeEach(func() {
+			baseDir = GinkgoT().TempDir()
+		})
+		It("should return dir itself", func() {
+			path, err := file.GetFileAbsDirPathOrDirItself(baseDir)
+			Expect(err).Error().ShouldNot(HaveOccurred())
+			Expect(path).Should(Equal(baseDir))
+		})
+	})
+})