Merge pull request #147 from carapace-sh/use-bridge

use bridge action

Author: rsteube

cmd/carapace-aws/cmd/common/bridge.go

@@ -2,37 +2,14 @@ package common
 
 import (
 	"os"
-	"strings"
 
 	"github.com/carapace-sh/carapace"
-	"github.com/carapace-sh/carapace/pkg/style"
+	"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
 )
 
 func ActionBridgeAwsCompleter() carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		c.Setenv("COMP_LINE", "aws "+strings.Join(append(os.Args[3:], c.Value), " ")) // TODO escape/quote special characters
-		return carapace.ActionExecCommand("aws_completer")(func(output []byte) carapace.Action {
-			lines := strings.Split(string(output), "\n")
-			if lines[0] == "" {
-				return carapace.ActionValues()
-			}
-			for index, line := range lines {
-				if strings.HasSuffix(line, " ") {
-					lines[index] = strings.TrimSuffix(line, " ") // v1 has space suffix
-				}
-			}
-			a := carapace.ActionValues(lines[:len(lines)-1]...)
-			switch {
-			case strings.HasPrefix(c.Value, "file://"):
-				a = a.NoSpace('/').StyleF(func(s string, sc style.Context) string {
-					return style.ForPath(strings.TrimPrefix(s, "file://"), sc)
-				})
-			case strings.HasPrefix(c.Value, "fileb://"):
-				a = a.NoSpace('/').StyleF(func(s string, sc style.Context) string {
-					return style.ForPath(strings.TrimPrefix(s, "fileb://"), sc)
-				})
-			}
-			return a
-		}).Invoke(c).ToA()
+		c.Args = carapace.NewContext(os.Args[4:]...).Args // TODO nasty args passthrough
+		return bridge.ActionAws("aws").Invoke(c).ToA()
 	})
 }

cmd/carapace-aws/cmd/root.go

@@ -77,7 +77,7 @@ func init() {
 
 				carapace.Gen(operationCmd).PreInvoke(func(cmd *cobra.Command, flag *pflag.Flag, action carapace.Action) carapace.Action {
 					// TODO same for deeper wait subcommands
-					if flag != nil && flag.Value.Type() == "string" {
+					if flag != nil && flag.Value.Type() != "bool" {
 						if _, ok := subCmd.Completion.Flag[flag.Name]; !ok {
 							return common.ActionBridgeAwsCompleter()
 						}

pkg/actions/aws/profile.go

@@ -0,0 +1,41 @@
+package aws
+
+import (
+	"github.com/carapace-sh/carapace"
+	"gopkg.in/ini.v1"
+	"strings"
+)
+
+// ActionProfiles completes configuration profile names
+//
+//	someprofile (eu-central-1)
+//	anotherprofile (us-east-1)
+func ActionProfiles() carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		profiles := []string{}
+
+		// TODO support windows
+		if path, err := c.Abs("~/.aws/config"); err != nil {
+			return carapace.ActionMessage(err.Error())
+		} else {
+			if cfg, err := ini.Load(path); err != nil {
+				return carapace.ActionMessage(err.Error())
+			} else {
+				for _, section := range cfg.Sections() {
+					if after, ok := strings.CutPrefix(section.Name(), "profile "); ok {
+						profiles = append(profiles, after)
+						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...)
+			}
+		}
+	})
+}

pkg/actions/aws/aws.go pkg/actions/aws/region.gopkg/actions/aws/aws.go renamed to pkg/actions/aws/region.go

@@ -1,11 +1,7 @@
-// package aws contains amazon web services related actions
 package aws
 
 import (
-	"strings"
-
 	"github.com/carapace-sh/carapace"
-	"gopkg.in/ini.v1"
 )
 
 // ActionRegions completes region names
@@ -50,37 +46,3 @@ func ActionRegions() carapace.Action {
 		"us-west-2", "US West (Oregon)",
 	)
 }
-
-// ActionProfiles completes configuration profile names
-//
-//	someprofile (eu-central-1)
-//	anotherprofile (us-east-1)
-func ActionProfiles() carapace.Action {
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		profiles := []string{}
-
-		// TODO support windows
-		if path, err := c.Abs("~/.aws/config"); err != nil {
-			return carapace.ActionMessage(err.Error())
-		} else {
-			if cfg, err := ini.Load(path); err != nil {
-				return carapace.ActionMessage(err.Error())
-			} else {
-				for _, section := range cfg.Sections() {
-					if after, ok := strings.CutPrefix(section.Name(), "profile "); ok {
-						profiles = append(profiles, after)
-						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...)
-			}
-		}
-	})
-}