From 6a67a48bf466eb0a0820c90a4753aa205a6b0230 Mon Sep 17 00:00:00 2001 From: Daniel Morris Date: Tue, 14 May 2024 09:35:03 +0100 Subject: [PATCH 1/7] chore: Update release-please-action organisation (#55) Google have moved the release-please-action from the google-github-actions organisation to the googleapis organisation. This GitHub issue comment states that future development will be done in the googleapis organisation. https://github.com/googleapis/release-please-action/issues/980#issuecomment-2108208115 --- .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 8dad209..b19640a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Prepare a release - uses: google-github-actions/release-please-action@v4 + uses: googleapis/release-please-action@v4 with: config-file: .github/release-please-config.json manifest-file: .github/release-please-manifest.json From 568aedfd3a7cc97dc05dc424802453fdba13571a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:56:58 +0100 Subject: [PATCH 2/7] chore: Bump slackapi/slack-github-action from 1.26.0 to 1.27.0 (#59) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron.yaml b/.github/workflows/cron.yaml index e56314e..45135fe 100644 --- a/.github/workflows/cron.yaml +++ b/.github/workflows/cron.yaml @@ -20,7 +20,7 @@ jobs: - run: aws sts get-caller-identity - if: ${{ failure() }} name: Send a notification to Slack - uses: slackapi/slack-github-action@v1.26.0 + uses: slackapi/slack-github-action@v1.27.0 env: SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From 7451536877cc1238477a98c00cd4970e62df7b72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 09:53:34 +0000 Subject: [PATCH 3/7] chore: Bump slackapi/slack-github-action from 1.27.0 to 2.0.0 (#61) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cron.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cron.yaml b/.github/workflows/cron.yaml index 45135fe..66b8464 100644 --- a/.github/workflows/cron.yaml +++ b/.github/workflows/cron.yaml @@ -20,7 +20,7 @@ jobs: - run: aws sts get-caller-identity - if: ${{ failure() }} name: Send a notification to Slack - uses: slackapi/slack-github-action@v1.27.0 + uses: slackapi/slack-github-action@v2.0.0 env: SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From a7b30ee6c2285e958be48cd21f69d147361abfe0 Mon Sep 17 00:00:00 2001 From: Conor Maher Date: Mon, 16 Dec 2024 10:20:36 +0000 Subject: [PATCH 4/7] fix: Swap deprecated inline_policy block for aws_iam_role_policy (#63) --- examples/complete/main.tf | 2 +- examples/complete/variables.tf | 4 ++-- main.tf | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 84d1bc1..f189378 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -31,6 +31,6 @@ data "aws_iam_policy_document" "example" { statement { actions = ["s3:GetObject"] effect = "Allow" - resources = ["dynamodb:CreateTable"] + resources = ["arn:aws:s3:::amzn-s3-demo-bucket/*"] } } diff --git a/examples/complete/variables.tf b/examples/complete/variables.tf index 6315d8d..6caf15b 100644 --- a/examples/complete/variables.tf +++ b/examples/complete/variables.tf @@ -40,9 +40,9 @@ variable "enabled" { } variable "enterprise_slug" { - default = false + default = "" description = "Enterprise slug for GitHub Enterprise Cloud customers." - type = bool + type = string } variable "force_detach_policies" { diff --git a/main.tf b/main.tf index 671d769..063ae22 100644 --- a/main.tf +++ b/main.tf @@ -32,14 +32,13 @@ resource "aws_iam_role" "github" { permissions_boundary = var.iam_role_permissions_boundary tags = var.tags - dynamic "inline_policy" { - for_each = var.iam_role_inline_policies +} - content { - name = inline_policy.key - policy = inline_policy.value - } - } +resource "aws_iam_role_policy" "inline_policies" { + for_each = { for k, v in var.iam_role_inline_policies : k => v if var.enabled } + name = each.key + policy = each.value + role = aws_iam_role.github[0].id } resource "aws_iam_role_policy_attachment" "admin" { From 4c6db5bf685fca239fa0e5992b51892000883cfc Mon Sep 17 00:00:00 2001 From: Eoin Shanaghy Date: Sun, 29 Dec 2024 16:42:23 +0000 Subject: [PATCH 5/7] fix: Allow wildcards in the repository variable (#62) --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 47ec94a..67c2731 100644 --- a/variables.tf +++ b/variables.tf @@ -74,7 +74,7 @@ variable "github_repositories" { // organization/repository format used by GitHub. condition = length([ for repo in var.github_repositories : 1 - if length(regexall("^[A-Za-z0-9_.-]+?/([A-Za-z0-9_.:/-]+[*]?|\\*)$", repo)) > 0 + if length(regexall("^[A-Za-z0-9_.-]+?/([A-Za-z0-9_.:/\\-\\*]+)$", repo)) > 0 ]) == length(var.github_repositories) error_message = "Repositories must be specified in the organization/repository format." } From 5d9d8cdccef1cd29f37d0384ff0ac05198aab817 Mon Sep 17 00:00:00 2001 From: Daniel Morris Date: Sun, 5 Jan 2025 12:39:39 +0000 Subject: [PATCH 6/7] chore: Bump README version for 1.8.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 904f8c6..b7a71c6 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ working OIDC connection between GitHub Actions and AWS. ```terraform module "oidc_github" { source = "unfunco/oidc-github/aws" - version = "1.8.0" + version = "1.8.1" github_repositories = [ "org/repo", From f664e8f6002b11b5c206f1fb3cf0377ea6a033ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 12:42:54 +0000 Subject: [PATCH 7/7] chore: Release v1.8.1 (#56) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Daniel Morris --- .github/release-please-manifest.json | 2 +- CHANGELOG.md | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/release-please-manifest.json b/.github/release-please-manifest.json index 5eb41ee..385f080 100644 --- a/.github/release-please-manifest.json +++ b/.github/release-please-manifest.json @@ -1 +1 @@ -{".":"1.8.0"} +{".":"1.8.1"} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7616fea..4501657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ Notable changes to this project are documented in this changelog. This project adheres to the [semantic versioning] specification. +## [1.8.1](https://github.com/unfunco/terraform-aws-oidc-github/compare/v1.8.0...v1.8.1) (2024-12-29) + + +### Bug fixes + +* Allow wildcards in the repository variable ([#62](https://github.com/unfunco/terraform-aws-oidc-github/issues/62)) ([4c6db5b](https://github.com/unfunco/terraform-aws-oidc-github/commit/4c6db5bf685fca239fa0e5992b51892000883cfc)) +* Swap deprecated inline_policy block for aws_iam_role_policy ([#63](https://github.com/unfunco/terraform-aws-oidc-github/issues/63)) ([a7b30ee](https://github.com/unfunco/terraform-aws-oidc-github/commit/a7b30ee6c2285e958be48cd21f69d147361abfe0)) + + +### Miscellaneous + +* Bump slackapi/slack-github-action from 1.26.0 to 1.27.0 ([#59](https://github.com/unfunco/terraform-aws-oidc-github/issues/59)) ([568aedf](https://github.com/unfunco/terraform-aws-oidc-github/commit/568aedfd3a7cc97dc05dc424802453fdba13571a)) +* Bump slackapi/slack-github-action from 1.27.0 to 2.0.0 ([#61](https://github.com/unfunco/terraform-aws-oidc-github/issues/61)) ([7451536](https://github.com/unfunco/terraform-aws-oidc-github/commit/7451536877cc1238477a98c00cd4970e62df7b72)) +* Update release-please-action organisation ([#55](https://github.com/unfunco/terraform-aws-oidc-github/issues/55)) ([6a67a48](https://github.com/unfunco/terraform-aws-oidc-github/commit/6a67a48bf466eb0a0820c90a4753aa205a6b0230)) + ## [1.8.0](https://github.com/unfunco/terraform-aws-oidc-github/compare/v1.7.1...v1.8.0) (2024-04-22)