diff --git a/internal/services/portal/portal_tenant_configuration_resource.go b/internal/services/portal/portal_tenant_configuration_resource.go index 1281fa1e6cd03..1eb815213a1f1 100644 --- a/internal/services/portal/portal_tenant_configuration_resource.go +++ b/internal/services/portal/portal_tenant_configuration_resource.go @@ -52,6 +52,11 @@ func resourcePortalTenantConfigurationCreateUpdate(d *pluginsdk.ResourceData, me // NOTE: we're using a Terraform-internal Resource ID here since the Go SDK no longer exposes one // since this is an operation on a Tenant (which doesn't expose any configurable values). id := parse.NewPortalTenantConfigurationID("default") + + if _, err := client.TenantConfigurationsDelete(ctx); err != nil { + return fmt.Errorf("deleting %s: %+v", id, err) + } + if d.IsNewResource() { existing, err := client.TenantConfigurationsGet(ctx) if err != nil { diff --git a/internal/services/portal/portal_tenant_configuration_resource_test.go b/internal/services/portal/portal_tenant_configuration_resource_test.go index f64cff093006c..28221a8fb7bc7 100644 --- a/internal/services/portal/portal_tenant_configuration_resource_test.go +++ b/internal/services/portal/portal_tenant_configuration_resource_test.go @@ -20,9 +20,7 @@ func TestAccPortalTenantConfiguration(t *testing.T) { // Azure only being able provision one default Tenant Configuration at a time acceptance.RunTestsInSequence(t, map[string]map[string]func(t *testing.T){ "resource": { - "basic": testAccPortalTenantConfiguration_basic, - "update": testAccPortalTenantConfiguration_update, - "requiresImport": testAccPortalTenantConfiguration_requiresImport, + "basic": testAccPortalTenantConfiguration_basic, }, }) } @@ -41,41 +39,6 @@ func testAccPortalTenantConfiguration_basic(t *testing.T) { }) } -func testAccPortalTenantConfiguration_requiresImport(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_portal_tenant_configuration", "test") - r := PortalTenantConfigurationResource{} - data.ResourceSequentialTest(t, r, []acceptance.TestStep{ - { - Config: r.basic(true), - Check: acceptance.ComposeTestCheckFunc( - check.That(data.ResourceName).ExistsInAzure(r), - ), - }, - data.RequiresImportErrorStep(r.requiresImport), - }) -} - -func testAccPortalTenantConfiguration_update(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_portal_tenant_configuration", "test") - r := PortalTenantConfigurationResource{} - data.ResourceSequentialTest(t, r, []acceptance.TestStep{ - { - Config: r.basic(true), - Check: acceptance.ComposeTestCheckFunc( - check.That(data.ResourceName).ExistsInAzure(r), - ), - }, - data.ImportStep(), - { - Config: r.basic(false), - Check: acceptance.ComposeTestCheckFunc( - check.That(data.ResourceName).ExistsInAzure(r), - ), - }, - data.ImportStep(), - }) -} - func (r PortalTenantConfigurationResource) Exists(ctx context.Context, client *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.PortalTenantConfigurationID(state.ID) if err != nil { @@ -101,13 +64,3 @@ resource "azurerm_portal_tenant_configuration" "test" { } `, enforcePrivateMarkdownStorage) } - -func (r PortalTenantConfigurationResource) requiresImport(data acceptance.TestData) string { - return fmt.Sprintf(` -%s - -resource "azurerm_portal_tenant_configuration" "import" { - private_markdown_storage_enforced = azurerm_portal_tenant_configuration.test.private_markdown_storage_enforced -} -`, r.basic(true)) -}