Adding data source support for google_compute_region_network_endpoint_group

mmv1/third_party/terraform/data_sources/data_source_google_compute_region_network_endpoint_group.go

@@ -0,0 +1,59 @@
+package google
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func dataSourceGoogleComputeRegionNetworkEndpointGroup() *schema.Resource {
+	// Generate datasource schema from resource
+	dsSchema := datasourceSchemaFromResourceSchema(resourceComputeRegionNetworkEndpointGroup().Schema)
+
+	addOptionalFieldsToSchema(dsSchema, "name")
+	addOptionalFieldsToSchema(dsSchema, "region")
+	addOptionalFieldsToSchema(dsSchema, "project")
+	addOptionalFieldsToSchema(dsSchema, "self_link")
+
+	return &schema.Resource{
+		Read:   dataSourceComputeRegionNetworkEndpointGroupRead,
+		Schema: dsSchema,
+	}
+}
+
+func dataSourceComputeRegionNetworkEndpointGroupRead(d *schema.ResourceData, meta interface{}) error {
+	config := meta.(*Config)
+	if name, ok := d.GetOk("name"); ok {
+		project, err := getProject(d, config)
+		if err != nil {
+			return err
+		}
+		region, err := getRegion(d, config)
+		if err != nil {
+			return err
+		}
+
+		d.SetId(fmt.Sprintf("projects/%s/regions/%s/networkEndpointGroups/%s", project, region, name.(string)))
+	} else if selfLink, ok := d.GetOk("self_link"); ok {
+		parsed, err := ParseNetworkEndpointGroupRegionalFieldValue(selfLink.(string), d, config)
+		if err != nil {
+			return err
+		}
+		if err := d.Set("name", parsed.Name); err != nil {
+			return fmt.Errorf("Error setting name: %s", err)
+		}
+		if err := d.Set("project", parsed.Project); err != nil {
+			return fmt.Errorf("Error setting project: %s", err)
+		}
+		if err := d.Set("region", parsed.Region); err != nil {
+			return fmt.Errorf("Error setting region: %s", err)
+		}
+
+		d.SetId(fmt.Sprintf("projects/%s/regions/%s/networkEndpointGroups/%s", parsed.Project, parsed.Region, parsed.Name))
+	} else {
+		return errors.New("Must provide either `self_link` or `region/name`")
+	}
+
+	return resourceComputeRegionNetworkEndpointGroupRead(d, meta)
+}

mmv1/third_party/terraform/tests/data_source_google_compute_region_network_endpoint_group_test.go

@@ -0,0 +1,63 @@
+package google
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccDataSourceRegionNetworkEndpointGroup_basic(t *testing.T) {
+	t.Parallel()
+	context := map[string]interface{}{
+		"project":       getTestProjectFromEnv(),
+		"region":        "us-central1",
+		"random_suffix": randString(t, 10),
+	}
+
+	vcrTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceRegionNetworkEndpointGroup_basic(context),
+				Check:  checkDataSourceStateMatchesResourceStateWithIgnores("data.google_compute_region_network_endpoint_group.cloudrun_neg", "google_compute_region_network_endpoint_group.cloudrun_neg", map[string]struct{}{"name": {}, "region": {}}),
+			},
+		},
+	})
+}
+
+func testAccDataSourceRegionNetworkEndpointGroup_basic(context map[string]interface{}) string {
+	return Nprintf(`
+  resource "google_compute_region_network_endpoint_group" "cloudrun_neg" {
+    name                  = "cloud-run-rneg-%{random_suffix}"
+    network_endpoint_type = "SERVERLESS"
+    region                = "%{region}"
+    project     = "%{project}"
+    cloud_run {
+      service = google_cloud_run_service.cloudrun_neg.name
+    }
+  }
+
+  resource "google_cloud_run_service" "cloudrun_neg" {
+    name     = "tf-test-cloudrun-neg%{random_suffix}"
+    location = "us-central1"
+    template {
+      spec {
+        containers {
+          image = "us-docker.pkg.dev/cloudrun/container/hello"
+        }
+      }
+    }
+
+    traffic {
+      percent         = 100
+      latest_revision = true
+    }
+  }
+
+  data "google_compute_region_network_endpoint_group" "cloudrun_neg" {
+      name = google_compute_region_network_endpoint_group.cloudrun_neg.name
+      region = "%{region}"
+  }
+`, context)
+}

mmv1/third_party/terraform/utils/field_helpers.go

@@ -88,6 +88,10 @@ func ParseNetworkEndpointGroupFieldValue(networkEndpointGroup string, d Terrafor
 	return parseZonalFieldValue("networkEndpointGroups", networkEndpointGroup, "project", "zone", d, config, false)
 }
 
+func ParseNetworkEndpointGroupRegionalFieldValue(networkEndpointGroup string, d TerraformResourceData, config *Config) (*RegionalFieldValue, error) {
+	return parseRegionalFieldValue("networkEndpointGroups", networkEndpointGroup, "project", "region", "zone", d, config, false)
+}
+
 // ------------------------------------------------------------
 // Base helpers used to create helpers for specific fields.
 // ------------------------------------------------------------

mmv1/third_party/terraform/utils/provider.go.erb

@@ -229,6 +229,7 @@ func Provider() *schema.Provider {
 			"google_compute_network_endpoint_group":            dataSourceGoogleComputeNetworkEndpointGroup(),
 			"google_compute_node_types":                        dataSourceGoogleComputeNodeTypes(),
 			"google_compute_regions":                           dataSourceGoogleComputeRegions(),
+			"google_compute_region_network_endpoint_group":     dataSourceGoogleComputeRegionNetworkEndpointGroup(),
 			"google_compute_region_instance_group":             dataSourceGoogleComputeRegionInstanceGroup(),
 			"google_compute_region_ssl_certificate":            dataSourceGoogleRegionComputeSslCertificate(),
 			"google_compute_resource_policy":                   dataSourceGoogleComputeResourcePolicy(),