From 4bb1c80cb363412ab265336bd7262c642c28a10d Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 1 Dec 2021 13:21:56 +0100
Subject: [PATCH 1/2] Updated kind & added param file

---
 .../ms.resources.deploymentscripts.yml        |  2 +-
 .../.parameters/cli.parameters.json           | 35 +++++++++++++++++++
 .../{parameters.json => ps.parameters.json}   |  2 +-
 .../deploymentScripts/deploy.bicep            |  3 +-
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
 rename arm/Microsoft.Resources/deploymentScripts/.parameters/{parameters.json => ps.parameters.json} (95%)

diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml
index 381ee94297..576f84cc05 100644
--- a/.github/workflows/ms.resources.deploymentscripts.yml
+++ b/.github/workflows/ms.resources.deploymentscripts.yml
@@ -107,7 +107,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        parameterFilePaths: ['parameters.json']
+        parameterFilePaths: ['cli.parameters.json', 'ps.parameters.json']
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
diff --git a/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json b/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
new file mode 100644
index 0000000000..5c7ec00284
--- /dev/null
+++ b/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
@@ -0,0 +1,35 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {
+        "name": {
+            "value": "sxx-az-ds-cli-x-001"
+        },
+        "userAssignedIdentities": {
+            "value": {
+                "/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-sxx-az-msi-x-001": {}
+            }
+        },
+        "kind": {
+            "value": "AzureCLI"
+        },
+        "azCliVersion": {
+            "value": "2.15.0"
+        },
+        "scriptContent": {
+            "value": "echo \"Hello from inside the script\""
+        },
+        "retentionInterval": {
+            "value": "P1D"
+        },
+        "runOnce": {
+            "value": false
+        },
+        "cleanupPreference": {
+            "value": "Always"
+        },
+        "timeout": {
+            "value": "PT30M"
+        }
+    }
+}
diff --git a/arm/Microsoft.Resources/deploymentScripts/.parameters/parameters.json b/arm/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
similarity index 95%
rename from arm/Microsoft.Resources/deploymentScripts/.parameters/parameters.json
rename to arm/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
index ec56d780af..5004396221 100644
--- a/arm/Microsoft.Resources/deploymentScripts/.parameters/parameters.json
+++ b/arm/Microsoft.Resources/deploymentScripts/.parameters/ps.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "sxx-az-ds-x-001"
+            "value": "sxx-az-ds-ps-x-001"
         },
         "userAssignedIdentities": {
             "value": {
diff --git a/arm/Microsoft.Resources/deploymentScripts/deploy.bicep b/arm/Microsoft.Resources/deploymentScripts/deploy.bicep
index 3ca81d034b..ba6fe19fe7 100644
--- a/arm/Microsoft.Resources/deploymentScripts/deploy.bicep
+++ b/arm/Microsoft.Resources/deploymentScripts/deploy.bicep
@@ -83,7 +83,6 @@ var identity = identityType != 'None' ? {
   userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null
 } : null
 
-
 module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   name: 'pid-${cuaId}'
   params: {}
@@ -94,7 +93,7 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
   location: location
   tags: tags
   identity: identity
-  kind: 'AzurePowerShell'
+  kind: any(kind)
   properties: {
     azPowerShellVersion: kind == 'AzurePowerShell' ? azPowerShellVersion : null
     azCliVersion: kind == 'AzureCLI' ? azCliVersion : null

From 472a9e1e14e4aa8f2b10eb20ab701b710beab693 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Wed, 1 Dec 2021 14:04:42 +0100
Subject: [PATCH 2/2] Update to latest

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

diff --git a/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json b/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
index 5c7ec00284..01bbc515da 100644
--- a/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
+++ b/arm/Microsoft.Resources/deploymentScripts/.parameters/cli.parameters.json
@@ -7,7 +7,7 @@
         },
         "userAssignedIdentities": {
             "value": {
-                "/subscriptions/a7439831-1cd9-435d-a091-4aa863c96556/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-sxx-az-msi-x-001": {}
+                "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-sxx-az-msi-x-001": {}
             }
         },
         "kind": {