Fix a bug where for the update network endpoints are sending empty in… (#15581)

Author: Cheriit

mmv1/products/compute/NetworkEndpoints.yaml

@@ -113,11 +113,12 @@ properties:
       properties:
         - name: 'instance'
           type: ResourceRef
+          default_from_api: true
           description: |
             The name for a specific VM instance that the IP address belongs to.
             This is required for network endpoints of type GCE_VM_IP_PORT.
             The instance must be in the same zone as the network endpoint group.
-          custom_expand: 'templates/terraform/custom_expand/resource_from_self_link.go.tmpl'
+          custom_expand: 'templates/terraform/custom_expand/resource_from_self_link_nullable.go.tmpl'
           resource: 'Instance'
           imports: 'name'
         - name: 'port'

mmv1/products/compute/RegionNetworkEndpoint.yaml

@@ -74,7 +74,6 @@ examples:
       network_name: 'network'
   - name: 'region_network_endpoint_portmap'
     primary_resource_id: 'region_network_endpoint_portmap'
-    min_version: 'beta'
     vars:
       network_name: 'network'
       subnetwork_name: 'subnetwork'
@@ -140,7 +139,6 @@ properties:
     type: Integer
     description: |
       Client destination port for the `GCE_VM_IP_PORTMAP` NEG.
-    min_version: 'beta'
     custom_flatten: 'templates/terraform/custom_flatten/float64_to_int.go.tmpl'
   - name: 'instance'
     type: ResourceRef
@@ -149,4 +147,3 @@ properties:
       This is required for network endpoints of type GCE_VM_IP_PORTMAP.
     resource: 'Instance'
     imports: 'name'
-    min_version: 'beta'

mmv1/templates/terraform/constants/network_endpoints.go.tmpl

@@ -34,7 +34,9 @@ func NetworkEndpointsNetworkEndpointConvertToAny(endpoint NetworkEndpointsNetwor
 	m := make(map[string]interface{})
 	m["ip_address"] = endpoint.IPAddress
 	m["port"] = endpoint.Port
-	m["instance"] = endpoint.Instance
+  if endpoint.Instance != "" {
+    m["instance"] = endpoint.Instance
+  }
 	return m
 }
 

mmv1/templates/terraform/custom_expand/resource_from_self_link_nullable.go.tmpl

@@ -0,0 +1,7 @@
+func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+  	if tpgresource.IsEmptyValue(reflect.ValueOf(v.(string))) {
+		return nil, nil
+	}
+
+	return tpgresource.GetResourceNameFromSelfLink(v.(string)), nil
+}

mmv1/templates/terraform/pre_update/network_endpoints.go.tmpl

@@ -57,6 +57,10 @@ if err != nil {
     return err
 }
 
+if len(lastPage) == 0 {
+    return resourceComputeNetworkEndpointsRead(d, meta)
+}
+
 obj = map[string]interface{}{
     "networkEndpoints": lastPage,
-}
+}

mmv1/third_party/terraform/services/compute/resource_compute_network_endpoints_recreate_test.go

