terraform: complete state resources

carapace-sh · Apr 2, 2023 · 13c52bc · 13c52bc
1 parent f8b371f
commit 13c52bc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 25 deletions.
diff --git a/completers/terraform_completer/cmd/graph.go b/completers/terraform_completer/cmd/graph.go
@@ -24,6 +24,6 @@ func init() {
 
 	carapace.Gen(graphCmd).FlagCompletion(carapace.ActionMap{
 		"plan": carapace.ActionFiles(),
-		"type": carapace.ActionValues("plan", "plan-destroy", "apply", "validate", "input", "refresh"),
+		"type": carapace.ActionValues("plan", "plan-refresh-only", "plan-destroy", "apply"),
 	})
 }
diff --git a/completers/terraform_completer/cmd/root.go b/completers/terraform_completer/cmd/root.go
@@ -1,9 +1,6 @@
 package cmd
 
 import (
-	"os"
-	"strings"
-
 	"github.com/rsteube/carapace"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -20,23 +17,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func ActionExecute() carapace.Action { // TODO this still needed / correct? maybe use bridging action
-	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-		// TODO don't change os.Args
-		backup := os.Args
-		for index, arg := range c.Args {
-			if strings.HasPrefix(arg, "-") && !strings.HasPrefix(arg, "--") {
-				c.Args[index] = "-" + arg
-			}
-		}
-		if strings.HasPrefix(c.CallbackValue, "-") && !strings.HasPrefix(c.CallbackValue, "--") {
-			c.CallbackValue = "-" + c.CallbackValue
-		}
-		os.Args = backup
-		return carapace.ActionExecute(rootCmd).Invoke(c).ToA()
-	})
-}
-
 func init() {
 	carapace.Gen(rootCmd).Standalone()
 

diff --git a/completers/terraform_completer/cmd/state_mv.go b/completers/terraform_completer/cmd/state_mv.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/terraform"
 	"github.com/spf13/cobra"
 )
 
@@ -22,5 +23,8 @@ func init() {
 
 	state_mvCmd.Flag("lock-timeout").NoOptDefVal = " "
 
-	// TODO positional completion
+	carapace.Gen(state_mvCmd).PositionalCompletion(
+		terraform.ActionResources(),
+		terraform.ActionResources(),
+	)
 }
diff --git a/completers/terraform_completer/cmd/state_rm.go b/completers/terraform_completer/cmd/state_rm.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/terraform"
 	"github.com/spf13/cobra"
 )
 
@@ -31,5 +32,9 @@ func init() {
 		"state":  carapace.ActionFiles(),
 	})
 
-	// TODO positional completion
+	carapace.Gen(state_rmCmd).PositionalAnyCompletion(
+		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return terraform.ActionResources().Invoke(c).Filter(c.Args).ToA()
+		}),
+	)
 }
diff --git a/completers/terraform_completer/cmd/state_show.go b/completers/terraform_completer/cmd/state_show.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/terraform"
 	"github.com/spf13/cobra"
 )
 
@@ -21,4 +22,8 @@ func init() {
 	carapace.Gen(state_showCmd).FlagCompletion(carapace.ActionMap{
 		"state": carapace.ActionFiles(),
 	})
+
+	carapace.Gen(state_showCmd).PositionalCompletion(
+		terraform.ActionResources(),
+	)
 }
diff --git a/completers/terragrunt_completer/cmd/runAll.go b/completers/terragrunt_completer/cmd/runAll.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	terraform "github.com/rsteube/carapace-bin/completers/terraform_completer/cmd"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
 	"github.com/spf13/cobra"
 )
 
@@ -20,6 +20,6 @@ func init() {
 	rootCmd.AddCommand(runAllCmd)
 
 	carapace.Gen(runAllCmd).PositionalAnyCompletion(
-		terraform.ActionExecute(),
+		bridge.ActionCarapaceBin("terraform"),
 	)
 }