updates

Azure · Nov 6, 2023 · 438e81a · 438e81a
1 parent fe74081
commit 438e81a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep b/workload/bicep/modules/storageAzureFiles/.bicep/azureFilesDomainJoin.bicep
@@ -20,12 +20,6 @@ param scriptArguments string
 @sys.description('Domain join user password.')
 param adminUserPassword string
 
-// =========== //
-// Variable declaration //
-// =========== //
-
-var varscriptArgumentsWithPassword = '${scriptArguments} -AdminUserPassword ${adminUserPassword} -verbose'
-
 // =========== //
 // Deployments //
 // =========== //
@@ -42,7 +36,7 @@ resource dscStorageScript 'Microsoft.Compute/virtualMachines/extensions@2022-08-
     settings: {}
     protectedSettings: {
       fileUris: array(baseScriptUri)
-      commandToExecute: 'powershell -ExecutionPolicy Unrestricted -File ${file} ${varscriptArgumentsWithPassword}'
+      commandToExecute: 'powershell -ExecutionPolicy Unrestricted -File ${file} ${scriptArguments} -AdminUserPassword ${adminUserPassword} -verbose'
     }
   }
 }
diff --git a/workload/scripts/DSCStorageScripts.zip b/workload/scripts/DSCStorageScripts.zip
diff --git a/workload/scripts/DSCStorageScripts/Configuration.ps1 b/workload/scripts/DSCStorageScripts/Configuration.ps1
@@ -66,7 +66,7 @@ param
 
     [Parameter(Mandatory = $true)]
     [ValidateNotNullOrEmpty()]
-    [SecureString] $AdminUserPassword
+    [string] $AdminUserPassword
 )
 
 
@@ -132,14 +132,13 @@ Configuration DomainJoinFileShare
 
         [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
-        [SecureString] $AdminUserPassword
+        [string] $AdminUserPassword
     )
 
     # Import the module that contains the File resource.
     Import-DscResource -ModuleName PsDesiredStateConfiguration
 
     $secStringPassword = ConvertTo-SecureString $AdminUserPassword -AsPlainText -Force
-    #$AdminCred = New-Object System.Management.Automation.PSCredential ($AdminUserName, $AdminUserPassword) # $secStringPassword)
     $AdminCred = New-Object System.Management.Automation.PSCredential ($AdminUserName, $secStringPassword)
 
     $ErrorActionPreference = 'Stop'

diff --git a/workload/scripts/Manual-DSC-Storage-Scripts.ps1 b/workload/scripts/Manual-DSC-Storage-Scripts.ps1
@@ -53,7 +53,7 @@ param (
 
         [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]
-        [SecureString] $AdminUserPassword,
+        [string] $AdminUserPassword,
 
         [Parameter(Mandatory = $true)]
         [ValidateNotNullOrEmpty()]