Add opt-in Key Vault RBAC authorization for CAF/landing zone compliance - #2249
Add opt-in Key Vault RBAC authorization for CAF/landing zone compliance#2249Michael Flanakin (flanakin) wants to merge 1 commit into
Conversation
Adds an `enableRbacAuthorization` parameter (default false) that switches the remote hub Key Vault from access policies to Azure RBAC, satisfying CAF / Enterprise-Scale landing zone guardrails that require RBAC-authorized key vaults. When enabled, the Data Factory managed identity is granted an equivalent Key Vault Secrets User role assignment so secret access continues to work instead of silently breaking. Defaults to false to avoid an irreversible auth-model change on redeploys of existing hubs, matching the existing opt-in `enablePurgeProtection` parameter, which cannot be disabled once enabled either. Fixes #1067
| storageSku, | ||
| keyVaultSku, | ||
| enablePurgeProtection, | ||
| enableRbacAuthorization, |
There was a problem hiding this comment.
Is this name too generic? This isn't clear it's for Key Vault only.
| { | ||
| "name": "enableRbacAuthorization", | ||
| "type": "Microsoft.Common.CheckBox", | ||
| "label": "Enable Key Vault RBAC authorization", |
There was a problem hiding this comment.
What happens on existing deployments? Will it end up with both, rbac and access policies, as we are not removing access policies via bicep I guess.
Roland Krummenacher (RolandKrummenacher)
left a comment
There was a problem hiding this comment.
Review — PR #2249
Approving the approach. The consumer trace is the part that matters most here and it holds up: the ADF AzureKeyVault linked service is the only data-plane secret reader, the keyVault_secret module write is management-plane and genuinely unaffected by the vault's authorization model, and no other hub app touches this vault. Granting exactly one Key Vault Secrets User assignment is the right scope — not a broader role, not a second assignment for the deploying principal.
Opt-in defaulting to false is also right, and for the reason stated: flipping enableRbacAuthorization on an existing vault silently stops honoring access policies with no rollback short of recreating the vault, and this template is explicitly redeploy-over-existing. Forcing it on would break deployed hubs at upgrade time. Following the enablePurgeProtection precedent keeps that consistent.
Two notes, neither blocking.
newHub() positional-argument fragility
keyVaultEnableRbacAuthorization is inserted mid-signature in both newHubInternal and newHub, and both are called positionally. There's exactly one caller today (modules/hub.bicep:190), so this is safe as written — I checked. But the signature is now 15+ positional bools and strings, and the next insertion is one where a mis-ordered pair of same-typed args compiles clean and misconfigures a hub silently. Not this PR's job to fix, but worth an issue: these should take a single object parameter, or at minimum new options should append rather than insert.
RBAC propagation vs. access-policy immediacy
Access policy grants take effect essentially immediately; RBAC role assignments can take a few minutes to propagate. ADF reads the secret at pipeline runtime rather than at deployment time, so in the normal case the assignment has long since propagated by the time anything needs it. The edge case is a pipeline triggered immediately after a first deployment with the flag on — that could see a transient 403 that looks like a misconfiguration rather than a timing artifact.
Not worth adding a dependsOn dance over, but if the deployment surfaces a "hub is ready" message anywhere, a sentence in the docs noting that RBAC-authorized vaults may need a few minutes before the first ingestion run succeeds would save someone a support round-trip.
Small thing
The enablePurgeProtection tooltip gained "This cannot be disabled once enabled" — good addition. The enableRbacAuthorization tooltip doesn't carry the equivalent warning, and its irreversibility is arguably the sharper one of the two (purge protection costs you a 90-day wait; a botched RBAC switch costs you vault access). Consider mirroring the wording from the main.bicep parameter description, which does say it.
Summary
Adds an
enableRbacAuthorizationparameter to the FinOps hub Bicep templates that switches the remote-hub Key Vault from the legacy access-policy model to Azure RBAC. This is required by Cloud Adoption Framework (CAF) / Enterprise-Scale landing zone Azure Policy guardrails (e.g., "Enforce recommended guardrails for Azure Key Vault"), which flag vaults that use access policies instead of RBAC.Fixes #1067
What changed
src/templates/finops-hub/modules/fx/hub-app.bicep— the Key Vault resource now setsenableRbacAuthorization: app.hub.options.keyVaultEnableRbacAuthorizationinstead of a hardcodedfalse. When RBAC is enabled:accessPoliciesis forced to an empty array (Azure rejects a non-emptyaccessPoliciesarray whenenableRbacAuthorization: true).keyVaultRoleAssignmentresource grants the Data Factory managed identity the built-in Key Vault Secrets User role (4633458b-17de-408a-b874-0445c86b69e6) on the vault — the RBAC equivalent of thesecrets: ['get']access policy it previously relied on. This is the only identity that reads secrets from this vault (verified below), so it's the only equivalent role assignment needed.src/templates/finops-hub/modules/fx/hub-types.bicep— addedkeyVaultEnableRbacAuthorizationtoHubProperties.optionsand threaded it throughnewHubInternal/newHub.src/templates/finops-hub/modules/hub.bicepandmain.bicep— added anenableRbacAuthorization bool = falseparameter, following the exact pattern already used forenablePurgeProtection.createUiDefinition.json— added a matching "Enable Key Vault RBAC authorization" checkbox next to the existing purge protection checkbox, gated to the remote-hub analytics engine path (the only path that deploys this vault).docs-mslearn/toolkit/changelog.md— added an entry under Unreleased.Purge protection (
enablePurgeProtection/enableSoftDelete) was already fully implemented on this branch (not something I needed to add) —enableSoftDelete: trueis hardcoded, andenablePurgeProtectionis already wired end-to-end as an opt-in parameter defaulting tofalse, following the exact convention I followed for RBAC here.Investigation: what currently depends on access policies
I traced every consumer of the Key Vault (
Microsoft.KeyVault/vaultsinsrc/templates/finops-hub/modules/fx/hub-app.bicep:471, only deployed when theRemoteHubapp requests the'KeyVault'feature —modules/Microsoft.FinOpsHubs/RemoteHub/app.bicep:52):AzureKeyVaultlinked service (hub-app.bicep:201,linkedService_keyVault) — ADF authenticates as its own system-assigned managed identity at runtime to read theremoteHubStorageconnection secret viaAzureKeyVaultSecret. This is the only data-plane secret reader, and it's exactly what the pre-existingkeyVaultAccessPoliciesvar (secrets: ['get']) granted. Now granted via RBAC (Key Vault Secrets User) whenenableRbacAuthorization: true.keyVault_secretmodule (fx/hub-vault.bicep, invoked fromRemoteHub/app.bicep:59) writes the storage key as a nested ARMMicrosoft.KeyVault/vaults/secretsresource. This is a management-plane (ARM) write authorized by the deploying principal's Azure RBAC role on the resource group (e.g., Contributor), not by the vault's own access-policy/RBAC-authorization setting — so it is unaffected either way.Core,Exports,Analytics,AzureResourceGraph, etc.) references this Key Vault at all.So the only identity needing a new role assignment is Data Factory's managed identity, which I added.
PR #1349 (closed, not merged)
Read
gh pr diff 1349before starting. It only addedenablePurgeProtection(12 lines acrossmain.bicep/hub.bicep/keyVault.bicep) against the pre-reorganization template layout — those exact file paths (modules/keyVault.bicep) no longer exist; the Key Vault resource now lives inmodules/fx/hub-app.bicepas part of the namespace-basedfx/Microsoft.FinOpsHubsrestructuring. It didn't touch RBAC at all, and its purge-protection change has since been superseded by a more complete implementation already ondev/v15-prep. I did not build on it — nothing to build on for RBAC, and the purge-protection piece it targeted was already done more thoroughly elsewhere.Design decision: opt-in, not forced-on
Both
enableRbacAuthorizationandenablePurgeProtectionare irreversible per Azure's API contract:enablePurgeProtection: trueis set on a vault, it cannot be reverted.enableRbacAuthorizationfromfalsetotrueon an existing vault immediately stops honoring access policies; any identity not covered by an equivalent RBAC role assignment loses access with no rollback path (short of recreating the vault).Because the FinOps hub template supports redeploying over existing hub instances (upgrade scenario), forcing either property on unconditionally would silently break already-deployed hubs that don't opt in, with no way back. I followed the existing precedent set by
enablePurgeProtection(already opt-in, defaulting tofalse, surfaced identically inmain.bicep/hub.bicep/createUiDefinition.json) and applied the same pattern toenableRbacAuthorization. Organizations that need CAF/Enterprise-Scale compliance can set both parameters totrueexplicitly; organizations upgrading an existing hub are not force-migrated into a breaking, irreversible change they didn't ask for.I believe this is the safer default, but it does mean the compliance gap in #1067 isn't closed by default — only when explicitly enabled. If maintainers prefer defaulting new deployments to
truewhile keeping upgrades safe, that would need a way to distinguish first-deploy from redeploy, which Bicep can't do natively (no reliable "does this resource already exist" check without aexistinglookup that fails hard on first deploy). Flagging this as an open discussion point for reviewers.Verification
bicep build src/templates/finops-hub/main.bicep --stdout— clean, no errors (2 pre-existing unrelated warnings inRecommendations/app.bicep, confirmed present before this change viagit stash).bicep buildonhub.bicep,hub-app.bicep, andhub-types.bicepindividually — all clean.pwsh -Command "./src/scripts/Test-PowerShell.ps1 -Lint"— 3418/3418 passed, includingms.datefrontmatter checks (already current at08/12/2026, no update needed).az deployment ... what-if— no Azure credentials available in this environment. Everything else that could be verified statically was.Open questions for reviewers
enableRbacAuthorization/enablePurgeProtectiontotruewhile upgrades stay opt-in? Flagged above as not straightforwardly expressible in Bicep.Key Vault Secrets Useris the right role scope (read-onlyget/liston secrets) rather thanKey Vault Secrets Officer— I matched the existing access policy'ssecrets: ['get']scope exactly, soSecrets User(read-only) seemed correct, but worth a second look given ADF also needs to enumerate the linked service's secret at authoring/refresh time.Test plan