From 58ffdef2526dda0e24bb181b719b066c553510c9 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 3 Sep 2022 16:55:50 +0200
Subject: [PATCH 01/10] Refactored Logic Workflows to new dependency approach

---
 .github/workflows/ms.logic.workflows.yml      |   3 +-
 .../.test/default/dependencies.bicep          |  14 +++
 .../workflows/.test/default/deploy.test.bicep | 106 ++++++++++++++++++
 .../workflows/.test/parameters.json           |  78 -------------
 modules/Microsoft.Logic/workflows/readme.md   |  28 ++---
 5 files changed, 135 insertions(+), 94 deletions(-)
 create mode 100644 modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep
 create mode 100644 modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
 delete mode 100644 modules/Microsoft.Logic/workflows/.test/parameters.json

diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml
index 97c7eac1cd..f6dbecc6a1 100644
--- a/.github/workflows/ms.logic.workflows.yml
+++ b/.github/workflows/ms.logic.workflows.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 }}'
diff --git a/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep b/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep
new file mode 100644
index 0000000000..7371d4437b
--- /dev/null
+++ b/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep
@@ -0,0 +1,14 @@
+@description('Optional. The location to deploy to.')
+param location string = resourceGroup().location
+
+@description('Required. The name of the Managed Identity to create.')
+param managedIdentityName string
+
+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.Logic/workflows/.test/default/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
new file mode 100644
index 0000000000..db9ec8b4cd
--- /dev/null
+++ b/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
@@ -0,0 +1,106 @@
+targetScope = 'subscription'
+
+// ========== //
+// Parameters //
+// ========== //
+@description('Optional. The name of the resource group to deploy for a testing purposes')
+@maxLength(90)
+param resourceGroupName string = 'ms.logic.workflows-${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 = 'lwdef'
+
+// =========== //
+// 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'
+    diagnosticLogsRetentionInDays: 7
+    diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId
+    diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId
+    diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId
+    diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName
+    lock: 'CanNotDelete'
+    roleAssignments: [
+      {
+        principalIds: [
+          resourceGroupResources.outputs.managedIdentityPrincipalId
+        ]
+        roleDefinitionIdOrName: 'Reader'
+      }
+    ]
+    systemAssignedIdentity: true
+    tags: {}
+    workflowActions: {
+      HTTP: {
+        inputs: {
+          body: {
+            BeginPeakTime: '[BeginPeakTime]'
+            EndPeakTime: '[EndPeakTime]'
+            HostPoolName: '[HostPoolName]'
+            LAWorkspaceName: '[LAWorkspaceName]'
+            LimitSecondsToForceLogOffUser: '[LimitSecondsToForceLogOffUser]'
+            LogOffMessageBody: '[LogOffMessageBody]'
+            LogOffMessageTitle: '[LogOffMessageTitle]'
+            MinimumNumberOfRDSH: 1
+            ResourceGroupName: '[ResourceGroupName]'
+            SessionThresholdPerCPU: 1
+            UtcOffset: '[UtcOffset]'
+          }
+          method: 'POST'
+          uri: 'https://testStringForValidation.com'
+        }
+        type: 'Http'
+      }
+    }
+    workflowTriggers: {
+      Recurrence: {
+        recurrence: {
+          frequency: 'Minute'
+          interval: 15
+        }
+        type: 'Recurrence'
+      }
+    }
+  }
+}
diff --git a/modules/Microsoft.Logic/workflows/.test/parameters.json b/modules/Microsoft.Logic/workflows/.test/parameters.json
deleted file mode 100644
index 6436e5c1b7..0000000000
--- a/modules/Microsoft.Logic/workflows/.test/parameters.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-        "name": {
-            "value": "<<namePrefix>>-az-lga-x-001"
-        },
-        "lock": {
-            "value": "CanNotDelete"
-        },
-        "tags": {
-            "value": {}
-        },
-        "workflowActions": {
-            "value": {
-                "HTTP": {
-                    "type": "Http",
-                    "inputs": {
-                        "method": "POST",
-                        "uri": "https://testStringForValidation.com",
-                        "body": {
-                            "HostPoolName": "[HostPoolName]",
-                            "LAWorkspaceName": "[LAWorkspaceName]",
-                            "LimitSecondsToForceLogOffUser": "[LimitSecondsToForceLogOffUser]",
-                            "EndPeakTime": "[EndPeakTime]",
-                            "BeginPeakTime": "[BeginPeakTime]",
-                            "UtcOffset": "[UtcOffset]",
-                            "LogOffMessageBody": "[LogOffMessageBody]",
-                            "LogOffMessageTitle": "[LogOffMessageTitle]",
-                            "MinimumNumberOfRDSH": 1,
-                            "SessionThresholdPerCPU": 1,
-                            "ResourceGroupName": "[ResourceGroupName]"
-                        }
-                    }
-                }
-            }
-        },
-        "workflowTriggers": {
-            "value": {
-                "Recurrence": {
-                    "recurrence": {
-                        "frequency": "Minute",
-                        "interval": 15
-                    },
-                    "type": "Recurrence"
-                }
-            }
-        },
-        "roleAssignments": {
-            "value": [
-                {
-                    "roleDefinitionIdOrName": "Reader",
-                    "principalIds": [
-                        "<<deploymentSpId>>"
-                    ]
-                }
-            ]
-        },
-        "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
-        }
-    }
-}
diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
index 5eb4a80931..fa1abf40ce 100644
--- a/modules/Microsoft.Logic/workflows/readme.md
+++ b/modules/Microsoft.Logic/workflows/readme.md
@@ -321,7 +321,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: Parameters</h3>
+<h3>Example 1: Default</h3>
 
 <details>
 
@@ -329,21 +329,21 @@ The following module usage examples are retrieved from the content of the files
 
 ```bicep
 module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-Workflows'
+  name: '${uniqueString(deployment().name)}-test-lwdef'
   params: {
     // Required parameters
-    name: '<<namePrefix>>-az-lga-x-001'
+    name: '<<namePrefix>>lwdef001'
     // Non-required parameters
-    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>'
     lock: 'CanNotDelete'
     roleAssignments: [
       {
         principalIds: [
-          '<<deploymentSpId>>'
+          '<managedIdentityPrincipalId>'
         ]
         roleDefinitionIdOrName: 'Reader'
       }
@@ -399,23 +399,23 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "<<namePrefix>>-az-lga-x-001"
+      "value": "<<namePrefix>>lwdef001"
     },
     // Non-required parameters
     "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>"
     },
     "lock": {
       "value": "CanNotDelete"
@@ -424,7 +424,7 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
       "value": [
         {
           "principalIds": [
-            "<<deploymentSpId>>"
+            "<managedIdentityPrincipalId>"
           ],
           "roleDefinitionIdOrName": "Reader"
         }

From cc02fd22f24fe560ae1b8c5250385e67144f63fd Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Sat, 3 Sep 2022 17:09:50 +0200
Subject: [PATCH 02/10] Update to latest

---
 .../workflows/.test/default/deploy.test.bicep | 18 +++++-----
 modules/Microsoft.Logic/workflows/readme.md   | 36 +++++++++----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
index db9ec8b4cd..aed41e1519 100644
--- a/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
+++ b/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
@@ -75,17 +75,17 @@ module testDeployment '../../deploy.bicep' = {
       HTTP: {
         inputs: {
           body: {
-            BeginPeakTime: '[BeginPeakTime]'
-            EndPeakTime: '[EndPeakTime]'
-            HostPoolName: '[HostPoolName]'
-            LAWorkspaceName: '[LAWorkspaceName]'
-            LimitSecondsToForceLogOffUser: '[LimitSecondsToForceLogOffUser]'
-            LogOffMessageBody: '[LogOffMessageBody]'
-            LogOffMessageTitle: '[LogOffMessageTitle]'
+            BeginPeakTime: '<BeginPeakTime>'
+            EndPeakTime: '<EndPeakTime>'
+            HostPoolName: '<HostPoolName>'
+            LAWorkspaceName: '<LAWorkspaceName>'
+            LimitSecondsToForceLogOffUser: '<LimitSecondsToForceLogOffUser>'
+            LogOffMessageBody: '<LogOffMessageBody>'
+            LogOffMessageTitle: '<LogOffMessageTitle>'
             MinimumNumberOfRDSH: 1
-            ResourceGroupName: '[ResourceGroupName]'
+            ResourceGroupName: '<ResourceGroupName>'
             SessionThresholdPerCPU: 1
-            UtcOffset: '[UtcOffset]'
+            UtcOffset: '<UtcOffset>'
           }
           method: 'POST'
           uri: 'https://testStringForValidation.com'
diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
index fa1abf40ce..eb627741b2 100644
--- a/modules/Microsoft.Logic/workflows/readme.md
+++ b/modules/Microsoft.Logic/workflows/readme.md
@@ -354,17 +354,17 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
       HTTP: {
         inputs: {
           body: {
-            BeginPeakTime: '[BeginPeakTime]'
-            EndPeakTime: '[EndPeakTime]'
-            HostPoolName: '[HostPoolName]'
-            LAWorkspaceName: '[LAWorkspaceName]'
-            LimitSecondsToForceLogOffUser: '[LimitSecondsToForceLogOffUser]'
-            LogOffMessageBody: '[LogOffMessageBody]'
-            LogOffMessageTitle: '[LogOffMessageTitle]'
+            BeginPeakTime: '<BeginPeakTime>'
+            EndPeakTime: '<EndPeakTime>'
+            HostPoolName: '<HostPoolName>'
+            LAWorkspaceName: '<LAWorkspaceName>'
+            LimitSecondsToForceLogOffUser: '<LimitSecondsToForceLogOffUser>'
+            LogOffMessageBody: '<LogOffMessageBody>'
+            LogOffMessageTitle: '<LogOffMessageTitle>'
             MinimumNumberOfRDSH: 1
-            ResourceGroupName: '[ResourceGroupName]'
+            ResourceGroupName: '<ResourceGroupName>'
             SessionThresholdPerCPU: 1
-            UtcOffset: '[UtcOffset]'
+            UtcOffset: '<UtcOffset>'
           }
           method: 'POST'
           uri: 'https://testStringForValidation.com'
@@ -441,17 +441,17 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
         "HTTP": {
           "inputs": {
             "body": {
-              "BeginPeakTime": "[BeginPeakTime]",
-              "EndPeakTime": "[EndPeakTime]",
-              "HostPoolName": "[HostPoolName]",
-              "LAWorkspaceName": "[LAWorkspaceName]",
-              "LimitSecondsToForceLogOffUser": "[LimitSecondsToForceLogOffUser]",
-              "LogOffMessageBody": "[LogOffMessageBody]",
-              "LogOffMessageTitle": "[LogOffMessageTitle]",
+              "BeginPeakTime": "<BeginPeakTime>",
+              "EndPeakTime": "<EndPeakTime>",
+              "HostPoolName": "<HostPoolName>",
+              "LAWorkspaceName": "<LAWorkspaceName>",
+              "LimitSecondsToForceLogOffUser": "<LimitSecondsToForceLogOffUser>",
+              "LogOffMessageBody": "<LogOffMessageBody>",
+              "LogOffMessageTitle": "<LogOffMessageTitle>",
               "MinimumNumberOfRDSH": 1,
-              "ResourceGroupName": "[ResourceGroupName]",
+              "ResourceGroupName": "<ResourceGroupName>",
               "SessionThresholdPerCPU": 1,
-              "UtcOffset": "[UtcOffset]"
+              "UtcOffset": "<UtcOffset>"
             },
             "method": "POST",
             "uri": "https://testStringForValidation.com"

From 52f67ff2b8b48d53253aa01443ed1cc82456adf1 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 7 Sep 2022 14:12:29 +0200
Subject: [PATCH 03/10] Added user assigned test

---
 .../workflows/.test/default/dependencies.bicep       |  2 ++
 .../workflows/.test/default/deploy.test.bicep        |  5 ++++-
 modules/Microsoft.Logic/workflows/readme.md          | 12 ++++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep b/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep
index 7371d4437b..0f0755a6f4 100644
--- a/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep
+++ b/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep
@@ -12,3 +12,5 @@ resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-
 @description('The principal ID of the created Managed Identity.')
 output managedIdentityPrincipalId string = managedIdentity.properties.principalId
 
+@description('The resource ID of the created Managed Identity.')
+output managedIdentityResourceId string = managedIdentity.id
diff --git a/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
index aed41e1519..a5cecdc816 100644
--- a/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
+++ b/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
@@ -69,7 +69,10 @@ module testDeployment '../../deploy.bicep' = {
         roleDefinitionIdOrName: 'Reader'
       }
     ]
-    systemAssignedIdentity: true
+    systemAssignedIdentity: false
+    userAssignedIdentities: {
+      '${resourceGroupResources.outputs.managedIdentityResourceId}': {}
+    }
     tags: {}
     workflowActions: {
       HTTP: {
diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
index eb627741b2..912a3a1d8c 100644
--- a/modules/Microsoft.Logic/workflows/readme.md
+++ b/modules/Microsoft.Logic/workflows/readme.md
@@ -348,8 +348,11 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
         roleDefinitionIdOrName: 'Reader'
       }
     ]
-    systemAssignedIdentity: true
+    systemAssignedIdentity: false
     tags: {}
+    userAssignedIdentities: {
+      '<managedIdentityResourceId>': {}
+    }
     workflowActions: {
       HTTP: {
         inputs: {
@@ -431,11 +434,16 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
       ]
     },
     "systemAssignedIdentity": {
-      "value": true
+      "value": false
     },
     "tags": {
       "value": {}
     },
+    "userAssignedIdentities": {
+      "value": {
+        "<managedIdentityResourceId>": {}
+      }
+    },
     "workflowActions": {
       "value": {
         "HTTP": {

From b1b62e48496317f25a9e3fd647f28cd3b74f2847 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 8 Sep 2022 19:34:25 +0200
Subject: [PATCH 04/10] Updated folder default to common.

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

diff --git a/modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep b/modules/Microsoft.Logic/workflows/.test/common/dependencies.bicep
similarity index 100%
rename from modules/Microsoft.Logic/workflows/.test/default/dependencies.bicep
rename to modules/Microsoft.Logic/workflows/.test/common/dependencies.bicep
diff --git a/modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
similarity index 100%
rename from modules/Microsoft.Logic/workflows/.test/default/deploy.test.bicep
rename to modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
index 912a3a1d8c..520ef161d6 100644
--- a/modules/Microsoft.Logic/workflows/readme.md
+++ b/modules/Microsoft.Logic/workflows/readme.md
@@ -321,7 +321,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 d1bba1c748f3e0527ba6688b1bf440f70c43aa25 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 9 Sep 2022 12:51:03 +0200
Subject: [PATCH 05/10] Update to latest

---
 .../Microsoft.Logic/workflows/.test/common/deploy.test.bicep  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
index a5cecdc816..e453f713da 100644
--- a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
@@ -10,8 +10,8 @@ param resourceGroupName string = 'ms.logic.workflows-${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 = 'lwdef'
+@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 = 'lwcom'
 
 // =========== //
 // Deployments //

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

---
 .../workflows/.test/common/deploy.test.bicep                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
index e453f713da..99ab291fe0 100644
--- a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.Logic/workflows/.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(90)
 param resourceGroupName string = 'ms.logic.workflows-${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 = 'lwcom'
 
 // =========== //

From 42de88cc638fbe9f27c5e51bcebaea789dcd3857 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 9 Sep 2022 14:22:05 +0200
Subject: [PATCH 07/10] Update to latest

---
 modules/Microsoft.Logic/workflows/readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
index 1a1a233b14..5bed75d64f 100644
--- a/modules/Microsoft.Logic/workflows/readme.md
+++ b/modules/Microsoft.Logic/workflows/readme.md
@@ -330,10 +330,10 @@ The following module usage examples are retrieved from the content of the files
 
 ```bicep
 module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
