Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug Fix: Fix crash when using MSI Authentication #4738

Merged
merged 2 commits into from
Oct 28, 2019
Merged

Bug Fix: Fix crash when using MSI Authentication #4738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
944ebbe
Fix crash when MSI auth is used
mbfrahry Oct 28, 2019
f51339d
Address review
mbfrahry Oct 28, 2019
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: 10 additions & 4 deletions azurerm/data_source_client_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,17 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err
}

d.Set("object_id", "")
if v, err := client.getAuthenticatedObjectID(ctx); err != nil {
return fmt.Errorf("Error getting authenticated object ID: %v", err)
} else {
d.Set("object_id", v)

// TODO remove this when we confirm that MSI no longer returns nil with getAuthenticatedObjectID
objectId := ""
if client.getAuthenticatedObjectID != nil {
v, err := client.getAuthenticatedObjectID(ctx)
if err != nil {
return fmt.Errorf("Error getting authenticated object ID: %v", err)
}
objectId = v
}
d.Set("object_id", objectId)

return nil
}