Test organization account

Author: sfc-gh-jcieslak

pkg/acceptance/bettertestspoc/assert/objectassert/organization_account_snowflake_gen.go

@@ -114,7 +114,7 @@ var OrganizationAccountsDef = g.NewInterface(
 			Number("managed_accounts").
 			Text("consumption_billing_entity_name").
 			OptionalText("marketplace_consumer_billing_entity_name").
-			Text("marketplace_provider_billing_entity_name").
+			OptionalText("marketplace_provider_billing_entity_name").
 			OptionalText("old_account_url").
 			Bool("is_org_admin").
 			OptionalText("account_old_url_saved_on").
@@ -137,7 +137,7 @@ var OrganizationAccountsDef = g.NewInterface(
 			Number("ManagedAccounts").
 			Text("ConsumptionBillingEntityName").
 			OptionalText("MarketplaceConsumerBillingEntityName").
-			Text("MarketplaceProviderBillingEntityName").
+			OptionalText("MarketplaceProviderBillingEntityName").
 			OptionalText("OldAccountUrl").
 			Bool("IsOrgAdmin").
 			OptionalText("AccountOldUrlSavedOn").

pkg/schemas/organization_account_gen.go

@@ -7,15 +7,18 @@ import (
 	"regexp"
 	"testing"
 
+	tfjson "github.com/hashicorp/terraform-json"
+
+	"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/assert/resourceshowoutputassert"
 	"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/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/previewfeatures"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -460,3 +463,44 @@ 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)
+
+	currentOrganizationAccountName := testClient().OrganizationAccount.ShowCurrent(t).AccountName
+
+	provider := providermodel.SnowflakeProvider().
+		WithPreviewFeaturesEnabled(string(previewfeatures.CurrentOrganizationAccountResource)).
+		WithWarehouse(testClient().Ids.WarehouseId().FullyQualifiedName())
+
+	configModel := model.CurrentOrganizationAccount("test", currentOrganizationAccountName).
+		WithComment("SNOWFLAKE")
+
+	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")),
+				),
+			},
+		},
+	})
+}