dataproc_metastore_service - promote args to GA (#9619) (#6767)

* promote to GA

* psc routes test

* lint
[upstream:16442bfe269f04a114487f48101598ab320f3e33]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/9619.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+metastore: added `endpoint_protocol`, `metadata_integration`, and `auxiliary_versions` to google_dataproc_metastore_service (GA only)
+```
+```release-note:enhancement
+metastore: added `consumers.custom_routes_enabled` to google_dataproc_metastore_service (beta only)
+```

google-beta/services/dataprocmetastore/resource_dataproc_metastore_service.go

@@ -293,6 +293,11 @@ There must be at least one IP address available in the subnet's primary range. T
 								},
 							},
 						},
+						"custom_routes_enabled": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Description: `Enables custom routes to be imported and exported for the Dataproc Metastore service's peered VPC network.`,
+						},
 					},
 				},
 			},
@@ -1136,6 +1141,8 @@ func flattenDataprocMetastoreServiceNetworkConfig(v interface{}, d *schema.Resou
 	transformed := make(map[string]interface{})
 	transformed["consumers"] =
 		flattenDataprocMetastoreServiceNetworkConfigConsumers(original["consumers"], d, config)
+	transformed["custom_routes_enabled"] =
+		flattenDataprocMetastoreServiceNetworkConfigCustomRoutesEnabled(original["customRoutesEnabled"], d, config)
 	return []interface{}{transformed}
 }
 func flattenDataprocMetastoreServiceNetworkConfigConsumers(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -1165,6 +1172,10 @@ func flattenDataprocMetastoreServiceNetworkConfigConsumersSubnetwork(v interface
 	return v
 }
 
+func flattenDataprocMetastoreServiceNetworkConfigCustomRoutesEnabled(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenDataprocMetastoreServiceDatabaseType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -1539,6 +1550,13 @@ func expandDataprocMetastoreServiceNetworkConfig(v interface{}, d tpgresource.Te
 		transformed["consumers"] = transformedConsumers
 	}
 
+	transformedCustomRoutesEnabled, err := expandDataprocMetastoreServiceNetworkConfigCustomRoutesEnabled(original["custom_routes_enabled"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedCustomRoutesEnabled); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["customRoutesEnabled"] = transformedCustomRoutesEnabled
+	}
+
 	return transformed, nil
 }
 
@@ -1579,6 +1597,10 @@ func expandDataprocMetastoreServiceNetworkConfigConsumersSubnetwork(v interface{
 	return v, nil
 }
 
+func expandDataprocMetastoreServiceNetworkConfigCustomRoutesEnabled(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandDataprocMetastoreServiceDatabaseType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

google-beta/services/dataprocmetastore/resource_dataproc_metastore_service_generated_test.go

@@ -167,7 +167,7 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAuxExample(t *testi
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckDataprocMetastoreServiceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -186,7 +186,6 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceAuxExample(t *testi
 func testAccDataprocMetastoreService_dataprocMetastoreServiceAuxExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_dataproc_metastore_service" "aux" {
-  provider   = google-beta
   service_id = "tf-test-metastore-aux%{random_suffix}"
   location   = "us-central1"
   tier       = "DEVELOPER"
@@ -211,7 +210,7 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceMetadataExample(t *
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckDataprocMetastoreServiceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -230,7 +229,6 @@ func TestAccDataprocMetastoreService_dataprocMetastoreServiceMetadataExample(t *
 func testAccDataprocMetastoreService_dataprocMetastoreServiceMetadataExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_dataproc_metastore_service" "metadata" {
-  provider   = google-beta
   service_id = "tf-test-metastore-metadata%{random_suffix}"
   location   = "us-central1"
   tier       = "DEVELOPER"

website/docs/r/dataproc_metastore_service.html.markdown

@@ -120,6 +120,42 @@ resource "google_dataproc_metastore_service" "default" {
   }
 }
 ```
+## Example Usage - Dataproc Metastore Service Private Service Connect Custom Routes
+
+
+```hcl
+resource "google_compute_network" "net" {
+  provider                = google-beta
+  name                    = "my-network"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_subnetwork" "subnet" {
+  provider                 = google-beta
+  name                     = "my-subnetwork"
+  region                   = "us-central1"
+  network                  = google_compute_network.net.id
+  ip_cidr_range            = "10.0.0.0/22"
+  private_ip_google_access = true
+}
+
+resource "google_dataproc_metastore_service" "default" {
+  provider   = google-beta
+  service_id = "metastore-srv"
+  location   = "us-central1"
+
+  hive_metastore_config {
+    version = "3.1.2"
+  }
+
+  network_config {
+    consumers {
+      subnetwork            = google_compute_subnetwork.subnet.id
+    }
+    custom_routes_enabled = true
+  }
+}
+```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
   <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_working_dir=dataproc_metastore_service_dpms2&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&open_in_editor=main.tf&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md" target="_blank">
     <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
@@ -249,7 +285,7 @@ The following arguments are supported:
   Possible values are: `CANARY`, `STABLE`.
 
 * `metadata_integration` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   The setting that defines how metastore metadata should be integrated with external services and systems.
   Structure is [documented below](#nested_metadata_integration).
 
@@ -299,7 +335,7 @@ The following arguments are supported:
 <a name="nested_hive_metastore_config"></a>The `hive_metastore_config` block supports:
 
 * `endpoint_protocol` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   The protocol to use for the metastore service endpoint. If unspecified, defaults to `THRIFT`.
   Default value is `THRIFT`.
   Possible values are: `THRIFT`, `GRPC`.
@@ -319,7 +355,7 @@ The following arguments are supported:
   Structure is [documented below](#nested_kerberos_config).
 
 * `auxiliary_versions` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   A mapping of Hive metastore version to the auxiliary version configuration.
   When specified, a secondary Hive metastore service is created along with the primary service.
   All auxiliary versions must be less than the service's primary version.
@@ -371,6 +407,10 @@ The following arguments are supported:
   The consumer-side network configuration for the Dataproc Metastore instance.
   Structure is [documented below](#nested_consumers).
 
+* `custom_routes_enabled` -
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  Enables custom routes to be imported and exported for the Dataproc Metastore service's peered VPC network.
+
 
 <a name="nested_consumers"></a>The `consumers` block supports: