From 785fcd8332180418463b4417f6ba8906c52e99e0 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Wed, 14 Jun 2023 19:36:58 +0300 Subject: [PATCH] Support AWS Provider V5 --- .github/workflows/release-branch.yml | 1 + .github/workflows/release-published.yml | 2 +- README.md | 6 +++--- docs/terraform.md | 6 +++--- examples/complete/main.tf | 2 +- examples/complete/versions.tf | 4 ++-- outputs.tf | 6 +++--- versions.tf | 4 ++-- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml index 3f8fe62..b30901e 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/release-branch.yml @@ -10,6 +10,7 @@ on: - 'docs/**' - 'examples/**' - 'test/**' + - 'README.*' permissions: contents: write diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml index f86352b..b31232b 100644 --- a/.github/workflows/release-published.yml +++ b/.github/workflows/release-published.yml @@ -11,4 +11,4 @@ permissions: jobs: terraform-module: - uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release.yml@main + uses: cloudposse/github-actions-workflows-terraform-module/.github/workflows/release-published.yml@main diff --git a/README.md b/README.md index a175522..bfb37b1 100644 --- a/README.md +++ b/README.md @@ -171,14 +171,14 @@ Available targets: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.0 | -| [aws](#requirement\_aws) | >= 2.0 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 5.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 2.0 | +| [aws](#provider\_aws) | >= 5.0 | ## Modules diff --git a/docs/terraform.md b/docs/terraform.md index 4835184..aac97bd 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -3,14 +3,14 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.0 | -| [aws](#requirement\_aws) | >= 2.0 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 5.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 2.0 | +| [aws](#provider\_aws) | >= 5.0 | ## Modules diff --git a/examples/complete/main.tf b/examples/complete/main.tf index cca3d1f..f369b71 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -17,7 +17,7 @@ module "cloudtrail" { module "cloudtrail_s3_bucket" { source = "cloudposse/cloudtrail-s3-bucket/aws" - version = "0.14.0" + version = "0.26.0" force_destroy = true diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 28298e5..7a1ec6c 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,10 +1,10 @@ terraform { - required_version = ">= 0.13.0" + required_version = ">= 1.0" required_providers { aws = { source = "hashicorp/aws" - version = ">= 2.0" + version = ">= 5.0" } local = { source = "hashicorp/local" diff --git a/outputs.tf b/outputs.tf index b5d8c0f..2d2321f 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,14 +1,14 @@ output "cloudtrail_id" { - value = join("", aws_cloudtrail.default.*.id) + value = join("", aws_cloudtrail.default[*].id) description = "The name of the trail" } output "cloudtrail_home_region" { - value = join("", aws_cloudtrail.default.*.home_region) + value = join("", aws_cloudtrail.default[*].home_region) description = "The region in which the trail was created" } output "cloudtrail_arn" { - value = join("", aws_cloudtrail.default.*.arn) + value = join("", aws_cloudtrail.default[*].arn) description = "The Amazon Resource Name of the trail" } diff --git a/versions.tf b/versions.tf index 5b2c49b..ddfcb0e 100644 --- a/versions.tf +++ b/versions.tf @@ -1,10 +1,10 @@ terraform { - required_version = ">= 0.13.0" + required_version = ">= 1.0" required_providers { aws = { source = "hashicorp/aws" - version = ">= 2.0" + version = ">= 5.0" } } }