diff --git a/internal/services/netapp/netapp_snapshot_policy_resource.go b/internal/services/netapp/netapp_snapshot_policy_resource.go index 468497aa8223..478b708eaabd 100644 --- a/internal/services/netapp/netapp_snapshot_policy_resource.go +++ b/internal/services/netapp/netapp_snapshot_policy_resource.go @@ -18,7 +18,6 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/azure" "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" - "github.com/hashicorp/terraform-provider-azurerm/internal/features" netAppValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/netapp/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" @@ -72,7 +71,6 @@ func resourceNetAppSnapshotPolicy() *pluginsdk.Resource { Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Computed: !features.FourPointOhBeta(), Elem: &pluginsdk.Resource{ Schema: map[string]*pluginsdk.Schema{ "snapshots_to_keep": { @@ -94,7 +92,6 @@ func resourceNetAppSnapshotPolicy() *pluginsdk.Resource { Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Computed: !features.FourPointOhBeta(), Elem: &pluginsdk.Resource{ Schema: map[string]*pluginsdk.Schema{ "snapshots_to_keep": { @@ -122,7 +119,6 @@ func resourceNetAppSnapshotPolicy() *pluginsdk.Resource { Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Computed: !features.FourPointOhBeta(), Elem: &pluginsdk.Resource{ Schema: map[string]*pluginsdk.Schema{ "snapshots_to_keep": { @@ -160,7 +156,6 @@ func resourceNetAppSnapshotPolicy() *pluginsdk.Resource { Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Computed: !features.FourPointOhBeta(), Elem: &pluginsdk.Resource{ Schema: map[string]*pluginsdk.Schema{ "snapshots_to_keep": { @@ -199,30 +194,18 @@ func resourceNetAppSnapshotPolicy() *pluginsdk.Resource { CustomizeDiff: pluginsdk.CustomDiffWithAll( pluginsdk.ForceNewIfChange("hourly_schedule", func(ctx context.Context, old, new, meta interface{}) bool { - if !features.FourPointOhBeta() { - return false - } return len(old.([]interface{})) > 0 && len(new.([]interface{})) == 0 }), pluginsdk.ForceNewIfChange("daily_schedule", func(ctx context.Context, old, new, meta interface{}) bool { - if !features.FourPointOhBeta() { - return false - } return len(old.([]interface{})) > 0 && len(new.([]interface{})) == 0 }), pluginsdk.ForceNewIfChange("weekly_schedule", func(ctx context.Context, old, new, meta interface{}) bool { - if !features.FourPointOhBeta() { - return false - } return len(old.([]interface{})) > 0 && len(new.([]interface{})) == 0 }), pluginsdk.ForceNewIfChange("monthly_schedule", func(ctx context.Context, old, new, meta interface{}) bool { - if !features.FourPointOhBeta() { - return false - } return len(old.([]interface{})) > 0 && len(new.([]interface{})) == 0 }), ),