From e26281ab8c3bb87de252e1660a2f5646b1f72acf Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Mon, 28 Feb 2022 09:26:38 +0100
Subject: [PATCH 01/13] law 2

---
 .../automationAccounts/parameters/law.parameters.json    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json

diff --git a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json b/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json
new file mode 100644
index 0000000000..1081107515
--- /dev/null
+++ b/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json
@@ -0,0 +1,9 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "name": {
+            "value": "adp-<<namePrefix>>-az-aut-law-001"
+        }
+    }
+}

From 196d78268c68084a86c525d0085f073b3cf3987f Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Mon, 28 Feb 2022 09:38:32 +0100
Subject: [PATCH 02/13] law aut

---
 .../workspaces/parameters/aut.parameters.json}                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename utilities/pipelines/dependencies/{Microsoft.Automation/automationAccounts/parameters/law.parameters.json => Microsoft.OperationalInsights/workspaces/parameters/aut.parameters.json} (77%)

diff --git a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/aut.parameters.json
similarity index 77%
rename from utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json
rename to utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/aut.parameters.json
index 1081107515..bf516996f8 100644
--- a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json
+++ b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/aut.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "adp-<<namePrefix>>-az-aut-law-001"
+            "value": "adp-<<namePrefix>>-az-law-aut-001"
         }
     }
 }

From 5a5e83d81faa931a1cef9dff19fcb3cd82c19689 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Mon, 28 Feb 2022 09:45:13 +0100
Subject: [PATCH 03/13] update aut name

---
 .../automationAccounts/.parameters/min.parameters.json        | 2 +-
 .../automationAccounts/.parameters/parameters.json            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
index 36d11228da..c76e891806 100644
--- a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
+++ b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-min-001"
+            "value": "<<namePrefix>>-az-aut-min-001"
         }
     }
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
index d95589e970..28d1a49f0f 100644
--- a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
+++ b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-x-001"
+            "value": "<<namePrefix>>-az-aut-x-001"
         },
         "schedules": {
             "value": [
@@ -77,7 +77,7 @@
             ]
         },
         "linkedWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
+            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-aut-001"
         },
         "gallerySolutions": {
             "value": [

From b8e6138dbe184b7d23cc00a419a1d7e29fccf0c4 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Mon, 28 Feb 2022 10:09:34 +0100
Subject: [PATCH 04/13] add new law to dep pipeline

---
 .github/workflows/platform.dependencies.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml
index 3876a9afac..a5152cfd4f 100644
--- a/.github/workflows/platform.dependencies.yml
+++ b/.github/workflows/platform.dependencies.yml
@@ -191,7 +191,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        parameterFilePaths: ['appi.parameters.json', 'parameters.json']
+        parameterFilePaths: ['appi.parameters.json', 'aut.parameters.json', 'parameters.json']
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2

From cfc832d749f27b90c3d3c6b80515c3430ce8cb50 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Mon, 28 Feb 2022 11:40:17 +0100
Subject: [PATCH 05/13] api update

---
 .../.bicep/nested_linkedService.bicep          |  2 +-
 .../.bicep/nested_privateEndpoint.bicep        |  4 ++--
 .../.bicep/nested_rbac.bicep                   |  2 +-
 .../automationAccounts/deploy.bicep            |  2 +-
 .../jobSchedules/deploy.bicep                  |  2 +-
 .../automationAccounts/modules/deploy.bicep    |  2 +-
 .../automationAccounts/readme.md               | 18 +++++++++---------
 .../automationAccounts/runbooks/deploy.bicep   |  2 +-
 .../automationAccounts/schedules/deploy.bicep  |  2 +-
 .../softwareUpdateConfigurations/deploy.bicep  |  2 +-
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep
index a5db7f1425..f7fb9f702b 100644
--- a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep
@@ -17,7 +17,7 @@ resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2021-06
   name: logAnalyticsWorkspaceName
 }
 
-resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-03-01-preview' = {
+resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-08-01' = {
   name: name
   parent: logAnalyticsWorkspace
   tags: tags
diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_privateEndpoint.bicep b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_privateEndpoint.bicep
index 1a3ea945fd..26e201e43b 100644
--- a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_privateEndpoint.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_privateEndpoint.bicep
@@ -14,7 +14,7 @@ var privateEndpoint_var = {
   customDnsConfigs: (contains(privateEndpointObj, 'customDnsConfigs') ? (empty(privateEndpointObj.customDnsConfigs) ? null : privateEndpointObj.customDnsConfigs) : null)
 }
 
-resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
+resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = {
   name: privateEndpoint_var.name
   location: privateEndpointVnetLocation
   tags: tags
@@ -36,7 +36,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-03-01' = {
   }
 }
 
-resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-03-01' = {
+resource privateDnsZoneGroups 'Microsoft.Network/privateEndpoints/privateDnsZoneGroups@2021-05-01' = {
   name: '${privateEndpoint_var.name}/default'
   properties: {
     privateDnsZoneConfigs: [for privateDnsZoneResourceId in privateEndpoint_var.privateDnsZoneResourceIds: {
diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
index 777f9d3bdb..2f8815c637 100644
--- a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
@@ -22,7 +22,7 @@ var builtInRoleNames = {
   'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
   name: last(split(resourceId, '/'))
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/deploy.bicep
index b63c5e92cf..daa3723518 100644
--- a/arm/Microsoft.Automation/automationAccounts/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/deploy.bicep
@@ -129,7 +129,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = {
   name: name
   location: location
   tags: tags
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
index f21d47cd98..71fe7b0a11 100644
--- a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
@@ -24,7 +24,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
index 429f29d1ab..a02a45a1d7 100644
--- a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
@@ -24,7 +24,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md
index 9aeebd36ab..58618b7075 100644
--- a/arm/Microsoft.Automation/automationAccounts/readme.md
+++ b/arm/Microsoft.Automation/automationAccounts/readme.md
@@ -8,7 +8,7 @@ This module deploys an Azure Automation Account.
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | 2017-04-01 |
 | `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
-| `Microsoft.Automation/automationAccounts` | 2020-01-13-preview |
+| `Microsoft.Automation/automationAccounts` | 2021-06-22 |
 | `Microsoft.Automation/automationAccounts/jobSchedules` | 2020-01-13-preview |
 | `Microsoft.Automation/automationAccounts/modules` | 2020-01-13-preview |
 | `Microsoft.Automation/automationAccounts/runbooks` | 2019-06-01 |
@@ -16,9 +16,9 @@ This module deploys an Azure Automation Account.
 | `Microsoft.Automation/automationAccounts/softwareUpdateConfigurations` | 2019-06-01 |
 | `Microsoft.Automation/automationAccounts/variables` | 2020-01-13-preview |
 | `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview |
-| `Microsoft.Network/privateEndpoints` | 2021-03-01 |
-| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-03-01 |
-| `Microsoft.OperationalInsights/workspaces/linkedServices` | 2020-03-01-preview |
+| `Microsoft.Network/privateEndpoints` | 2021-05-01 |
+| `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | 2021-05-01 |
+| `Microsoft.OperationalInsights/workspaces/linkedServices` | 2020-08-01 |
 | `Microsoft.OperationsManagement/solutions` | 2015-11-01-preview |
 
 ## Parameters
@@ -46,7 +46,7 @@ This module deploys an Azure Automation Account.
 | `schedules` | _[schedules](schedules/readme.md)_ array | `[]` |  | Optional. List of schedules to be created in the automation account. |
 | `skuName` | string | `Basic` | `[Free, Basic]` | Optional. SKU name of the account. |
 | `softwareUpdateConfigurations` | _[softwareUpdateConfigurations](softwareUpdateConfigurations/readme.md)_ array | `[]` |  | Optional. List of softwareUpdateConfigurations to be created in the automation account |
-| `systemAssignedIdentity` | bool |  |  | Optional. Enables system assigned managed identity on the resource. |
+| `systemAssignedIdentity` | bool | `False` |  | Optional. Enables system assigned managed identity on the resource. |
 | `tags` | object | `{object}` |  | Optional. Tags of the Automation Account resource. |
 | `userAssignedIdentities` | object | `{object}` |  | Optional. The ID(s) to assign to the resource. |
 | `variables` | _[variables](variables/readme.md)_ array | `[]` |  | Optional. List of variables to be created in the automation account. |
@@ -150,7 +150,7 @@ You can specify multiple user assigned identities to a resource by providing add
 
 ## Template references
 
-- [Automationaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts)
+- [Automationaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2021-06-22/automationAccounts)
 - [Automationaccounts/Jobschedules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts/jobSchedules)
 - [Automationaccounts/Modules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts/modules)
 - [Automationaccounts/Runbooks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2019-06-01/automationAccounts/runbooks)
@@ -159,8 +159,8 @@ You can specify multiple user assigned identities to a resource by providing add
 - [Automationaccounts/Variables](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts/variables)
 - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings)
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
-- [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints)
-- [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints/privateDnsZoneGroups)
+- [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints)
+- [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints/privateDnsZoneGroups)
 - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
 - [Solutions](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationsManagement/2015-11-01-preview/solutions)
-- [Workspaces/Linkedservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-03-01-preview/workspaces/linkedServices)
+- [Workspaces/Linkedservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/linkedServices)
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
index 48be20cae4..e2fea384d0 100644
--- a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
@@ -54,7 +54,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
index ded932f9bf..6729f27f37 100644
--- a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
@@ -49,7 +49,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
index 447aac7b6f..d4fa8e66e3 100644
--- a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
@@ -187,7 +187,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
   name: automationAccountName
 }
 

From 5899251a85d96c6f8946012cc053f97b8226df10 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:22:23 +0100
Subject: [PATCH 06/13] revert api

---
 .../automationAccounts/.bicep/nested_rbac.bicep                 | 2 +-
 arm/Microsoft.Automation/automationAccounts/deploy.bicep        | 2 +-
 .../automationAccounts/jobSchedules/deploy.bicep                | 2 +-
 .../automationAccounts/modules/deploy.bicep                     | 2 +-
 arm/Microsoft.Automation/automationAccounts/readme.md           | 2 +-
 .../automationAccounts/runbooks/deploy.bicep                    | 2 +-
 .../automationAccounts/schedules/deploy.bicep                   | 2 +-
 .../softwareUpdateConfigurations/deploy.bicep                   | 2 +-
 .../automationAccounts/variables/deploy.bicep                   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
index 2f8815c637..777f9d3bdb 100644
--- a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_rbac.bicep
@@ -22,7 +22,7 @@ var builtInRoleNames = {
   'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9')
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
   name: last(split(resourceId, '/'))
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/deploy.bicep
index f5aee90161..b1caa69c55 100644
--- a/arm/Microsoft.Automation/automationAccounts/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/deploy.bicep
@@ -129,7 +129,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' = {
   name: name
   location: location
   tags: tags
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
index 71fe7b0a11..f21d47cd98 100644
--- a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep
@@ -24,7 +24,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
index a02a45a1d7..429f29d1ab 100644
--- a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep
@@ -24,7 +24,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md
index 2f6e520efa..3e19829ce4 100644
--- a/arm/Microsoft.Automation/automationAccounts/readme.md
+++ b/arm/Microsoft.Automation/automationAccounts/readme.md
@@ -8,7 +8,7 @@ This module deploys an Azure Automation Account.
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | 2017-04-01 |
 | `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
-| `Microsoft.Automation/automationAccounts` | 2021-06-22 |
+| `Microsoft.Automation/automationAccounts` | 2020-01-13-preview |
 | `Microsoft.Automation/automationAccounts/jobSchedules` | 2020-01-13-preview |
 | `Microsoft.Automation/automationAccounts/modules` | 2020-01-13-preview |
 | `Microsoft.Automation/automationAccounts/runbooks` | 2019-06-01 |
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
index e2fea384d0..48be20cae4 100644
--- a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep
@@ -54,7 +54,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
index 6729f27f37..ded932f9bf 100644
--- a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep
@@ -49,7 +49,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
index d4fa8e66e3..447aac7b6f 100644
--- a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep
@@ -187,7 +187,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
index 6473a994f7..3de0f26db7 100644
--- a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
@@ -21,7 +21,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
   name: automationAccountName
 }
 

From 2f12b32e60c661b684b085dafe511c10d0a8353b Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:23:14 +0100
Subject: [PATCH 07/13] revert api link

---
 .../automationAccounts/.bicep/nested_linkedService.bicep        | 2 +-
 .../workspaces/linkedServices/deploy.bicep                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep
index f7fb9f702b..a5db7f1425 100644
--- a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_linkedService.bicep
@@ -17,7 +17,7 @@ resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2021-06
   name: logAnalyticsWorkspaceName
 }
 
-resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-08-01' = {
+resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-03-01-preview' = {
   name: name
   parent: logAnalyticsWorkspace
   tags: tags
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
index b54dab3c79..39bb1f3a1d 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
+++ b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
@@ -25,7 +25,7 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2021-06-01' existin
   name: logAnalyticsWorkspaceName
 }
 
-resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-08-01' = {
+resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-03-01-preview' = {
   name: name
   parent: workspace
   tags: tags

From 568f73d8708f902abfb72f965e4c17b9d4ee3a01 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:29:09 +0100
Subject: [PATCH 08/13] param

---
 .../automationAccounts/.parameters/parameters.json            | 4 ++--
 .../automationAccounts/variables/deploy.bicep                 | 2 +-
 .../workspaces/linkedServices/deploy.bicep                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
index 28d1a49f0f..d95589e970 100644
--- a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
+++ b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-az-aut-x-001"
+            "value": "<<namePrefix>>-wd-aut-x-001"
         },
         "schedules": {
             "value": [
@@ -77,7 +77,7 @@
             ]
         },
         "linkedWorkspaceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-aut-001"
+            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
         },
         "gallerySolutions": {
             "value": [
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
index 3de0f26db7..6473a994f7 100644
--- a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
+++ b/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep
@@ -21,7 +21,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = {
+resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = {
   name: automationAccountName
 }
 
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
index 39bb1f3a1d..b54dab3c79 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
+++ b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep
@@ -25,7 +25,7 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2021-06-01' existin
   name: logAnalyticsWorkspaceName
 }
 
-resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-03-01-preview' = {
+resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@2020-08-01' = {
   name: name
   parent: workspace
   tags: tags

From 94572e12ce9d3395689bb2b174fda3455b42774e Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:29:54 +0100
Subject: [PATCH 09/13] param min

---
 .../automationAccounts/.parameters/min.parameters.json          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
index c76e891806..36d11228da 100644
--- a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
+++ b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-az-aut-min-001"
+            "value": "<<namePrefix>>-wd-aut-min-001"
         }
     }
 }

