Merge pull request #931 from gruntwork-io/fix-terraform-validation-is…

…sues Fix terraform validation issues
gruntwork-io · Jun 17, 2021 · dff8b51 · dff8b51
2 parents 3888b06 + 9fa9950
commit dff8b51
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 35 deletions.
diff --git a/examples/terraform-aws-dynamodb-example/main.tf b/examples/terraform-aws-dynamodb-example/main.tf
@@ -2,6 +2,9 @@
 # PIN TERRAFORM VERSION TO >= 0.12
 # The examples have been upgraded to 0.12 syntax
 # ---------------------------------------------------------------------------------------------------------------------
+provider "aws" {
+  region = var.region
+}
 
 terraform {
   # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting

diff --git a/examples/terraform-aws-dynamodb-example/variables.tf b/examples/terraform-aws-dynamodb-example/variables.tf
@@ -1,3 +1,11 @@
+# ---------------------------------------------------------------------------------------------------------------------
+# REQUIRED PARAMETERS
+# ---------------------------------------------------------------------------------------------------------------------
+variable "region" {
+  description = "The AWS region to deploy to"
+  type        = string
+}
+
 # ---------------------------------------------------------------------------------------------------------------------
 # OPTIONAL PARAMETERS
 # These parameters have reasonable defaults.
@@ -8,4 +16,3 @@ variable "table_name" {
   type        = string
   default     = "terratest-example"
 }
-
diff --git a/examples/terraform-aws-ecs-example/main.tf b/examples/terraform-aws-ecs-example/main.tf
@@ -2,6 +2,9 @@
 # PIN TERRAFORM VERSION TO >= 0.12
 # The examples have been upgraded to 0.12 syntax
 # ---------------------------------------------------------------------------------------------------------------------
+provider "aws" {
+  region = var.region
+}
 
 terraform {
   # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting

diff --git a/examples/terraform-aws-ecs-example/variables.tf b/examples/terraform-aws-ecs-example/variables.tf
@@ -10,7 +10,10 @@
 # REQUIRED PARAMETERS
 # You must provide a value for each of these parameters.
 # ---------------------------------------------------------------------------------------------------------------------
-
+variable "region" {
+  description = "The AWS region to deploy to"
+  type        = string
+}
 # ---------------------------------------------------------------------------------------------------------------------
 # OPTIONAL PARAMETERS
 # These parameters have reasonable defaults.

diff --git a/examples/terraform-aws-lambda-example/main.tf b/examples/terraform-aws-lambda-example/main.tf
@@ -2,6 +2,9 @@
 # AWS LAMBDA TERRAFORM EXAMPLE
 # See test/terraform_aws_lambda_example_test.go for how to write automated tests for this code.
 # ---------------------------------------------------------------------------------------------------------------------
+provider "aws" {
+  region = var.region
+}
 
 terraform {
   # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting

diff --git a/examples/terraform-aws-lambda-example/variables.tf b/examples/terraform-aws-lambda-example/variables.tf
@@ -10,7 +10,10 @@
 # REQUIRED PARAMETERS
 # You must provide a value for each of these parameters.
 # ---------------------------------------------------------------------------------------------------------------------
-
+variable "region" {
+  description = "The AWS region to deploy to"
+  type        = string
+}
 
 variable "function_name" {
   description = "The name of the function to provision"

diff --git a/examples/terraform-aws-rds-example/main.tf b/examples/terraform-aws-rds-example/main.tf
@@ -3,6 +3,10 @@
 # The examples have been upgraded to 0.12 syntax
 # ---------------------------------------------------------------------------------------------------------------------
 
+provider "aws" {
+  region = var.region
+}
+
 terraform {
   # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
@@ -119,4 +123,3 @@ resource "aws_db_instance" "example" {
     Name = var.name
   }
 }
-
diff --git a/examples/terraform-aws-rds-example/variables.tf b/examples/terraform-aws-rds-example/variables.tf
@@ -11,6 +11,10 @@
 # You must provide a value for each of these parameters.
 # Given these are credentials, security of the values should be considered.
 # ---------------------------------------------------------------------------------------------------------------------
+variable "region" {
+  description = "The AWS region to deploy to"
+  type        = string
+}
 
 variable "username" {
   description = "Master username of the DB"

diff --git a/examples/terraform-aws-s3-example/main.tf b/examples/terraform-aws-s3-example/main.tf
@@ -2,6 +2,9 @@
 # PIN TERRAFORM VERSION TO >= 0.12
 # The examples have been upgraded to 0.12 syntax
 # ---------------------------------------------------------------------------------------------------------------------
+provider "aws" {
+  region = var.region
+}
 
 terraform {
   # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting

diff --git a/examples/terraform-aws-s3-example/variables.tf b/examples/terraform-aws-s3-example/variables.tf
@@ -10,6 +10,10 @@
 # REQUIRED PARAMETERS
 # You must provide a value for each of these parameters.
 # ---------------------------------------------------------------------------------------------------------------------
+variable "region" {
+  description = "The AWS region to deploy to"
+  type        = string
+}
 
 # ---------------------------------------------------------------------------------------------------------------------
 # OPTIONAL PARAMETERS

diff --git a/modules/terraform/validate_test.go b/modules/terraform/validate_test.go
@@ -121,7 +121,11 @@ func TestValidateAllTerraformModulesOnTerratest(t *testing.T) {
 
 	projectRootDir := filepath.Join(cwd, "../..")
 
-	opts, optsErr := NewValidationOptions(projectRootDir, []string{}, []string{"test/fixtures/terraform-with-plan-error", "examples/terraform-backend-example"})
+	opts, optsErr := NewValidationOptions(projectRootDir, []string{}, []string{
+		"test/fixtures/terraform-with-plan-error",
+		"test/fixtures/terragrunt/terragrunt-with-plan-error",
+		"examples/terraform-backend-example",
+	})
 	require.NoError(t, optsErr)
 
 	ValidateAllTerraformModules(t, opts)

diff --git a/test/terraform_aws_dynamodb_example_test.go b/test/terraform_aws_dynamodb_example_test.go
@@ -39,11 +39,7 @@ func TestTerraformAwsDynamoDBExample(t *testing.T) {
 		// Variables to pass to our Terraform code using -var options
 		Vars: map[string]interface{}{
 			"table_name": expectedTableName,
-		},
-
-		// Environment variables to set when running Terraform
-		EnvVars: map[string]string{
-			"AWS_DEFAULT_REGION": awsRegion,
+			"region":     awsRegion,
 		},
 	})
 

diff --git a/test/terraform_aws_ecs_example_test.go b/test/terraform_aws_ecs_example_test.go
@@ -32,11 +32,7 @@ func TestTerraformAwsEcsExample(t *testing.T) {
 		Vars: map[string]interface{}{
 			"cluster_name": expectedClusterName,
 			"service_name": expectedServiceName,
-		},
-
-		// Environment variables to set when running Terraform
-		EnvVars: map[string]string{
-			"AWS_DEFAULT_REGION": awsRegion,
+			"region":       awsRegion,
 		},
 	})
 

diff --git a/test/terraform_aws_lambda_example_test.go b/test/terraform_aws_lambda_example_test.go
@@ -36,11 +36,7 @@ func TestTerraformAwsLambdaExample(t *testing.T) {
 		// Variables to pass to our Terraform code using -var options
 		Vars: map[string]interface{}{
 			"function_name": functionName,
-		},
-
-		// Environment variables to set when running Terraform
-		EnvVars: map[string]string{
-			"AWS_DEFAULT_REGION": awsRegion,
+			"region":        awsRegion,
 		},
 	})
 
@@ -93,11 +89,7 @@ func TestTerraformAwsLambdaWithParamsExample(t *testing.T) {
 		// Variables to pass to our Terraform code using -var options
 		Vars: map[string]interface{}{
 			"function_name": functionName,
-		},
-
-		// Environment variables to set when running Terraform
-		EnvVars: map[string]string{
-			"AWS_DEFAULT_REGION": awsRegion,
+			"region":        awsRegion,
 		},
 	})
 

diff --git a/test/terraform_aws_rds_example_test.go b/test/terraform_aws_rds_example_test.go
@@ -47,11 +47,7 @@ func TestTerraformAwsRdsExample(t *testing.T) {
 			"engine_version":       "5.7.21",
 			"port":                 expectedPort,
 			"database_name":        expectedDatabaseName,
-		},
-
-		// Environment variables to set when running Terraform
-		EnvVars: map[string]string{
-			"AWS_DEFAULT_REGION": awsRegion,
+			"region":               awsRegion,
 		},
 	})
 

diff --git a/test/terraform_aws_s3_example_test.go b/test/terraform_aws_s3_example_test.go
@@ -36,11 +36,7 @@ func TestTerraformAwsS3Example(t *testing.T) {
 			"tag_bucket_name":        expectedName,
 			"tag_bucket_environment": expectedEnvironment,
 			"with_policy":            "true",
-		},
-
-		// Environment variables to set when running Terraform
-		EnvVars: map[string]string{
-			"AWS_DEFAULT_REGION": awsRegion,
+			"region":                 awsRegion,
 		},
 	})