diff --git a/.github/workflows/build-infra.yaml b/.github/workflows/build-infra.yaml index 222b289..bafd0dc 100644 --- a/.github/workflows/build-infra.yaml +++ b/.github/workflows/build-infra.yaml @@ -72,9 +72,9 @@ jobs: run: | aws ecs describe-task-definition --task-definition ${{ env.ecs_task_arn }} --region ${{ env.AWS_REGION }} --output json >> task-definition.json - - name: Check what task-definitions.json looks like + - name: Check what task-definition.json looks like run: | - cat task-definitions.json + cat task-definition.json - name: Render Amazon ECS task definition id: render-web-container diff --git a/terraform/oidc/main.tf b/terraform/oidc/main.tf index c9046cb..d7c2d8b 100644 --- a/terraform/oidc/main.tf +++ b/terraform/oidc/main.tf @@ -2,6 +2,21 @@ data "tls_certificate" "github_thumbprint" { url = "https://token.actions.githubusercontent.com/.well-known/openid-configuration" } +## Uncomment this block of code if you are testing this in a personal aws account +## This is a central resource that in my org is not managed via terraform and thus +## including this resouce causes issues. +# resource "aws_iam_openid_connect_provider" "github" { +# url = "https://token.actions.githubusercontent.com" + +# # All roles go here. +# # You can find these in the audience of the Github OIDC tokens +# client_id_list = ["sts.amazonaws.com"] + +# thumbprint_list = [ +# data.tls_certificate.github_thumbprint.certificates[0].sha1_fingerprint +# ] +# } + data "aws_iam_openid_connect_provider" "github" { url = "https://token.actions.githubusercontent.com" }