Remove multi_region_auxiliary from google_bigquery_reservation (#…

…11304) (#7844) [upstream:b5f859fc1750ac1f250d540a7ad9d0af45c4370b] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jul 31, 2024 · ae32bf7 · ae32bf7
1 parent 840f5a6
commit ae32bf7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 41 deletions.
diff --git a/.changelog/11304.txt b/.changelog/11304.txt
@@ -0,0 +1,3 @@
+```release-note:breaking-change
+bigqueryreservation: remove `multi_region_auxiliary` from `google_bigquery_reservation`
+```
diff --git a/google-beta/services/bigqueryreservation/resource_bigquery_reservation.go b/google-beta/services/bigqueryreservation/resource_bigquery_reservation.go
@@ -115,13 +115,6 @@ capacity specified above at most.`,
 Examples: US, EU, asia-northeast1. The default value is US.`,
 				Default: "US",
 			},
-			"multi_region_auxiliary": {
-				Type:       schema.TypeBool,
-				Optional:   true,
-				Deprecated: "`multi_region_auxiliary` is deprecated and will be removed in a future major release. This field is no longer supported by the BigQuery Reservation API.",
-				Description: `Applicable only for reservations located within one of the BigQuery multi-regions (US or EU).
-If set to true, this reservation is placed in the organization's secondary region which is designated for disaster recovery purposes. If false, this reservation is placed in the organization's default region.`,
-			},
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -159,12 +152,6 @@ func resourceBigqueryReservationReservationCreate(d *schema.ResourceData, meta i
 	} else if v, ok := d.GetOkExists("concurrency"); !tpgresource.IsEmptyValue(reflect.ValueOf(concurrencyProp)) && (ok || !reflect.DeepEqual(v, concurrencyProp)) {
 		obj["concurrency"] = concurrencyProp
 	}
-	multiRegionAuxiliaryProp, err := expandBigqueryReservationReservationMultiRegionAuxiliary(d.Get("multi_region_auxiliary"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("multi_region_auxiliary"); !tpgresource.IsEmptyValue(reflect.ValueOf(multiRegionAuxiliaryProp)) && (ok || !reflect.DeepEqual(v, multiRegionAuxiliaryProp)) {
-		obj["multiRegionAuxiliary"] = multiRegionAuxiliaryProp
-	}
 	editionProp, err := expandBigqueryReservationReservationEdition(d.Get("edition"), d, config)
 	if err != nil {
 		return err
@@ -275,9 +262,6 @@ func resourceBigqueryReservationReservationRead(d *schema.ResourceData, meta int
 	if err := d.Set("concurrency", flattenBigqueryReservationReservationConcurrency(res["concurrency"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Reservation: %s", err)
 	}
-	if err := d.Set("multi_region_auxiliary", flattenBigqueryReservationReservationMultiRegionAuxiliary(res["multiRegionAuxiliary"], d, config)); err != nil {
-		return fmt.Errorf("Error reading Reservation: %s", err)
-	}
 	if err := d.Set("edition", flattenBigqueryReservationReservationEdition(res["edition"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Reservation: %s", err)
 	}
@@ -322,12 +306,6 @@ func resourceBigqueryReservationReservationUpdate(d *schema.ResourceData, meta i
 	} else if v, ok := d.GetOkExists("concurrency"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, concurrencyProp)) {
 		obj["concurrency"] = concurrencyProp
 	}
-	multiRegionAuxiliaryProp, err := expandBigqueryReservationReservationMultiRegionAuxiliary(d.Get("multi_region_auxiliary"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("multi_region_auxiliary"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, multiRegionAuxiliaryProp)) {
-		obj["multiRegionAuxiliary"] = multiRegionAuxiliaryProp
-	}
 	autoscaleProp, err := expandBigqueryReservationReservationAutoscale(d.Get("autoscale"), d, config)
 	if err != nil {
 		return err
@@ -356,10 +334,6 @@ func resourceBigqueryReservationReservationUpdate(d *schema.ResourceData, meta i
 		updateMask = append(updateMask, "concurrency")
 	}
 
-	if d.HasChange("multi_region_auxiliary") {
-		updateMask = append(updateMask, "multiRegionAuxiliary")
-	}
-
 	if d.HasChange("autoscale") {
 		updateMask = append(updateMask, "autoscale")
 	}
@@ -505,10 +479,6 @@ func flattenBigqueryReservationReservationConcurrency(v interface{}, d *schema.R
 	return v // let terraform core handle it otherwise
 }
 
-func flattenBigqueryReservationReservationMultiRegionAuxiliary(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
-
 func flattenBigqueryReservationReservationEdition(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -574,10 +544,6 @@ func expandBigqueryReservationReservationConcurrency(v interface{}, d tpgresourc
 	return v, nil
 }
 
-func expandBigqueryReservationReservationMultiRegionAuxiliary(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandBigqueryReservationReservationEdition(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

diff --git a/website/docs/guides/version_6_upgrade.html.markdown b/website/docs/guides/version_6_upgrade.html.markdown
@@ -108,6 +108,12 @@ Description of the change and how users should adjust their configuration (if ne
 
 A `view` can no longer be created when `schema` contains required fields
 
+## Resource: `google_bigquery_reservation`
+
+### `multi_region_auxiliary` is now removed
+
+This field is no longer supported by the BigQuery Reservation API.
+
 ## Resource: `google_sql_database_instance`
 
 ### `settings.ip_configuration.require_ssl` is now removed

diff --git a/website/docs/r/bigquery_reservation.html.markdown b/website/docs/r/bigquery_reservation.html.markdown
@@ -80,13 +80,6 @@ The following arguments are supported:
   (Optional)
   Maximum number of queries that are allowed to run concurrently in this reservation. This is a soft limit due to asynchronous nature of the system and various optimizations for small queries. Default value is 0 which means that concurrency will be automatically set based on the reservation size.
 
-* `multi_region_auxiliary` -
-  (Optional, Deprecated)
-  Applicable only for reservations located within one of the BigQuery multi-regions (US or EU).
-  If set to true, this reservation is placed in the organization's secondary region which is designated for disaster recovery purposes. If false, this reservation is placed in the organization's default region.
-
-  ~> **Warning:** `multi_region_auxiliary` is deprecated and will be removed in a future major release. This field is no longer supported by the BigQuery Reservation API.
-
 * `edition` -
   (Optional)
   The edition type. Valid values are STANDARD, ENTERPRISE, ENTERPRISE_PLUS