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

Exact domain matching for organization data source #2085

Merged
merged 1 commit into from
May 19, 2020
Merged

Exact domain matching for organization data source #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3534.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
Fixed an issue where data source `google_organization` would ignore exact domain matches if multiple domains were found
```
14 changes: 12 additions & 2 deletions google-beta/data_source_google_organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,20 @@ func dataSourceOrganizationRead(d *schema.ResourceData, meta interface{}) error
}

if len(resp.Organizations) > 1 {
return fmt.Errorf("More than one matching organization found")
// Attempt to find an exact domain match
for _, org := range resp.Organizations {
if org.DisplayName == v.(string) {
organization = org
break
}
}
if organization == nil {
return fmt.Errorf("Received multiple organizations in the response, but could not find an exact domain match.")
}
} else {
organization = resp.Organizations[0]
}

organization = resp.Organizations[0]
} else if v, ok := d.GetOk("organization"); ok {
var resp *cloudresourcemanager.Organization
err := retryTimeDuration(func() (err error) {
Expand Down