-  name: '${uniqueString(deployment().name)}-test-lwdef'
+  name: '${uniqueString(deployment().name)}-test-lwcom'
   params: {
     // Required parameters
-    name: '<<namePrefix>>lwdef001'
+    name: '<<namePrefix>>lwcom001'
     // Non-required parameters
     diagnosticEventHubAuthorizationRuleId: '<diagnosticEventHubAuthorizationRuleId>'
     diagnosticEventHubName: '<diagnosticEventHubName>'
@@ -403,7 +403,7 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "<<namePrefix>>lwdef001"
+      "value": "<<namePrefix>>lwcom001"
     },
     // Non-required parameters
     "diagnosticEventHubAuthorizationRuleId": {

From 1f95e30475f249cf2418fa8de48d01c9f46aac7a Mon Sep 17 00:00:00 2001
From: Alexander Sehr <ASehr@hotmail.de>
Date: Mon, 19 Sep 2022 08:13:59 +0200
Subject: [PATCH 08/10] Update
 modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep

---
 .../Microsoft.Logic/workflows/.test/common/deploy.test.bicep    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
index 99ab291fe0..f35198a0ab 100644
--- a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.Logic/workflows/.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(90)
 param resourceGroupName string = 'ms.logic.workflows-${serviceShort}-rg'
 

From 490846a9f14dd564bf67ebf8e0f7085a08f53141 Mon Sep 17 00:00:00 2001
From: Alexander Sehr <ASehr@hotmail.de>
Date: Tue, 11 Oct 2022 12:56:04 +0200
Subject: [PATCH 09/10] Update
 modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 .../Microsoft.Logic/workflows/.test/common/deploy.test.bicep | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
index f35198a0ab..8674c8451b 100644
--- a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
@@ -73,7 +73,10 @@ module testDeployment '../../deploy.bicep' = {
     userAssignedIdentities: {
       '${resourceGroupResources.outputs.managedIdentityResourceId}': {}
     }
-    tags: {}
+    tags: {
+      Environment: 'Non-Prod'
+      Role: 'DeploymentValidation'
+    }
     workflowActions: {
       HTTP: {
         inputs: {

From a2c27a970fd245ec1bf8098190bb9982bd8a3ece Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Tue, 11 Oct 2022 12:58:04 +0200
Subject: [PATCH 10/10] Update to latest

---
 .../workflows/.test/common/deploy.test.bicep     |  1 -
 modules/Microsoft.Logic/workflows/readme.md      | 16 ++++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
index 8674c8451b..a028255c33 100644
--- a/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
+++ b/modules/Microsoft.Logic/workflows/.test/common/deploy.test.bicep
@@ -69,7 +69,6 @@ module testDeployment '../../deploy.bicep' = {
         roleDefinitionIdOrName: 'Reader'
       }
     ]
-    systemAssignedIdentity: false
     userAssignedIdentities: {
       '${resourceGroupResources.outputs.managedIdentityResourceId}': {}
     }
diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Microsoft.Logic/workflows/readme.md
index 5bed75d64f..acce2ac0b5 100644
--- a/modules/Microsoft.Logic/workflows/readme.md
+++ b/modules/Microsoft.Logic/workflows/readme.md
@@ -22,11 +22,13 @@ This module deploys a Logic App resource.
 ## Parameters
 
 **Required parameters**
+
 | Parameter Name | Type | Description |
 | :-- | :-- | :-- |
 | `name` | string | The logic app workflow name. |
 
 **Optional parameters**
+
 | Parameter Name | Type | Default Value | Allowed Values | Description |
 | :-- | :-- | :-- | :-- | :-- |
 | `actionsAccessControlConfiguration` | object | `{object}` |  | The access control configuration for workflow actions. |
@@ -349,8 +351,10 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
         roleDefinitionIdOrName: 'Reader'
       }
     ]
-    systemAssignedIdentity: false
-    tags: {}
+    tags: {
+      Environment: 'Non-Prod'
+      Role: 'DeploymentValidation'
+    }
     userAssignedIdentities: {
       '<managedIdentityResourceId>': {}
     }
@@ -434,11 +438,11 @@ module workflows './Microsoft.Logic/workflows/deploy.bicep' = {
         }
       ]
     },
-    "systemAssignedIdentity": {
-      "value": false
-    },
     "tags": {
-      "value": {}
+      "value": {
+        "Environment": "Non-Prod",
+        "Role": "DeploymentValidation"
+      }
     },
     "userAssignedIdentities": {
       "value": {