diff --git a/.circleci/config.yml b/.circleci/config.yml index 4bcba58..858deb1 100644 --- 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 index 41306e7..01279cb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ This module creates AWS CloudTrail and configures it so that logs go to cloudwat ## Terraform Versions -Terraform 0.12. Pin module version to `~> 3.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.X`. Submit pull-requests to `terraform12` branch. Terraform 0.11. Pin module version to `~> 1.X`. Submit pull-requests to `terraform011` branch. @@ -33,14 +35,14 @@ previous invocations of the module prior to upgrading the version. | 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 index 91934af..b2c5ca1 100644 --- a/examples/simple/main.tf +++ b/examples/simple/main.tf @@ -11,7 +11,7 @@ module "aws_cloudtrail" { module "logs" { source = "trussworks/logs/aws" - version = "~> 5" + version = "~> 9.0.0" s3_bucket_name = var.logs_bucket region = var.region diff --git a/examples/simple/providers.tf b/examples/simple/providers.tf index b8cdb83..dcdb391 100644 --- a/examples/simple/providers.tf +++ b/examples/simple/providers.tf @@ -1,3 +1,3 @@ provider "aws" { - version = "~> 2.70" -} \ No newline at end of file + version = "~> 3.0" +} diff --git a/go.mod b/go.mod index 9fc7ded..d16b84b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/trussworks/terraform-aws-cloudtrail -go 1.13 +go 1.14 require ( github.com/aws/aws-sdk-go v1.34.0 diff --git a/main.tf b/main.tf index 07a34d3..29f2acb 100644 --- a/main.tf +++ b/main.tf @@ -253,7 +253,7 @@ resource "aws_cloudtrail" "main" { name = var.trail_name # Send logs to CloudWatch Logs - cloud_watch_logs_group_arn = aws_cloudwatch_log_group.cloudtrail.arn + cloud_watch_logs_group_arn = "${aws_cloudwatch_log_group.cloudtrail.arn}:*" cloud_watch_logs_role_arn = aws_iam_role.cloudtrail_cloudwatch_role.arn # Send logs to S3 diff --git a/versions.tf b/versions.tf index d7ce6c1..071bde9 100644 --- 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" } }