Merge pull request kubernetes#87590 from weinong/fix-87586

k8s-ci-robot · web-flow · commit d88304507d3b · 2020-02-13T05:16:35.000-08:00
don't specify apiVersion when getting AAD token
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth.go b/staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth.go
@@ -97,7 +97,7 @@ func GetServicePrincipalToken(config *AzureAuthConfig, env *azure.Environment) (
 			env.ServiceManagementEndpoint)
 	}
 
-	oauthConfig, err := adal.NewOAuthConfig(env.ActiveDirectoryEndpoint, tenantID)
+	oauthConfig, err := adal.NewOAuthConfigWithAPIVersion(env.ActiveDirectoryEndpoint, tenantID, nil)
 	if err != nil {
 		return nil, fmt.Errorf("creating the OAuth config: %v", err)
 	}
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth_test.go
@@ -97,7 +97,7 @@ func TestGetServicePrincipalToken(t *testing.T) {
 	token, err := GetServicePrincipalToken(config, env)
 	assert.NoError(t, err)
 
-	oauthConfig, err := adal.NewOAuthConfig(env.ActiveDirectoryEndpoint, config.TenantID)
+	oauthConfig, err := adal.NewOAuthConfigWithAPIVersion(env.ActiveDirectoryEndpoint, config.TenantID, nil)
 	assert.NoError(t, err)
 
 	spt, err := adal.NewServicePrincipalToken(*oauthConfig, config.AADClientID, config.AADClientSecret, env.ServiceManagementEndpoint)

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func GetServicePrincipalToken(config AzureAuthConfig, env azure.Environment) (`
`97`	`97`	`env.ServiceManagementEndpoint)`
`98`	`98`	`}`
`99`	`99`
`100`		`- oauthConfig, err := adal.NewOAuthConfig(env.ActiveDirectoryEndpoint, tenantID)`
	`100`	`+ oauthConfig, err := adal.NewOAuthConfigWithAPIVersion(env.ActiveDirectoryEndpoint, tenantID, nil)`
`101`	`101`	`if err != nil {`
`102`	`102`	`return nil, fmt.Errorf("creating the OAuth config: %v", err)`
`103`	`103`	`}`