From 6dd054d4e6245853d58e38d8c1f264a37da53d8e Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 30 Aug 2022 19:44:58 +0200
Subject: [PATCH 01/12] Updated AppConfig

---
 .../.test/default/dependencies.bicep          |  13 ++
 .../.test/default/deploy.test.bicep           |  94 +++++++++++++
 .../.test/min.parameters.json                 |   9 --
 .../.test/min/dependencies.bicep              |   0
 .../.test/min/deploy.test.bicep               |  37 ++++++
 .../configurationStores/.test/parameters.json |  69 ----------
 .../.test/pe.parameters.json                  |  34 -----
 .../.test/pe/dependencies.bicep               |  47 +++++++
 .../.test/pe/deploy.test.bicep                |  60 +++++++++
 .../configurationStores/readme.md             | 124 +++++++++---------
 10 files changed, 313 insertions(+), 174 deletions(-)
 create mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/default/dependencies.bicep
 create mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/default/deploy.test.bicep
 delete mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/min.parameters.json
 create mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/min/dependencies.bicep
 create mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
 delete mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/parameters.json
 delete mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/pe.parameters.json
 create mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep
 create mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/default/dependencies.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/default/dependencies.bicep
new file mode 100644
index 0000000000..bfae36a05d
--- /dev/null
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/default/dependencies.bicep
@@ -0,0 +1,13 @@
+@description('Required. The name of the managed identity to create.')
+param managedIdentityName string
+
+@description('Optional. The location to deploy resources to.')
+param location string = resourceGroup().location
+
+resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
+  name: managedIdentityName
+  location: location
+}
+
+@description('The principal ID of the created managed identity')
+output managedIdentityPrincipalId string = managedIdentity.properties.principalId
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/default/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/default/deploy.test.bicep
new file mode 100644
index 0000000000..f8b4b8f364
--- /dev/null
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/default/deploy.test.bicep
@@ -0,0 +1,94 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. The name of the resource group to deploy for a testing purposes')
+@maxLength(80)
+param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints')
+param serviceShort string = 'accdef'
+
+// =========== //
+// Deployments //
+// =========== //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+  name: resourceGroupName
+  location: location
+}
+
+module resourceGroupResources 'dependencies.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name, location)}-paramNested'
+  params: {
+    managedIdentityName: 'dep-<<namePrefix>>-msi-${serviceShort}'
+
+  }
+}
+
+// Diagnostics
+// ===========
+module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnostic.dependencies.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name, location)}-diagnosticDependencies'
+  params: {
+    storageAccountName: 'dep<<namePrefix>>diasa${serviceShort}01'
+    logAnalyticsWorkspaceName: 'dep-<<namePrefix>>-law-${serviceShort}'
+    eventHubNamespaceEventHubName: 'dep-<<namePrefix>>-evh-${serviceShort}'
+    eventHubNamespaceName: 'dep-<<namePrefix>>-evhns-${serviceShort}'
+    location: location
+  }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../deploy.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    name: '<<namePrefix>>${serviceShort}001'
+    createMode: 'Default'
+    diagnosticLogsRetentionInDays: 7
+    diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+    diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+    diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+    diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+    disableLocalAuth: false
+    enablePurgeProtection: false
+    keyValues: [
+      {
+        contentType: 'contentType'
+        name: 'keyName'
+        roleAssignments: [
+          {
+            principalIds: [
+              resourceGroupResources.outputs.managedIdentityPrincipalId
+            ]
+            roleDefinitionIdOrName: 'Reader'
+          }
+        ]
+        value: 'valueName'
+      }
+    ]
+    lock: 'CanNotDelete'
+    roleAssignments: [
+      {
+        principalIds: [
+          resourceGroupResources.outputs.managedIdentityPrincipalId
+        ]
+        roleDefinitionIdOrName: 'Reader'
+      }
+    ]
+    softDeleteRetentionInDays: 1
+    systemAssignedIdentity: true
+  }
+}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min.parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.test/min.parameters.json
deleted file mode 100644
index ccc759e927..0000000000
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/min.parameters.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appc-min-001"
-        }
-    }
-}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/dependencies.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/dependencies.bicep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
new file mode 100644
index 0000000000..99b324e4a2
--- /dev/null
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
@@ -0,0 +1,37 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. The name of the resource group to deploy for a testing purposes')
+@maxLength(80)
+param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints')
+param serviceShort string = 'accmin'
+
+// =========== //
+// Deployments //
+// =========== //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+  name: resourceGroupName
+  location: location
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../deploy.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    name: '<<namePrefix>>${serviceShort}001'
+  }
+}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.test/parameters.json
deleted file mode 100644
index 0b7490ea14..0000000000
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/parameters.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appc-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "diagnosticLogsRetentionInDays": {
-            "value": 7
-        },
-        "diagnosticStorageAccountId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
-        },
-        "diagnosticWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
-        },
-        "diagnosticEventHubAuthorizationRuleId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
-        },
-        "diagnosticEventHubName": {
-            "value": "adp-<<namePrefix>>-az-evh-x-001"
-        },
-        "systemAssignedIdentity": {
-            "value": true
-        },
-        "keyValues": {
-            "value": [
-                {
-                    "name": "keyName",
-                    "value": "valueName",
-                    "contentType": "contentType",
-                    "roleAssignments": [
-                        {
-                            "roleDefinitionIdOrName": "Reader",
-                            "principalIds": [
-                                "<<deploymentSpId>>"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "createMode": {
-            "value": "Default"
-        },
-        "disableLocalAuth": {
-            "value": false
-        },
-        "enablePurgeProtection": {
-            "value": false
-        },
-        "softDeleteRetentionInDays": {
-            "value": 1
-        }
-    }
-}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe.parameters.json b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe.parameters.json
deleted file mode 100644
index baab61d420..0000000000
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe.parameters.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-appc-pe-001"
-        },
-        "createMode": {
-            "value": "Default"
-        },
-        "disableLocalAuth": {
-            "value": false
-        },
-        "enablePurgeProtection": {
-            "value": false
-        },
-        "softDeleteRetentionInDays": {
-            "value": 1
-        },
-        "privateEndpoints": {
-            "value": [
-                {
-                    "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints",
-                    "service": "configurationStores",
-                    "privateDnsZoneGroup": {
-                        "privateDNSResourceIds": [
-                            "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.azconfig.io"
-                        ]
-                    }
-                }
-            ]
-        }
-    }
-}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep
new file mode 100644
index 0000000000..f122466913
--- /dev/null
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep
@@ -0,0 +1,47 @@
+@description('Required. The name of the Virtual Network to create.')
+param virtualNetworkName string
+
+@description('Optional. The location to deploy resources to.')
+param location string = resourceGroup().location
+
+resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = {
+  name: virtualNetworkName
+  location: location
+  properties: {
+    addressSpace: {
+      addressPrefixes: [
+        '10.0.0.0/24'
+      ]
+    }
+    subnets: [
+      {
+        name: 'defaultSubnet'
+        properties: {
+          addressPrefix: '10.0.0.0/24'
+        }
+      }
+    ]
+  }
+}
+
+resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
+  name: 'privatelink.azconfig.io'
+  location: 'global'
+
+  resource virtualNetworkLinks 'virtualNetworkLinks@2020-06-01' = {
+    name: '${virtualNetworkName}-vnetlink'
+    location: 'global'
+    properties: {
+      virtualNetwork: {
+        id: virtualNetwork.id
+      }
+      registrationEnabled: false
+    }
+  }
+}
+
+@description('The resource ID of the created Virtual Network Subnet.')
+output subnetResourceId string = virtualNetwork.properties.subnets[0].id
+
+@description('The resource ID of the created Virtual Network Subnet.')
+output privateDNSResourceId string = privateDNSZone.id
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
new file mode 100644
index 0000000000..6c60d7eea8
--- /dev/null
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
@@ -0,0 +1,60 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. The name of the resource group to deploy for a testing purposes')
+@maxLength(80)
+param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
+
+@description('Optional. The location to deploy resources to')
+param location string = deployment().location
+
+@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints')
+param serviceShort string = 'accpe'
+
+// =========== //
+// Deployments //
+// =========== //
+
+// General resources
+// =================
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
+  name: resourceGroupName
+  location: location
+}
+
+module resourceGroupResources 'dependencies.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name, location)}-paramNested'
+  params: {
+    virtualNetworkName: 'dep-<<namePrefix>>-vnet-${serviceShort}'
+  }
+}
+
+// ============== //
+// Test Execution //
+// ============== //
+
+module testDeployment '../../deploy.bicep' = {
+  scope: resourceGroup
+  name: '${uniqueString(deployment().name)}-test-${serviceShort}'
+  params: {
+    name: '<<namePrefix>>${serviceShort}001'
+    createMode: 'Default'
+    disableLocalAuth: false
+    enablePurgeProtection: false
+    privateEndpoints: [
+      {
+        privateDnsZoneGroup: {
+          privateDNSResourceIds: [
+            resourceGroupResources.outputs.privateDNSResourceId
+          ]
+        }
+        service: 'configurationStores'
+        subnetResourceId: resourceGroupResources.outputs.subnetResourceId
+      }
+    ]
+    softDeleteRetentionInDays: 1
+  }
+}
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
index 3a55cccdf9..b5a573edf2 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/readme.md
+++ b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
@@ -295,62 +295,25 @@ The following module usage examples are retrieved from the content of the files
    >**Note**: The name of each example is based on the name of the file from which it is taken.
    >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
 
