feat: support passing variables via environment variables

suzuki-shunsuke · Apr 18, 2023 · f2bef37 · f2bef37
1 parent 8d52a9b
commit f2bef37
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/pkg/cli/apply.go b/pkg/cli/apply.go
@@ -1,6 +1,8 @@
 package cli
 
 import (
+	"os"
+
 	"github.com/suzuki-shunsuke/tfcmt/pkg/controller"
 	"github.com/suzuki-shunsuke/tfcmt/pkg/terraform"
 	"github.com/urfave/cli/v2"
@@ -20,7 +22,7 @@ func cmdApply(ctx *cli.Context) error {
 		setLogLevel(logLevel)
 	}
 
-	if err := parseOpts(ctx, &cfg); err != nil {
+	if err := parseOpts(ctx, &cfg, os.Environ()); err != nil {
 		return err
 	}
 

diff --git a/pkg/cli/plan.go b/pkg/cli/plan.go
@@ -1,6 +1,8 @@
 package cli
 
 import (
+	"os"
+
 	"github.com/suzuki-shunsuke/tfcmt/pkg/controller"
 	"github.com/suzuki-shunsuke/tfcmt/pkg/terraform"
 	"github.com/urfave/cli/v2"
@@ -19,7 +21,7 @@ func cmdPlan(ctx *cli.Context) error {
 		setLogLevel(logLevel)
 	}
 
-	if err := parseOpts(ctx, &cfg); err != nil {
+	if err := parseOpts(ctx, &cfg, os.Environ()); err != nil {
 		return err
 	}
 

diff --git a/pkg/cli/var.go b/pkg/cli/var.go
@@ -8,6 +8,11 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+func parseVars(vars []string, envs []string, varsM map[string]string) error {
+	parseVarEnvs(envs, varsM)
+	return parseVarOpts(vars, varsM)
+}
+
 func parseVarOpts(vars []string, varsM map[string]string) error {
 	for _, v := range vars {
 		a := strings.Index(v, ":")
@@ -19,7 +24,16 @@ func parseVarOpts(vars []string, varsM map[string]string) error {
 	return nil
 }
 
-func parseOpts(ctx *cli.Context, cfg *config.Config) error {
+func parseVarEnvs(envs []string, m map[string]string) {
+	for _, kv := range envs {
+		k, v, _ := strings.Cut(kv, "=")
+		if a := strings.TrimPrefix(k, "TFCMT_VAR_"); k != a {
+			m[a] = v
+		}
+	}
+}
+
+func parseOpts(ctx *cli.Context, cfg *config.Config, envs []string) error {
 	if owner := ctx.String("owner"); owner != "" {
 		cfg.CI.Owner = owner
 	}
@@ -50,7 +64,7 @@ func parseOpts(ctx *cli.Context, cfg *config.Config) error {
 
 	vars := ctx.StringSlice("var")
 	vm := make(map[string]string, len(vars))
-	if err := parseVarOpts(vars, vm); err != nil {
+	if err := parseVars(vars, envs, vm); err != nil {
 		return err
 	}
 	cfg.Vars = vm