Skip to content

feat(infra): grant DSQL IAM access #398

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.

Sign up for GitHub

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

Merged
nourshoreibah merged 3 commits into from
Sep 6, 2026
Merged

feat(infra): grant DSQL IAM access #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71b0a60
feat(infra): grant DSQL IAM access
nourshoreibah Sep 6, 2026
029bb2e
chore: auto-format terraform and update documentation
github-actions[bot] Sep 6, 2026
5feae97
chore: trim comments
nourshoreibah Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions infrastructure/aws/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@
| [aws_iam_role_policy.ci_plan_state_lock](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.ci_preview](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.lambda_cognito_admin](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.lambda_dsql_connect](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.lambda_s3_objects](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy.lambda_ses_send](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy) | resource |
| [aws_iam_role_policy_attachment.ci_apply_admin](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.ci_plan_dsql_readonly](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.ci_plan_readonly](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy_attachment) | resource |
| [aws_iam_role_policy_attachment.lambda_basic](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/iam_role_policy_attachment) | resource |
| [aws_lambda_function.functions](https://registry.terraform.io/providers/hashicorp/aws/6.14.1/docs/resources/lambda_function) | resource |
Expand Down
16 changes: 16 additions & 0 deletions infrastructure/aws/lambda.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,22 @@ resource "aws_iam_role_policy" "lambda_ses_send" {
})
}

# Resource "*" until the DSQL cluster exists; scope to its ARN then.
resource "aws_iam_role_policy" "lambda_dsql_connect" {
name = "branch-lambda-dsql-connect"
role = aws_iam_role.lambda_role.id

policy = jsonencode({
Version = "2012-10-17"
Statement = [{
Sid = "LambdaDsqlConnect"
Effect = "Allow"
Action = ["dsql:DbConnectAdmin"]
Resource = "*"
}]
})
}

# Get AWS account ID for unique bucket naming
data "aws_caller_identity" "current" {}

Expand Down
6 changes: 6 additions & 0 deletions infrastructure/aws/oidc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ resource "aws_iam_role_policy_attachment" "ci_plan_readonly" {
policy_arn = "arn:aws:iam::aws:policy/ReadOnlyAccess"
}

# Plan needs dsql read access; ReadOnlyAccess is not guaranteed to include it.
resource "aws_iam_role_policy_attachment" "ci_plan_dsql_readonly" {
role = aws_iam_role.ci_plan.name
policy_arn = "arn:aws:iam::aws:policy/AmazonAuroraDSQLReadOnlyAccess"
}

resource "aws_iam_role_policy" "ci_plan_state_lock" {
name = "tfstate-lock"
role = aws_iam_role.ci_plan.id
Expand Down
Loading