-<h3>Example 1: Min</h3>
+<h3>Example 1: Default</h3>
 
 <details>
 
 <summary>via Bicep module</summary>
 
 ```bicep
-module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-configurationStores'
-  params: {
-    name: '<<namePrefix>>-az-appc-min-001'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "name": {
-      "value": "<<namePrefix>>-az-appc-min-001"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-<h3>Example 2: Parameters</h3>
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-configurationStores'
+module Configurationstores './Microsoft.Appconfiguration/Configurationstores/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-accdef'
   params: {
     // Required parameters
-    name: '<<namePrefix>>-az-appc-x-001'
+    name: '<<namePrefix>>accdef001'
     // Non-required parameters
     createMode: 'Default'
-    diagnosticEventHubAuthorizationRuleId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey'
-    diagnosticEventHubName: 'adp-<<namePrefix>>-az-evh-x-001'
+    diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
+    diagnosticEventHubName: '<diagnosticEventHubName>'
     diagnosticLogsRetentionInDays: 7
-    diagnosticStorageAccountId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001'
-    diagnosticWorkspaceId: '/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001'
+    diagnosticStorageAccountId: '<diagnosticStorageAccountId>'
+    diagnosticWorkspaceId: '<diagnosticWorkspaceId>'
     disableLocalAuth: false
     enablePurgeProtection: false
     keyValues: [
@@ -360,7 +323,7 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
         roleAssignments: [
           {
             principalIds: [
-              '<<deploymentSpId>>'
+              '<managedIdentityPrincipalId>'
             ]
             roleDefinitionIdOrName: 'Reader'
           }
@@ -372,7 +335,7 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
     roleAssignments: [
       {
         principalIds: [
-          '<<deploymentSpId>>'
+          '<managedIdentityPrincipalId>'
         ]
         roleDefinitionIdOrName: 'Reader'
       }
@@ -397,26 +360,26 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
   "parameters": {
     // Required parameters
     "name": {
-      "value": "<<namePrefix>>-az-appc-x-001"
+      "value": "<<namePrefix>>accdef001"
     },
     // Non-required parameters
     "createMode": {
       "value": "Default"
     },
     "diagnosticEventHubAuthorizationRuleId": {
-      "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<<namePrefix>>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey"
+      "value": "<diagnosticEventHubAuthorizationRuleId>"
     },
     "diagnosticEventHubName": {
-      "value": "adp-<<namePrefix>>-az-evh-x-001"
+      "value": "<diagnosticEventHubName>"
     },
     "diagnosticLogsRetentionInDays": {
       "value": 7
     },
     "diagnosticStorageAccountId": {
-      "value": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001"
+      "value": "<diagnosticStorageAccountId>"
     },
     "diagnosticWorkspaceId": {
-      "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
+      "value": "<diagnosticWorkspaceId>"
     },
     "disableLocalAuth": {
       "value": false
@@ -432,7 +395,7 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
           "roleAssignments": [
             {
               "principalIds": [
-                "<<deploymentSpId>>"
+                "<managedIdentityPrincipalId>"
               ],
               "roleDefinitionIdOrName": "Reader"
             }
@@ -448,7 +411,7 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
       "value": [
         {
           "principalIds": [
-            "<<deploymentSpId>>"
+            "<managedIdentityPrincipalId>"
           ],
           "roleDefinitionIdOrName": "Reader"
         }
@@ -467,6 +430,43 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
 </details>
 <p>
 
+<h3>Example 2: Min</h3>
+
+<details>
+
+<summary>via Bicep module</summary>
+
+```bicep
+module Configurationstores './Microsoft.Appconfiguration/Configurationstores/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-accmin'
+  params: {
+    name: '<<namePrefix>>accmin001'
+  }
+}
+```
+
+</details>
+<p>
+
+<details>
+
+<summary>via JSON Parameter file</summary>
+
+```json
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "name": {
+      "value": "<<namePrefix>>accmin001"
+    }
+  }
+}
+```
+
+</details>
+<p>
+
 <h3>Example 3: Pe</h3>
 
 <details>
@@ -474,11 +474,11 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
 <summary>via Bicep module</summary>
 
 ```bicep