@@ -0,0 +1,182 @@
+package compute_test
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+)
+
+func TestAccComputeNetworkEndpoints_recreateNetworkEndpointsBasic(t *testing.T) {
+	// Multiple fine-grained resources
+	acctest.SkipIfVcr(t)
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+	negId := fmt.Sprintf("projects/%s/zones/%s/networkEndpointGroups/tf-test-neg-%s",
+		envvar.GetTestProjectFromEnv(), envvar.GetTestZoneFromEnv(), context["random_suffix"])
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		Steps: []resource.TestStep{
+			{
+				// Create one endpoint
+				Config: testAccComputeNetworkEndpoints_networkEndpointGroupOnly(context),
+			},
+			{
+				ResourceName:      "google_compute_network_endpoint_group.external_group",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				// Create single endpoint
+				Config: testAccComputeNetworkEndpoints_networkEndpointsSingle(context),
+			},
+			{
+				ResourceName:      "google_compute_network_endpoints.external_endpoints",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				// Add two new endpoints
+				Config: testAccComputeNetworkEndpoints_networkEndpointsMultiple(context),
+			},
+			{
+				ResourceName:      "google_compute_network_endpoints.external_endpoints",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				// Remove two endpoints
+				Config: testAccComputeNetworkEndpoints_networkEndpointsSingle(context),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeNetworkEndpointsWithPortsDestroyedCustom(t, negId, "8442"),
+					testAccCheckComputeNetworkEndpointsWithPortsDestroyedCustom(t, negId, "8443"),
+				),
+			},
+			{
+				ResourceName:      "google_compute_network_endpoints.external_endpoints",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				// Delete all endpoints
+				Config: testAccComputeNetworkEndpoints_networkEndpointGroupOnly(context),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeNetworkEndpointsWithPortsDestroyedCustom(t, negId, "8441"),
+				),
+			},
+		},
+	})
+}
+
+func testAccComputeNetworkEndpoints_networkEndpointsSingle(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_network_endpoints" "external_endpoints" {
+  network_endpoint_group = google_compute_network_endpoint_group.external_group.id
+  zone                   = google_compute_network_endpoint_group.external_group.zone
+
+  network_endpoints {
+    ip_address = "8.8.8.8"
+    port       = 8441
+  }
+}
+`, context) + testAccComputeNetworkEndpoints_networkEndpointGroupOnly(context)
+}
+
+func testAccComputeNetworkEndpoints_networkEndpointsMultiple(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_network_endpoints" "external_endpoints" {
+  network_endpoint_group = google_compute_network_endpoint_group.external_group.id
+  zone                   = google_compute_network_endpoint_group.external_group.zone
+
+  network_endpoints {
+    ip_address = "8.8.8.8"
+    port       = 8441
+  }
+
+  network_endpoints {
+    ip_address = "1.2.3.4"
+    port       = 8442
+  }
+
+  network_endpoints {
+    ip_address = "5.6.7.8"
+    port       = 8443
+  }
+}
+`, context) + testAccComputeNetworkEndpoints_networkEndpointGroupOnly(context)
+}
+
+func testAccComputeNetworkEndpoints_networkEndpointGroupOnly(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_network" "default" {
+  name                    = "tf-test-neg-network-%{random_suffix}"
+}
+
+resource "google_compute_network_endpoint_group" "external_group" {
+  name                  = "tf-test-neg-%{random_suffix}"
+  network               = google_compute_network.default.self_link
+  zone	                = "us-central1-a"
+  network_endpoint_type = "NON_GCP_PRIVATE_IP_PORT"
+}
+`, context)
+}
+
+// testAccCheckComputeNetworkEndpointsDestroyed makes sure the endpoint with
+// given Terraform resource name and previous information (obtained from Exists)
+// was destroyed properly.
+func testAccCheckComputeNetworkEndpointsWithPortsDestroyedCustom(t *testing.T, negId string, ports ...string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		foundPorts, err := testAccComputeNetworkEndpointsListEndpointPortsCustom(t, negId)
+		if err != nil {
+			return fmt.Errorf("unable to confirm endpoints with ports %+v was destroyed: %v", ports, err)
+		}
+		for _, p := range ports {
+			if _, ok := foundPorts[p]; ok {
+				return fmt.Errorf("network endpoint with port %s still exists", p)
+			}
+		}
+
+		return nil
+	}
+}
+
+func testAccComputeNetworkEndpointsListEndpointPortsCustom(t *testing.T, negId string) (map[string]struct{}, error) {
+	config := acctest.GoogleProviderConfig(t)
+
+	url := fmt.Sprintf("https://www.googleapis.com/compute/v1/%s/listNetworkEndpoints", negId)
+	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		Config:    config,
+		Method:    "POST",
+		RawURL:    url,
+		UserAgent: config.UserAgent,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	v, ok := res["items"]
+	if !ok || v == nil {
+		return nil, nil
+	}
+	items := v.([]interface{})
+	ports := make(map[string]struct{})
+	for _, item := range items {
+		endptWithHealth := item.(map[string]interface{})
+		v, ok := endptWithHealth["networkEndpoint"]
+		if !ok || v == nil {
+			continue
+		}
+		endpt := v.(map[string]interface{})
+		ports[fmt.Sprintf("%v", endpt["port"])] = struct{}{}
+	}
+	return ports, nil
+}