3.54.0 - release notes and cherry pick (#2887)

ScottSuarez · modular-magician · rileykarson · web-flow · commit 503e103da591 · 2021-01-22T12:57:38.000-08:00
Co-authored-by: The Magician &lt;magic-modules@google.com&gt;
Co-authored-by: Riley Karson &lt;rileykarson@google.com&gt;
diff --git a/.changelog/4412.txt b/.changelog/4412.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+healthcare: add retry logic on healthcare dataset not initialized error
+```
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,29 @@
 ## 3.54.0 (Unreleased)
+
+FEATURES:
+* **New Data Source:** `google_cloud_run_locations` ([#2864](https://github.com/hashicorp/terraform-provider-google-beta/pull/2864))
+* **New Resource:** `google_privateca_certificate_authority` ([#2877](https://github.com/hashicorp/terraform-provider-google-beta/pull/2877))
+* **New Resource:** `google_privateca_certificate_authority_iam_binding` ([#2883](https://github.com/hashicorp/terraform-provider-google-beta/pull/2883))
+* **New Resource:** `google_privateca_certificate_authority_iam_member` ([#2883](https://github.com/hashicorp/terraform-provider-google-beta/pull/2883))
+* **New Resource:** `google_privateca_certificate_authority_iam_policy` ([#2883](https://github.com/hashicorp/terraform-provider-google-beta/pull/2883))
+
+IMPROVEMENTS:
+* bigquery: made incompatible changes to the `google_bigquery_table.schema` field cause the resource to be recreated ([#2876](https://github.com/hashicorp/terraform-provider-google-beta/pull/2876))
+* bigtable: fixed an issue where the `google_bigtable_instance` resource was not inferring the zone from the provider. ([#2873](https://github.com/hashicorp/terraform-provider-google-beta/pull/2873))
+* cloudscheduler: fixed unnecessary recreate for `google_cloud_scheduler_job` ([#2882](https://github.com/hashicorp/terraform-provider-google-beta/pull/2882))
+* compute: added `scaling_schedules` fields to `google_compute_autoscaler` and `google_compute_region_autoscaler` (beta) ([#2879](https://github.com/hashicorp/terraform-provider-google-beta/pull/2879))
+* compute: fixed an issue where `google_compute_region_per_instance_config`, `google_compute_per_instance_config`, `google_compute_region_instance_group_manager` resources were not inferring the region/zone from the provider. ([#2874](https://github.com/hashicorp/terraform-provider-google-beta/pull/2874))
+* memcache: fixed an issue where `google_memcached_instance` resource was not inferring the region from the provider. ([#2863](https://github.com/hashicorp/terraform-provider-google-beta/pull/2863))
+* tpu: fixed an issue where `google_tpu_node` resource was not inferring the zone from the provider. ([#2863](https://github.com/hashicorp/terraform-provider-google-beta/pull/2863))
+* vpcaccess: fixed an issue where `google_vpc_access_connector` resource was not inferring the region from the provider. ([#2863](https://github.com/hashicorp/terraform-provider-google-beta/pull/2863))
+
+BUG FIXES:
+* bigquery: fixed an issue in `bigquery_dataset_iam_member` where deleted members were not handled correctly ([#2875](https://github.com/hashicorp/terraform-provider-google-beta/pull/2875))
+* compute: fixed a perma-diff on `google_compute_health_check` when `log_config.enable` is set to false ([#2866](https://github.com/hashicorp/terraform-provider-google-beta/pull/2866))
+* notebooks: fixed permadiff on noRemoveDataDisk for `google_notebooks_instance` ([#2880](https://github.com/hashicorp/terraform-provider-google-beta/pull/2880))
+* resourcemanager: fixed an inconsistent result when IAM conditions are specified with `google_folder_iam_*` ([#2878](https://github.com/hashicorp/terraform-provider-google-beta/pull/2878))
+* healthcare: added retry logic on healthcare dataset not initialized error ([#2885](https://github.com/hashicorp/terraform-provider-google-beta/pull/2885))
+
 ## 3.53.0 (January 19, 2021)
 
 FEATURES:
diff --git a/google-beta/error_retry_predicates.go b/google-beta/error_retry_predicates.go
@@ -315,3 +315,12 @@ func iapClient409Operation(err error) (bool, string) {
 	}
 	return false, ""
 }
+
+func healthcareDatasetNotInitialized(err error) (bool, string) {
+	if gerr, ok := err.(*googleapi.Error); ok {
+		if gerr.Code == 404 && strings.Contains(strings.ToLower(gerr.Body), "dataset not initialized") {
+			return true, "dataset not initialized - retrying"
+		}
+	}
+	return false, ""
+}
diff --git a/google-beta/resource_dataflow_flex_template_job_test.go b/google-beta/resource_dataflow_flex_template_job_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
-	"google.golang.org/api/compute/v1"
+	compute "google.golang.org/api/compute/v1"
 )
 
 func TestAccDataflowFlexTemplateJob_basic(t *testing.T) {
diff --git a/google-beta/resource_healthcare_dataset.go b/google-beta/resource_healthcare_dataset.go
@@ -118,7 +118,7 @@ func resourceHealthcareDatasetCreate(d *schema.ResourceData, meta interface{}) e
 		billingProject = bp
 	}
 
-	res, err := sendRequestWithTimeout(config, "POST", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutCreate))
+	res, err := sendRequestWithTimeout(config, "POST", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutCreate), healthcareDatasetNotInitialized)
 	if err != nil {
 		return fmt.Errorf("Error creating Dataset: %s", err)
 	}
@@ -160,7 +160,7 @@ func resourceHealthcareDatasetRead(d *schema.ResourceData, meta interface{}) err
 		billingProject = bp
 	}
 
-	res, err := sendRequest(config, "GET", billingProject, url, userAgent, nil)
+	res, err := sendRequest(config, "GET", billingProject, url, userAgent, nil, healthcareDatasetNotInitialized)
 	if err != nil {
 		return handleNotFoundError(err, d, fmt.Sprintf("HealthcareDataset %q", d.Id()))
 	}
@@ -237,7 +237,7 @@ func resourceHealthcareDatasetUpdate(d *schema.ResourceData, meta interface{}) e
 		billingProject = bp
 	}
 
-	res, err := sendRequestWithTimeout(config, "PATCH", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
+	res, err := sendRequestWithTimeout(config, "PATCH", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate), healthcareDatasetNotInitialized)
 
 	if err != nil {
 		return fmt.Errorf("Error updating Dataset %q: %s", d.Id(), err)
@@ -276,7 +276,7 @@ func resourceHealthcareDatasetDelete(d *schema.ResourceData, meta interface{}) e
 		billingProject = bp
 	}
 
-	res, err := sendRequestWithTimeout(config, "DELETE", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutDelete))
+	res, err := sendRequestWithTimeout(config, "DELETE", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutDelete), healthcareDatasetNotInitialized)
 	if err != nil {
 		return handleNotFoundError(err, d, "Dataset")
 	}
diff --git a/google-beta/resource_healthcare_dataset_generated_test.go b/google-beta/resource_healthcare_dataset_generated_test.go
@@ -84,7 +84,7 @@ func testAccCheckHealthcareDatasetDestroyProducer(t *testing.T) func(s *terrafor
 				billingProject = config.BillingProject
 			}
 
-			_, err = sendRequest(config, "GET", billingProject, url, config.userAgent, nil)
+			_, err = sendRequest(config, "GET", billingProject, url, config.userAgent, nil, healthcareDatasetNotInitialized)
 			if err == nil {
 				return fmt.Errorf("HealthcareDataset still exists at %s", url)
 			}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	`+healthcare: add retry logic on healthcare dataset not initialized error`
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -315,3 +315,12 @@ func iapClient409Operation(err error) (bool, string) {`
`315`	`315`	`}`
`316`	`316`	`return false, ""`
`317`	`317`	`}`
	`318`	`+`
	`319`	`+func healthcareDatasetNotInitialized(err error) (bool, string) {`
	`320`	`+ if gerr, ok := err.(*googleapi.Error); ok {`
	`321`	`+ if gerr.Code == 404 && strings.Contains(strings.ToLower(gerr.Body), "dataset not initialized") {`
	`322`	`+ return true, "dataset not initialized - retrying"`
	`323`	`+ }`
	`324`	`+ }`
	`325`	`+ return false, ""`
	`326`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"`
`10`	`10`	`"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"`
`11`		`- "google.golang.org/api/compute/v1"`
	`11`	`+ compute "google.golang.org/api/compute/v1"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestAccDataflowFlexTemplateJob_basic(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func resourceHealthcareDatasetCreate(d *schema.ResourceData, meta interface{}) e`
`118`	`118`	`billingProject = bp`
`119`	`119`	`}`
`120`	`120`
`121`		`- res, err := sendRequestWithTimeout(config, "POST", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutCreate))`
	`121`	`+ res, err := sendRequestWithTimeout(config, "POST", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutCreate), healthcareDatasetNotInitialized)`
`122`	`122`	`if err != nil {`
`123`	`123`	`return fmt.Errorf("Error creating Dataset: %s", err)`
`124`	`124`	`}`
`@@ -160,7 +160,7 @@ func resourceHealthcareDatasetRead(d *schema.ResourceData, meta interface{}) err`
`160`	`160`	`billingProject = bp`
`161`	`161`	`}`
`162`	`162`
`163`		`- res, err := sendRequest(config, "GET", billingProject, url, userAgent, nil)`
	`163`	`+ res, err := sendRequest(config, "GET", billingProject, url, userAgent, nil, healthcareDatasetNotInitialized)`
`164`	`164`	`if err != nil {`
`165`	`165`	`return handleNotFoundError(err, d, fmt.Sprintf("HealthcareDataset %q", d.Id()))`
`166`	`166`	`}`
`@@ -237,7 +237,7 @@ func resourceHealthcareDatasetUpdate(d *schema.ResourceData, meta interface{}) e`
`237`	`237`	`billingProject = bp`
`238`	`238`	`}`
`239`	`239`
`240`		`- res, err := sendRequestWithTimeout(config, "PATCH", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))`
	`240`	`+ res, err := sendRequestWithTimeout(config, "PATCH", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate), healthcareDatasetNotInitialized)`
`241`	`241`
`242`	`242`	`if err != nil {`
`243`	`243`	`return fmt.Errorf("Error updating Dataset %q: %s", d.Id(), err)`
`@@ -276,7 +276,7 @@ func resourceHealthcareDatasetDelete(d *schema.ResourceData, meta interface{}) e`
`276`	`276`	`billingProject = bp`
`277`	`277`	`}`
`278`	`278`
`279`		`- res, err := sendRequestWithTimeout(config, "DELETE", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutDelete))`
	`279`	`+ res, err := sendRequestWithTimeout(config, "DELETE", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutDelete), healthcareDatasetNotInitialized)`
`280`	`280`	`if err != nil {`
`281`	`281`	`return handleNotFoundError(err, d, "Dataset")`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func testAccCheckHealthcareDatasetDestroyProducer(t testing.T) func(s terrafor`
`84`	`84`	`billingProject = config.BillingProject`
`85`	`85`	`}`
`86`	`86`
`87`		`- _, err = sendRequest(config, "GET", billingProject, url, config.userAgent, nil)`
	`87`	`+ _, err = sendRequest(config, "GET", billingProject, url, config.userAgent, nil, healthcareDatasetNotInitialized)`
`88`	`88`	`if err == nil {`
`89`	`89`	`return fmt.Errorf("HealthcareDataset still exists at %s", url)`
`90`	`90`	`}`