-module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-configurationStores'
+module Configurationstores './Microsoft.Appconfiguration/Configurationstores/deploy.bicep' = {
+  name: '${uniqueString(deployment().name)}-test-accpe'
   params: {
     // Required parameters
-    name: '<<namePrefix>>-az-appc-pe-001'
+    name: '<<namePrefix>>accpe001'
     // Non-required parameters
     createMode: 'Default'
     disableLocalAuth: false
@@ -487,11 +487,11 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
       {
         privateDnsZoneGroup: {
           privateDNSResourceIds: [
-            '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.azconfig.io'
+            '<privateDNSResourceId>'
           ]
         }
         service: 'configurationStores'
-        subnetResourceId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints'
+        subnetResourceId: '<subnetResourceId>'
       }
     ]
     softDeleteRetentionInDays: 1
@@ -513,7 +513,7 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
   "parameters": {
     // Required parameters
     "name": {
-      "value": "<<namePrefix>>-az-appc-pe-001"
+      "value": "<<namePrefix>>accpe001"
     },
     // Non-required parameters
     "createMode": {
@@ -530,11 +530,11 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
         {
           "privateDnsZoneGroup": {
             "privateDNSResourceIds": [
-              "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.azconfig.io"
+              "<privateDNSResourceId>"
             ]
           },
           "service": "configurationStores",
-          "subnetResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<<namePrefix>>-az-vnet-x-001/subnets/<<namePrefix>>-az-subnet-x-005-privateEndpoints"
+          "subnetResourceId": "<subnetResourceId>"
         }
       ]
     },

From e5ae7fb0c4c1e1c39a618690337755769de6ec57 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 30 Aug 2022 19:56:52 +0200
Subject: [PATCH 02/12] fixed pipeline

---
 .github/workflows/ms.appconfiguration.configurationstores.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ms.appconfiguration.configurationstores.yml b/.github/workflows/ms.appconfiguration.configurationstores.yml
index 8df94e9822..77cb5f6b47 100644
--- a/.github/workflows/ms.appconfiguration.configurationstores.yml
+++ b/.github/workflows/ms.appconfiguration.configurationstores.yml
@@ -106,8 +106,7 @@ jobs:
       - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]'
         uses: ./.github/actions/templates/validateModuleDeployment
         with:
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
+          templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}'
           location: '${{ env.location }}'
           resourceGroupName: '${{ env.resourceGroupName }}'
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'

