From 4ba2488aa8aa728638f901736a2e6cdef088a672 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 19 Feb 2025 08:50:51 +0100 Subject: [PATCH] fix: KVLT - Changed GUID used by role assignment due to conflict (#4477) ## Description - Changed the GUID used by one role assignment as it let to consistent conflicts in main (out of the blue, I might add) - Implemented other changes to trigger a module publishing (as a previous change got not merged because of the previous issue) ## Pipeline Reference | Pipeline | | -------- | | [![avm.res.container-registry.registry](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.container-registry.registry.yml/badge.svg?branch=users%2Falsehr%2FcontainerRegistryGUID&event=workflow_dispatch)](https://github.com/Azure/bicep-registry-modules/actions/workflows/avm.res.container-registry.registry.yml) | ## Type of Change - [ ] Update to CI Environment or utilities (Non-module affecting changes) - [ ] Azure Verified Module updates: - [x] Bugfix containing backwards-compatible bug fixes, and I have NOT bumped the MAJOR or MINOR version in `version.json`: - [ ] Someone has opened a bug report issue, and I have included "Closes #{bug_report_issue_number}" in the PR description. - [ ] The bug was found by the module author, and no one has opened an issue to report it yet. - [ ] Feature update backwards compatible feature updates, and I have bumped the MINOR version in `version.json`. - [ ] Breaking changes and I have bumped the MAJOR version in `version.json`. - [ ] Update to documentation --- avm/res/container-registry/registry/README.md | 6 +++--- .../container-registry/registry/main.bicep | 14 ++++++------- avm/res/container-registry/registry/main.json | 20 +++++++++---------- .../registry/tests/e2e/max/main.test.bicep | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/avm/res/container-registry/registry/README.md b/avm/res/container-registry/registry/README.md index fa70d39ffe..4c84a4c69b 100644 --- a/avm/res/container-registry/registry/README.md +++ b/avm/res/container-registry/registry/README.md @@ -305,7 +305,7 @@ module registry 'br/public:avm/res/container-registry/registry:' = { ] roleAssignments: [ { - name: '60395919-cfd3-47bf-8349-775ddebb255e' + name: '8f8b1c39-827f-43e6-a457-98bb15b5dbdf' principalId: '' principalType: 'ServicePrincipal' roleDefinitionIdOrName: 'Owner' @@ -453,7 +453,7 @@ module registry 'br/public:avm/res/container-registry/registry:' = { "roleAssignments": { "value": [ { - "name": "60395919-cfd3-47bf-8349-775ddebb255e", + "name": "8f8b1c39-827f-43e6-a457-98bb15b5dbdf", "principalId": "", "principalType": "ServicePrincipal", "roleDefinitionIdOrName": "Owner" @@ -583,7 +583,7 @@ param replications = [ ] param roleAssignments = [ { - name: '60395919-cfd3-47bf-8349-775ddebb255e' + name: '8f8b1c39-827f-43e6-a457-98bb15b5dbdf' principalId: '' principalType: 'ServicePrincipal' roleDefinitionIdOrName: 'Owner' diff --git a/avm/res/container-registry/registry/main.bicep b/avm/res/container-registry/registry/main.bicep index 682774e4da..ee4fd6b958 100644 --- a/avm/res/container-registry/registry/main.bicep +++ b/avm/res/container-registry/registry/main.bicep @@ -225,22 +225,22 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableT } resource cMKKeyVault 'Microsoft.KeyVault/vaults@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId)) { - name: last(split((customerManagedKey.?keyVaultResourceId ?? 'dummyVault'), '/')) + name: last(split(customerManagedKey.?keyVaultResourceId!, '/')) scope: resourceGroup( - split((customerManagedKey.?keyVaultResourceId ?? '//'), '/')[2], - split((customerManagedKey.?keyVaultResourceId ?? '////'), '/')[4] + split(customerManagedKey.?keyVaultResourceId!, '/')[2], + split(customerManagedKey.?keyVaultResourceId!, '/')[4] ) resource cMKKey 'keys@2023-02-01' existing = if (!empty(customerManagedKey.?keyVaultResourceId) && !empty(customerManagedKey.?keyName)) { - name: customerManagedKey.?keyName ?? 'dummyKey' + name: customerManagedKey.?keyName! } } resource cMKUserAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' existing = if (!empty(customerManagedKey.?userAssignedIdentityResourceId)) { - name: last(split(customerManagedKey.?userAssignedIdentityResourceId ?? 'dummyMsi', '/')) + name: last(split(customerManagedKey.?userAssignedIdentityResourceId!, '/')) scope: resourceGroup( - split((customerManagedKey.?userAssignedIdentityResourceId ?? '//'), '/')[2], - split((customerManagedKey.?userAssignedIdentityResourceId ?? '////'), '/')[4] + split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[2], + split(customerManagedKey.?userAssignedIdentityResourceId!, '/')[4] ) } diff --git a/avm/res/container-registry/registry/main.json b/avm/res/container-registry/registry/main.json index 6506d73f14..f5de253d59 100644 --- a/avm/res/container-registry/registry/main.json +++ b/avm/res/container-registry/registry/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.33.13.18514", - "templateHash": "9895920276913879197" + "templateHash": "2125225472095331873" }, "name": "Azure Container Registries (ACR)", "description": "This module deploys an Azure Container Registry (ACR)." @@ -1224,9 +1224,9 @@ "existing": true, "type": "Microsoft.KeyVault/vaults/keys", "apiVersion": "2023-02-01", - "subscriptionId": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '//'), '/')[2]]", - "resourceGroup": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '////'), '/')[4]]", - "name": "[format('{0}/{1}', last(split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), 'dummyVault'), '/')), coalesce(tryGet(parameters('customerManagedKey'), 'keyName'), 'dummyKey'))]" + "subscriptionId": "[split(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '/')[2]]", + "resourceGroup": "[split(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '/')[4]]", + "name": "[format('{0}/{1}', last(split(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '/')), tryGet(parameters('customerManagedKey'), 'keyName'))]" }, "avmTelemetry": { "condition": "[parameters('enableTelemetry')]", @@ -1253,18 +1253,18 @@ "existing": true, "type": "Microsoft.KeyVault/vaults", "apiVersion": "2023-02-01", - "subscriptionId": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '//'), '/')[2]]", - "resourceGroup": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '////'), '/')[4]]", - "name": "[last(split(coalesce(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), 'dummyVault'), '/'))]" + "subscriptionId": "[split(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '/')[2]]", + "resourceGroup": "[split(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '/')[4]]", + "name": "[last(split(tryGet(parameters('customerManagedKey'), 'keyVaultResourceId'), '/'))]" }, "cMKUserAssignedIdentity": { "condition": "[not(empty(tryGet(parameters('customerManagedKey'), 'userAssignedIdentityResourceId')))]", "existing": true, "type": "Microsoft.ManagedIdentity/userAssignedIdentities", "apiVersion": "2023-01-31", - "subscriptionId": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'userAssignedIdentityResourceId'), '//'), '/')[2]]", - "resourceGroup": "[split(coalesce(tryGet(parameters('customerManagedKey'), 'userAssignedIdentityResourceId'), '////'), '/')[4]]", - "name": "[last(split(coalesce(tryGet(parameters('customerManagedKey'), 'userAssignedIdentityResourceId'), 'dummyMsi'), '/'))]" + "subscriptionId": "[split(tryGet(parameters('customerManagedKey'), 'userAssignedIdentityResourceId'), '/')[2]]", + "resourceGroup": "[split(tryGet(parameters('customerManagedKey'), 'userAssignedIdentityResourceId'), '/')[4]]", + "name": "[last(split(tryGet(parameters('customerManagedKey'), 'userAssignedIdentityResourceId'), '/'))]" }, "registry": { "type": "Microsoft.ContainerRegistry/registries", diff --git a/avm/res/container-registry/registry/tests/e2e/max/main.test.bicep b/avm/res/container-registry/registry/tests/e2e/max/main.test.bicep index 36964a7bb1..1860cae15e 100644 --- a/avm/res/container-registry/registry/tests/e2e/max/main.test.bicep +++ b/avm/res/container-registry/registry/tests/e2e/max/main.test.bicep @@ -135,7 +135,7 @@ module testDeployment '../../../main.bicep' = [ ] roleAssignments: [ { - name: '60395919-cfd3-47bf-8349-775ddebb255e' + name: '8f8b1c39-827f-43e6-a457-98bb15b5dbdf' roleDefinitionIdOrName: 'Owner' principalId: nestedDependencies.outputs.managedIdentityPrincipalId principalType: 'ServicePrincipal'