wip

Author: sfc-gh-jcieslak

pkg/resources/current_account.go

@@ -11,7 +11,6 @@ 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"
 )
@@ -76,15 +75,15 @@ 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,
-			},
-		},
+		//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/testacc/resource_current_account_acceptance_test.go

@@ -1026,8 +1026,8 @@ func TestAcc_CurrentAccount_migrateFromV2_10_0(t *testing.T) {
 	provider := providermodel.SnowflakeProvider().
 		WithPreviewFeaturesEnabled(string(previewfeatures.CurrentAccountResource)).
 		WithWarehouse(testClient().Ids.WarehouseId().FullyQualifiedName())
-	configModel := model.CurrentAccount("test").
-		WithNetworkPolicy("RESTRICTED_ACCESS")
+
+	configModel := model.CurrentAccount("test")
 
 	resource.Test(t, resource.TestCase{
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{

pkg/testacc/resource_current_organization_account_acceptance_test.go

@@ -464,7 +464,6 @@ func TestAcc_CurrentOrganizationAccount_NonEmptyComment_OnCreate(t *testing.T) {
 	})
 }
 
-// TODO: Can't be tested as 2.10.0 version doesn't work apparently
 func TestAcc_CurrentOrganizationAccount_migrateFromV2_10_0(t *testing.T) {
 	testClient().EnsureValidNonProdOrganizationAccountIsUsed(t)
 
@@ -474,27 +473,26 @@ func TestAcc_CurrentOrganizationAccount_migrateFromV2_10_0(t *testing.T) {
 		WithPreviewFeaturesEnabled(string(previewfeatures.CurrentOrganizationAccountResource)).
 		WithWarehouse(testClient().Ids.WarehouseId().FullyQualifiedName())
 
-	configModel := model.CurrentOrganizationAccount("test", currentOrganizationAccountName).
-		WithComment("SNOWFLAKE")
+	configModel := model.CurrentOrganizationAccount("test", currentOrganizationAccountName)
 
 	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),
-				//	},
-				//},
+				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,