From ab5423904a93e1146802662b40bab9da0faef4b3 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 30 Aug 2022 20:47:23 +0200
Subject: [PATCH 03/12] Updated readme

---
 utilities/tools/Set-ModuleReadMe.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index a1074fed21..6b922d65e8 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -883,9 +883,10 @@ function Set-DeploymentExamplesSection {
         ''
     )
 
+    $TextInfo = (Get-Culture -Name 'en-US').TextInfo
     $moduleRoot = Split-Path $TemplateFilePath -Parent
-    $resourceTypeIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/')
-    $resourceType = $resourceTypeIdentifier.Split('/')[1]
+    $resourceTypeIdentifier = $TextInfo.ToTitleCase($moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/'))
+    $resourceType = $TextInfo.ToTitleCase($resourceTypeIdentifier.Split('/')[1])
     $testFilePaths = Get-ModuleTestFileList -ModulePath $moduleRoot | ForEach-Object { Join-Path $moduleRoot $_ }
 
     $RequiredParametersList = $TemplateFileContent.parameters.Keys | Where-Object { $TemplateFileContent.parameters[$_].Keys -notcontains 'defaultValue' } | Sort-Object
@@ -906,7 +907,6 @@ function Set-DeploymentExamplesSection {
         } else {
             $exampleTitle = ((Split-Path $testFilePath -LeafBase) -replace '\.', ' ') -replace ' parameters', ''
         }
-        $TextInfo = (Get-Culture -Name 'en-US').TextInfo
         $exampleTitle = $TextInfo.ToTitleCase($exampleTitle)
         $SectionContent += @(
             '<h3>Example {0}: {1}</h3>' -f $pathIndex, $exampleTitle

From 61065a430b018095577400ca7bb3e48e631c8432 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 1 Sep 2022 10:13:25 +0200
Subject: [PATCH 04/12] Update to latest

---
 .../configurationStores/readme.md             |  6 ++---
 utilities/tools/Set-ModuleReadMe.ps1          | 23 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
index b5a573edf2..9e0aef6720 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/readme.md
+++ b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
@@ -302,7 +302,7 @@ The following module usage examples are retrieved from the content of the files
 <summary>via Bicep module</summary>
 
 ```bicep
-module Configurationstores './Microsoft.Appconfiguration/Configurationstores/deploy.bicep' = {
+module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-test-accdef'
   params: {
     // Required parameters
@@ -437,7 +437,7 @@ module Configurationstores './Microsoft.Appconfiguration/Configurationstores/dep
 <summary>via Bicep module</summary>
 
 ```bicep
-module Configurationstores './Microsoft.Appconfiguration/Configurationstores/deploy.bicep' = {
+module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-test-accmin'
   params: {
     name: '<<namePrefix>>accmin001'
@@ -474,7 +474,7 @@ module Configurationstores './Microsoft.Appconfiguration/Configurationstores/dep
 <summary>via Bicep module</summary>
 
 ```bicep
-module Configurationstores './Microsoft.Appconfiguration/Configurationstores/deploy.bicep' = {
+module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-test-accpe'
   params: {
     // Required parameters
diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1
index 6b922d65e8..25d22f3fff 100644
--- a/utilities/tools/Set-ModuleReadMe.ps1
+++ b/utilities/tools/Set-ModuleReadMe.ps1
@@ -51,7 +51,7 @@ function Set-ResourceTypesSection {
 
     $RelevantResourceTypeObjects = Get-NestedResourceList $TemplateFileContent | Where-Object {
         $_.type -notin $ResourceTypesToExclude -and $_
-    } | Select-Object 'Type', 'ApiVersion' -Unique | Sort-Object Type -Culture en-US
+    } | Select-Object 'Type', 'ApiVersion' -Unique | Sort-Object Type -Culture 'en-US'
 
     foreach ($resourceTypeObject in $RelevantResourceTypeObjects) {
         $ProviderNamespace, $ResourceType = $resourceTypeObject.Type -split '/', 2
@@ -280,7 +280,7 @@ function Set-OutputsSection {
             '| Output Name | Type | Description |',
             '| :-- | :-- | :-- |'
         )
-        foreach ($outputName in ($templateFileContent.outputs.Keys | Sort-Object -Culture en-US)) {
+        foreach ($outputName in ($templateFileContent.outputs.Keys | Sort-Object -Culture 'en-US')) {
             $output = $TemplateFileContent.outputs[$outputName]
             $description = $output.metadata.description.Replace("`r`n", '<p>').Replace("`n", '<p>')
             $SectionContent += ("| ``{0}`` | {1} | {2} |" -f $outputName, $output.type, $description)
@@ -290,7 +290,7 @@ function Set-OutputsSection {
             '| Output Name | Type |',
             '| :-- | :-- |'
         )
-        foreach ($outputName in ($templateFileContent.outputs.Keys | Sort-Object -Culture en-US)) {
+        foreach ($outputName in ($templateFileContent.outputs.Keys | Sort-Object -Culture 'en-US')) {
             $output = $TemplateFileContent.outputs[$outputName]
             $SectionContent += ("| ``{0}`` | {1} |" -f $outputName, $output.type)
         }
@@ -883,10 +883,16 @@ function Set-DeploymentExamplesSection {
         ''
     )
 
-    $TextInfo = (Get-Culture -Name 'en-US').TextInfo
     $moduleRoot = Split-Path $TemplateFilePath -Parent
-    $resourceTypeIdentifier = $TextInfo.ToTitleCase($moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/'))
-    $resourceType = $TextInfo.ToTitleCase($resourceTypeIdentifier.Split('/')[1])
+    $fullIdentifier = $moduleRoot.Replace('\', '/').Split('/modules/')[1].TrimStart('/')
+
+    # Get resource type and make first letter upper case. Requires manual handling as ToTitleCase lowercases everything but the first letter
+    $providerNamespace = ($fullIdentifier.Split('/')[0] -split '\.' | ForEach-Object { $_.Substring(0, 1).ToUpper() + $_.Substring(1) }) -join '.'
+    $resourceType = $fullIdentifier.Split('/')[1]
+    $resourceTypeUpper = $resourceType.Substring(0, 1).ToUpper() + $resourceType.Substring(1)
+
+    $resourceTypeIdentifier = "$providerNamespace/$resourceType"
+
     $testFilePaths = Get-ModuleTestFileList -ModulePath $moduleRoot | ForEach-Object { Join-Path $moduleRoot $_ }
 
     $RequiredParametersList = $TemplateFileContent.parameters.Keys | Where-Object { $TemplateFileContent.parameters[$_].Keys -notcontains 'defaultValue' } | Sort-Object
@@ -907,7 +913,8 @@ function Set-DeploymentExamplesSection {
         } else {
             $exampleTitle = ((Split-Path $testFilePath -LeafBase) -replace '\.', ' ') -replace ' parameters', ''
         }
-        $exampleTitle = $TextInfo.ToTitleCase($exampleTitle)
+        $textInfo = (Get-Culture -Name 'en-US').TextInfo
+        $exampleTitle = $textInfo.ToTitleCase($exampleTitle)
         $SectionContent += @(
             '<h3>Example {0}: {1}</h3>' -f $pathIndex, $exampleTitle
         )
@@ -1138,7 +1145,7 @@ function Set-DeploymentExamplesSection {
                     '```bicep',
                     $extendedKeyVaultReferences,
                     "module $resourceType './$resourceTypeIdentifier/deploy.bicep' = {"
-                    "  name: '`${uniqueString(deployment().name)}-$resourceType'"
+                    "  name: '`${uniqueString(deployment().name)}-$resourceTypeUpper'"
                     '  params: {'
                     $bicepExample.TrimEnd(),
                     '  }'

From 14ba25f1fdf7636cedf6696f59f544bd29dc6427 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 1 Sep 2022 11:29:53 +0200
Subject: [PATCH 05/12] Update to latest

---
 .../configurationStores/readme.md             | 41 +------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
index 4f127f34ed..9e0aef6720 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/readme.md
+++ b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
@@ -303,44 +303,7 @@ The following module usage examples are retrieved from the content of the files
 
 ```bicep
 module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-ConfigurationStores'
-  params: {
-    name: '<<namePrefix>>-az-appc-min-001'
-  }
-}
-```
-
-</details>
-<p>
-
-<details>
-
-<summary>via JSON Parameter file</summary>
-
-```json
-{
-  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "name": {
-      "value": "<<namePrefix>>-az-appc-min-001"
-    }
-  }
-}
-```
-
-</details>
-<p>
-
-<h3>Example 2: Parameters</h3>
-
-<details>
-
-<summary>via Bicep module</summary>
-
-```bicep
-module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-ConfigurationStores'
+  name: '${uniqueString(deployment().name)}-test-accdef'
   params: {
     // Required parameters
     name: '<<namePrefix>>accdef001'
@@ -512,7 +475,7 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
 
 ```bicep
 module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-ConfigurationStores'
+  name: '${uniqueString(deployment().name)}-test-accpe'
   params: {
     // Required parameters
     name: '<<namePrefix>>accpe001'

From 0b7026d8645446b860fa3acd5c243ef13069bee5 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 3 Sep 2022 12:37:38 +0200
Subject: [PATCH 06/12] Update to latest

---
 .../configurationStores/.test/min/dependencies.bicep              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 modules/Microsoft.AppConfiguration/configurationStores/.test/min/dependencies.bicep

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/dependencies.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/dependencies.bicep
deleted file mode 100644
index e69de29bb2..0000000000

From 879d2a74ba365e01b2e24142846ddc54b56f9471 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 8 Sep 2022 18:46:30 +0200
Subject: [PATCH 07/12] Updated folder default to common.

---
 .../.test/{default => common}/dependencies.bicep                | 0
 .../.test/{default => common}/deploy.test.bicep                 | 0
 .../Microsoft.AppConfiguration/configurationStores/readme.md    | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename modules/Microsoft.AppConfiguration/configurationStores/.test/{default => common}/dependencies.bicep (100%)
 rename modules/Microsoft.AppConfiguration/configurationStores/.test/{default => common}/deploy.test.bicep (100%)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/default/dependencies.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.test/default/dependencies.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/default/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
similarity index 100%
rename from modules/Microsoft.AppConfiguration/configurationStores/.test/default/deploy.test.bicep
rename to modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
index 9e0aef6720..7012972fd9 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/readme.md
+++ b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
@@ -295,7 +295,7 @@ The following module usage examples are retrieved from the content of the files
    >**Note**: The name of each example is based on the name of the file from which it is taken.
    >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.
 
-<h3>Example 1: Default</h3>
+<h3>Example 1: Common</h3>
 
 <details>
 

From f57b1be3140b0a1235a20d997375ad9d93c0a504 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 9 Sep 2022 12:49:03 +0200
Subject: [PATCH 08/12] Update to latest

---
 .../configurationStores/.test/common/deploy.test.bicep        | 4 ++--
 .../configurationStores/.test/min/deploy.test.bicep           | 2 +-
 .../configurationStores/.test/pe/deploy.test.bicep            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
index f8b4b8f364..7226229074 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
@@ -10,8 +10,8 @@ param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serv
 @description('Optional. The location to deploy resources to')
 param location string = deployment().location
 
-@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints')
-param serviceShort string = 'accdef'
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints')
+param serviceShort string = 'acccom'
 
 // =========== //
 // Deployments //
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
index 99b324e4a2..0452a30778 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
@@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serv
 @description('Optional. The location to deploy resources to')
 param location string = deployment().location
 
-@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints')
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints')
 param serviceShort string = 'accmin'
 
 // =========== //
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
index 6c60d7eea8..526f95d136 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
@@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serv
 @description('Optional. The location to deploy resources to')
 param location string = deployment().location
 
-@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints')
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints')
 param serviceShort string = 'accpe'
 
 // =========== //

From 2107d1f3884ad0aa9f4fcf80b3f5d5419331e5c0 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 9 Sep 2022 13:01:55 +0200
Subject: [PATCH 09/12] Update to latest

---
 .../configurationStores/.test/common/deploy.test.bicep      | 6 +++---
 .../configurationStores/.test/min/deploy.test.bicep         | 6 +++---
 .../configurationStores/.test/pe/deploy.test.bicep          | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
index 7226229074..320f33db8b 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
@@ -3,14 +3,14 @@ targetScope = 'subscription'
 // ========== //
 // Parameters //
 // ========== //
-@description('Optional. The name of the resource group to deploy for a testing purposes')
+@description('Optional. The name of the resource group to deploy for a testing purposes.')
 @maxLength(80)
 param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
 
-@description('Optional. The location to deploy resources to')
+@description('Optional. The location to deploy resources to.')
 param location string = deployment().location
 
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints')
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
 param serviceShort string = 'acccom'
 
 // =========== //
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
index 0452a30778..ef966cdf8e 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
@@ -3,14 +3,14 @@ targetScope = 'subscription'
 // ========== //
 // Parameters //
 // ========== //
-@description('Optional. The name of the resource group to deploy for a testing purposes')
+@description('Optional. The name of the resource group to deploy for a testing purposes.')
 @maxLength(80)
 param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
 
-@description('Optional. The location to deploy resources to')
+@description('Optional. The location to deploy resources to.')
 param location string = deployment().location
 
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints')
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
 param serviceShort string = 'accmin'
 
 // =========== //
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
index 526f95d136..e461a65747 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
@@ -3,14 +3,14 @@ targetScope = 'subscription'
 // ========== //
 // Parameters //
 // ========== //
-@description('Optional. The name of the resource group to deploy for a testing purposes')
+@description('Optional. The name of the resource group to deploy for a testing purposes.')
 @maxLength(80)
 param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
 
-@description('Optional. The location to deploy resources to')
+@description('Optional. The location to deploy resources to.')
 param location string = deployment().location
 
-@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints')
+@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
 param serviceShort string = 'accpe'
 
 // =========== //

From 4dd748f5d4b6c858dfd49445623c4778ad2dfcec Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 9 Sep 2022 13:23:52 +0200
Subject: [PATCH 10/12] Update to latest

---
 .../configurationStores/readme.md                           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
index f832c22271..55c08ab976 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/readme.md
+++ b/modules/Microsoft.AppConfiguration/configurationStores/readme.md
@@ -304,10 +304,10 @@ The following module usage examples are retrieved from the content of the files
 
 ```bicep
 module configurationStores './Microsoft.AppConfiguration/configurationStores/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-test-accdef'
+  name: '${uniqueString(deployment().name)}-test-acccom'
   params: {
     // Required parameters
-    name: '<<namePrefix>>accdef001'
+    name: '<<namePrefix>>acccom001'
     // Non-required parameters
     createMode: 'Default'
     diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
@@ -361,7 +361,7 @@ module configurationStores './Microsoft.AppConfiguration/configurationStores/dep
   "parameters": {
     // Required parameters
     "name": {
-      "value": "<<namePrefix>>accdef001"
+      "value": "<<namePrefix>>acccom001"
     },
     // Non-required parameters
     "createMode": {

From c839a6da161be7f13e2d2c859bad17fbb91ce843 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sun, 18 Sep 2022 22:58:40 +0200
Subject: [PATCH 11/12] Update to latest

---
 .../configurationStores/.test/common/deploy.test.bicep          | 2 +-
 .../configurationStores/.test/min/deploy.test.bicep             | 2 +-
 .../configurationStores/.test/pe/deploy.test.bicep              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
index 320f33db8b..7e2e4d790b 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/common/deploy.test.bicep
@@ -3,7 +3,7 @@ targetScope = 'subscription'
 // ========== //
 // Parameters //
 // ========== //
-@description('Optional. The name of the resource group to deploy for a testing purposes.')
+@description('Optional. The name of the resource group to deploy for testing purposes.')
 @maxLength(80)
 param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
 
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
index ef966cdf8e..d02c7314b0 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/min/deploy.test.bicep
@@ -3,7 +3,7 @@ targetScope = 'subscription'
 // ========== //
 // Parameters //
 // ========== //
-@description('Optional. The name of the resource group to deploy for a testing purposes.')
+@description('Optional. The name of the resource group to deploy for testing purposes.')
 @maxLength(80)
 param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
 
diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
index e461a65747..a625478d46 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/deploy.test.bicep
@@ -3,7 +3,7 @@ targetScope = 'subscription'
 // ========== //
 // Parameters //
 // ========== //
-@description('Optional. The name of the resource group to deploy for a testing purposes.')
+@description('Optional. The name of the resource group to deploy for testing purposes.')
 @maxLength(80)
 param resourceGroupName string = 'ms.appconfiguration.configurationstores-${serviceShort}-rg'
 

From 2a435b630e9619921daee3ae4eb0fc4e65412dfc Mon Sep 17 00:00:00 2001
From: Alexander Sehr <ASehr@hotmail.de>
Date: Thu, 13 Oct 2022 17:05:52 +0200
Subject: [PATCH 12/12] Update
 modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 .../configurationStores/.test/pe/dependencies.bicep             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep
index f122466913..14afb1f1b4 100644
--- a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep
+++ b/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep
@@ -43,5 +43,5 @@ resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
 @description('The resource ID of the created Virtual Network Subnet.')
 output subnetResourceId string = virtualNetwork.properties.subnets[0].id
 
-@description('The resource ID of the created Virtual Network Subnet.')
+@description('The resource ID of the created Private DNS Zone.')
 output privateDNSResourceId string = privateDNSZone.id