Fix x-ms-authorization-auxiliary header sperator to comma (#521)

* auxTokens should be joined with comma * Update CHANGELOG.md * Clean up PR and fix CI * Update tests Co-authored-by: Joel Hendrix <[email protected]>
Azure · May 21, 2020 · 778ae56 · 778ae56
1 parent 9132adf
commit 778ae56
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v14.1.1
+
+### Bug Fixes
+
+- Change `x-ms-authorization-auxiliary` header value separator to comma.
+
 ## v14.1.0
 
 ### New Features

diff --git a/autorest/authorization.go b/autorest/authorization.go
@@ -331,7 +331,7 @@ func (mt multiTenantSPTAuthorizer) WithAuthorization() PrepareDecorator {
 			for i := range auxTokens {
 				auxTokens[i] = fmt.Sprintf("Bearer %s", auxTokens[i])
 			}
-			return Prepare(r, WithHeader(headerAuxAuthorization, strings.Join(auxTokens, "; ")))
+			return Prepare(r, WithHeader(headerAuxAuthorization, strings.Join(auxTokens, ", ")))
 		})
 	}
 }
diff --git a/autorest/authorization_test.go b/autorest/authorization_test.go
@@ -299,7 +299,7 @@ func TestMultitenantAuthorizationThree(t *testing.T) {
 	if primary := req.Header.Get(headerAuthorization); primary != "Bearer primary" {
 		t.Fatalf("bad primary authorization header %s", primary)
 	}
-	if aux := req.Header.Get(headerAuxAuthorization); aux != "Bearer aux1; Bearer aux2; Bearer aux3" {
+	if aux := req.Header.Get(headerAuxAuthorization); aux != "Bearer aux1, Bearer aux2, Bearer aux3" {
 		t.Fatalf("bad auxiliary authorization header %s", aux)
 	}
 }
@@ -376,7 +376,7 @@ func TestMultiTenantServicePrincipalTokenWithAuthorizationRefresh(t *testing.T)
 		auxTokens[i] = fmt.Sprintf("Bearer %s", auxTokens[i])
 	}
 	auxHeader := req.Header.Get(http.CanonicalHeaderKey(headerAuxAuthorization))
-	if auxHeader != strings.Join(auxTokens, "; ") {
+	if auxHeader != strings.Join(auxTokens, ", ") {
 		t.Fatal("azure: multiTenantSPTAuthorizer#WithAuthorization failed to set Authorization header for auxiliary tokens")
 	}
 	for i := range auxTokens {

diff --git a/autorest/version.go b/autorest/version.go
@@ -19,7 +19,7 @@ import (
 	"runtime"
 )
 
-const number = "v14.1.0"
+const number = "v14.1.1"
 
 var (
 	userAgent = fmt.Sprintf("Go/%s (%s-%s) go-autorest/%s",

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -11,23 +11,25 @@ jobs:
         Linux_Go113:
           vm.image: 'ubuntu-18.04'
           go.version: '1.13'
-          GOROOT: '/usr/local/go$(go.version)'
         Linux_Go114:
           vm.image: 'ubuntu-18.04'
           go.version: '1.14'
-          GOROOT: '/usr/local/go$(go.version)'
 
     pool:
       vmImage: '$(vm.image)'
 
     steps:
+      - task: GoTool@0
+        inputs:
+          version: '$(go.version)'
+        displayName: "Select Go Version"
+
       - script: |
           set -e
           mkdir -p '$(GOPATH)/bin'
           mkdir -p '$(sdkPath)'
           shopt -s extglob
           mv !(work) '$(sdkPath)'
-          echo '##vso[task.prependpath]$(GOROOT)/bin'
           echo '##vso[task.prependpath]$(GOPATH)/bin'
         displayName: 'Create Go Workspace'