github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102063 from tdihp/fix/azure-auth-refresh

Browse Source 
Azure auth forwarding adal refresh error to azureTokenSource
This commit is contained in:
Kubernetes Prow Robot 2021-06-01 19:48:45 -07:00 committed by GitHub
commit eee6e54ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure.go
View File

@ -354,7 +354,6 @@ func (ts *azureTokenSource) Refresh(token *azureToken) (*azureToken, error) {
} }
// refresh outdated token with adal. // refresh outdated token with adal.
// adal.RefreshTokenError will be returned if error occur during refreshing.
func (ts *azureTokenSourceDeviceCode) Refresh(token *azureToken) (*azureToken, error) { func (ts *azureTokenSourceDeviceCode) Refresh(token *azureToken) (*azureToken, error) {
env, err := azure.EnvironmentFromName(token.environment) env, err := azure.EnvironmentFromName(token.environment)
if err != nil { if err != nil {
@ -388,7 +387,8 @@ func (ts *azureTokenSourceDeviceCode) Refresh(token *azureToken) (*azureToken, e
} }
if err := spt.Refresh(); err != nil { if err := spt.Refresh(); err != nil {
return nil, fmt.Errorf("refreshing token: %v", err) // Caller expects IsTokenRefreshError(err) to trigger prompt.
return nil, fmt.Errorf("refreshing token: %w", err)
} }
return &azureToken{ return &azureToken{

10
staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure_test.go
View File

@ -330,6 +330,16 @@ func TestAzureTokenSourceScenarios(t *testing.T) {
tokenCalls: 1, tokenCalls: 1,
persistCalls: 1, persistCalls: 1,
}, },
{
name: "extend failure with fmt.Errorf nested tokenRefreshError",
configToken: expiredToken,
refreshErr: fmt.Errorf("refreshing token: %w", fakeTokenRefreshError{message: "nested FakeError happened when refreshing"}),
sourceToken: fakeToken,
expectToken: fakeToken,
refreshCalls: 1,
tokenCalls: 1,
persistCalls: 1,
},
{ {
name: "unexpected error when extend", name: "unexpected error when extend",
configToken: expiredToken, configToken: expiredToken,