From b70e34d9575018c872d7bf776908e6479069bc4b Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:31:20 +0100
Subject: [PATCH 10/13] aut readme

---
 arm/Microsoft.Automation/automationAccounts/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md
index 3e19829ce4..8a35a9b672 100644
--- a/arm/Microsoft.Automation/automationAccounts/readme.md
+++ b/arm/Microsoft.Automation/automationAccounts/readme.md
@@ -150,7 +150,7 @@ You can specify multiple user assigned identities to a resource by providing add
 
 ## Template references
 
-- [Automationaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2021-06-22/automationAccounts)
+- [Automationaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts)
 - [Automationaccounts/Jobschedules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts/jobSchedules)
 - [Automationaccounts/Modules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts/modules)
 - [Automationaccounts/Runbooks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2019-06-01/automationAccounts/runbooks)
@@ -163,4 +163,4 @@ You can specify multiple user assigned identities to a resource by providing add
 - [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints/privateDnsZoneGroups)
 - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
 - [Solutions](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationsManagement/2015-11-01-preview/solutions)
-- [Workspaces/Linkedservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/linkedServices)
+- [Workspaces/Linkedservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-03-01-preview/workspaces/linkedServices)

From 72a7afd25ec58acee0274ab07d04570e77924d9c Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:35:51 +0100
Subject: [PATCH 11/13] ADO dep pipeline

