Merge pull request #32 from gruntwork-io/terraform-0_9

Replace terraform remote config with terraform init for Terraform 0.9.

Author: josh-padnick

apply.go

@@ -21,7 +21,7 @@ func Apply(options *TerratestOptions) (string, error) {
 		return output, fmt.Errorf("Test failed because the S3 Bucket '%s' does not exist in the '%s' region.\n", options.TfRemoteStateS3BucketName, options.TfRemoteStateS3BucketRegion)
 	}
 
-	terraform.ConfigureRemoteState(options.TemplatePath, options.TfRemoteStateS3BucketName, options.GetTfStateFileName(), options.TfRemoteStateS3BucketRegion, logger)
+	terraform.Init(options.TemplatePath, logger)
 
 	// TERRAFORM APPLY
 	// Download all the Terraform modules

terraform/apply.go

@@ -22,13 +22,13 @@ var terraformDebugEnv = map[string]string{}
 
 // Call Terraform Apply on the template at "templatePath" with the given "vars"
 func Apply(templatePath string, vars map[string]interface{}, logger *log.Logger) error {
-	return shell.RunCommand(shell.Command { Command: "terraform", Args: FormatArgs(vars, "apply", "-input=false"), WorkingDir: templatePath, Env: terraformDebugEnv }, logger)
+	return shell.RunCommand(shell.Command { Command: "terraform", Args: FormatArgs(vars, "apply", "-input=false", "-lock=false"), WorkingDir: templatePath, Env: terraformDebugEnv }, logger)
 }
 
 // Call Terraform Apply on the template at "templatePath" with the given "vars", and return the output as a string
 func ApplyAndGetOutput(terraformPath string, vars map[string]interface{}, logger *log.Logger) (string, error) {
 	logger.Println("Applying Terraform templates in folder", terraformPath)
-	return shell.RunCommandAndGetOutput( shell.Command { Command: "terraform", Args: FormatArgs(vars, "apply", "-input=false"), WorkingDir: terraformPath, Env: terraformDebugEnv }, logger)
+	return shell.RunCommandAndGetOutput( shell.Command { Command: "terraform", Args: FormatArgs(vars, "apply", "-input=false", "-lock=false"), WorkingDir: terraformPath, Env: terraformDebugEnv }, logger)
 }
 
 // Regrettably Terraform has many bugs. Often, just re-running terraform apply will resolve the issue.

terraform/destroy.go

@@ -10,11 +10,11 @@ import (
 // Call Terraform Destroy on the template at "templatePath" with the given "vars"
 func Destroy(templatePath string, vars map[string]interface{}, logger *log.Logger) error {
 	logger.Println("Destroy Terraform changes in folder", templatePath)
-	return shell.RunCommand(shell.Command { Command: "terraform", Args: FormatArgs(vars, "destroy", "-force", "-input=false"), WorkingDir: templatePath, Env: terraformDebugEnv }, logger)
+	return shell.RunCommand(shell.Command { Command: "terraform", Args: FormatArgs(vars, "destroy", "-force", "-input=false", "-lock=false"), WorkingDir: templatePath, Env: terraformDebugEnv }, logger)
 }
 
 // Call Terraform Destroy on the template at "templatePath" with the given "vars", and return the output as a string
 func DestroyAndGetOutput(templatePath string, vars map[string]interface{}, logger *log.Logger) (string, error) {
 	logger.Println("Destroy Terraform changes in folder", templatePath)
-	return shell.RunCommandAndGetOutput(shell.Command { Command: "terraform", Args: FormatArgs(vars, "destroy", "-force", "-input=false"), WorkingDir: templatePath, Env: terraformDebugEnv }, logger)
+	return shell.RunCommandAndGetOutput(shell.Command { Command: "terraform", Args: FormatArgs(vars, "destroy", "-force", "-input=false", "-lock=false"), WorkingDir: templatePath, Env: terraformDebugEnv }, logger)
 }

terraform/init.go

@@ -8,9 +8,8 @@ import (
 	"github.com/gruntwork-io/terratest/shell"
 )
 
-func ConfigureRemoteState(templatePath string, s3BucketName string, tfStateFileName string, awsRegion string, logger *log.Logger) error {
-	logger.Println("Setting up Terraform remote state storage in S3 bucket", s3BucketName, "with tfstate file name", tfStateFileName, "for folder", templatePath)
-	args := []string{"remote", "config", "-backend=s3", "-backend-config=bucket=" + s3BucketName, "-backend-config=key=" + tfStateFileName, "-backend-config=encrypt=true", "-backend-config=region=" + awsRegion}
+func Init(templatePath string, logger *log.Logger) error {
+	logger.Println("Running terraform init")
+	args := []string{"init"}
 	return shell.RunCommand(shell.Command{ Command: "terraform", Args: args, WorkingDir: templatePath, Env: terraformDebugEnv }, logger)
 }
-