From ed38b7795f86755655996ee5b5f40bfd64484249 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 23 Dec 2020 20:29:27 +0000 Subject: [PATCH] Add ga version of bigquery reservation (#4342) Signed-off-by: Modular Magician --- .changelog/4342.txt | 3 +++ ...ce_bigquery_reservation_reservation_generated_test.go | 9 +++++++-- website/docs/r/bigquery_reservation.html.markdown | 3 --- 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .changelog/4342.txt diff --git a/.changelog/4342.txt b/.changelog/4342.txt new file mode 100644 index 0000000000..22a1a7e79c --- /dev/null +++ b/.changelog/4342.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +bigquery: promoted bigquery reservation to GA. +``` diff --git a/google-beta/resource_bigquery_reservation_reservation_generated_test.go b/google-beta/resource_bigquery_reservation_reservation_generated_test.go index 81135aa796..b57a7cb910 100644 --- a/google-beta/resource_bigquery_reservation_reservation_generated_test.go +++ b/google-beta/resource_bigquery_reservation_reservation_generated_test.go @@ -32,7 +32,7 @@ func TestAccBigqueryReservationReservation_bigqueryReservationBasicExample(t *te vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, ExternalProviders: map[string]resource.ExternalProvider{ "random": {}, }, @@ -41,6 +41,12 @@ func TestAccBigqueryReservationReservation_bigqueryReservationBasicExample(t *te { Config: testAccBigqueryReservationReservation_bigqueryReservationBasicExample(context), }, + { + ResourceName: "google_bigquery_reservation.reservation", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"location", "name"}, + }, }, }) } @@ -48,7 +54,6 @@ func TestAccBigqueryReservationReservation_bigqueryReservationBasicExample(t *te func testAccBigqueryReservationReservation_bigqueryReservationBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_bigquery_reservation" "reservation" { - provider = google-beta name = "reservation%{random_suffix}" location = "asia-northeast1" // Set to 0 for testing purposes diff --git a/website/docs/r/bigquery_reservation.html.markdown b/website/docs/r/bigquery_reservation.html.markdown index 1c56045724..2eaae3b01b 100644 --- a/website/docs/r/bigquery_reservation.html.markdown +++ b/website/docs/r/bigquery_reservation.html.markdown @@ -24,8 +24,6 @@ description: |- A reservation is a mechanism used to guarantee BigQuery slots to users. -~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources. To get more information about Reservation, see: @@ -43,7 +41,6 @@ To get more information about Reservation, see: ```hcl resource "google_bigquery_reservation" "reservation" { - provider = google-beta name = "reservation" location = "asia-northeast1" // Set to 0 for testing purposes