Retry reads of organization datasource (#2878)

Merged PR #2878.

third_party/terraform/data_sources/data_source_google_organization.go

@@ -54,23 +54,32 @@ func dataSourceOrganizationRead(d *schema.ResourceData, meta interface{}) error
 	var organization *cloudresourcemanager.Organization
 	if v, ok := d.GetOk("domain"); ok {
 		filter := fmt.Sprintf("domain=%s", v.(string))
-		resp, err := config.clientResourceManager.Organizations.Search(&cloudresourcemanager.SearchOrganizationsRequest{
-			Filter: filter,
-		}).Do()
+		var resp *cloudresourcemanager.SearchOrganizationsResponse
+		err := retryTimeDuration(func() (err error) {
+			resp, err = config.clientResourceManager.Organizations.Search(&cloudresourcemanager.SearchOrganizationsRequest{
+				Filter: filter,
+			}).Do()
+			return err
+		}, d.Timeout(schema.TimeoutRead))
 		if err != nil {
 			return fmt.Errorf("Error reading organization: %s", err)
 		}
 
 		if len(resp.Organizations) == 0 {
 			return fmt.Errorf("Organization not found: %s", v)
 		}
+
 		if len(resp.Organizations) > 1 {
 			return fmt.Errorf("More than one matching organization found")
 		}
 
 		organization = resp.Organizations[0]
 	} else if v, ok := d.GetOk("organization"); ok {
-		resp, err := config.clientResourceManager.Organizations.Get(canonicalOrganizationName(v.(string))).Do()
+		var resp *cloudresourcemanager.Organization
+		err := retryTimeDuration(func() (err error) {
+			resp, err = config.clientResourceManager.Organizations.Get(canonicalOrganizationName(v.(string))).Do()
+			return err
+		}, d.Timeout(schema.TimeoutRead))
 		if err != nil {
 			return handleNotFoundError(err, d, fmt.Sprintf("Organization Not Found : %s", v))
 		}