Merge pull request #2228 from janegilring/issue_2205_private_link

Updated Azure Arc-enabled servers scenario for Azure Private Link to use securestring for parameters with sensitive information
microsoft · Nov 3, 2023 · 216b00e · 216b00e
2 parents c534770 + f9b5db2
commit 216b00e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/azure_arc_servers_jumpstart/privatelink/ARM/onPremisesDeploy.json b/azure_arc_servers_jumpstart/privatelink/ARM/onPremisesDeploy.json
@@ -279,7 +279,7 @@
                     "imageReference": {
                         "publisher": "MicrosoftWindowsServer",
                         "offer": "WindowsServer",
-                        "sku": "2019-datacenter-gensecond",
+                        "sku": "2022-Datacenter",
                         "version": "latest"
                     },
                     "osDisk": {

diff --git a/azure_arc_servers_jumpstart/privatelink/artifacts/Bootstrap.ps1 b/azure_arc_servers_jumpstart/privatelink/artifacts/Bootstrap.ps1
@@ -5,9 +5,9 @@ param (
     [string]$resourceGroup,
     [string]$subscriptionId,
     [string]$Location,
-    [string]$PEname, 
+    [string]$PEname,
     [string]$adminUsername,
-    [string]$PLscope 
+    [string]$PLscope
 
 )
 [System.Environment]::SetEnvironmentVariable('appId', $appId,[System.EnvironmentVariableTarget]::Machine)
@@ -41,17 +41,17 @@ workflow ClientTools_01
                         Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
                     }
                 }
-                if ([string]::IsNullOrWhiteSpace($using:chocolateyAppList) -eq $false){   
-                    Write-Host "Chocolatey Apps Specified"  
-                    
+                if ([string]::IsNullOrWhiteSpace($using:chocolateyAppList) -eq $false){
+                    Write-Host "Chocolatey Apps Specified"
+
                     $appsToInstall = $using:chocolateyAppList -split "," | foreach { "$($_.Trim())" }
-                
+
                     foreach ($app in $appsToInstall)
                     {
                         Write-Host "Installing $app"
                         & choco install $app /y -Force| Write-Output
                     }
-                }                        
+                }
             }
         }
 ClientTools_01 | Format-Table
@@ -89,5 +89,5 @@ Get-ScheduledTask -TaskName ServerManager | Disable-ScheduledTask
 
 # Clean up Bootstrap.log
 Stop-Transcript
-$logSuppress = Get-Content C:\Temp\LogonScript.log -Force | Where { $_ -notmatch "Host Application: powershell.exe" } 
-$logSuppress | Set-Content C:\Temp\LogonScript.log -Force
+$logSuppress = Get-Content C:\Temp\LogonScript.log -Force | Where { $_ -notmatch "Host Application: powershell.exe" }
+$logSuppress | Set-Content C:\Temp\LogonScript.log -Force
diff --git a/azure_arc_servers_jumpstart/privatelink/azuredeploy.json b/azure_arc_servers_jumpstart/privatelink/azuredeploy.json
@@ -101,7 +101,7 @@
             }
         },
         "adminPassword": {
-            "type": "string",
+            "type": "securestring",
             "metadata": {
                 "description": "SSH key or password for the Azure Arc-enabled virtual Machine. SSH key is recommended for Linux."
             }
@@ -163,7 +163,7 @@
             }
         },
         "sharedKey": {
-            "type": "string",
+            "type": "securestring",
             "defaultValue": "ArcPa$$w0rd",
             "metadata": {
                 "description": "Shared secret key for the vNET-to-vNET connection between Virtual Network Gateways."
@@ -176,7 +176,7 @@
             }
         },
         "password": {
-            "type": "string",
+            "type": "securestring",
             "metadata": {
                 "description": "Unique SPN password"
             }
@@ -189,7 +189,7 @@
         }
     },
     "variables": {
-        
+
     },
     "resources": [
         {
@@ -414,7 +414,7 @@
                             "type": "string"
                         },
                         "sharedKey": {
-                            "type": "string"
+                            "type": "securestring"
                         }
                     },
                     "resources": [
@@ -471,10 +471,10 @@
                     },
                     "PLscope": {
                         "value": "[reference('AzureDeployment').outputs.PLscope.value]"
-                    }, 
+                    },
                     "privateEndpoints_name": {
                         "value": "[parameters('privateEndpoints_name')]"
-                    }, 
+                    },
                     "adminUsername": {
                         "value": "[parameters('adminUsername')]"
                     }
@@ -494,7 +494,7 @@
                         "type": "string"
                     },
                     "password": {
-                        "type": "string"
+                        "type": "securestring"
                     },
                     "tenantId": {
                         "type": "string"
@@ -510,7 +510,7 @@
                     }
                     },
                     "variables": {
-                        
+
                     },
                     "resources": [
                         {