added new rm flag for aliyun profile deletion

arafato · Mar 10, 2020 · f3e5597 · f3e5597
1 parent ba0bf4e
commit f3e5597
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/cli/rm.go b/cli/rm.go
@@ -9,8 +9,9 @@ import (
 )
 
 type RemoveCommandInput struct {
-	ProfileName string
-	Keyring     *vault.CredentialKeyring
+	ProfileName     string
+	AliyunCliProfil bool
+	Keyring         *vault.CredentialKeyring
 }
 
 func ConfigureRemoveCommand(app *kingpin.Application) {
@@ -24,6 +25,10 @@ func ConfigureRemoveCommand(app *kingpin.Application) {
 		HintAction(getProfileNames).
 		StringVar(&input.ProfileName)
 
+	cmd.Flag("aliyun", "Delete the according Aliyun CLI profile").
+		Short('a').
+		BoolVar(&input.AliyunCliProfil)
+
 	cmd.Action(func(c *kingpin.ParseContext) error {
 		input.Keyring = &vault.CredentialKeyring{Keyring: keyringImpl}
 		RemoveCommand(app, input)
@@ -44,5 +49,13 @@ func RemoveCommand(app *kingpin.Application, input RemoveCommandInput) {
 		app.Fatalf(err.Error())
 		return
 	}
-	fmt.Printf("Deleted profile.\n")
+	fmt.Printf("Deleted profile from Keyvault.\n")
+
+	if input.AliyunCliProfil {
+		if err := configLoader.DeleteProfile(input.ProfileName); err != nil {
+			app.Fatalf(err.Error())
+			return
+		}
+		fmt.Printf("Deleted profile from Aliyun CLI config.\n")
+	}
 }
diff --git a/vault/config.go b/vault/config.go
@@ -56,6 +56,17 @@ func (cl *ConfigLoader) LoadProfile(profileName string) (*Config, error) {
 	return &cl.BaseConfig, nil
 }
 
+func (cl *ConfigLoader) DeleteProfile(profileName string) error {
+	newConfig := config.NewConfiguration()
+	for _, p := range cl.AliyunConfig.Profiles {
+		if p.Name != profileName {
+			newConfig.PutProfile(p)
+		}
+	}
+	err := config.SaveConfiguration(newConfig)
+	return err
+}
+
 func (cl *ConfigLoader) AddNewProfile(name string) error {
 	p, exists := cl.AliyunConfig.GetProfile(name)
 	if !exists {