Add SHARED_LOADBALANCER_VIP purpose to regional addresses. (#4169) (#…

…2773) Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Dec 10, 2020 · b13a8f2 · b13a8f2
1 parent 8e0ccf4
commit b13a8f2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/.changelog/4169.txt b/.changelog/4169.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added SHARED_LOADBALANCER_VIP as a valid option for `google_compute_address.purpose`
+```
diff --git a/google-beta/resource_compute_address.go b/google-beta/resource_compute_address.go
@@ -98,13 +98,16 @@ specified, it is assumed to be PREMIUM. Possible values: ["PREMIUM", "STANDARD"]
 				Computed:     true,
 				Optional:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.StringInSlice([]string{"GCE_ENDPOINT", "SHARED_LOADBALANCER_VIP", ""}, false),
+				ValidateFunc: validation.StringInSlice([]string{"GCE_ENDPOINT", "VPC_PEERING", "SHARED_LOADBALANCER_VIP", ""}, false),
 				Description: `The purpose of this resource, which can be one of the following values:
 
 * GCE_ENDPOINT for addresses that are used by VM instances, alias IP ranges, internal load balancers, and similar resources.
+
 * SHARED_LOADBALANCER_VIP for an address that can be used by multiple internal load balancers.
 
-This should only be set when using an Internal address. Possible values: ["GCE_ENDPOINT", "SHARED_LOADBALANCER_VIP"]`,
+* VPC_PEERING for addresses that are reserved for VPC peer networks.
+
+This should only be set when using an Internal address. Possible values: ["GCE_ENDPOINT", "VPC_PEERING", "SHARED_LOADBALANCER_VIP"]`,
 			},
 			"region": {
 				Type:             schema.TypeString,

diff --git a/google-beta/resource_compute_address_generated_test.go b/google-beta/resource_compute_address_generated_test.go
@@ -157,7 +157,7 @@ func TestAccComputeAddress_addressWithSharedLoadbalancerVipExample(t *testing.T)
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProvidersOiCS,
+		Providers: testAccProviders,
 		ExternalProviders: map[string]resource.ExternalProvider{
 			"random": {},
 		},
@@ -166,14 +166,19 @@ func TestAccComputeAddress_addressWithSharedLoadbalancerVipExample(t *testing.T)
 			{
 				Config: testAccComputeAddress_addressWithSharedLoadbalancerVipExample(context),
 			},
+			{
+				ResourceName:            "google_compute_address.internal_with_shared_loadbalancer_vip",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"subnetwork", "region"},
+			},
 		},
 	})
 }
 
 func testAccComputeAddress_addressWithSharedLoadbalancerVipExample(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_compute_address" "internal_with_shared_loadbalancer_vip" {
-  provider     = google-beta 
   name         = "tf-test-my-internal-address%{random_suffix}"
   address_type = "INTERNAL"
   purpose      = "SHARED_LOADBALANCER_VIP"

diff --git a/website/docs/r/compute_address.html.markdown b/website/docs/r/compute_address.html.markdown
@@ -178,8 +178,9 @@ The following arguments are supported:
   The purpose of this resource, which can be one of the following values:
   * GCE_ENDPOINT for addresses that are used by VM instances, alias IP ranges, internal load balancers, and similar resources.
   * SHARED_LOADBALANCER_VIP for an address that can be used by multiple internal load balancers.
+  * VPC_PEERING for addresses that are reserved for VPC peer networks.
   This should only be set when using an Internal address.
-  Possible values are `GCE_ENDPOINT` and `SHARED_LOADBALANCER_VIP`.
+  Possible values are `GCE_ENDPOINT`, `VPC_PEERING`, and `SHARED_LOADBALANCER_VIP`.
 
 * `network_tier` -
   (Optional)