adam/payments-dashboard
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/payments-dashboard.git synced 2026-10-07 01:12:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(iam): trust only this account's deploy environment (PLAT-79)

Browse source
This commit is contained in:
Adam Moussa 2026-09-28 15:38:18 -04:00
parent bc18f3debe
commit 496e568872
No known key found for this signature in database
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
terraform/iam_github_deploy.tf
View file

@ -1,8 +1,9 @@
# GitHub Actions OIDC role for the thin deploy.yaml caller of # GitHub Actions OIDC role for the thin deploy.yaml caller of
# org reusable cd-hcp-lambda.yaml. # org reusable cd-hcp-lambda.yaml.
# #
# One role: GitHub Environments have a single DEPLOY_ROLE_ARN. Trust is pinned # One role per account: GitHub Environments have a single DEPLOY_ROLE_ARN.
# to Environments dev and prod. job_workflow_ref matches the reusable at any ref. # The prod role trusts environment:prod only. The dev role trusts environment:dev only.
# job_workflow_ref is StringEquals on the reusable SHA pinned by deploy.yaml.
# AWS STS GitHub condition keys include job_workflow_ref, not workflow_ref. # AWS STS GitHub condition keys include job_workflow_ref, not workflow_ref.
# #
# Not a Lambda execution role: no permissions_boundary. Path /tf-managed/ so # Not a Lambda execution role: no permissions_boundary. Path /tf-managed/ so
@ -33,11 +34,9 @@ data "aws_iam_policy_document" "github_deploy_assume" {
} }
condition { condition {
test = "StringLike" test = "StringEquals"
variable = "token.actions.githubusercontent.com:job_workflow_ref" variable = "token.actions.githubusercontent.com:job_workflow_ref"
values = [ values = [local.github_deploy_workflow_ref]
"Sea-Haven-Industries/.github/.github/workflows/cd-hcp-lambda.yaml@*",
]
} }
} }
} }

16
terraform/locals.tf
View file

@ -21,13 +21,19 @@ locals {
dynamodb_cmk_ssm = "/seahaven/dynamodb/cmk-arn" dynamodb_cmk_ssm = "/seahaven/dynamodb/cmk-arn"
github_oidc_provider_arn = "arn:aws:iam::${local.account_id}:oidc-provider/token.actions.githubusercontent.com" github_oidc_provider_arn = "arn:aws:iam::${local.account_id}:oidc-provider/token.actions.githubusercontent.com"
# Org has Actions OIDC use_immutable_subject=true. Both forms, both environments. # Repo OIDC subject customization is the default (use_default=true), so tokens
github_oidc_subs = [ # use the classic repo:owner/name:environment:<env> form. Each account's role
"repo:${var.github_repo}:environment:dev", # trusts only its own Environment. The prod role must not trust dev.
github_oidc_subs_prod = [
"repo:${var.github_repo}:environment:prod", "repo:${var.github_repo}:environment:prod",
"repo:Sea-Haven-Industries@183236204/payments-dashboard@1206210946:environment:dev",
"repo:Sea-Haven-Industries@183236204/payments-dashboard@1206210946:environment:prod",
] ]
github_oidc_subs_dev = [
"repo:${var.github_repo}:environment:dev",
]
github_oidc_subs = local.is_prod ? local.github_oidc_subs_prod : local.github_oidc_subs_dev
# Matches the SHA pin in .github/workflows/deploy.yaml. A reusable bump
# updates both together. StringEquals, not @*.
github_deploy_workflow_ref = "Sea-Haven-Industries/.github/.github/workflows/cd-hcp-lambda.yaml@ee5b843ca105422b679c3fdeb9eaa68c6e500a85"
dynamodb_cmk_arns = { dynamodb_cmk_arns = {
prod = "arn:aws:kms:us-east-1:011934824531:key/be5fa4cb-c546-40fe-a13d-c7bec79f5d12" prod = "arn:aws:kms:us-east-1:011934824531:key/be5fa4cb-c546-40fe-a13d-c7bec79f5d12"

11
tests/infra/hcpContract.test.js
View file

@ -88,10 +88,15 @@ describe("HCP Terraform seam (PLAT-79)", () => {
}); });
it("pins GitHub deploy trust to the Lambda reusable", () => { it("pins GitHub deploy trust to the Lambda reusable", () => {
assert.match(locals, /environment:dev/); const prodSubs = locals.split("github_oidc_subs_prod")[1].split("github_oidc_subs_dev")[0];
assert.match(locals, /environment:prod/); assert.match(prodSubs, /environment:prod/);
assert.doesNotMatch(prodSubs, /environment:dev/);
assert.match(githubDeploy, /github_oidc_subs/); assert.match(githubDeploy, /github_oidc_subs/);
assert.match(githubDeploy, /cd-hcp-lambda\.yaml@\*/); assert.match(githubDeploy, /job_workflow_ref/);
assert.match(locals, /cd-hcp-lambda\.yaml@ee5b843ca105422b679c3fdeb9eaa68c6e500a85/);
assert.match(deploy, /cd-hcp-lambda\.yaml@ee5b843ca105422b679c3fdeb9eaa68c6e500a85/);
assert.doesNotMatch(githubDeploy, /cd-hcp-lambda\.yaml@\*/);
assert.doesNotMatch(locals, /cd-hcp-lambda\.yaml@\*/);
assert.doesNotMatch(githubDeploy, /deploy\.yaml@refs\/heads/); assert.doesNotMatch(githubDeploy, /deploy\.yaml@refs\/heads/);
assert.doesNotMatch(variables, /github_deploy_branch/); assert.doesNotMatch(variables, /github_deploy_branch/);
}); });