Skip to content

Preserve Clauditor GCP identity and clear Azure storage plan drift - #334

Merged
jwmossmoz merged 2 commits into
masterfrom
fix-pr333-clauditor-state-moves
Sep 14, 2026
Merged

jwmossmoz merged 2 commits into
masterfrom
fix-pr333-clauditor-state-moves

Conversation

@jwmossmoz

@jwmossmoz jwmossmoz commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

PR #333 changed the Clauditor Terraform key from audience to gcp-aud. Without state moves, Terraform deleted the original application and service principal, then failed to create a replacement with the original application ID URI.

Add moved blocks for the application, service principal, and Contributor role assignment. These preserve the original GCP client ID, audience URI, and role assignment when the key changes. Also correct the GCP application name in the comment.

The hardwareimaging storage account also showed the same network rules change after each apply. Remove its redundant default network rules block. AzureRM 4.60.0 omits these defaults from state, which caused the repeated difference. The account continues to use Allow with the AzureServices bypass.

Validation:

  • Restored the original application and service principal and imported them at the gcp-aud addresses in the shared state.
  • Completed the recovery applies. The GCP role assignment moved without an Azure resource change.
  • Fresh full plans for azure_ad, azure_fuzzing, and azure_fxci all reported no changes with -detailed-exitcode exit code 0.
  • Repository pre-commit checks passed for all three changed files.

@jwmossmoz jwmossmoz changed the title Preserve Clauditor GCP identity when renaming Terraform keys Preserve Clauditor GCP identity and clear Azure storage plan drift Sep 14, 2026
@jwmossmoz
jwmossmoz marked this pull request as ready for review September 14, 2026 14:09
@jwmossmoz
jwmossmoz enabled auto-merge (squash) September 14, 2026 14:09
@jwmossmoz
jwmossmoz disabled auto-merge September 14, 2026 14:10
@jwmossmoz
jwmossmoz merged commit 47b7aa5 into master Sep 14, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant