Merge pull request #45 from trussworks/replace-circleci-docker-primary

Replace circleci docker primary and upgrade to terraform 13
trussworks · Sep 11, 2020 · ed182b5 · ed182b5
2 parents 6dbba4f + f6e8266
commit ed182b5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,12 +1,12 @@
 version: 2.1
 
 references:
-  circleci_docker_primary: &circleci_docker_primary trussworks/circleci-docker-primary:822fac1c30f3bb7d5d595bed5d2dc86265c4f2f0
+  circleci: &circleci trussworks/circleci:29ab89fdada1f85c5d8fb685a2c71660f0c5f60c
 
 jobs:
   terratest:
     docker:
-      - image: *circleci_docker_primary
+      - image: *circleci
     steps:
       - checkout
       - restore_cache:

diff --git a/README.md b/README.md
@@ -8,7 +8,9 @@ Creates the following resources:
 
 ## Terraform Versions
 
-Terraform 0.12. Pin module version to ~> 2.0.2. Submit pull-requests to master branch.
+Terraform 0.13. Pin module version to ~> 4.X. Submit pull-requests to master branch.
+
+Terraform 0.12. Pin module version to ~> 3.X. Submit pull-requests to terraform012 branch.
 
 Terraform 0.11. Pin module version to ~> 1.5.0. Submit pull-requests to terraform011 branch.
 
@@ -40,14 +42,14 @@ module "app_nlb" {
 
 | Name | Version |
 |------|---------|
-| terraform | ~> 0.12.0 |
-| aws | ~> 2.70 |
+| terraform | ~> 0.13.0 |
+| aws | ~> 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | ~> 2.70 |
+| aws | ~> 3.0 |
 
 ## Inputs
 

diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -10,10 +10,10 @@ module "aws_nlb" {
 
 module "nlb_logs" {
   source            = "trussworks/logs/aws"
-  version           = "~> 5.2.0"
+  version           = "~> 10"
   s3_bucket_name    = var.logs_bucket
-  region            = var.region
   nlb_logs_prefixes = ["nlb/${var.nlb_name}-${var.environment}"]
+  allow_nlb         = true
 }
 
 module "vpc" {

diff --git a/examples/simple/providers.tf b/examples/simple/providers.tf
diff --git a/examples/simple/variables.tf b/examples/simple/variables.tf
@@ -10,10 +10,6 @@ variable "logs_bucket" {
   type = string
 }
 
-variable "region" {
-  type = string
-}
-
 variable "vpc_azs" {
   type = list(string)
 }
diff --git a/test/terraform_aws_nlb_test.go b/test/terraform_aws_nlb_test.go
@@ -25,7 +25,6 @@ func TestTerraformAwsNlb(t *testing.T) {
 			"environment": environment,
 			"nlb_name":    nlbName,
 			"logs_bucket": logsBucket,
-			"region":      awsRegion,
 			"vpc_azs":     vpcAzs,
 		},
 		EnvVars: map[string]string{

diff --git a/versions.tf b/versions.tf
@@ -1,7 +1,7 @@
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = "~> 0.13.0"
 
   required_providers {
-    aws = "~> 2.70"
+    aws = "~> 3.0"
   }
 }