Changes after review

Author: sfc-gh-jcieslak

pkg/acceptance/bettertestspoc/assert/resourceparametersassert/account_resource_parameters_gen.go

@@ -11,6 +11,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/previewfeatures"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -75,6 +76,16 @@ func CurrentAccount() *schema.Resource {
 			StateContext: TrackingImportWrapper(resources.CurrentAccount, schema.ImportStatePassthroughContext),
 		},
 
+		SchemaVersion: 1,
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Version: 0,
+				// setting type to cty.EmptyObject is a bit hacky here but following https://developer.hashicorp.com/terraform/plugin/framework/migrating/resources/state-upgrade#sdkv2-1 would require lots of repetitive code; this should work with cty.EmptyObject
+				Type:    cty.EmptyObject,
+				Upgrade: v2_10_0_CurrentAccountStateUpgrader,
+			},
+		},
+
 		Timeouts: defaultTimeouts,
 	}
 }

pkg/resources/current_account.go

@@ -0,0 +1,17 @@
+package resources
+
+import (
+	"context"
+)
+
+func v2_10_0_CurrentAccountStateUpgrader(_ context.Context, state map[string]any, _ any) (map[string]any, error) {
+	if state == nil {
+		return state, nil
+	}
+
+	if v, ok := state["saml_identity_provider"]; ok && v != nil && v.(string) == "" {
+		delete(state, "saml_identity_provider")
+	}
+
+	return state, nil
+}

pkg/resources/current_account_state_upgraders.go

@@ -5,11 +5,13 @@ package testacc
 import (
 	"testing"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/providermodel"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/previewfeatures"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
@@ -762,7 +764,6 @@ func TestAcc_CurrentAccount_Complete(t *testing.T) {
 		WithWeekOfYearPolicy(1).
 		WithWeekStart(1)
 
-	config.FromModels(t, completeConfigModel)
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: TestAccProtoV6ProviderFactories,
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
@@ -1018,3 +1019,40 @@ func TestAcc_CurrentAccount_Complete(t *testing.T) {
 		},
 	})
 }
+
+func TestAcc_CurrentAccount_migrateFromV2_10_0(t *testing.T) {
+	testClient().EnsureValidNonProdAccountIsUsed(t)
+
+	provider := providermodel.SnowflakeProvider().
+		WithPreviewFeaturesEnabled(string(previewfeatures.CurrentAccountResource)).
+		WithWarehouse(testClient().Ids.WarehouseId().FullyQualifiedName())
+	configModel := model.CurrentAccount("test").
+		WithNetworkPolicy("RESTRICTED_ACCESS")
+
+	resource.Test(t, resource.TestCase{
+		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
+			tfversion.RequireAbove(tfversion.Version1_5_0),
+		},
+		Steps: []resource.TestStep{
+			{
+				ExternalProviders: ExternalProviderWithExactVersion("2.10.0"),
+				Config:            config.FromModels(t, provider, configModel),
+				Check: assertThat(t,
+					assert.Check(resource.TestCheckResourceAttr(configModel.ResourceReference(), "saml_identity_provider", "")),
+				),
+			},
+			{
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(configModel.ResourceReference(), plancheck.ResourceActionNoop),
+					},
+				},
+				ProtoV6ProviderFactories: TestAccProtoV6ProviderFactories,
+				Config:                   config.FromModels(t, provider, configModel),
+				Check: assertThat(t,
+					assert.Check(resource.TestCheckNoResourceAttr(configModel.ResourceReference(), "saml_identity_provider")),
+				),
+			},
+		},
+	})
+}