Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ Refactor OIDC #757

Merged
merged 10 commits into from
Jul 4, 2023
Merged

♻️ Refactor OIDC #757

merged 10 commits into from
Jul 4, 2023

Conversation

jacobwoffenden
Copy link
Member

@jacobwoffenden jacobwoffenden commented Jul 3, 2023

Resolves #762

  • Move to terraform/aws/analytical-platform/oidc
  • Amend account names to match AWS Organisation
  • Amend module names to match account names

TODO:

  • Fix clashes on
    ❇️ Add GitHub known TLS thumbprints modernisation-platform-github-oidc-provider#151
      # module.github-oidc-provider-data-ecr.aws_iam_openid_connect_provider.github_actions will be updated in-place
    ~ resource "aws_iam_openid_connect_provider" "github_actions" {
        id              = "arn:aws:iam::593291632749:oidc-provider/token.actions.githubusercontent.com"
        tags            = {
            "business-unit" = "Platforms"
            "is-production" = "true"
            "owner"         = "data-platform"
            "project"       = "data-platform-oidc"
            "source-code"   = "github.com/ministryofjustice/data-platform/tree/main/terraform/oidc"
        }
      ~ thumbprint_list = [
          - "1c58a3a8518e8759bf075b76b750d4f2df264fcd",
          + "6938fd4d98bab03faadb97b34396831e3780aea1",
            "f879abce0008e4eb126e0097e46620f5aaae26ad",
        ]
        # (4 unchanged attributes hidden)
    }
    
    # module.github-oidc-provider-sandbox.aws_iam_openid_connect_provider.github_actions will be updated in-place
    ~ resource "aws_iam_openid_connect_provider" "github_actions" {
        id              = "arn:aws:iam::684969100054:oidc-provider/token.actions.githubusercontent.com"
        tags            = {
            "business-unit" = "Platforms"
            "is-production" = "true"
            "owner"         = "data-platform"
            "project"       = "data-platform-oidc"
            "source-code"   = "github.com/ministryofjustice/data-platform/tree/main/terraform/oidc"
        }
      ~ thumbprint_list = [
          - "1c58a3a8518e8759bf075b76b750d4f2df264fcd",
          + "6938fd4d98bab03faadb97b34396831e3780aea1",
            "f879abce0008e4eb126e0097e46620f5aaae26ad",
        ]
        # (4 unchanged attributes hidden)
    }
  • Rename modules to use use snake casing

@jacobwoffenden jacobwoffenden self-assigned this Jul 3, 2023
@github-actions github-actions bot added the github-workflow Pull requests that update workflows label Jul 3, 2023
Add outputs back
@jacobwoffenden jacobwoffenden marked this pull request as ready for review July 4, 2023 11:36
@jacobwoffenden jacobwoffenden requested a review from a team July 4, 2023 11:36
Copy link
Contributor

@julialawrence julialawrence left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jacobwoffenden jacobwoffenden merged commit 5bb7313 into main Jul 4, 2023
@jacobwoffenden jacobwoffenden deleted the fix/mod-plat-oidc branch July 4, 2023 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
github-workflow Pull requests that update workflows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

♻️ Refactor OIDC component
2 participants