Merge pull request #93 from yjinjo/master

hange toml to yaml for short names
cloudforet-io · Dec 18, 2024 · 3d36dc0 · 3d36dc0
2 parents 6c581b9 + 7625450
commit 3d36dc0
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/cmd/other/shortNames.go b/cmd/other/shortNames.go
@@ -29,8 +29,8 @@ func validateServiceCommand(service, verb, resource string) error {
 	}
 
 	mainV := viper.New()
-	mainV.SetConfigFile(filepath.Join(home, ".cfctl", "setting.toml"))
-	mainV.SetConfigType("toml")
+	mainV.SetConfigFile(filepath.Join(home, ".cfctl", "setting.yaml"))
+	mainV.SetConfigType("yaml")
 	if err := mainV.ReadInConfig(); err != nil {
 		return fmt.Errorf("failed to read config: %v", err)
 	}
@@ -208,10 +208,10 @@ func addShortName(service, shortName, command string) error {
 		return fmt.Errorf("failed to get home directory: %v", err)
 	}
 
-	settingPath := filepath.Join(home, ".cfctl", "setting.toml")
+	settingPath := filepath.Join(home, ".cfctl", "setting.yaml")
 	v := viper.New()
 	v.SetConfigFile(settingPath)
-	v.SetConfigType("toml")
+	v.SetConfigType("yaml")
 
 	if err := v.ReadInConfig(); err != nil && !os.IsNotExist(err) {
 		return fmt.Errorf("failed to read config: %v", err)
@@ -232,10 +232,10 @@ func removeShortName(service, shortName string) error {
 		return fmt.Errorf("failed to get home directory: %v", err)
 	}
 
-	settingPath := filepath.Join(home, ".cfctl", "setting.toml")
+	settingPath := filepath.Join(home, ".cfctl", "setting.yaml")
 	v := viper.New()
 	v.SetConfigFile(settingPath)
-	v.SetConfigType("toml")
+	v.SetConfigType("yaml")
 
 	if err := v.ReadInConfig(); err != nil {
 		return fmt.Errorf("failed to read config: %v", err)
@@ -266,10 +266,10 @@ func listShortNames() (map[string]interface{}, error) {
 		return nil, fmt.Errorf("failed to get home directory: %v", err)
 	}
 
-	settingPath := filepath.Join(home, ".cfctl", "setting.toml")
+	settingPath := filepath.Join(home, ".cfctl", "setting.yaml")
 	v := viper.New()
 	v.SetConfigFile(settingPath)
-	v.SetConfigType("toml")
+	v.SetConfigType("yaml")
 
 	if err := v.ReadInConfig(); err != nil {
 		if os.IsNotExist(err) {