Merge remote-tracking branch 'upstream/main'

avm/ptn/azd/acr-container-app/main.json

@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "8683355263365484382"
+      "version": "0.30.23.60470",
+      "templateHash": "11200666829036307571"
     },
     "name": "Azd ACR Linked Container App",
     "description": "Creates a container app in an Azure Container App environment.\n\n**Note:** This module is not intended for broad, generic use, as it was designed to cater for the requirements of the AZD CLI product. Feature requests and bug fix requests are welcome if they support the development of the AZD CLI but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case",
@@ -1428,8 +1428,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.29.47.4906",
-              "templateHash": "9239508313239206967"
+              "version": "0.30.23.60470",
+              "templateHash": "676465844790879977"
             },
             "name": "ACR Pull permissions",
             "description": "Assigns ACR Pull permissions to access an Azure Container Registry.",
@@ -1463,7 +1463,7 @@
             {
               "type": "Microsoft.Resources/deployments",
               "apiVersion": "2022-09-01",
-              "name": "acrpullrole-deployment",
+              "name": "[guid(subscription().id, resourceGroup().id, parameters('principalId'), variables('acrPullRole'))]",
               "properties": {
                 "expressionEvaluationOptions": {
                   "scope": "inner"

avm/ptn/azd/acr-container-app/modules/registry-access.bicep

@@ -17,7 +17,7 @@ var acrPullRole = subscriptionResourceId(
 )
 
 module aksAcrPull 'br/public:avm/ptn/authorization/resource-role-assignment:0.1.1' = {
-  name: 'acrpullrole-deployment'
+  name: guid(subscription().id, resourceGroup().id, principalId, acrPullRole)
   params: {
     principalId: principalId
     resourceId: containerRegistry.id