From b570d7995efa9b542d5cdbe9ae30dea29f23cfcc Mon Sep 17 00:00:00 2001 From: morre Date: Sun, 29 Oct 2023 15:09:38 +0100 Subject: [PATCH 1/3] fix: only use OIDC provider ARN when OIDC provider is created (#40) This fixes #39. --- outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/outputs.tf b/outputs.tf index 1b51818..acff5a3 100644 --- a/outputs.tf +++ b/outputs.tf @@ -27,5 +27,5 @@ output "iam_role_name" { output "oidc_provider_arn" { depends_on = [aws_iam_openid_connect_provider.github] description = "ARN of the OIDC provider." - value = var.enabled ? aws_iam_openid_connect_provider.github[0].arn : "" + value = var.enabled && var.create_oidc_provider ? aws_iam_openid_connect_provider.github[0].arn : "" } From e8265d1072babd4a7b0f6c6a5dfd231a97646737 Mon Sep 17 00:00:00 2001 From: Daniel Morris Date: Sun, 29 Oct 2023 14:11:44 +0000 Subject: [PATCH 2/3] chore: Add Terraform 1.6 to verification matrix --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5f28525..33d129d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,7 +37,7 @@ jobs: run: terraform validate strategy: matrix: - terraform_version: [ "1.0", "1.1", "1.2", "1.3", "1.4", "1.5" ] + terraform_version: [ "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6" ] caller-identity: if: ${{ github.event_name == 'push' }} From 6aed749fc1cdbff25a0052eec5ae9a2d584507e9 Mon Sep 17 00:00:00 2001 From: Daniel Morris Date: Sun, 29 Oct 2023 14:13:55 +0000 Subject: [PATCH 3/3] chore: Prepare to release v1.7.1 --- CHANGELOG.md | 5 +++++ README.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b78360b..fc61bfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Notable changes to this project are documented in this changelog. This project adheres to the [semantic versioning] specification. +## [1.7.1] – 2023-10-29 + +- Condition the OIDC provider ARN output ([b570d79](https://github.com/unfunco/terraform-aws-oidc-github/commit/b570d7995efa9b542d5cdbe9ae30dea29f23cfcc)) + ## [1.7.0] – 2023-10-26 - Add the OIDC provider ARN as an output ([11d98e3](https://github.com/unfunco/terraform-aws-oidc-github/commit/11d98e3dea7ca8e41be157d21fe4769c31fe7570)) @@ -138,4 +142,5 @@ This project adheres to the [semantic versioning] specification. [1.5.2]: https://github.com/unfunco/terraform-aws-oidc-github/compare/v1.5.1...v1.5.2 [1.6.0]: https://github.com/unfunco/terraform-aws-oidc-github/compare/v1.5.2...v1.6.0 [1.7.0]: https://github.com/unfunco/terraform-aws-oidc-github/compare/v1.6.0...v1.7.0 +[1.7.1]: https://github.com/unfunco/terraform-aws-oidc-github/compare/v1.7.0...v1.7.1 [semantic versioning]: https://semver.org diff --git a/README.md b/README.md index f52f693..0784c7d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ provider "aws" { module "oidc_github" { source = "unfunco/oidc-github/aws" - version = "1.7.0" + version = "1.7.1" github_repositories = [ "org/repo",