Pass-thru secure strings as-is until ready for use (#281)

Azure · May 10, 2022 · 799ad52 · 799ad52
1 parent a9c9419
commit 799ad52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/scripts/deployments/Functions/HubNetworkWithNVA.ps1 b/scripts/deployments/Functions/HubNetworkWithNVA.ps1
@@ -29,10 +29,10 @@ function Set-HubNetwork-With-NVA {
     [String]$LogAnalyticsWorkspaceResourceId,
 
     [Parameter(Mandatory = $false)]
-    [String]$NvaUsername = $null,
+    [SecureString]$NvaUsername = $null,
 
     [Parameter(Mandatory = $false)]
-    [String]$NvaPassword = $null
+    [SecureString]$NvaPassword = $null
   )
 
   Set-AzContext -Subscription $SubscriptionId
@@ -67,7 +67,7 @@ function Set-HubNetwork-With-NVA {
     Write-Output "NVA username is provided.  Setting NVA username in configuration."
     $NvaUsernameElement = @{
       fwUsername = @{
-        value = $NvaUsername
+        value = ($NvaUsername | ConvertFrom-SecureString -AsPlainText)
       }
     }
     $Configuration.parameters | Add-Member $NvaUsernameElement -Force
@@ -77,7 +77,7 @@ function Set-HubNetwork-With-NVA {
     Write-Output "NVA password is provided.  Setting NVA password in configuration."
     $NvaPasswordElement = @{
       fwPassword = @{
-        value = $NvaPassword
+        value = ($NvaPassword | ConvertFrom-SecureString -AsPlainText)
       }
     }
     $Configuration.parameters | Add-Member $NvaPasswordElement -Force

diff --git a/scripts/deployments/RunWorkflows.ps1 b/scripts/deployments/RunWorkflows.ps1
@@ -259,8 +259,8 @@ if ($DeployHubNetworkWithNVA) {
     -SubscriptionId $Context.Variables['var-hubnetwork-subscriptionId'] `
     -ConfigurationFilePath "$($Context.NetworkingDirectory)/$($Context.Variables['var-hubnetwork-nva-configurationFileName'])" `
     -LogAnalyticsWorkspaceResourceId $LoggingConfiguration.LogAnalyticsWorkspaceResourceId `
-    -NvaUsername (ConvertFrom-SecureString -SecureString $NvaUsername -AsPlainText) `
-    -NvaPassword (ConvertFrom-SecureString -SecureString $NvaPassword -AsPlainText)
+    -NvaUsername $NvaUsername `
+    -NvaPassword $NvaPassword
 }
 
 # Hub Networking with Azure Firewall