Merge pull request #1629 from rsteube/terraform-state-resources

terraform: complete state resources
carapace-sh · Apr 3, 2023 · 89645f2 · 89645f2
2 parents f8b371f + 28e6d5c
commit 89645f2
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 51 deletions.
diff --git a/completers/terraform_completer/cmd/action/resource.go b/completers/terraform_completer/cmd/action/resource.go
@@ -0,0 +1,16 @@
+package action
+
+import (
+	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/tools/terraform"
+	"github.com/spf13/cobra"
+)
+
+func ActionResources(cmd *cobra.Command) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		if f := cmd.Flag("state"); f != nil {
+			return terraform.ActionResources(f.Value.String())
+		}
+		return terraform.ActionResources("")
+	})
+}
diff --git a/completers/terraform_completer/cmd/apply.go b/completers/terraform_completer/cmd/apply.go
@@ -39,4 +39,8 @@ func init() {
 		"state":     carapace.ActionFiles(),
 		"state-out": carapace.ActionFiles(),
 	})
+
+	carapace.Gen(applyCmd).PositionalCompletion(
+		carapace.ActionFiles(),
+	)
 }
diff --git a/completers/terraform_completer/cmd/destroy.go b/completers/terraform_completer/cmd/destroy.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/terraform"
+	"github.com/rsteube/carapace-bin/completers/terraform_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -46,14 +46,10 @@ func init() {
 	destroyCmd.Flag("var-file").NoOptDefVal = " "
 
 	carapace.Gen(destroyCmd).FlagCompletion(carapace.ActionMap{
-		"out": carapace.ActionFiles(),
-		"replace": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return terraform.ActionResources().Invoke(c).ToMultiPartsA(".")
-		}),
-		"state": carapace.ActionFiles(),
-		"target": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return terraform.ActionResources().Invoke(c).ToMultiPartsA(".")
-		}),
+		"out":      carapace.ActionFiles(),
+		"replace":  action.ActionResources(destroyCmd).MultiParts("."),
+		"state":    carapace.ActionFiles(),
+		"target":   action.ActionResources(destroyCmd).MultiParts("."),
 		"var-file": carapace.ActionFiles(),
 	})
 }
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/plan.go b/completers/terraform_completer/cmd/plan.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/terraform"
+	"github.com/rsteube/carapace-bin/completers/terraform_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -44,14 +44,10 @@ func init() {
 	planCmd.Flag("var-file").NoOptDefVal = " "
 
 	carapace.Gen(planCmd).FlagCompletion(carapace.ActionMap{
-		"out": carapace.ActionFiles(),
-		"replace": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return terraform.ActionResources().Invoke(c).ToMultiPartsA(".")
-		}),
-		"state": carapace.ActionFiles(),
-		"target": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return terraform.ActionResources().Invoke(c).ToMultiPartsA(".")
-		}),
+		"out":      carapace.ActionFiles(),
+		"replace":  action.ActionResources(planCmd).MultiParts("."),
+		"state":    carapace.ActionFiles(),
+		"target":   action.ActionResources(planCmd).MultiParts("."),
 		"var-file": carapace.ActionFiles(),
 	})
 }
diff --git a/completers/terraform_completer/cmd/refresh.go b/completers/terraform_completer/cmd/refresh.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bin/pkg/actions/tools/terraform"
+	"github.com/rsteube/carapace-bin/completers/terraform_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -33,9 +33,7 @@ func init() {
 
 	// TODO complete var
 	carapace.Gen(refreshCmd).FlagCompletion(carapace.ActionMap{
-		"target": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return terraform.ActionResources().Invoke(c).ToMultiPartsA(".")
-		}),
+		"target":   action.ActionResources(refreshCmd).MultiParts("."),
 		"var-file": carapace.ActionFiles(),
 	})
 }
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/completers/terraform_completer/cmd/action"
 	"github.com/spf13/cobra"
 )
 
@@ -22,5 +23,8 @@ func init() {
 
 	state_mvCmd.Flag("lock-timeout").NoOptDefVal = " "
 
-	// TODO positional completion
+	carapace.Gen(state_mvCmd).PositionalCompletion(
+		action.ActionResources(state_mvCmd).MultiParts("."),
+		action.ActionResources(state_mvCmd).MultiParts("."),
+	)
 }
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/completers/terraform_completer/cmd/action"
 	"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 action.ActionResources(state_rmCmd).Invoke(c).Filter(c.Args).ToA().MultiParts(".")
+		}),
+	)
 }
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/completers/terraform_completer/cmd/action"
 	"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(
+		action.ActionResources(state_showCmd).MultiParts("."),
+	)
 }
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"),
 	)
 }
diff --git a/pkg/actions/tools/terraform/resources.go b/pkg/actions/tools/terraform/resources.go
@@ -7,9 +7,15 @@ import (
 )
 
 // ActionResources completes resources
-func ActionResources() carapace.Action {
-	return carapace.ActionExecCommand("terraform", "state", "list")(func(output []byte) carapace.Action {
-		lines := strings.Split(string(output), "\n")
-		return carapace.ActionValues(lines[:len(lines)-1]...)
+func ActionResources(state string) carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		args := []string{"state", "list"}
+		if state != "" {
+			args = append(args, "--state", state)
+		}
+		return carapace.ActionExecCommand("terraform", args...)(func(output []byte) carapace.Action {
+			lines := strings.Split(string(output), "\n")
+			return carapace.ActionValues(lines[:len(lines)-1]...)
+		})
 	})
 }