Merge pull request #81 from trussworks/ee-try-awsp-30

Fixes tests and allows us to use AWS provider 3.0
trussworks · Sep 4, 2020 · b2a2a98 · b2a2a98
2 parents fade9c8 + b145480
commit b2a2a98
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 17 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:6986bb9022e5a83599feb66a7128a2d0fa12732a
 
 jobs:
   terratest:
     docker:
-      - image: *circleci_docker_primary
+      - image: *circleci
     steps:
       - checkout
       - restore_cache:

diff --git a/README.md b/README.md
@@ -64,7 +64,9 @@ Enables AWS Config and adds managed config rules with good defaults.
 
 ## Terraform Versions
 
-Terraform 0.12. Pin module version to ~> 2.x 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.0. Submit pull-requests to terraform012 branch.
 
 Terraform 0.11. Pin module version to ~> 1.5.1. Submit pull-requests to terraform011 branch.
 
@@ -88,15 +90,15 @@ module "aws_config" {
 
 | Name | Version |
 |------|---------|
-| terraform | ~> 0.12.0 |
-| aws | ~> 2.70 |
+| terraform | >= 0.12.7, < 0.14 |
+| aws | >= 2.70, < 4.0 |
 | template | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | ~> 2.70 |
+| aws | >= 2.70, < 4.0 |
 | template | >= 2.0 |
 
 ## Inputs

diff --git a/examples/required-tags/main.tf b/examples/required-tags/main.tf
@@ -4,7 +4,7 @@
 
 module "config_logs" {
   source  = "trussworks/logs/aws"
-  version = "~> 5"
+  version = "~> 9"
 
   s3_bucket_name     = var.config_logs_bucket
   region             = var.region

diff --git a/examples/required-tags/providers.tf b/examples/required-tags/providers.tf
@@ -1,3 +1,4 @@
 provider "aws" {
-  version = "~> 2.70"
-}
+  version = ">= 2.70"
+  region  = var.region
+}
diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -4,7 +4,7 @@
 
 module "config_logs" {
   source  = "trussworks/logs/aws"
-  version = "~> 5"
+  version = "~> 9"
 
   s3_bucket_name     = var.config_logs_bucket
   region             = var.region

diff --git a/examples/simple/providers.tf b/examples/simple/providers.tf
@@ -1,3 +1,4 @@
 provider "aws" {
-  version = "~> 2.70"
-}
+  version = ">= 2.70"
+  region  = var.region
+}
diff --git a/examples/sns-topic/main.tf b/examples/sns-topic/main.tf
@@ -6,7 +6,7 @@ data "aws_partition" "current" {}
 
 module "config_logs" {
   source  = "trussworks/logs/aws"
-  version = "~> 8"
+  version = "~> 9"
 
   s3_bucket_name     = var.config_logs_bucket
   region             = var.region

diff --git a/examples/sns-topic/providers.tf b/examples/sns-topic/providers.tf
@@ -1,3 +1,4 @@
 provider "aws" {
-  version = "~> 2.70"
-}
+  version = ">= 2.70"
+  region  = var.region
+}
diff --git a/versions.tf b/versions.tf
@@ -1,8 +1,8 @@
 terraform {
-  required_version = "~> 0.12.0"
+  required_version = ">= 0.12.7, < 0.14"
 
   required_providers {
-    aws      = "~> 2.70"
+    aws      = ">= 2.70, < 4.0"
     template = ">= 2.0"
   }
 }