Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ dist/
infra/terraform/**/.terraform/
infra/terraform/**/*.tfstate*
infra/terraform/**/.terraform.lock.hcl.bak
.claude/settings.local.json
2 changes: 1 addition & 1 deletion infra/terraform/bootstrap/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ resource "aws_iam_openid_connect_provider" "github" {
}

locals {
oidc_sub = "repo:${var.github_repository}"
oidc_sub = var.github_oidc_subject
}

# Read-only: terraform plan on pull requests into main.
Expand Down
13 changes: 10 additions & 3 deletions infra/terraform/bootstrap/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@ variable "region" {
default = "us-east-1"
}

variable "github_repository" {
description = "owner/name of the repository allowed to assume the CI roles"
variable "github_oidc_subject" {
description = <<-EOT
The repository part of the GitHub OIDC `sub` claim the CI roles trust.
This repository uses GitHub's immutable subject claims, which embed the
owner and repository ids (owner@id/name@id), so a renamed or recreated
repository can't inherit the roles. Read the current value with
`gh api repos/<owner>/<repo>/actions/oidc/customization/sub`
(sub_claim_prefix).
EOT
type = string
default = "CompositeCode/substratalapps.com"
default = "repo:CompositeCode@38675098/substratalapps.com@1403762290"
}

variable "billing_email" {
Expand Down
2 changes: 1 addition & 1 deletion infra/terraform/prod/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ resource "aws_rds_cluster" "main" {
cluster_identifier = "${local.prefix}-db"
engine = "aurora-postgresql"
engine_mode = "provisioned"
engine_version = "16.6"
engine_version = "16.15"
database_name = local.db_name
master_username = "substratal"
manage_master_user_password = true # Secrets Manager–managed; the Data API authenticates with it
Expand Down
Loading