Skip to content
This repository has been archived by the owner on Feb 12, 2025. It is now read-only.

Adding User Assigned Identity Support for the MSIConfig Authorizor #332

Merged
merged 2 commits into from
Oct 19, 2018
+11 −3
Merged

Adding User Assigned Identity Support for the MSIConfig Authorizor #332

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c290d
Adding User assigned identity support for the MSIConfig authorizor
samkreter Oct 12, 2018
ea4ac2e
Merge branch 'dev' into sakreter-AddingUserAssignedAuthorizor
Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions autorest/azure/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,17 @@ func (mc MSIConfig) Authorizer() (autorest.Authorizer, error) {
return nil, err
}

spToken, err := adal.NewServicePrincipalTokenFromMSI(msiEndpoint, mc.Resource)
if err != nil {
return nil, fmt.Errorf("failed to get oauth token from MSI: %v", err)
var spToken *adal.ServicePrincipalToken
if mc.ClientID == "" {
spToken, err = adal.NewServicePrincipalTokenFromMSI(msiEndpoint, mc.Resource)
if err != nil {
return nil, fmt.Errorf("failed to get oauth token from MSI: %v", err)
}
} else {
spToken, err = adal.NewServicePrincipalTokenFromMSIWithUserAssignedID(msiEndpoint, mc.Resource, mc.ClientID)
if err != nil {
return nil, fmt.Errorf("failed to get oauth token from MSI for user assigned identity: %v", err)
}
}

return autorest.NewBearerAuthorizer(spToken), nil
Expand Down