Merge pull request #761 from srdan-bozovic-msft/patch-1

Add environment option in scripts so they could be used in different cloud environments

Author: jovanpop-msft

samples/manage/azure-sql-db-managed-instance/attach-jumpbox/attachJumpbox.ps1

@@ -2,13 +2,19 @@ $parameters = $args[0]
 $scriptUrlBase = $args[1]
 
 $subscriptionId = $parameters['subscriptionId']
+$environmentName = $parameters['environmentName']
 $resourceGroupName = $parameters['resourceGroupName']
 $virtualMachineName = $parameters['virtualMachineName']
 $virtualNetworkName = $parameters['virtualNetworkName']
 $managementSubnetName = $parameters['subnetName']
 $administratorLogin = $parameters['administratorLogin']
 $administratorLoginPassword = $parameters['administratorLoginPassword']
 
+if ($environmentName -eq '' -or ($null -eq $environmentName)) {
+    $environmentName = 'AzureCloud'
+    Write-Host "Environment: AzureCloud." -ForegroundColor Green
+}
+
 if ($virtualMachineName -eq '' -or ($null -eq $virtualMachineName)) {
     $virtualMachineName = 'Jumpbox'
     Write-Host "VM Name: 'Jumpbox'." -ForegroundColor Green
@@ -59,11 +65,14 @@ function EnsureAzModule {
     }
 }
 
-function EnsureLogin () {
+function EnsureLogin {
+    param (
+        $environmentName
+    )
     $context = Get-AzContext
     If ($null -eq $context.Subscription) {
         Write-Host "Sign-in..."
-        If ($null -eq (Connect-AzAccount -ErrorAction SilentlyContinue -ErrorVariable Errors)) {
+        If ($null -eq (Connect-AzAccount -Environment $environmentName -ErrorAction SilentlyContinue -ErrorVariable Errors)) {
             Write-Host ("Sign-in failed: {0}" -f $Errors[0].Exception.Message) -ForegroundColor Red
             Break
         }
@@ -180,7 +189,7 @@ function CalculateVpnClientAddressPoolPrefix {
 
 VerifyPSVersion
 EnsureAzModule
-EnsureLogin
+EnsureLogin -environmentName $environmentName
 SelectSubscriptionId -subscriptionId $subscriptionId
 
 $virtualNetwork = LoadVirtualNetwork -resourceGroupName $resourceGroupName -virtualNetworkName $virtualNetworkName

samples/manage/azure-sql-db-managed-instance/attach-vpn-gateway/attachVPNGateway.ps1

@@ -2,11 +2,17 @@ $parameters = $args[0]
 $scriptUrlBase = $args[1]
 
 $subscriptionId = $parameters['subscriptionId']
+$environmentName = $parameters['environmentName']
 $resourceGroupName = $parameters['resourceGroupName']
 $virtualNetworkName = $parameters['virtualNetworkName']
 $certificateNamePrefix = $parameters['certificateNamePrefix']
 $clientCertificatePassword = $parameters['clientCertificatePassword'] #used only when certificates are created using openssl
 
+if ($environmentName -eq '' -or ($null -eq $environmentName)) {
+    $environmentName = 'AzureCloud'
+    Write-Host "Environment: AzureCloud." -ForegroundColor Green
+}
+
 if ($clientCertificatePassword -eq '' -or ($null -eq $clientCertificatePassword)) {
     $clientCertificatePassword = 'S0m3Str0nGP@ssw0rd'
 }
@@ -52,11 +58,14 @@ function EnsureAzModule {
     }
 }
 
-function EnsureLogin () {
+function EnsureLogin {
+    param (
+        $environmentName
+    )
     $context = Get-AzContext
     If ($null -eq $context.Subscription) {
         Write-Host "Sign-in..."
-        If ($null -eq (Connect-AzAccount -ErrorAction SilentlyContinue -ErrorVariable Errors)) {
+        If ($null -eq (Connect-AzAccount -Environment $environmentName -ErrorAction SilentlyContinue -ErrorVariable Errors)) {
             Write-Host ("Sign-in failed: {0}" -f $Errors[0].Exception.Message) -ForegroundColor Red
             Break
         }
@@ -220,9 +229,8 @@ function CreateCertificate() {
 
 VerifyPSVersion
 EnsureAzModule
-EnsureLogin
+EnsureLogin -environmentName $environmentName
 SelectSubscriptionId -subscriptionId $subscriptionId
-
 $virtualNetwork = LoadVirtualNetwork -resourceGroupName $resourceGroupName -virtualNetworkName $virtualNetworkName
 
 $subnets = $virtualNetwork.Subnets.Name
@@ -265,4 +273,4 @@ $templateParameters = @{
 
 New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateUri ($scriptUrlBase + '/azuredeploy.json?t=' + [DateTime]::Now.Ticks) -TemplateParameterObject $templateParameters
 
-Write-Host "Deployment completed."
+Write-Host "Deployment completed."