Standardize test resource names

https://www.pivotaltracker.com/story/show/169682491
trussworks · Nov 14, 2019 · 44ebbec · 44ebbec
1 parent aa745c8
commit 44ebbec
Show file tree

Hide file tree

Showing 27 changed files with 96 additions and 105 deletions.
diff --git a/examples/alb/main.tf b/examples/alb/main.tf
@@ -1,11 +1,12 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
   allow_alb      = "true"
 }
 
 resource "aws_lb" "test_lb" {
+  name               = var.test_name
   internal           = false
   load_balancer_type = "application"
   subnets            = module.vpc.public_subnets
@@ -20,7 +21,7 @@ resource "aws_lb" "test_lb" {
 module "vpc" {
   source         = "terraform-aws-modules/vpc/aws"
   version        = "~> 2"
-  name           = var.vpc_name
+  name           = var.test_name
   cidr           = "10.0.0.0/16"
   azs            = var.vpc_azs
   public_subnets = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]

diff --git a/examples/alb/variables.tf b/examples/alb/variables.tf
@@ -1,15 +1,11 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 
 variable "region" {
   type = string
 }
 
-variable "vpc_name" {
-  type = string
-}
-
 variable "vpc_azs" {
   type = list(string)
 }
diff --git a/examples/cloudtrail/main.tf b/examples/cloudtrail/main.tf
@@ -1,11 +1,12 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
 }
 
 module "aws_cloudtrail" {
-  source         = "trussworks/cloudtrail/aws"
-  version        = "~> 2"
-  s3_bucket_name = module.aws_logs.aws_logs_bucket
+  source                    = "trussworks/cloudtrail/aws"
+  version                   = "~> 2"
+  s3_bucket_name            = module.aws_logs.aws_logs_bucket
+  cloudwatch_log_group_name = var.test_name
 }
diff --git a/examples/cloudtrail/variables.tf b/examples/cloudtrail/variables.tf
@@ -1,4 +1,4 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 

diff --git a/examples/combined/main.tf b/examples/combined/main.tf
@@ -1,10 +1,11 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
 }
 
 resource "aws_lb" "test_alb" {
+  name               = var.test_name
   internal           = false
   load_balancer_type = "application"
   subnets            = module.vpc.public_subnets
@@ -17,20 +18,22 @@ resource "aws_lb" "test_alb" {
 }
 
 module "aws_cloudtrail" {
-  source         = "trussworks/cloudtrail/aws"
-  version        = "~> 2"
-  s3_bucket_name = module.aws_logs.aws_logs_bucket
+  source                    = "trussworks/cloudtrail/aws"
+  version                   = "~> 2"
+  s3_bucket_name            = module.aws_logs.aws_logs_bucket
+  cloudwatch_log_group_name = var.test_name
 }
 
 module "config" {
-  source  = "trussworks/config/aws"
-  version = "~> 2"
-
+  source             = "trussworks/config/aws"
+  version            = "~> 2"
+  config_name        = var.test_name
   config_logs_bucket = module.aws_logs.aws_logs_bucket
   config_logs_prefix = "config"
 }
 
 resource "aws_elb" "test_elb" {
+  name    = var.test_name
   subnets = module.vpc.public_subnets
 
   access_logs {
@@ -48,6 +51,7 @@ resource "aws_elb" "test_elb" {
 }
 
 resource "aws_lb" "test_nlb" {
+  name               = var.test_name
   internal           = false
   load_balancer_type = "network"
   subnets            = module.vpc.public_subnets
@@ -61,7 +65,7 @@ resource "aws_lb" "test_nlb" {
 
 resource "aws_redshift_cluster" "test_redshift" {
   count               = var.test_redshift ? 1 : 0
-  cluster_identifier  = "tf-redshift-cluster"
+  cluster_identifier  = var.test_name
   node_type           = "dc2.large"
   cluster_type        = "single-node"
   master_username     = "testredshiftuser"
@@ -76,7 +80,8 @@ resource "aws_redshift_cluster" "test_redshift" {
 }
 
 resource "aws_s3_bucket" "log_source_bucket" {
-  acl = "private"
+  bucket = "${var.test_name}-source"
+  acl    = "private"
 
   logging {
     target_bucket = module.aws_logs.aws_logs_bucket
@@ -87,7 +92,7 @@ resource "aws_s3_bucket" "log_source_bucket" {
 module "vpc" {
   source         = "terraform-aws-modules/vpc/aws"
   version        = "~> 2"
-  name           = var.vpc_name
+  name           = var.test_name
   cidr           = "10.0.0.0/16"
   azs            = var.vpc_azs
   public_subnets = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]

diff --git a/examples/combined/variables.tf b/examples/combined/variables.tf
@@ -1,15 +1,11 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 
 variable "region" {
   type = string
 }
 
-variable "vpc_name" {
-  type = string
-}
-
 variable "vpc_azs" {
   type = list(string)
 }

diff --git a/examples/config/main.tf b/examples/config/main.tf
@@ -1,15 +1,15 @@
 module "aws_logs" {
   source             = "../../"
-  s3_bucket_name     = var.logs_bucket
+  s3_bucket_name     = var.test_name
   region             = var.region
   allow_config       = "true"
   config_logs_prefix = "config"
 }
 
 module "config" {
-  source  = "trussworks/config/aws"
-  version = "~> 2"
-
+  source             = "trussworks/config/aws"
+  version            = "~> 2"
+  config_name        = var.test_name
   config_logs_bucket = module.aws_logs.aws_logs_bucket
   config_logs_prefix = "config"
 }
diff --git a/examples/config/variables.tf b/examples/config/variables.tf
@@ -1,4 +1,4 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = "string"
 }
 

diff --git a/examples/elb/main.tf b/examples/elb/main.tf
@@ -1,11 +1,12 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
   allow_elb      = "true"
 }
 
 resource "aws_elb" "test_elb" {
+  name    = var.test_name
   subnets = module.vpc.public_subnets
 
   access_logs {
@@ -25,7 +26,7 @@ resource "aws_elb" "test_elb" {
 module "vpc" {
   source         = "terraform-aws-modules/vpc/aws"
   version        = "~> 2"
-  name           = var.vpc_name
+  name           = var.test_name
   cidr           = "10.0.0.0/16"
   azs            = var.vpc_azs
   public_subnets = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]

diff --git a/examples/elb/variables.tf b/examples/elb/variables.tf
@@ -1,15 +1,11 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 
 variable "region" {
   type = string
 }
 
-variable "vpc_name" {
-  type = string
-}
-
 variable "vpc_azs" {
   type = list(string)
 }
diff --git a/examples/nlb/main.tf b/examples/nlb/main.tf
@@ -1,11 +1,12 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
   allow_nlb      = "true"
 }
 
 resource "aws_lb" "test_lb" {
+  name               = var.test_name
   internal           = false
   load_balancer_type = "network"
   subnets            = module.vpc.public_subnets
@@ -20,7 +21,7 @@ resource "aws_lb" "test_lb" {
 module "vpc" {
   source         = "terraform-aws-modules/vpc/aws"
   version        = "~> 2"
-  name           = var.vpc_name
+  name           = var.test_name
   cidr           = "10.0.0.0/16"
   azs            = var.vpc_azs
   public_subnets = ["10.0.101.0/24", "10.0.102.0/24", "10.0.103.0/24"]

diff --git a/examples/nlb/variables.tf b/examples/nlb/variables.tf
@@ -1,15 +1,11 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 
 variable "region" {
   type = string
 }
 
-variable "vpc_name" {
-  type = string
-}
-
 variable "vpc_azs" {
   type = list(string)
 }
diff --git a/examples/redshift/main.tf b/examples/redshift/main.tf
@@ -1,12 +1,12 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
   allow_redshift = "true"
 }
 
 resource "aws_redshift_cluster" "test_redshift" {
-  cluster_identifier  = "tf-redshift-cluster"
+  cluster_identifier  = var.test_name
   node_type           = "dc2.large"
   cluster_type        = "single-node"
   master_username     = "testredshiftuser"

diff --git a/examples/redshift/variables.tf b/examples/redshift/variables.tf
@@ -1,4 +1,4 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 

diff --git a/examples/s3/main.tf b/examples/s3/main.tf
@@ -1,11 +1,12 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
 }
 
 resource "aws_s3_bucket" "log_source_bucket" {
-  acl = "private"
+  bucket = "${var.test_name}-source"
+  acl    = "private"
 
   logging {
     target_bucket = module.aws_logs.aws_logs_bucket

diff --git a/examples/s3/variables.tf b/examples/s3/variables.tf
@@ -1,4 +1,4 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 

diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -1,5 +1,5 @@
 module "aws_logs" {
   source         = "../../"
-  s3_bucket_name = var.logs_bucket
+  s3_bucket_name = var.test_name
   region         = var.region
 }
diff --git a/examples/simple/variables.tf b/examples/simple/variables.tf
@@ -1,4 +1,4 @@
-variable "logs_bucket" {
+variable "test_name" {
   type = string
 }
 

diff --git a/test/terraform_aws_logs_alb_test.go b/test/terraform_aws_logs_alb_test.go
@@ -13,18 +13,16 @@ import (
 func TestTerraformAwsLogsAlb(t *testing.T) {
 	t.Parallel()
 
-	expectedLogsBucket := fmt.Sprintf("terratest-aws-logs-alb-%s", strings.ToLower(random.UniqueId()))
-	vpcName := fmt.Sprintf("terratest-vpc-alb-%s", strings.ToLower(random.UniqueId()))
+	testName := fmt.Sprintf("terratest-aws-logs-%s", strings.ToLower(random.UniqueId()))
 	awsRegion := "us-west-2"
 	vpcAzs := aws.GetAvailabilityZones(t, awsRegion)[:3]
 
 	terraformOptions := &terraform.Options{
 		TerraformDir: "../examples/alb/",
 		Vars: map[string]interface{}{
-			"region":      awsRegion,
-			"vpc_azs":     vpcAzs,
-			"logs_bucket": expectedLogsBucket,
-			"vpc_name":    vpcName,
+			"region":    awsRegion,
+			"vpc_azs":   vpcAzs,
+			"test_name": testName,
 		},
 		EnvVars: map[string]string{
 			"AWS_DEFAULT_REGION": awsRegion,
@@ -33,6 +31,6 @@ func TestTerraformAwsLogsAlb(t *testing.T) {
 
 	defer terraform.Destroy(t, terraformOptions)
 	// Empty logs_bucket before terraform destroy
-	defer aws.EmptyS3Bucket(t, awsRegion, expectedLogsBucket)
+	defer aws.EmptyS3Bucket(t, awsRegion, testName)
 	terraform.InitAndApply(t, terraformOptions)
 }
diff --git a/test/terraform_aws_logs_cloudtrail_test.go b/test/terraform_aws_logs_cloudtrail_test.go
@@ -15,22 +15,23 @@ func TestTerraformAwsLogsCloudtrail(t *testing.T) {
 	// Running this test in parallel with other tests in the module
 	// often causes issues when attempting to empty and delete the bucket.
 
-	expectedLogsBucket := fmt.Sprintf("terratest-aws-logs-cloudtrail-%s", strings.ToLower(random.UniqueId()))
+	testName := fmt.Sprintf("terratest-aws-logs-%s", strings.ToLower(random.UniqueId()))
 	awsRegion := "us-west-2"
 
 	terraformOptions := &terraform.Options{
 		TerraformDir: "../examples/cloudtrail/",
 		Vars: map[string]interface{}{
-			"region":      awsRegion,
-			"logs_bucket": expectedLogsBucket,
+			"region":    awsRegion,
+			"test_name": testName,
 		},
 		EnvVars: map[string]string{
 			"AWS_DEFAULT_REGION": awsRegion,
 		},
 	}
 
 	defer terraform.Destroy(t, terraformOptions)
-	// Empty logs_bucket before terraform destroy
-	defer aws.EmptyS3Bucket(t, awsRegion, expectedLogsBucket)
+	// Empty and delete logs_bucket before terraform destroy
+	defer aws.DeleteS3Bucket(t, awsRegion, testName)
+	defer aws.EmptyS3Bucket(t, awsRegion, testName)
 	terraform.InitAndApply(t, terraformOptions)
 }