Add PSC fields to Filestore instance in ga (#15116) (#10822)

[upstream:250877817a0812a25d8b725d727847887bee14e8]

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

Author: modular-magician

.changelog/15116.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+filestore: added PSC fields to `google_filestore_instance` (ga)
+```

google-beta/services/filestore/resource_filestore_instance_test.go

@@ -631,7 +631,7 @@ func TestAccFilestoreInstance_psc(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckFilestoreInstanceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -652,26 +652,21 @@ func TestAccFilestoreInstance_psc(t *testing.T) {
 
 func testAccFilestoreInstance_psc(context map[string]interface{}) string {
 	return acctest.Nprintf(`
-data "google_client_config" "current" {
-  provider = google-beta
-}
+data "google_client_config" "current" {}
 
 resource "google_compute_network" "psc_network" {
-  provider                = google-beta
   name                    = "%{name}"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "psc_subnet" {
-  provider      = google-beta
   name          = "%{name}"
   ip_cidr_range = "10.2.0.0/16"
   region        = "%{location}"
   network       = google_compute_network.psc_network.id
 }
 
 resource "google_network_connectivity_service_connection_policy" "default" {
-  provider      = google-beta
   name          = "%{name}"
   location      = "%{location}"
   service_class = "google-cloud-filestore"
@@ -682,7 +677,6 @@ resource "google_network_connectivity_service_connection_policy" "default" {
 }
 
 resource "google_filestore_instance" "instance" {
-  provider = google-beta
   depends_on = [
     google_network_connectivity_service_connection_policy.default
   ]
@@ -724,7 +718,7 @@ func TestAccFilestoreInstance_nfsExportOptionsNetwork_update(t *testing.T) {
 	// Currently, we can only alternate between an empty network and the instance network of non-PSC instances.
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckFilestoreInstanceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -754,7 +748,6 @@ func TestAccFilestoreInstance_nfsExportOptionsNetwork_update(t *testing.T) {
 func testAccFilestoreInstance_nfsExportOptionsNetwork_update(name, location, tier, network string) string {
 	return fmt.Sprintf(`
 resource "google_filestore_instance" "instance" {
-  provider    = google-beta
   name        = "%s"
   zone        = "%s"
   tier        = "%s"

website/docs/r/filestore_instance.html.markdown

@@ -319,7 +319,7 @@ The following arguments are supported:
   if this field is specified for other squashMode settings.
 
 * `network` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   The source VPC network for `ip_ranges`.
   Required for instances using Private Service Connect, optional otherwise.
 
@@ -354,7 +354,7 @@ The following arguments are supported:
   Possible values are: `DIRECT_PEERING`, `PRIVATE_SERVICE_ACCESS`, `PRIVATE_SERVICE_CONNECT`.
 
 * `psc_config` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   Private Service Connect configuration.
   Should only be set when connect_mode is PRIVATE_SERVICE_CONNECT.
   Structure is [documented below](#nested_networks_networks_psc_config).