Adding suport for -var-file and -target argument

examples/terraform-basic-example/main.tf

@@ -5,4 +5,8 @@
 
 data "template_file" "example" {
   template = "${var.example}"
-}
+}
+
+data "template_file" "example2" {
+  template = "${var.example2}"
+}

examples/terraform-basic-example/outputs.tf

@@ -1,3 +1,7 @@
 output "example" {
   value = "${data.template_file.example.rendered}"
-}
+}
+
+output "example2" {
+  value = "${data.template_file.example2.rendered}"
+}

examples/terraform-basic-example/varfile.tfvars

@@ -0,0 +1 @@
+example2 = "test"

examples/terraform-basic-example/variables.tf

@@ -20,4 +20,9 @@
 variable "example" {
   description = "Example variable"
   default     = "example"
-}
+}
+
+variable "example2" {
+  description = "Example variable 2"
+  default     = ""
+}

modules/terraform/cmd.go

@@ -17,6 +17,14 @@ func GetCommonOptions(options *Options, args ...string) (*Options, []string) {
 		args = append(args, "-no-color")
 	}
 
+	for _, varFile = range options.VarFiles {
+		arg = append(args, fmt.Sprintf("%s=%s","-var-file", varFile))
+	}
+
+	for _, target = range options.Targets {
+		arg = append(args, fmt.Sprintf("%s=%s","-target", target))
+	}
+
 	// if SshAgent is provided, override the local SSH agent with the socket of our in-process agent
 	if options.SshAgent != nil {
 		// Initialize EnvVars, if it hasn't been set yet

modules/terraform/options.go

@@ -10,6 +10,8 @@ import (
 type Options struct {
 	TerraformDir             string                 // The path to the folder where the Terraform code is defined.
 	Vars                     map[string]interface{} // The vars to pass to Terraform commands using the -var option.
+	VarFiles                 []string               // The var file paths to pass to Terraform commands using -var-file option.
+	Targets                  []string               // The target resources to pass to the terraform command with -target
 	EnvVars                  map[string]string      // Environment variables to set when running Terraform
 	BackendConfig            map[string]interface{} // The vars to pass to the terraform init command for extra configuration for the backend
 	RetryableTerraformErrors map[string]string      // If Terraform apply fails with one of these (transient) errors, retry. The keys are text to look for in the error and the message is what to display to a user if that error is found.

test/terraform_basic_example_test.go

@@ -13,6 +13,7 @@ func TestTerraformBasicExample(t *testing.T) {
 
 	expectedText := "foo"
 
+        // TODO create the terraform varfile from test
 	terraformOptions := &terraform.Options{
 		// The path to where our Terraform code is located
 		TerraformDir: "../examples/terraform-basic-example",
@@ -21,9 +22,13 @@ func TestTerraformBasicExample(t *testing.T) {
 		Vars: map[string]interface{}{
 			"example": expectedText,
 		},
+                VarFiles: []string{
+                    "varfile.tfvars"
+                }
 
 		NoColor: true,
 	}
+
 
 	// At the end of the test, run `terraform destroy` to clean up any resources that were created
 	defer terraform.Destroy(t, terraformOptions)
@@ -36,4 +41,10 @@ func TestTerraformBasicExample(t *testing.T) {
 
 	// Verify we're getting back the variable we expect
 	assert.Equal(t, expectedText, actualText)
+
+        // Test for the second variable which comes from the var file
+        actualText = terraform.Output(t, terraformOptions, "example")
+        assert.Equal(t, "example2", actualText)
+
 }
+