From 4ebb830452d89545204888b1c861650976bacf0e Mon Sep 17 00:00:00 2001 From: Luis Silva Date: Fri, 27 Jul 2018 08:32:19 +0100 Subject: [PATCH 1/2] Add -var-file and -var to destroy operation ; Go fmt the code --- plugin.go | 7 +++++++ plugin_test.go | 6 +++--- terraform.go | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/plugin.go b/plugin.go index 7321c03..dcd241d 100644 --- a/plugin.go +++ b/plugin.go @@ -255,6 +255,13 @@ func tfDestroy(config Config) *exec.Cmd { for _, v := range config.Targets { args = append(args, fmt.Sprintf("-target=%s", v)) } + for _, v := range config.VarFiles { + args = append(args, "-var-file", fmt.Sprintf("%s", v)) + } + for k, v := range config.Vars { + args = append(args, "-var") + args = append(args, fmt.Sprintf("%s=%s", k, v)) + } if config.Parallelism > 0 { args = append(args, fmt.Sprintf("-parallelism=%d", config.Parallelism)) } diff --git a/plugin_test.go b/plugin_test.go index baf59c0..197d2a7 100644 --- a/plugin_test.go +++ b/plugin_test.go @@ -102,10 +102,10 @@ func TestPlugin(t *testing.T) { } tests := []struct { - name string - args args + name string + args args destroy bool - want *exec.Cmd + want *exec.Cmd }{ { "default", diff --git a/terraform.go b/terraform.go index 19ee04e..6834ddc 100644 --- a/terraform.go +++ b/terraform.go @@ -32,7 +32,7 @@ func downloadTerraform(version string) error { func downloadFile(filepath string, url string) error { // Create the file out, err := os.Create(filepath) - if err != nil { + if err != nil { return err } defer out.Close() @@ -46,7 +46,7 @@ func downloadFile(filepath string, url string) error { // Writer the body to file _, err = io.Copy(out, resp.Body) - if err != nil { + if err != nil { return err } From 1198e5b02d6c36000393dd91cda5a6060fa87091 Mon Sep 17 00:00:00 2001 From: Luis Silva Date: Mon, 30 Jul 2018 08:21:00 +0100 Subject: [PATCH 2/2] Improve argument parsing formatting --- plugin.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/plugin.go b/plugin.go index dcd241d..2d33629 100644 --- a/plugin.go +++ b/plugin.go @@ -256,11 +256,10 @@ func tfDestroy(config Config) *exec.Cmd { args = append(args, fmt.Sprintf("-target=%s", v)) } for _, v := range config.VarFiles { - args = append(args, "-var-file", fmt.Sprintf("%s", v)) + args = append(args, fmt.Sprintf("-var-file=%s", v)) } for k, v := range config.Vars { - args = append(args, "-var") - args = append(args, fmt.Sprintf("%s=%s", k, v)) + args = append(args, "-var", fmt.Sprintf("%s=%s", k, v)) } if config.Parallelism > 0 { args = append(args, fmt.Sprintf("-parallelism=%d", config.Parallelism)) @@ -293,11 +292,10 @@ func tfPlan(config Config, destroy bool) *exec.Cmd { args = append(args, "--target", fmt.Sprintf("%s", v)) } for _, v := range config.VarFiles { - args = append(args, "-var-file", fmt.Sprintf("%s", v)) + args = append(args, fmt.Sprintf("-var-file=%s", v)) } for k, v := range config.Vars { - args = append(args, "-var") - args = append(args, fmt.Sprintf("%s=%s", k, v)) + args = append(args, "-var", fmt.Sprintf("%s=%s", k, v)) } if config.Parallelism > 0 { args = append(args, fmt.Sprintf("-parallelism=%d", config.Parallelism)) @@ -319,11 +317,10 @@ func tfValidate(config Config) *exec.Cmd { "validate", } for _, v := range config.VarFiles { - args = append(args, "-var-file", fmt.Sprintf("%s", v)) + args = append(args, fmt.Sprintf("-var-file=%s", v)) } for k, v := range config.Vars { - args = append(args, "-var") - args = append(args, fmt.Sprintf("%s=%s", k, v)) + args = append(args, "-var", fmt.Sprintf("%s=%s", k, v)) } return exec.Command( "terraform",