Replace powershell with pwsh in Powershell Login (#2558)

* Replace powershell with pwsh

* Fix testcase

* Fix testcase

* Remove debug

Author: nakulkar-msft

azure-pipelines.yml

@@ -154,10 +154,10 @@ jobs:
 
     steps:
       - task: PowerShell@2
-        condition: eq(variables.type, 'windows' )
         inputs: 
           targetType: 'inline'
           script: 'Install-Module -Name Az -Scope CurrentUser -Repository PSGallery -AllowClobber -Force'
+          pwsh: 'true'
         displayName: 'Install Powershell Az Module'
       - task: GoTool@0
         inputs:

common/azure_ps_context_credential.go

@@ -117,16 +117,15 @@ var defaultAzdTokenProvider PSTokenProvider = func(ctx context.Context, _ string
 		defer cancel()
 	}
 
-	r := regexp.MustCompile(`\{"token".*"expiresOn".*\}`)
+	r := regexp.MustCompile("(?s){.*Token.*ExpiresOn.*}")
 
 	if tenantID != "" {
-		tenantID += " -TenantId " + tenantID
+		tenantID += " -TenantId" + tenantID
 	}
-	cmd := `$token = Get-AzAccessToken -ResourceUrl https://storage.azure.com` + tenantID + ";"
-	cmd += `$output = -join('{"token":','"',$token.Token,'"', ',"expiresOn":', '"',$token.ExpiresOn.ToString("yyyy-MM-ddTHH:mm:ss.fffK"),'"',"}");`
-	cmd += "echo $output"
+	cmd := "Get-AzAccessToken -ResourceUrl https://storage.azure.com" + tenantID + " | ConvertTo-Json"
+	
 
-	cliCmd := exec.CommandContext(ctx, "powershell", cmd)
+	cliCmd := exec.CommandContext(ctx, "pwsh", "-Command", cmd)
 	cliCmd.Env = os.Environ()
 	var stderr bytes.Buffer
 	cliCmd.Stderr = &stderr
@@ -142,15 +141,17 @@ var defaultAzdTokenProvider PSTokenProvider = func(ctx context.Context, _ string
 
 	output = []byte(r.FindString(string(output)))
 	if string(output) == "" {
-		return nil, errors.New(credNamePSContext + "Invalid output while retrving token")
+		invalidTokenMsg := " Invalid output received while retrieving token with Powershell. Run command \"" + cmd + "\"" +
+		" on powershell and verify that the output is indeed a valid token."
+		return nil, errors.New(credNamePSContext + invalidTokenMsg)
 	}
 	return output, nil
 }
 
 func (c *PowershellContextCredential) createAccessToken(tk []byte) (azcore.AccessToken, error) {
 	t := struct {
-		AccessToken string `json:"token"`
-		ExpiresOn   string `json:"expiresOn"`
+		AccessToken string `json:"Token"`
+		ExpiresOn   string `json:"ExpiresOn"`
 	}{}
 
 	err := json.Unmarshal(tk, &t)

e2etest/zt_basic_cli_ps_auth_test.go

@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"runtime"
 	"testing"
 
 	"github.com/Azure/azure-storage-azcopy/v10/common"
@@ -111,9 +110,6 @@ func TestBasic_PSAuth(t *testing.T) {
 		recursive: true,
 	}, &hooks{
 		beforeTestRun: func(h hookHelper) {
-			if runtime.GOOS != "windows" {
-				h.SkipTest()
-			}
 			tenId, appId, clientSecret := GlobalInputManager{}.GetServicePrincipalAuth()
 			cmd := `$secret = ConvertTo-SecureString -String %s -AsPlainText -Force;
 				$cred = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList %s, $secret;
@@ -123,7 +119,7 @@ func TestBasic_PSAuth(t *testing.T) {
 			}
 
 			script := fmt.Sprintf(cmd, clientSecret, appId)
-			out, err := exec.Command("powershell", script).Output()
+			out, err := exec.Command("pwsh", "-Command", script).Output()
 			if err != nil {
 				e := err.(*exec.ExitError)
 				t.Logf(string(e.Stderr))
@@ -149,9 +145,6 @@ func TestBasic_PSAuthCamelCase(t *testing.T) {
 		recursive: true,
 	}, &hooks{
 		beforeTestRun: func(h hookHelper) {
-			if runtime.GOOS != "windows" {
-				h.SkipTest()
-			}
 			tenId, appId, clientSecret := GlobalInputManager{}.GetServicePrincipalAuth()
 			cmd := `$secret = ConvertTo-SecureString -String %s -AsPlainText -Force;
 				$cred = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList %s, $secret;
@@ -161,7 +154,7 @@ func TestBasic_PSAuthCamelCase(t *testing.T) {
 			}
 
 			script := fmt.Sprintf(cmd, clientSecret, appId)
-			out, err := exec.Command("powershell", script).Output()
+			out, err := exec.Command("pwsh", "-Command", script).Output()
 			if err != nil {
 				e := err.(*exec.ExitError)
 				t.Logf(string(e.Stderr))