Revert the promotion of Port Mapping NEGs from GA to Beta (#11854) (#…

…8305) [upstream:2d34af8bcf47b390ede98ace828c98e80cb3acd0] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 30, 2024 · 780b3e6 · 780b3e6
1 parent 82d97bc
commit 780b3e6
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/.changelog/11854.txt b/.changelog/11854.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: promoted `client_destination_port` and `instance` fields in `google_compute_region_network_endpoint` resource to GA (revert)
+```
diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint.go b/google-beta/services/compute/resource_compute_region_network_endpoint.go
@@ -380,7 +380,6 @@ func resourceComputeRegionNetworkEndpointDelete(d *schema.ResourceData, meta int
 	if fqdnProp != "" {
 		toDelete["fqdn"] = fqdnProp
 	}
-
 	// Instance
 	instanceProp, err := expandNestedComputeRegionNetworkEndpointInstance(d.Get("instance"), d, config)
 	if err != nil {

diff --git a/...le-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go b/...le-beta/services/compute/resource_compute_region_network_endpoint_group_generated_test.go
@@ -518,7 +518,7 @@ func TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupPortmapE
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		CheckDestroy:             testAccCheckComputeRegionNetworkEndpointGroupDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -543,17 +543,20 @@ resource "google_compute_region_network_endpoint_group" "region_network_endpoint
   subnetwork            = google_compute_subnetwork.default.id
 
   network_endpoint_type = "GCE_VM_IP_PORTMAP"
+  provider              = google-beta
 }
 
 resource "google_compute_network" "default" {
   name                    = "network%{random_suffix}"
+  provider              = google-beta
 }
 
 resource "google_compute_subnetwork" "default" {
   name          = "subnetwork%{random_suffix}"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
   network       = google_compute_network.default.id
+  provider              = google-beta
 }
 `, context)
 }

diff --git a/google-beta/services/compute/resource_compute_region_network_endpoint_test.go b/google-beta/services/compute/resource_compute_region_network_endpoint_test.go
@@ -158,7 +158,7 @@ func TestAccComputeRegionNetworkEndpoint_regionNetworkEndpointPortmapExample(t *
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccComputeRegionNetworkEndpoint_regionNetworkEndpointPortmapExample(context),
@@ -185,13 +185,15 @@ func testAccComputeRegionNetworkEndpoint_regionNetworkEndpointPortmapNoEndpointE
 resource "google_compute_network" "default" {
   name                    = "network%{random_suffix}"
   auto_create_subnetworks = false
+  provider           = google-beta
 }
 
 resource "google_compute_subnetwork" "default" {
   name          = "subnetwork%{random_suffix}"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
   network       = google_compute_network.default.id
+  provider           = google-beta
 }
 
 resource "google_compute_region_network_endpoint_group" default {
@@ -201,11 +203,13 @@ resource "google_compute_region_network_endpoint_group" default {
   subnetwork            = google_compute_subnetwork.default.id
 
   network_endpoint_type = "GCE_VM_IP_PORTMAP"
+  provider           = google-beta
 }
 
 data "google_compute_image" "my_image" {
   family  = "debian-11"
   project = "debian-cloud"
+  provider           = google-beta
 }
 
 resource "google_compute_instance" "default" {
@@ -224,6 +228,7 @@ resource "google_compute_instance" "default" {
     access_config {
     }
   }
+  provider           = google-beta
 }
 `, context)
 }
@@ -237,6 +242,7 @@ resource "google_compute_region_network_endpoint" "region_network_endpoint_portm
   port       = 80
   ip_address = google_compute_instance.default.network_interface[0].network_ip
   client_destination_port = 8080
+  provider           = google-beta
 }
 `, context) + testAccComputeRegionNetworkEndpoint_regionNetworkEndpointPortmapNoEndpointExample(context)
 }

diff --git a/website/docs/r/compute_region_network_endpoint.html.markdown b/website/docs/r/compute_region_network_endpoint.html.markdown
@@ -102,13 +102,15 @@ resource "google_compute_network" "default" {
 resource "google_compute_network" "default" {
   name                    = "network"
   auto_create_subnetworks = false
+  provider           = google-beta
 }
 
 resource "google_compute_subnetwork" "default" {
   name          = "subnetwork"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
   network       = google_compute_network.default.id
+  provider           = google-beta
 }
 
 resource "google_compute_region_network_endpoint_group" default {
@@ -118,6 +120,7 @@ resource "google_compute_region_network_endpoint_group" default {
   subnetwork            = google_compute_subnetwork.default.id
 
   network_endpoint_type = "GCE_VM_IP_PORTMAP"
+  provider           = google-beta
 }
 
 resource "google_compute_region_network_endpoint" "region_network_endpoint_portmap" {
@@ -127,11 +130,13 @@ resource "google_compute_region_network_endpoint" "region_network_endpoint_portm
   port       = 80
   ip_address = google_compute_instance.default.network_interface[0].network_ip
   client_destination_port = 8080
+  provider           = google-beta
 }
 
 data "google_compute_image" "my_image" {
   family  = "debian-11"
   project = "debian-cloud"
+  provider           = google-beta
 }
 
 resource "google_compute_instance" "default" {
@@ -150,6 +155,7 @@ resource "google_compute_instance" "default" {
     access_config {
     }
   }
+  provider           = google-beta
 }
 ```
 
@@ -181,11 +187,11 @@ The following arguments are supported:
   This can only be specified when network_endpoint_type of the NEG is INTERNET_FQDN_PORT.
 
 * `client_destination_port` -
-  (Optional)
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
   Client destination port for the `GCE_VM_IP_PORTMAP` NEG.
 
 * `instance` -
-  (Optional)
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
   The name for a specific VM instance that the IP address belongs to.
   This is required for network endpoints of type GCE_VM_IP_PORTMAP.
 

diff --git a/website/docs/r/compute_region_network_endpoint_group.html.markdown b/website/docs/r/compute_region_network_endpoint_group.html.markdown
@@ -369,17 +369,20 @@ resource "google_compute_region_network_endpoint_group" "region_network_endpoint
   subnetwork            = google_compute_subnetwork.default.id
 
   network_endpoint_type = "GCE_VM_IP_PORTMAP"
+  provider              = google-beta
 }
 
 resource "google_compute_network" "default" {
   name                    = "network"
+  provider              = google-beta
 }
 
 resource "google_compute_subnetwork" "default" {
   name          = "subnetwork"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
   network       = google_compute_network.default.id
+  provider              = google-beta
 }
 ```