Fix ApigeeInstance location to be a region instead of a zone in tests (#5872) (#4193)

Co-authored-by: Stephen Lewis (Burrows) <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Stephen Lewis (Burrows) <[email protected]>

Author: modular-magician

.changelog/5872.txt

@@ -0,0 +1,2 @@
+```release-note:none
+```

google-beta/resource_apigee_instance.go

@@ -41,12 +41,10 @@ func resourceApigeeInstance() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"location": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				Description: `Compute Engine location where the instance resides. For trial organization
-subscriptions, the location must be a Compute Engine zone. For paid organization
-subscriptions, it should correspond to a Compute Engine region.`,
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: `Required. Compute Engine location where the instance resides.`,
 			},
 			"name": {
 				Type:        schema.TypeString,

google-beta/resource_apigee_instance_attachment_generated_test.go

@@ -109,7 +109,7 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_instance" "apigee_instance" {
   name     = "tf-test%{random_suffix}"
-  location = "us-central1-b"
+  location = "us-central1"
   org_id   = google_apigee_organization.apigee_org.id
 }
 

google-beta/resource_apigee_instance_generated_test.go

@@ -109,7 +109,7 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_instance" "apigee_instance" {
   name     = "tf-test%{random_suffix}"
-  location = "us-central1-b"
+  location = "us-central1"
   org_id   = google_apigee_organization.apigee_org.id
 }
 `, context)
@@ -450,7 +450,7 @@ resource "google_apigee_instance" "apigee_instance" {
   provider = google-beta
 
   name                     = "tf-test%{random_suffix}"
-  location                 = "us-central1-b"
+  location                 = "us-central1"
   description              = "Terraform-managed Apigee Instance"
   display_name             = "tf-test%{random_suffix}"
   org_id                   = google_apigee_organization.apigee_org.id

website/docs/r/apigee_instance.html.markdown

@@ -64,7 +64,7 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_instance" "apigee_instance" {
   name     = "tf-test%{random_suffix}"
-  location = "us-central1-b"
+  location = "us-central1"
   org_id   = google_apigee_organization.apigee_org.id
 }
 ```
@@ -101,7 +101,7 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_instance" "apigee_instance" {
   name     = "tf-test%{random_suffix}"
-  location = "us-central1-b"
+  location = "us-central1"
   org_id   = google_apigee_organization.apigee_org.id
   peering_cidr_range = "SLASH_22"
 }
@@ -139,7 +139,7 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_instance" "apigee_instance" {
   name     = "tf-test%{random_suffix}"
-  location = "us-central1-b"
+  location = "us-central1"
   org_id   = google_apigee_organization.apigee_org.id
   ip_range = "10.87.8.0/22"
 }
@@ -213,8 +213,8 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_instance" "apigee_instance" {
   name                     = "tf-test%{random_suffix}"
-  location                 = "us-central1-b"
-  description	             = "Terraform-managed Apigee Runtime Instance"
+  location                 = "us-central1"
+  description              = "Terraform-managed Apigee Runtime Instance"
   display_name             = "tf-test%{random_suffix}"
   org_id                   = google_apigee_organization.apigee_org.id
   disk_encryption_key_name = google_kms_crypto_key.apigee_key.id
@@ -232,9 +232,7 @@ The following arguments are supported:
 
 * `location` -
   (Required)
-  Compute Engine location where the instance resides. For trial organization
-  subscriptions, the location must be a Compute Engine zone. For paid organization
-  subscriptions, it should correspond to a Compute Engine region.
+  Required. Compute Engine location where the instance resides.
 
 * `org_id` -
   (Required)

website/docs/r/apigee_instance_attachment.html.markdown

@@ -91,7 +91,7 @@ resource "google_apigee_organization" "apigee_org" {
 
 resource "google_apigee_instance" "apigee_ins" {
   name     = "tf-test%{random_suffix}"
-  location = "us-central1-b"
+  location = "us-central1"
   org_id   = google_apigee_organization.apigee_org.id
 }