From 8b2935d96044158480df1f78e9707820cfedd729 Mon Sep 17 00:00:00 2001 From: Max Lobur Date: Tue, 27 Jun 2023 00:02:47 +0300 Subject: [PATCH] Ensure support of the AWS Provider V5 and latest terraform (#31) * Support AWS Provider V5 * updates --- .github/workflows/release-branch.yml | 1 + .github/workflows/release-published.yml | 2 +- README.md | 2 +- docs/terraform.md | 2 +- examples/complete/main.tf | 2 +- examples/complete/versions.tf | 2 +- main.tf | 2 +- outputs.tf | 4 ++-- versions.tf | 2 +- 9 files changed, 10 insertions(+), 9 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 ba02cf6..f77affb 100644 --- a/README.md +++ b/README.md @@ -178,7 +178,7 @@ Available targets: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.0 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [aws](#requirement\_aws) | >= 3.0 | | [local](#requirement\_local) | >= 1.3 | diff --git a/docs/terraform.md b/docs/terraform.md index 9cc33d9..68bf62a 100644 --- a/docs/terraform.md +++ b/docs/terraform.md @@ -3,7 +3,7 @@ | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.0 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [aws](#requirement\_aws) | >= 3.0 | | [local](#requirement\_local) | >= 1.3 | diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 1ed7a4a..5ae37dd 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -1,6 +1,6 @@ module "yaml_config" { source = "cloudposse/config/yaml" - version = "0.7.0" + version = "1.0.2" list_config_local_base_path = path.module list_config_paths = var.list_config_paths diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 7bc9f12..45c8a33 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.0" + required_version = ">= 1.3" required_providers { aws = { diff --git a/main.tf b/main.tf index 11cef1b..40feefb 100644 --- a/main.tf +++ b/main.tf @@ -44,6 +44,6 @@ resource "aws_organizations_policy" "this" { resource "aws_organizations_policy_attachment" "this" { count = module.this.enabled && length(var.service_control_policy_statements) > 0 ? 1 : 0 - policy_id = join("", aws_organizations_policy.this.*.id) + policy_id = join("", aws_organizations_policy.this[*].id) target_id = var.target_id } diff --git a/outputs.tf b/outputs.tf index 843ea12..c51f397 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,9 +1,9 @@ output "organizations_policy_id" { - value = join("", aws_organizations_policy.this.*.id) + value = join("", aws_organizations_policy.this[*].id) description = "The unique identifier of the policy" } output "organizations_policy_arn" { - value = join("", aws_organizations_policy.this.*.arn) + value = join("", aws_organizations_policy.this[*].arn) description = "Amazon Resource Name (ARN) of the policy" } diff --git a/versions.tf b/versions.tf index 7bc9f12..45c8a33 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.0" + required_version = ">= 1.3" required_providers { aws = {