Apply changes from suggestions and regenerate files

Azure · Feb 19, 2025 · 275dca7 · 275dca7
1 parent 5bc2135
commit 275dca7
Show file tree

Hide file tree

Showing 13 changed files with 227 additions and 92 deletions.
diff --git a/avm/res/cache/redis-enterprise/README.md b/avm/res/cache/redis-enterprise/README.md
@@ -266,7 +266,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
     // Required parameters
     name: 'creamr001'
     // Non-required parameters
-    location: '<location>'
     skuName: 'Balanced_B10'
   }
 }
@@ -289,9 +288,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
       "value": "creamr001"
     },
     // Non-required parameters
-    "location": {
-      "value": "<location>"
-    },
     "skuName": {
       "value": "Balanced_B10"
     }
@@ -312,7 +308,6 @@ using 'br/public:avm/res/cache/redis-enterprise:<version>'
 // Required parameters
 param name = 'creamr001'
 // Non-required parameters
-param location = '<location>'
 param skuName = 'Balanced_B10'
 ```
 
@@ -335,7 +330,7 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
     // Required parameters
     name: 'cremin001'
     // Non-required parameters
-    location: '<location>'
+    skuName: 'Balanced_B10'
   }
 }
 ```
@@ -357,8 +352,8 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
       "value": "cremin001"
     },
     // Non-required parameters
-    "location": {
-      "value": "<location>"
+    "skuName": {
+      "value": "Balanced_B10"
     }
   }
 }
@@ -377,7 +372,7 @@ using 'br/public:avm/res/cache/redis-enterprise:<version>'
 // Required parameters
 param name = 'cremin001'
 // Non-required parameters
-param location = '<location>'
+param skuName = 'Balanced_B10'
 ```
 
 </details>
@@ -410,7 +405,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         secondaryStackExchangeRedisConnectionStringName: 'custom-secondaryStackExchangeRedisConnectionString-name'
       }
     }
-    location: '<location>'
     skuName: 'Balanced_B10'
   }
 }
@@ -446,9 +440,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         }
       }
     },
-    "location": {
-      "value": "<location>"
-    },
     "skuName": {
       "value": "Balanced_B10"
     }
@@ -480,7 +471,6 @@ param database = {
     secondaryStackExchangeRedisConnectionStringName: 'custom-secondaryStackExchangeRedisConnectionString-name'
   }
 }
-param location = '<location>'
 param skuName = 'Balanced_B10'
 ```
 
@@ -574,6 +564,25 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         }
       }
     ]
+    roleAssignments: [
+      {
+        name: '759769d2-fc52-4a92-a943-724e48927e0b'
+        principalId: '<principalId>'
+        principalType: 'ServicePrincipal'
+        roleDefinitionIdOrName: 'Owner'
+      }
+      {
+        name: '<name>'
+        principalId: '<principalId>'
+        principalType: 'ServicePrincipal'
+        roleDefinitionIdOrName: 'b24988ac-6180-42a0-ab88-20f7382dd24c'
+      }
+      {
+        principalId: '<principalId>'
+        principalType: 'ServicePrincipal'
+        roleDefinitionIdOrName: '<roleDefinitionIdOrName>'
+      }
+    ]
     skuName: 'Balanced_B10'
     tags: {
       Environment: 'Non-Prod'
@@ -693,6 +702,27 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         }
       ]
     },
+    "roleAssignments": {
+      "value": [
+        {
+          "name": "759769d2-fc52-4a92-a943-724e48927e0b",
+          "principalId": "<principalId>",
+          "principalType": "ServicePrincipal",
+          "roleDefinitionIdOrName": "Owner"
+        },
+        {
+          "name": "<name>",
+          "principalId": "<principalId>",
+          "principalType": "ServicePrincipal",
+          "roleDefinitionIdOrName": "b24988ac-6180-42a0-ab88-20f7382dd24c"
+        },
+        {
+          "principalId": "<principalId>",
+          "principalType": "ServicePrincipal",
+          "roleDefinitionIdOrName": "<roleDefinitionIdOrName>"
+        }
+      ]
+    },
     "skuName": {
       "value": "Balanced_B10"
     },
@@ -798,6 +828,25 @@ param privateEndpoints = [
     }
   }
 ]
+param roleAssignments = [
+  {
+    name: '759769d2-fc52-4a92-a943-724e48927e0b'
+    principalId: '<principalId>'
+    principalType: 'ServicePrincipal'
+    roleDefinitionIdOrName: 'Owner'
+  }
+  {
+    name: '<name>'
+    principalId: '<principalId>'
+    principalType: 'ServicePrincipal'
+    roleDefinitionIdOrName: 'b24988ac-6180-42a0-ab88-20f7382dd24c'
+  }
+  {
+    principalId: '<principalId>'
+    principalType: 'ServicePrincipal'
+    roleDefinitionIdOrName: '<roleDefinitionIdOrName>'
+  }
+]
 param skuName = 'Balanced_B10'
 param tags = {
   Environment: 'Non-Prod'
@@ -841,7 +890,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         type: 'rdb'
       }
     }