---
 .azuredevops/platformPipelines/platform.dependencies.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.azuredevops/platformPipelines/platform.dependencies.yml b/.azuredevops/platformPipelines/platform.dependencies.yml
index dd0300fa33..d6191cc43f 100644
--- a/.azuredevops/platformPipelines/platform.dependencies.yml
+++ b/.azuredevops/platformPipelines/platform.dependencies.yml
@@ -129,6 +129,9 @@ stages:
             - path: $(dependencyPath)/$(resourceType)/parameters/parameters.json
               templateFilePath: $(templateFilePath)
               displayName: Default LAW
+            - path: $(dependencyPath)/$(resourceType)/parameters/aut.parameters.json
+              templateFilePath: $(templateFilePath)
+              displayName: Automation account LAW
             - path: $(dependencyPath)/$(resourceType)/parameters/appi.parameters.json
               templateFilePath: $(templateFilePath)
               displayName: AppInsights LAW

From 52ada4e72326610d3a3b0317bf62a010c4886eea Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:48:23 +0100
Subject: [PATCH 12/13] appi law naming and docs

---
 arm/Microsoft.Insights/components/.parameters/parameters.json   | 2 +-
 arm/Microsoft.Web/sites/.parameters/wa.parameters.json          | 2 +-
 .../Microsoft.Insights/components/parameters/parameters.json    | 2 +-
 .../workspaces/parameters/appi.parameters.json                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arm/Microsoft.Insights/components/.parameters/parameters.json b/arm/Microsoft.Insights/components/.parameters/parameters.json
