aws.ActionProfiles should be a callback action

carapace-sh · Sep 3, 2020 · c118bd4 · c118bd4
1 parent 5c423bb
commit c118bd4
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/actions/aws/aws.go b/actions/aws/aws.go
@@ -34,29 +34,31 @@ func ActionRegions() carapace.Action {
 }
 
 func ActionProfiles() carapace.Action {
-	profiles := []string{}
+	return carapace.ActionCallback(func(args []string) carapace.Action {
+		profiles := []string{}
 
-	// TODO support windows
-	if path, err := homedir.Expand("~/.aws/config"); err != nil {
-		return carapace.ActionMessage(err.Error())
-	} else {
-		if cfg, err := ini.Load(path); err != nil {
+		// TODO support windows
+		if path, err := homedir.Expand("~/.aws/config"); err != nil {
 			return carapace.ActionMessage(err.Error())
 		} else {
-			for _, section := range cfg.Sections() {
-				if strings.HasPrefix(section.Name(), "profile ") {
-					profiles = append(profiles, strings.TrimPrefix(section.Name(), "profile "))
-					if key, err := section.GetKey("region"); err != nil {
-						profiles = append(profiles, "")
-					} else {
-						profiles = append(profiles, key.String())
+			if cfg, err := ini.Load(path); err != nil {
+				return carapace.ActionMessage(err.Error())
+			} else {
+				for _, section := range cfg.Sections() {
+					if strings.HasPrefix(section.Name(), "profile ") {
+						profiles = append(profiles, strings.TrimPrefix(section.Name(), "profile "))
+						if key, err := section.GetKey("region"); err != nil {
+							profiles = append(profiles, "")
+						} else {
+							profiles = append(profiles, key.String())
+						}
 					}
 				}
+				if len(profiles) == 0 {
+					profiles = append(profiles, "default", "")
+				}
+				return carapace.ActionValuesDescribed(profiles...)
 			}
-			if len(profiles) == 0 {
-				profiles = append(profiles, "default", "")
-			}
-			return carapace.ActionValuesDescribed(profiles...)
 		}
-	}
+	})
 }