Merge pull request #83 from lorengordon/aws-v3

plus3it · Aug 11, 2020 · 20896e7 · 20896e7
2 parents cd538b3 + 24e9432
commit 20896e7
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 864 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.0
+current_version = 4.0.0
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,7 @@ tardigrade-ci/
 
 # eclint
 .git/
+
+# terratest
+tests/go.mod
+tests/go.sum
diff --git a/README.md b/README.md
@@ -9,12 +9,13 @@ Creates an AWS Cloudtrail
 | Name | Version |
 |------|---------|
 | terraform | >= 0.12 |
+| aws | >= 3.0.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | n/a |
+| aws | >= 3.0.0 |
 
 ## Inputs
 

diff --git a/main.tf b/main.tf
@@ -1,11 +1,9 @@
-provider "aws" {}
-
 ### LOCALS ###
 locals {
   # cloudwatch log group integration
   create_log_group            = var.cloud_watch_logs_group_name == null
   cloud_watch_logs_group_name = local.create_log_group ? "/aws/cloudtrail/${format("%v", var.cloudtrail_name)}" : var.cloud_watch_logs_group_name
-  cloud_watch_logs_group_arn  = local.create_log_group ? join("", aws_cloudwatch_log_group.this.*.arn) : data.aws_cloudwatch_log_group.this[0].arn
+  cloud_watch_logs_group_arn  = local.create_log_group ? "${join("", aws_cloudwatch_log_group.this.*.arn)}:*" : data.aws_cloudwatch_log_group.this[0].arn
 
   create_log_group_role     = var.cloud_watch_logs_role_arn == null
   cloud_watch_logs_role_arn = local.create_log_group_role ? join("", aws_iam_role.this.*.arn) : var.cloud_watch_logs_role_arn

diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/tests/baseline/README.md b/tests/baseline/README.md
diff --git a/tests/baseline/versions.tf b/tests/baseline/versions.tf
diff --git a/tests/cocreate_kms_key/README.md b/tests/cocreate_kms_key/README.md
diff --git a/tests/cocreate_kms_key/versions.tf b/tests/cocreate_kms_key/versions.tf
diff --git a/tests/event_selector/README.md b/tests/event_selector/README.md
diff --git a/tests/go.mod b/tests/go.mod
diff --git a/tests/go.sum b/tests/go.sum
diff --git a/tests/multiple_event_selectors/README.md b/tests/multiple_event_selectors/README.md
diff --git a/tests/no_cloudtrail/README.md b/tests/no_cloudtrail/README.md
diff --git a/tests/no_cloudtrail/versions.tf b/tests/no_cloudtrail/versions.tf
diff --git a/tests/premade_cwl_group/README.md b/tests/premade_cwl_group/README.md
diff --git a/tests/premade_cwl_group/versions.tf b/tests/premade_cwl_group/versions.tf
diff --git a/tests/premade_cwl_role/README.md b/tests/premade_cwl_role/README.md
diff --git a/tests/premade_cwl_role/versions.tf b/tests/premade_cwl_role/versions.tf
diff --git a/tests/premade_kms_key/README.md b/tests/premade_kms_key/README.md
diff --git a/tests/premade_kms_key/versions.tf b/tests/premade_kms_key/versions.tf
diff --git a/versions.tf b/versions.tf
@@ -1,3 +1,7 @@
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    aws = ">= 3.0.0"
+  }
 }