From 55dbf2927859d4e5ffd12e973a6462f3724597e1 Mon Sep 17 00:00:00 2001 From: Arjun Gupta Date: Thu, 31 Dec 2020 11:54:05 +0530 Subject: [PATCH] new line changes --- src/PowerShell/Utilities/ScriptBuilder.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/PowerShell/Utilities/ScriptBuilder.ts b/src/PowerShell/Utilities/ScriptBuilder.ts index 36fe4815..323241d0 100644 --- a/src/PowerShell/Utilities/ScriptBuilder.ts +++ b/src/PowerShell/Utilities/ScriptBuilder.ts @@ -8,17 +8,22 @@ export default class ScriptBuilder { getAzPSLoginScript(scheme: string, tenantId: string, args: any): string { let command = `Clear-AzContext -Scope Process; Clear-AzContext -Scope CurrentUser -Force -ErrorAction SilentlyContinue;`; + if (scheme === Constants.ServicePrincipal) { + if (args.environment.toLowerCase() == "azurestack") { command += `Add-AzEnvironment -Name ${args.environment} -ARMEndpoint ${args.resourceManagerEndpointUrl} | out-null;`; } + command += `Connect-AzAccount -ServicePrincipal -Tenant '${tenantId}' -Credential \ (New-Object System.Management.Automation.PSCredential('${args.servicePrincipalId}',(ConvertTo-SecureString '${args.servicePrincipalKey.replace("'", "''")}' -AsPlainText -Force))) \ -Environment '${args.environment}' | out-null;`; + if (args.scopeLevel === Constants.Subscription && !args.allowNoSubscriptionsLogin) { command += `Set-AzContext -SubscriptionId '${args.subscriptionId}' -TenantId '${tenantId}' | out-null;`; } } + this.script += `try { $ErrorActionPreference = "Stop" $WarningPreference = "SilentlyContinue" @@ -30,6 +35,7 @@ export default class ScriptBuilder { $output['${Constants.Error}'] = $_.exception.Message } return ConvertTo-Json $output`; + core.debug(`Azure PowerShell Login Script: ${this.script}`); return this.script; }