Skip to content

Commit

Permalink
Exact domain matching for organization data source (#3534) (#2085)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed May 19, 2020
1 parent d16cbf8 commit e30b174
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/3534.txt
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
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

0 comments on commit e30b174

Please sign in to comment.