From 7c8fd9739145eb70980753ebaf3d1ca7a4eb0672 Mon Sep 17 00:00:00 2001 From: Steve Min Date: Tue, 8 May 2018 09:12:30 -0500 Subject: [PATCH 1/5] adding plugin dir init option --- DOCS.md | 3 +++ plugin.go | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/DOCS.md b/DOCS.md index 5ed9ddf..9967d53 100644 --- a/DOCS.md +++ b/DOCS.md @@ -202,6 +202,9 @@ init_options.lock init_options.lock-timeout : Duration to wait for a state lock. Default `0s`. +init_options.plugin-dir +: Local path to use terraform plugins from. Default is `""` which will pull from upstream Terraform. + vars : a map of variables to pass to the Terraform `plan` and `apply` commands. Each value is passed as a `-var =` option. diff --git a/plugin.go b/plugin.go index 7321c03..f70b06f 100644 --- a/plugin.go +++ b/plugin.go @@ -45,6 +45,7 @@ type ( BackendConfig []string `json:"backend-config"` Lock *bool `json:"lock"` LockTimeout string `json:"lock-timeout"` + PluginDir string `json:"plugin-dir` } // Plugin represents the plugin instance to be executed @@ -205,6 +206,11 @@ func initCommand(config InitOptions) *exec.Cmd { args = append(args, fmt.Sprintf("-lock-timeout=%s", config.LockTimeout)) } + // "" is default in TF + if config.PluginDir != "" { + args = append(args, fmt.Sprintf("-plugin-dir=%s", config.PluginDir)) + } + // Fail Terraform execution on prompt args = append(args, "-input=false") From 7eb591941c4469469f4ed14495d03f9dac2ee5a1 Mon Sep 17 00:00:00 2001 From: Steve Min Date: Tue, 8 May 2018 09:25:16 -0500 Subject: [PATCH 2/5] adding additional bool --- plugin.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugin.go b/plugin.go index f70b06f..1c4c141 100644 --- a/plugin.go +++ b/plugin.go @@ -32,6 +32,7 @@ type ( Parallelism int Targets []string VarFiles []string + PluginDir bool } Netrc struct { @@ -45,7 +46,7 @@ type ( BackendConfig []string `json:"backend-config"` Lock *bool `json:"lock"` LockTimeout string `json:"lock-timeout"` - PluginDir string `json:"plugin-dir` + PluginPath string `json:"plugin-path` } // Plugin represents the plugin instance to be executed @@ -206,9 +207,10 @@ func initCommand(config InitOptions) *exec.Cmd { args = append(args, fmt.Sprintf("-lock-timeout=%s", config.LockTimeout)) } - // "" is default in TF - if config.PluginDir != "" { - args = append(args, fmt.Sprintf("-plugin-dir=%s", config.PluginDir)) + if config.PluginDir == true { + if config.PluginPath != "" { + args = append(args, fmt.Sprintf("-plugin-dir=%s", config.PluginPath)) + } } // Fail Terraform execution on prompt From 07852f7673834f6d1b266cd9ddcbede89bd03896 Mon Sep 17 00:00:00 2001 From: Steve Min Date: Tue, 8 May 2018 09:32:04 -0500 Subject: [PATCH 3/5] adding missing code --- DOCS.md | 4 +++- main.go | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/DOCS.md b/DOCS.md index 9967d53..6062ecd 100644 --- a/DOCS.md +++ b/DOCS.md @@ -202,7 +202,7 @@ init_options.lock init_options.lock-timeout : Duration to wait for a state lock. Default `0s`. -init_options.plugin-dir +init_options.plugin-path : Local path to use terraform plugins from. Default is `""` which will pull from upstream Terraform. vars @@ -216,6 +216,8 @@ Each value is passed as a `-var-file ` option. ca_cert : ca cert to add to your environment to allow terraform to use internal/private resources +plugin_dir + sensitive : (default: `false`) - Whether or not to suppress terraform commands to stdout. diff --git a/main.go b/main.go index ce00fba..528669c 100644 --- a/main.go +++ b/main.go @@ -78,6 +78,11 @@ func main() { Usage: "a map of secrets to pass to the Terraform `plan` and `apply` commands. Each value is passed as a `=` option", EnvVar: "PLUGIN_SECRETS", }, + cli.StringFlag{ + Name: "plugin_dir", + Usage: "whether or not to set custom plugin directory path", + EnvVar: "PLUGIN_DIR", + } cli.BoolFlag{ Name: "sensitive", Usage: "whether or not to suppress terraform commands to stdout", @@ -148,6 +153,7 @@ func run(c *cli.Context) error { Parallelism: c.Int("parallelism"), Targets: c.StringSlice("targets"), VarFiles: c.StringSlice("var_files"), + PluginDir: c.Bool("plugin_dir"), }, Netrc: Netrc{ Login: c.String("netrc.username"), From 3329e8b6561d97bacf69160dc11815d5f1e8d5e6 Mon Sep 17 00:00:00 2001 From: Steve Min Date: Tue, 8 May 2018 09:41:17 -0500 Subject: [PATCH 4/5] fixing build errors --- main.go | 2 +- plugin.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main.go b/main.go index 528669c..9d80c03 100644 --- a/main.go +++ b/main.go @@ -82,7 +82,7 @@ func main() { Name: "plugin_dir", Usage: "whether or not to set custom plugin directory path", EnvVar: "PLUGIN_DIR", - } + }, cli.BoolFlag{ Name: "sensitive", Usage: "whether or not to suppress terraform commands to stdout", diff --git a/plugin.go b/plugin.go index 1c4c141..fc121c1 100644 --- a/plugin.go +++ b/plugin.go @@ -89,7 +89,7 @@ func (p Plugin) Exec() error { } commands = append(commands, deleteCache()) - commands = append(commands, initCommand(p.Config.InitOptions)) + commands = append(commands, initCommand(p.Config)) commands = append(commands, getModules()) // Add commands listed from Actions @@ -188,28 +188,28 @@ func getModules() *exec.Cmd { ) } -func initCommand(config InitOptions) *exec.Cmd { +func initCommand(config Config) *exec.Cmd { args := []string{ "init", } - for _, v := range config.BackendConfig { + for _, v := range config.InitOptions.BackendConfig { args = append(args, fmt.Sprintf("-backend-config=%s", v)) } // True is default in TF - if config.Lock != nil { - args = append(args, fmt.Sprintf("-lock=%t", *config.Lock)) + if config.InitOptions.Lock != nil { + args = append(args, fmt.Sprintf("-lock=%t", *config.InitOptions.Lock)) } // "0s" is default in TF - if config.LockTimeout != "" { - args = append(args, fmt.Sprintf("-lock-timeout=%s", config.LockTimeout)) + if config.InitOptions.LockTimeout != "" { + args = append(args, fmt.Sprintf("-lock-timeout=%s", config.InitOptions.LockTimeout)) } if config.PluginDir == true { - if config.PluginPath != "" { - args = append(args, fmt.Sprintf("-plugin-dir=%s", config.PluginPath)) + if config.InitOptions.PluginPath != "" { + args = append(args, fmt.Sprintf("-plugin-dir=%s", config.InitOptions.PluginPath)) } } From fe63d082ccd4eb5cefd34cddb0d7a33e439b2c0f Mon Sep 17 00:00:00 2001 From: Steve Min Date: Tue, 8 May 2018 09:52:41 -0500 Subject: [PATCH 5/5] docs won't take the change --- DOCS.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DOCS.md b/DOCS.md index 6062ecd..d977769 100644 --- a/DOCS.md +++ b/DOCS.md @@ -216,11 +216,12 @@ Each value is passed as a `-var-file ` option. ca_cert : ca cert to add to your environment to allow terraform to use internal/private resources -plugin_dir - sensitive : (default: `false`) - Whether or not to suppress terraform commands to stdout. +plugin_dir +: (default: `false`) - Wheter or not to set custom plugin directory path. + role_arn_to_assume : A role to assume before running the terraform commands.