Merge branch 'GoogleCloudPlatform:main' into megan-kuo-patch-1

Author: megan-kuo

mmv1/products/dataprocgdc/ServiceInstance.yaml

@@ -57,6 +57,7 @@ examples:
       project: "my-project"
     test_vars_overrides:
       'project': '"gdce-cluster-monitoring"'
+    skip_test: https://github.com/hashicorp/terraform-provider-google/issues/21173
 properties:
   - name: gdceCluster
     type: NestedObject

mmv1/products/lustre/Instance.yaml

@@ -14,6 +14,10 @@
 ---
 name: Instance
 description: A Managed Lustre instance
+references:
+  guides:
+    'Official Documentation': 'https://cloud.google.com/managed-lustre/docs/create-instance'
+  api: 'https://cloud.google.com/managed-lustre/docs/reference/rest/v1/projects.locations.instances'
 base_url: projects/{{project}}/locations/{{location}}/instances
 update_mask: true
 self_link: projects/{{project}}/locations/{{location}}/instances/{{instance_id}}

mmv1/third_party/terraform/provider/provider_mmv1_resources.go.tmpl

@@ -168,6 +168,7 @@ var handwrittenDatasources = map[string]*schema.Resource{
 	"google_logging_project_cmek_settings":             logging.DataSourceGoogleLoggingProjectCmekSettings(),
 	"google_logging_project_settings":                  logging.DataSourceGoogleLoggingProjectSettings(),
 	"google_logging_sink":                              logging.DataSourceGoogleLoggingSink(),
+	"google_lustre_instance":                           lustre.DataSourceLustreInstance(),
 	"google_monitoring_notification_channel":           monitoring.DataSourceMonitoringNotificationChannel(),
 	"google_monitoring_cluster_istio_service":          monitoring.DataSourceMonitoringServiceClusterIstio(),
 	"google_monitoring_istio_canonical_service":        monitoring.DataSourceMonitoringIstioCanonicalService(),

mmv1/third_party/terraform/services/dataprocgdc/resource_dataproc_gdc_application_environment_test.go

@@ -9,6 +9,7 @@ import (
 )
 
 func TestAccDataprocGdcApplicationEnvironment_update(t *testing.T) {
+	t.Skip("https://github.com/hashicorp/terraform-provider-google/issues/20419")
 	t.Parallel()
 
 	context := map[string]interface{}{

mmv1/third_party/terraform/services/lustre/data_source_lustre_instance.go

@@ -0,0 +1,76 @@
+package lustre
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+)
+
+func DataSourceLustreInstance() *schema.Resource {
+
+	// Generate datasource schema from resource
+	dsSchema := tpgresource.DatasourceSchemaFromResourceSchema(ResourceLustreInstance().Schema)
+
+	dsScema_zone := map[string]*schema.Schema{
+		"zone": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: `Zone of Lustre instance`,
+		},
+	}
+
+	// Set 'Required' schema elements from resource
+	tpgresource.AddRequiredFieldsToSchema(dsSchema, "instance_id")
+
+	// Set 'Optional' schema elements from resource
+	tpgresource.AddOptionalFieldsToSchema(dsSchema, "project")
+
+	// Merge schema elements
+	dsSchema_m := tpgresource.MergeSchemas(dsScema_zone, dsSchema)
+
+	return &schema.Resource{
+		Read:   dataSourceLustreInstanceRead,
+		Schema: dsSchema_m,
+	}
+}
+
+func dataSourceLustreInstanceRead(d *schema.ResourceData, meta interface{}) error {
+	config := meta.(*transport_tpg.Config)
+
+	//  Get required fields for ID
+	instance_id := d.Get("instance_id").(string)
+
+	zone, err := tpgresource.GetZone(d, config)
+	if err != nil {
+		return err
+	}
+
+	project, err := tpgresource.GetProject(d, config)
+	if err != nil {
+		return err
+	}
+
+	// Set the ID
+	id := fmt.Sprintf("projects/%s/locations/%s/instances/%s", project, zone, instance_id)
+	d.SetId(id)
+
+	// Setting location field for url_param_only field
+	d.Set("location", zone)
+
+	err = resourceLustreInstanceRead(d, meta)
+	if err != nil {
+		return err
+	}
+
+	if err := tpgresource.SetDataSourceLabels(d); err != nil {
+		return err
+	}
+
+	if d.Id() == "" {
+		return fmt.Errorf("%s not found", d.Id())
+	}
+
+	return nil
+}

mmv1/third_party/terraform/services/lustre/data_source_lustre_instance_test.go

@@ -0,0 +1,81 @@
+package lustre_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+)
+
+func TestAccLustreInstanceDatasource_basic(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccLustreInstanceDatasource_basic(context),
+				Check: acctest.CheckDataSourceStateMatchesResourceState(
+					"data.google_lustre_instance.default",
+					"google_lustre_instance.instance",
+				),
+			},
+			{
+				ResourceName:      "google_lustre_instance.instance",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccLustreInstanceDatasource_basic(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_lustre_instance" "instance" {
+  instance_id             = "my-instance-%{random_suffix}"
+  location                = "us-central1-a"
+  filesystem              = "testfs"
+  capacity_gib            = 18000
+  network                 = google_compute_network.producer_net.id
+  gke_support_enabled     = false
+       
+ depends_on               = [ google_service_networking_connection.service_con ]
+}
+
+resource "google_compute_subnetwork" "producer_subnet" {
+  name                    = "tf-test-my-subnet-%{random_suffix}"
+  ip_cidr_range           = "10.0.0.248/29"
+  region                  = "us-central1"
+  network                 = google_compute_network.producer_net.id
+}
+
+resource "google_compute_network" "producer_net" {
+  name                    = "tf-test-my-network-%{random_suffix}"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_global_address" "private_ip_alloc" {
+  name                    = "private-ip-alloc-%{random_suffix}"
+  purpose                 = "VPC_PEERING"
+  address_type            = "INTERNAL"
+  prefix_length           = 16
+  network                 = google_compute_network.producer_net.id
+}
+
+resource "google_service_networking_connection" "service_con" {
+  network                 = google_compute_network.producer_net.id
+  service                 = "servicenetworking.googleapis.com"
+  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
+}
+
+data "google_lustre_instance" "default" {
+  instance_id             = google_lustre_instance.instance.instance_id
+  zone                    = "us-central1-a"
+}
+`, context)
+}

mmv1/third_party/terraform/website/docs/d/lustre_instance.html.markdown

@@ -0,0 +1,32 @@
+---
+subcategory: "Lustre"
+description: |-
+  Fetches the details of a Lustre instance.
+---
+
+# google_lustre_instance
+
+Use this data source to get information about a Lustre instance. For more information see the [API docs](https://cloud.google.com/filestore/docs/lustre/reference/rest/v1/projects.locations.instances).
+
+## Example Usage
+
+```hcl
+data "google_lustre_instance" "instance" {
+  name   = "my-instance"
+  location = "us-central1"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `instance_id` - (Required) The instance id of the Lustre instance.
+
+* `zone` - (Optional) The ID of the zone in which the resource belongs. If it is not provided, the provider zone is used.
+
+* `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used.
+
+## Attributes Reference
+
+See [google_lustre_instance](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/lustre_instance) resource for details of all the available attributes.