index 737d8e7491..636d9f6c7d 100644
--- a/arm/Microsoft.Insights/components/.parameters/parameters.json
+++ b/arm/Microsoft.Insights/components/.parameters/parameters.json
@@ -6,7 +6,7 @@
             "value": "<<namePrefix>>-az-appi-x-001"
         },
         "workspaceResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-002"
+            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-appi-001"
         },
         "roleAssignments": {
             "value": [
diff --git a/arm/Microsoft.Web/sites/.parameters/wa.parameters.json b/arm/Microsoft.Web/sites/.parameters/wa.parameters.json
index 4e87f2ef73..31b54a7317 100644
--- a/arm/Microsoft.Web/sites/.parameters/wa.parameters.json
+++ b/arm/Microsoft.Web/sites/.parameters/wa.parameters.json
@@ -22,7 +22,7 @@
         "appInsightObject": {
             "value": {
                 "name": "<<namePrefix>>-az-wa-x-001-appi",
-                "workspaceResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.OperationalInsights/workspaces/adp-<<namePrefix>>-az-law-x-002"
+                "workspaceResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.OperationalInsights/workspaces/adp-<<namePrefix>>-az-law-appi-001"
             }
         },
         "siteConfig": {
diff --git a/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json
index 5e75a61ea3..3792b6ba8f 100644
--- a/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json
+++ b/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json
@@ -6,7 +6,7 @@
             "value": "adp-<<namePrefix>>-az-appi-x-001"
         },
         "workspaceResourceId": {
-            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-002"
+            "value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-appi-001"
         }
     }
 }
diff --git a/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json
index 5af16c4175..87b0ebfdc5 100644
--- a/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json
+++ b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "adp-<<namePrefix>>-az-law-x-002"
+            "value": "adp-<<namePrefix>>-az-law-appi-001"
         }
     }
 }

From 179a8ca21cb327ba4bd6a365a082568b4e395ea5 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag@microsoft.com>
Date: Tue, 1 Mar 2022 11:52:18 +0100
Subject: [PATCH 13/13] docs

---
 docs/wiki/TestingDesign.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/wiki/TestingDesign.md b/docs/wiki/TestingDesign.md
index e89cba832b..8639bc806a 100644
--- a/docs/wiki/TestingDesign.md
+++ b/docs/wiki/TestingDesign.md
@@ -125,7 +125,10 @@ Since also dependency resources are in turn subject to dependencies with each ot
       >**Note**: This resource has a global scope name.
   1. Event hub namespace and Event hub: This resource is leveraged by all resources supporting diagnostic settings on an event hub.
       >**Note**: This resource has a global scope name.
-  1. Log analytics workspace: This resource is leveraged by all resources supporting diagnostic settings on LAW.
+  1. Log analytics workspaces: These resources are leveraged by all resources supporting diagnostic settings on LAW. Multiple instances are deployed:
+      - '_adp-\<<namePrefix\>>-az-law-x-001_': Default LAW.
+      - '_adp-\<<namePrefix\>>-az-law-aut-001_': Dedicated LAW to be leveraged by the [automation account] resource.
+      - '_adp-\<<namePrefix\>>-az-law-appi-001_': Dedicated LAW to be leveraged by the [application insights] resource.
   1. User assigned identity: This resource is leveraged by the [role assignment], [key vault] and [recovery services vault] dependency resources.
       > **Note**: The object ID of the [user assigned identity] is needed by several dependency parameter files. However, before running the dependency pipeline for the first time, the [user assigned identity] resource does not exist yet, thus its object ID is unknown. For this reason, instead of the object ID value, some dependency parameter files contain the `"<<msiPrincipalId>>"` token, for which the correct value is retrieved and replaced by the pipeline at runtime.
   1. Shared image gallery and definition: These resources are leveraged by the [image template] resource.