Revert "[BLOCK] Add storage pool type field" (#15406) (#10891)

[upstream:b661adacdaa34f49efebe4566fd564a9556da0b1]

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

Author: modular-magician

.changelog/15406.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+netapp: revert field `type` in `google_netapp_storage_pool` resource
+```

google-beta/services/netapp/resource_netapp_storage_pool.go

@@ -49,7 +49,7 @@ func ResourceNetappStoragePool() *schema.Resource {
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(45 * time.Minute),
 			Update: schema.DefaultTimeout(20 * time.Minute),
-			Delete: schema.DefaultTimeout(45 * time.Minute),
+			Delete: schema.DefaultTimeout(20 * time.Minute),
 		},
 
 		CustomizeDiff: customdiff.All(
@@ -103,7 +103,6 @@ Auto-tiering can be enabled after storage pool creation but it can't be disabled
 			},
 			"custom_performance_enabled": {
 				Type:        schema.TypeBool,
-				Computed:    true,
 				Optional:    true,
 				ForceNew:    true,
 				Description: `Optional. True if using Independent Scaling of capacity and performance (Hyperdisk). Default is false.`,
@@ -175,16 +174,6 @@ Possible values are: AUTO, MANUAL. Possible values: ["QOS_TYPE_UNSPECIFIED", "AU
 				Optional:    true,
 				Description: `Optional. Custom Performance Total Throughput of the pool (in MiB/s).`,
 			},
-			"type": {
-				Type:         schema.TypeString,
-				Computed:     true,
-				Optional:     true,
-				ForceNew:     true,
-				ValidateFunc: verify.ValidateEnum([]string{"STORAGE_POOL_TYPE_UNSPECIFIED", "FILE", "UNIFIED", ""}),
-				Description: `Type of the storage pool.
-This field is used to control whether the pool supports FILE based volumes only or UNIFIED (both FILE and BLOCK) volumes.
-If not specified during creation, it defaults to FILE. Possible values: ["STORAGE_POOL_TYPE_UNSPECIFIED", "FILE", "UNIFIED"]`,
-			},
 			"zone": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -351,12 +340,6 @@ func resourceNetappStoragePoolCreate(d *schema.ResourceData, meta interface{}) e
 	} else if v, ok := d.GetOkExists("qos_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(qosTypeProp)) && (ok || !reflect.DeepEqual(v, qosTypeProp)) {
 		obj["qosType"] = qosTypeProp
 	}
-	typeProp, err := expandNetappStoragePoolType(d.Get("type"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("type"); !tpgresource.IsEmptyValue(reflect.ValueOf(typeProp)) && (ok || !reflect.DeepEqual(v, typeProp)) {
-		obj["type"] = typeProp
-	}
 	effectiveLabelsProp, err := expandNetappStoragePoolEffectiveLabels(d.Get("effective_labels"), d, config)
 	if err != nil {
 		return err
@@ -528,9 +511,6 @@ func resourceNetappStoragePoolRead(d *schema.ResourceData, meta interface{}) err
 	if err := d.Set("hot_tier_size_used_gib", flattenNetappStoragePoolHotTierSizeUsedGib(res["hotTierSizeUsedGib"], d, config)); err != nil {
 		return fmt.Errorf("Error reading StoragePool: %s", err)
 	}
-	if err := d.Set("type", flattenNetappStoragePoolType(res["type"], d, config)); err != nil {
-		return fmt.Errorf("Error reading StoragePool: %s", err)
-	}
 	if err := d.Set("terraform_labels", flattenNetappStoragePoolTerraformLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading StoragePool: %s", err)
 	}
@@ -982,10 +962,6 @@ func flattenNetappStoragePoolHotTierSizeUsedGib(v interface{}, d *schema.Resourc
 	return v
 }
 
-func flattenNetappStoragePoolType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
-
 func flattenNetappStoragePoolTerraformLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -1069,10 +1045,6 @@ func expandNetappStoragePoolQosType(v interface{}, d tpgresource.TerraformResour
 	return v, nil
 }
 
-func expandNetappStoragePoolType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandNetappStoragePoolEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

google-beta/services/netapp/resource_netapp_storage_pool_generated_meta.yaml

@@ -33,7 +33,6 @@ fields:
     provider_only: true
   - api_field: 'totalIops'
   - api_field: 'totalThroughputMibps'
-  - api_field: 'type'
   - api_field: 'volumeCapacityGib'
   - api_field: 'volumeCount'
   - api_field: 'zone'

google-beta/services/netapp/resource_netapp_storage_pool_test.go

@@ -743,53 +743,3 @@ data "google_compute_network" "default" {
 }
 `, context)
 }
-
-func TestAccNetappStoragePool_unifiedStoragePoolCreate(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"network_name":  acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
-		"random_suffix": acctest.RandString(t, 10),
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccNetappStoragePool_unifiedStoragePoolCreate(context),
-			},
-			{
-				ResourceName:            "google_netapp_storage_pool.test_pool",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
-			},
-		},
-	})
-}
-
-func testAccNetappStoragePool_unifiedStoragePoolCreate(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-
-data "google_compute_network" "default" {
-	provider = google-beta
-    name = "%{network_name}"
-}
-
-resource "google_netapp_storage_pool" "test_pool" {
-    provider = google-beta
-    name = "tf-test-pool%{random_suffix}"
-    location = "us-central1-a"
-    service_level = "FLEX"
-    type = "UNIFIED"
-    capacity_gib = "2048"
-    network = data.google_compute_network.default.id
-    description           = "this is a test description"
-    labels                = {
-        key = "test"
-        value = "pool"
-    }
-}
-`, context)
-}

website/docs/r/netapp_storage_pool.html.markdown

@@ -197,13 +197,6 @@ The following arguments are supported:
   Possible values are: AUTO, MANUAL.
   Possible values are: `QOS_TYPE_UNSPECIFIED`, `AUTO`, `MANUAL`.
 
-* `type` -
-  (Optional)
-  Type of the storage pool.
-  This field is used to control whether the pool supports FILE based volumes only or UNIFIED (both FILE and BLOCK) volumes.
-  If not specified during creation, it defaults to FILE.
-  Possible values are: `STORAGE_POOL_TYPE_UNSPECIFIED`, `FILE`, `UNIFIED`.
-
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.
 
@@ -248,7 +241,7 @@ This resource provides the following
 
 - `create` - Default is 45 minutes.
 - `update` - Default is 20 minutes.
-- `delete` - Default is 45 minutes.
+- `delete` - Default is 20 minutes.
 
 ## Import