fix: match tfroot-twilio OIDC subject - #40
Merged
Conversation
Contributor
OpenTofu TestOpenTofu test passed. View run output |
Contributor
OpenTofu PlanOpenTofu plan passed. View run outputOpenTofu will perform the following actions:
[REDACTED: potentially sensitive plan output]
[REDACTED: potentially sensitive plan output]
~ assume_role_policy = jsonencode(
~ {
~ Statement = [
~ {
~ Condition = {
~ StringLike = {
[REDACTED: potentially sensitive plan output]
# (4 unchanged elements hidden)
"repo:makeitworkcloud@195502628/tfroot-namecheap@1349145005:*",
- "repo:makeitworkcloud/tfroot-twilio:*",
+ "repo:makeitworkcloud@195502628/tfroot-twilio@1356437102:*",
]
}
# (1 unchanged attribute hidden)
}
# (3 unchanged attributes hidden)
},
]
# (1 unchanged attribute hidden)
}
)
[REDACTED: potentially sensitive plan output]
[REDACTED: potentially sensitive plan output]
tags = {
"ManagedBy" = "Terraform"
}
# (8 unchanged attributes hidden)
# (1 unchanged block hidden)
}
Plan: 0 to add, 1 to change, 0 to destroy.
OpenTofu will perform the following actions:
[REDACTED: potentially sensitive plan output]
[REDACTED: potentially sensitive plan output]
~ assume_role_policy = jsonencode(
~ {
~ Statement = [
~ {
~ Condition = {
~ StringLike = {
[REDACTED: potentially sensitive plan output]
# (4 unchanged elements hidden)
"repo:makeitworkcloud@195502628/tfroot-namecheap@1349145005:*",
- "repo:makeitworkcloud/tfroot-twilio:*",
+ "repo:makeitworkcloud@195502628/tfroot-twilio@1356437102:*",
]
}
# (1 unchanged attribute hidden)
}
# (3 unchanged attributes hidden)
},
]
# (1 unchanged attribute hidden)
}
)
[REDACTED: potentially sensitive plan output]
[REDACTED: potentially sensitive plan output]
tags = {
"ManagedBy" = "Terraform"
}
# (8 unchanged attributes hidden)
# (1 unchanged block hidden)
}
Plan: 0 to add, 1 to change, 0 to destroy. |
15 tasks
xnoto
added a commit
to makeitworkcloud/tfroot-twilio
that referenced
this pull request
Sep 3, 2026
## Summary Bootstrap `tfroot-twilio` as a no-resource OpenTofu root. It evaluates the pinned `RJPearson94/twilio` `0.27.1` provider, adds the shared OpenTofu caller, and documents the future SOPS/backend and least-privilege credential gates. The PR also seeds the two exact `tfroot-github`-generated Dependabot files through the required pull-request path. This resolves the existing direct-commit/branch-protection conflict without changing protection rules or assigning downstream ownership. The bootstrap deliberately omits an S3 backend because its Makefile initializes with `-backend=false`; a permanent encrypted backend remains a follow-up prerequisite before Twilio resources can be managed. Fixes # N/A — owner-approved Twilio root bootstrap and centralized Dependabot delivery repair. ## Type of change - [ ] Bug fix - [x] Feature / enhancement - [ ] Documentation - [x] Infrastructure (OpenTofu root or module) - [ ] GitOps desired state (manifests, kustomize, charts, SOPS/KSOPS secrets) - [ ] Container image - [ ] CI / reusable workflow - [ ] Refactor / cleanup - [ ] Breaking change ## Validation - [x] Required pull-request checks pass — OpenTofu test and no-resource plan succeeded in [run 33818165420](https://github.com/makeitworkcloud/tfroot-twilio/actions/runs/33818165420). - [x] Plan reports no changes; there are no provider configurations, data sources, or Twilio resources. - [x] Generated or centrally distributed files were regenerated by their owning automation, not hand-edited — the two generated files are an exact PR-based seed from `tfroot-github/gh-dependabot.tf`; central ownership remains unchanged and will adopt them after merge. The exact repository-scoped GitHub OIDC subject was validated through the separately applied [`tfroot-aws` PR #40](makeitworkcloud/tfroot-aws#40). No local OpenTofu, SOPS, state, import, plan, or apply operations were run. Registry review verified `RJPearson94/twilio` `0.27.1` supports phone-number and inbound messaging-webhook fields; the bootstrap intentionally has no provider configuration or Twilio resources. ## Impact and rollout Producer/consumer chain: `images/tfroot-runner` supplies the canonical CI toolchain, `shared-workflows` supplies the reusable OpenTofu workflow, `tfroot-twilio` becomes the future Twilio phone/webhook owner, and `tfroot-github` remains the sole long-term owner of the seeded Dependabot files. Merging will submit the environment-gated main workflow. This bootstrap's apply has no provider-side effect because there are no configured providers, data sources, or resources. A later reviewed change must first establish encrypted backend and credential-delivery inputs with least privilege before managing Twilio inventory. Twilio provisioning and webhook changes remain separately confirmation-gated. Rollback is a normal revert of this bootstrap PR. Do not manually edit the seeded Dependabot files after merge. ## Safety and secrets - [x] Contains no plaintext secrets, decrypted SOPS values, state files, kubeconfigs, tokens, or private endpoints. - [x] No local OpenTofu init/plan/apply/destroy/import/state operations were run or claimed — plans come from pull-request checks. - [x] Breaking or irreversible effects are described above with rollback notes. Repository-side secret scanning is unavailable because GitHub Advanced Security is not enabled; the committed diff was manually inspected before publication. AI agent materially produced this change; reviewers should confirm the retained no-resource bootstrap boundary and central generated-file ownership. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Replace the just-applied human-readable
tfroot-twiliotrust pattern with the exact organization/repository-ID subject emitted by its GitHub Actions OIDC token:repo:makeitworkcloud@195502628/tfroot-twilio@1356437102:pull_request.The repository's bootstrap plan still fails because the subject format differs from the older roots. A temporary, secret-free diagnostic job emitted only this non-sensitive claim; it is removed from the Twilio-root branch before merge.
Fixes # N/A — restore the intended single-repository KMS OIDC trust boundary.
Type of change
Validation
github-actions-sops-kms:0 to add, 1 to change, 0 to destroy.The failed revalidation in
tfroot-twilioPR #1 established that the initial subject pattern does not match. Its temporary diagnostic job emitted the exact repository-scoped subject without exposing a token. No local OpenTofu, SOPS, state, import, plan, or apply operations were run.Impact and rollout
Producer:
tfroot-awsowns thegithub-actions-sops-kmstrust policy.Consumer: only
tfroot-twiliois affected. This replaces one repository-scoped subject expression with the exact repository-ID-qualified expression; it does not add repositories, widen permissions, grant S3 state access, or grant Twilio API access. After a confirmed merge and successful environment-gated apply, rerun the no-resource Twilio-root plan. Its merge remains separately confirmation-gated.Rollback is a reviewed revert of this one subject expression. Do not use an organization wildcard.
Safety and secrets
AI agent materially produced this change; reviewers should confirm the exact claim evidence, no added repository scope, and retained KMS-only permission boundary.