-    location: '<location>'
     managedIdentities: {
       userAssignedResourceIds: [
         '<managedIdentityResourceId>'
@@ -884,9 +932,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         }
       }
     },
-    "location": {
-      "value": "<location>"
-    },
     "managedIdentities": {
       "value": {
         "userAssignedResourceIds": [
@@ -925,7 +970,6 @@ param database = {
     type: 'rdb'
   }
 }
-param location = '<location>'
 param managedIdentities = {
   userAssignedResourceIds: [
     '<managedIdentityResourceId>'
@@ -987,7 +1031,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
-    location: '<location>'
     privateEndpoints: [
       {
         privateDnsZoneGroup: {
@@ -1075,9 +1118,6 @@ module redisEnterprise 'br/public:avm/res/cache/redis-enterprise:<version>' = {
         }
       ]
     },
-    "location": {
-      "value": "<location>"
-    },
     "privateEndpoints": {
       "value": [
         {
@@ -1165,7 +1205,6 @@ param diagnosticSettings = [
     workspaceResourceId: '<workspaceResourceId>'
   }
 ]
-param location = '<location>'
 param privateEndpoints = [
   {
     privateDnsZoneGroup: {

diff --git a/avm/res/cache/redis-enterprise/database/access-policy-assignment/main.bicep b/avm/res/cache/redis-enterprise/database/access-policy-assignment/main.bicep
@@ -1,6 +1,5 @@
 metadata name = 'Azure Managed Redis (Preview) Database Access Policy Assignment'
 metadata description = 'This module deploys an access policy assignment for an Azure Managed Redis (Preview) database.'
-metadata owner = 'Azure/module-maintainers'
 
 @description('Optional. Name of the access policy assignment.')
 param name string?

diff --git a/avm/res/cache/redis-enterprise/database/access-policy-assignment/main.json b/avm/res/cache/redis-enterprise/database/access-policy-assignment/main.json
@@ -6,11 +6,10 @@
     "_generator": {
       "name": "bicep",
       "version": "0.33.93.31351",
-      "templateHash": "716203646143628467"
+      "templateHash": "6473026260124919331"
     },
     "name": "Azure Managed Redis (Preview) Database Access Policy Assignment",
-    "description": "This module deploys an access policy assignment for an Azure Managed Redis (Preview) database.",
-    "owner": "Azure/module-maintainers"
+    "description": "This module deploys an access policy assignment for an Azure Managed Redis (Preview) database."
   },
   "parameters": {
     "name": {

diff --git a/avm/res/cache/redis-enterprise/database/main.bicep b/avm/res/cache/redis-enterprise/database/main.bicep
@@ -1,6 +1,5 @@
 metadata name = 'Redis database'
 metadata description = 'This module deploys a Redis database in a Redis Enterprise or Azure Managed Redis (Preview) cluster.'
-metadata owner = 'Azure/module-maintainers'
 
 @description('Conditional. The name of the parent Redis Enterprise or Azure Managed Redis (Preview) resource. Required if the template is used in a standalone deployment.')
 param redisClusterName string
@@ -153,11 +152,11 @@ resource database_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021
 module secretsExport 'modules/keyVaultExport.bicep' = if (secretsExportConfiguration != null) {
   name: '${uniqueString(deployment().name)}-secrets-kv'
   scope: resourceGroup(
-    split((secretsExportConfiguration.?keyVaultResourceId ?? '//'), '/')[2],
-    split((secretsExportConfiguration.?keyVaultResourceId ?? '////'), '/')[4]
+    split(secretsExportConfiguration.?keyVaultResourceId!, '/')[2],
+    split(secretsExportConfiguration.?keyVaultResourceId!, '/')[4]
   )
   params: {
-    keyVaultName: last(split(secretsExportConfiguration.?keyVaultResourceId ?? '//', '/'))
+    keyVaultName: last(split(secretsExportConfiguration.?keyVaultResourceId!, '/'))
     secretsToSet: union(
       [],
       contains(secretsExportConfiguration!, 'primaryAccessKeyName')

diff --git a/avm/res/cache/redis-enterprise/database/main.json b/avm/res/cache/redis-enterprise/database/main.json
@@ -6,11 +6,10 @@
     "_generator": {
       "name": "bicep",
       "version": "0.33.93.31351",
-      "templateHash": "13414709051021301977"
+      "templateHash": "12094637252334328193"
     },
     "name": "Redis database",
-    "description": "This module deploys a Redis database in a Redis Enterprise or Azure Managed Redis (Preview) cluster.",
-    "owner": "Azure/module-maintainers"
+    "description": "This module deploys a Redis database in a Redis Enterprise or Azure Managed Redis (Preview) cluster."
   },
   "definitions": {
     "secretsExportConfigurationType": {
@@ -635,11 +634,10 @@
             "_generator": {
               "name": "bicep",
               "version": "0.33.93.31351",
-              "templateHash": "716203646143628467"
+              "templateHash": "6473026260124919331"
             },
             "name": "Azure Managed Redis (Preview) Database Access Policy Assignment",
-            "description": "This module deploys an access policy assignment for an Azure Managed Redis (Preview) database.",
-            "owner": "Azure/module-maintainers"
+            "description": "This module deploys an access policy assignment for an Azure Managed Redis (Preview) database."
           },
           "parameters": {
             "name": {
@@ -744,16 +742,16 @@
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2022-09-01",
       "name": "[format('{0}-secrets-kv', uniqueString(deployment().name))]",
-      "subscriptionId": "[split(coalesce(tryGet(parameters('secretsExportConfiguration'), 'keyVaultResourceId'), '//'), '/')[2]]",
-      "resourceGroup": "[split(coalesce(tryGet(parameters('secretsExportConfiguration'), 'keyVaultResourceId'), '////'), '/')[4]]",
+      "subscriptionId": "[split(tryGet(parameters('secretsExportConfiguration'), 'keyVaultResourceId'), '/')[2]]",
+      "resourceGroup": "[split(tryGet(parameters('secretsExportConfiguration'), 'keyVaultResourceId'), '/')[4]]",
       "properties": {
         "expressionEvaluationOptions": {
           "scope": "inner"
         },
         "mode": "Incremental",
         "parameters": {
           "keyVaultName": {
-            "value": "[last(split(coalesce(tryGet(parameters('secretsExportConfiguration'), 'keyVaultResourceId'), '//'), '/'))]"
+            "value": "[last(split(tryGet(parameters('secretsExportConfiguration'), 'keyVaultResourceId'), '/'))]"
           },
           "secretsToSet": {
             "value": "[union(createArray(), if(contains(parameters('secretsExportConfiguration'), 'primaryAccessKeyName'), createArray(createObject('name', tryGet(parameters('secretsExportConfiguration'), 'primaryAccessKeyName'), 'value', listKeys(resourceId('Microsoft.Cache/redisEnterprise/databases', parameters('redisClusterName'), parameters('name')), '2024-09-01-preview').primaryKey)), createArray()), if(contains(parameters('secretsExportConfiguration'), 'primaryConnectionStringName'), createArray(createObject('name', tryGet(parameters('secretsExportConfiguration'), 'primaryConnectionStringName'), 'value', format('{0}:{1}@{2}:{3}', if(equals(reference('redisDatabase').clientProtocol, 'Plaintext'), 'redis://', 'rediss://'), listKeys(resourceId('Microsoft.Cache/redisEnterprise/databases', parameters('redisClusterName'), parameters('name')), '2024-09-01-preview').primaryKey, reference('redisCluster').hostName, reference('redisDatabase').port))), createArray()), if(contains(parameters('secretsExportConfiguration'), 'primaryStackExchangeRedisConnectionStringName'), createArray(createObject('name', tryGet(parameters('secretsExportConfiguration'), 'primaryStackExchangeRedisConnectionStringName'), 'value', format('{0}:{1},password={2},ssl={3},abortConnect=False', reference('redisCluster').hostName, reference('redisDatabase').port, listKeys(resourceId('Microsoft.Cache/redisEnterprise/databases', parameters('redisClusterName'), parameters('name')), '2024-09-01-preview').primaryKey, if(equals(reference('redisDatabase').clientProtocol, 'Plaintext'), 'False', 'True')))), createArray()), if(contains(parameters('secretsExportConfiguration'), 'secondaryAccessKeyName'), createArray(createObject('name', tryGet(parameters('secretsExportConfiguration'), 'secondaryAccessKeyName'), 'value', listKeys(resourceId('Microsoft.Cache/redisEnterprise/databases', parameters('redisClusterName'), parameters('name')), '2024-09-01-preview').secondaryKey)), createArray()), if(contains(parameters('secretsExportConfiguration'), 'secondaryConnectionStringName'), createArray(createObject('name', tryGet(parameters('secretsExportConfiguration'), 'secondaryConnectionStringName'), 'value', format('{0}:{1}@{2}:{3}', if(equals(reference('redisDatabase').clientProtocol, 'Plaintext'), 'redis://', 'rediss://'), listKeys(resourceId('Microsoft.Cache/redisEnterprise/databases', parameters('redisClusterName'), parameters('name')), '2024-09-01-preview').secondaryKey, reference('redisCluster').hostName, reference('redisDatabase').port))), createArray()), if(contains(parameters('secretsExportConfiguration'), 'secondaryStackExchangeRedisConnectionStringName'), createArray(createObject('name', tryGet(parameters('secretsExportConfiguration'), 'secondaryStackExchangeRedisConnectionStringName'), 'value', format('{0}:{1},password={2},ssl={3},abortConnect=False', reference('redisCluster').hostName, reference('redisDatabase').port, listKeys(resourceId('Microsoft.Cache/redisEnterprise/databases', parameters('redisClusterName'), parameters('name')), '2024-09-01-preview').secondaryKey, if(equals(reference('redisDatabase').clientProtocol, 'Plaintext'), 'False', 'True')))), createArray()))]"