Merge remote-tracking branch 'upstream/main'

hundredacres · Nov 23, 2024 · 7683e36 · 7683e36
2 parents e8e09ab + 8ee8adb
commit 7683e36
Show file tree

Hide file tree

Showing 24 changed files with 670 additions and 600 deletions.
diff --git a/avm/res/cache/redis/README.md b/avm/res/cache/redis/README.md
@@ -794,7 +794,6 @@ module redis 'br/public:avm/res/cache/redis:<version>' = {
         workspaceResourceId: '<workspaceResourceId>'
       }
     ]
-    enableNonSslPort: true
     location: '<location>'
     lock: {
       kind: 'CanNotDelete'
@@ -876,9 +875,6 @@ module redis 'br/public:avm/res/cache/redis:<version>' = {
         }
       ]
     },
-    "enableNonSslPort": {
-      "value": true
-    },
     "location": {
       "value": "<location>"
     },
@@ -978,7 +974,6 @@ param diagnosticSettings = [
     workspaceResourceId: '<workspaceResourceId>'
   }
 ]
-param enableNonSslPort = true
 param location = '<location>'
 param lock = {
   kind: 'CanNotDelete'

diff --git a/avm/res/cache/redis/linked-servers/main.json b/avm/res/cache/redis/linked-servers/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "6993324639761594928"
+      "version": "0.31.92.45157",
+      "templateHash": "4764248912015671674"
     },
     "name": "Redis Cache Linked Servers",
     "description": "This module connects a primary and secondary Redis Cache together for geo-replication.",
@@ -98,4 +98,4 @@
       "value": "[resourceGroup().name]"
     }
   }
-}
+}
diff --git a/avm/res/cache/redis/tests/e2e/waf-aligned/main.test.bicep b/avm/res/cache/redis/tests/e2e/waf-aligned/main.test.bicep
@@ -81,7 +81,6 @@ module testDeployment '../../../main.bicep' = [
           workspaceResourceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
         }
       ]
-      enableNonSslPort: true
       lock: {
         kind: 'CanNotDelete'
         name: 'myCustomLockName'