Revert "adding deployment type to beta provider" (#12414) (#8772)

[upstream:5e57c61eeb68326f62200fad77220ed086fe7dc4]

Signed-off-by: Modular Magician <magic-modules@google.com>

Author: modular-magician

.changelog/12414.txt

@@ -78,15 +78,6 @@ func ResourceParallelstoreInstance() *schema.Resource {
 				ForceNew:    true,
 				Description: `Part of 'parent'. See documentation of 'projectsId'.`,
 			},
-			"deployment_type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Description: `Parallelstore Instance deployment type.
-  Possible values:
-  DEPLOYMENT_TYPE_UNSPECIFIED
-  SCRATCH
-  PERSISTENT`,
-			},
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -280,12 +271,6 @@ func resourceParallelstoreInstanceCreate(d *schema.ResourceData, meta interface{
 	} else if v, ok := d.GetOkExists("directory_stripe_level"); !tpgresource.IsEmptyValue(reflect.ValueOf(directoryStripeLevelProp)) && (ok || !reflect.DeepEqual(v, directoryStripeLevelProp)) {
 		obj["directoryStripeLevel"] = directoryStripeLevelProp
 	}
-	deploymentTypeProp, err := expandParallelstoreInstanceDeploymentType(d.Get("deployment_type"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("deployment_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(deploymentTypeProp)) && (ok || !reflect.DeepEqual(v, deploymentTypeProp)) {
-		obj["deploymentType"] = deploymentTypeProp
-	}
 	labelsProp, err := expandParallelstoreInstanceEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -447,9 +432,6 @@ func resourceParallelstoreInstanceRead(d *schema.ResourceData, meta interface{})
 	if err := d.Set("directory_stripe_level", flattenParallelstoreInstanceDirectoryStripeLevel(res["directoryStripeLevel"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
-	if err := d.Set("deployment_type", flattenParallelstoreInstanceDeploymentType(res["deploymentType"], d, config)); err != nil {
-		return fmt.Errorf("Error reading Instance: %s", err)
-	}
 	if err := d.Set("terraform_labels", flattenParallelstoreInstanceTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Instance: %s", err)
 	}
@@ -494,12 +476,6 @@ func resourceParallelstoreInstanceUpdate(d *schema.ResourceData, meta interface{
 	} else if v, ok := d.GetOkExists("directory_stripe_level"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, directoryStripeLevelProp)) {
 		obj["directoryStripeLevel"] = directoryStripeLevelProp
 	}
-	deploymentTypeProp, err := expandParallelstoreInstanceDeploymentType(d.Get("deployment_type"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("deployment_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, deploymentTypeProp)) {
-		obj["deploymentType"] = deploymentTypeProp
-	}
 	labelsProp, err := expandParallelstoreInstanceEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -528,10 +504,6 @@ func resourceParallelstoreInstanceUpdate(d *schema.ResourceData, meta interface{
 		updateMask = append(updateMask, "directoryStripeLevel")
 	}
 
-	if d.HasChange("deployment_type") {
-		updateMask = append(updateMask, "deploymentType")
-	}
-
 	if d.HasChange("effective_labels") {
 		updateMask = append(updateMask, "labels")
 	}
@@ -721,10 +693,6 @@ func flattenParallelstoreInstanceDirectoryStripeLevel(v interface{}, d *schema.R
 	return v
 }
 
-func flattenParallelstoreInstanceDeploymentType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
-
 func flattenParallelstoreInstanceTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -768,10 +736,6 @@ func expandParallelstoreInstanceDirectoryStripeLevel(v interface{}, d tpgresourc
 	return v, nil
 }
 
-func expandParallelstoreInstanceDeploymentType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandParallelstoreInstanceEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google-beta/services/parallelstore/resource_parallelstore_instance.go

@@ -39,7 +39,7 @@ func TestAccParallelstoreInstance_parallelstoreInstanceBasicExample(t *testing.T
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckParallelstoreInstanceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -65,19 +65,16 @@ resource "google_parallelstore_instance" "instance" {
   network = google_compute_network.network.name
   file_stripe_level = "FILE_STRIPE_LEVEL_MIN"
   directory_stripe_level = "DIRECTORY_STRIPE_LEVEL_MIN"
-  deployment_type = "SCRATCH"
   labels = {
     test = "value"
   }
-  provider = google-beta
   depends_on = [google_service_networking_connection.default]
 }
 
 resource "google_compute_network" "network" {
   name                    = "network%{random_suffix}"
   auto_create_subnetworks = true
   mtu = 8896
-  provider = google-beta
 }
 
 # Create an IP address
@@ -86,15 +83,13 @@ resource "google_compute_global_address" "private_ip_alloc" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 24
-  provider = google-beta
   network       = google_compute_network.network.id
 }
 
 # Create a private connection
 resource "google_service_networking_connection" "default" {
   network                 = google_compute_network.network.id
   service                 = "servicenetworking.googleapis.com"
-  provider = google-beta
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
 }
 `, context)

google-beta/services/parallelstore/resource_parallelstore_instance_generated_test.go

@@ -40,19 +40,16 @@ resource "google_parallelstore_instance" "instance" {
   network = google_compute_network.network.name
   file_stripe_level = "FILE_STRIPE_LEVEL_MIN"
   directory_stripe_level = "DIRECTORY_STRIPE_LEVEL_MIN"
-  deployment_type = "SCRATCH"
   labels = {
     test = "value"
   }
-  provider = google-beta
   depends_on = [google_service_networking_connection.default]
 }
 
 resource "google_compute_network" "network" {
   name                    = "network"
   auto_create_subnetworks = true
   mtu = 8896
-  provider = google-beta
 }
 
 # Create an IP address
@@ -61,15 +58,13 @@ resource "google_compute_global_address" "private_ip_alloc" {
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 24
-  provider = google-beta
   network       = google_compute_network.network.id
 }
 
 # Create a private connection
 resource "google_service_networking_connection" "default" {
   network                 = google_compute_network.network.id
   service                 = "servicenetworking.googleapis.com"
-  provider = google-beta
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
 }
 ```
@@ -162,14 +157,6 @@ The following arguments are supported:
     DIRECTORY_STRIPE_LEVEL_BALANCED
     DIRECTORY_STRIPE_LEVEL_MAX
 
-* `deployment_type` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
-  Parallelstore Instance deployment type.
-    Possible values:
-    DEPLOYMENT_TYPE_UNSPECIFIED
-    SCRATCH
-    PERSISTENT
-
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.