CP-42815 Revert CP-42080: remove ConnectorsAccountId / connectors_account_id second trust principal#108
Conversation
Greptile SummaryThis PR reverts CP-42080 (#107), which had added a second CloudZero AWS account (
Confidence Score: 5/5The code changes are a clean, symmetric revert with no missed references or residual call-sites; the only risk is operational (already-deployed stacks), which is documented in the release notes and PR description. Every location that referenced ConnectorsAccountId / connectors_account_id in both CloudFormation and Terraform is removed consistently. The reactor principal is untouched throughout. No new logic is introduced — this is a pure deletion revert. The release note accurately reflects what changed and explicitly calls out the partial-rollout deployment caveat for existing stacks. No files require special attention — all changes are symmetric across the four account-type templates, two parent templates, and three Terraform modules. Important Files Changed
Reviews (2): Last reviewed commit: "Add 1.0.99 release notes for the CP-4208..." | Re-trigger Greptile |
| @@ -130,7 +126,6 @@ Resources: | |||
| MasterPayerBillingBucketArns: !GetAtt Discovery.Outputs.MasterPayerBillingBucketArns | |||
There was a problem hiding this comment.
Confirm connectors-service dependency before merging
The PR removes 931830253929 as a trust principal from every IAM role and the CloudTrail SQS queue across both prod and dev templates. If any workload running under that account currently calls sts:AssumeRole against a customer-provisioned role (e.g. the connectors service fetching CUR or CloudTrail data), those calls will start failing for customers who redeploy after this merges. The PR description explicitly asks for this confirmation but does not show it was obtained. Please post a clear sign-off (e.g. from the connectors-service owner) that account 931830253929 is not currently assuming any of these roles before this PR is merged to develop.
Description of the change
Reverts #107 (commit 3b8b70e, CP-42080), which added a second CloudZero AWS account (
931830253929prod /618300337335dev) as a trust principal on every CloudZero-provisioned IAM role and the CloudTrail-owner SQS queue policy.This restores the single reactor principal across all four CloudFormation account-type templates, both parent templates, and all three Terraform modules. The
ConnectorsAccountIdparameters,connectors_account_idvariable/locals, andCallbackConfigurationmapping entries are removed; eachPrincipal.AWScollapses back to a scalar. Thedocs/releases/1.0.98.mdrelease note describing the reverted feature is also removed.The existing reactor principal (
061190967865prod /998146006915dev) is untouched.Clean, single-feature revert: 11 files changed, 9 insertions / 87 deletions. No version bump or unrelated files involved.
Operational note
This reverts the code only. Already-deployed customer stacks retain the second trust principal until they re-deploy (CloudFormation stack update) or re-apply Terraform against a newly published template version. Please confirm nothing in the connectors service currently depends on
931830253929being able to assume these roles before merging.Type of change
PR Generated with AI
Co-Authored-By: AI