azurerm_databricks_workspace - changing the sku no longer forces a ne…

…w resource unless it is required (#9541) Co-authored-by: kt <[email protected]> fixes #9124
hashicorp · Jan 13, 2021 · 65b44cc · 65b44cc
1 parent 59066bd
commit 65b44cc
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 8 deletions.
diff --git a/azurerm/internal/services/databricks/databricks_workspace_resource.go b/azurerm/internal/services/databricks/databricks_workspace_resource.go
@@ -55,7 +55,6 @@ func resourceDatabricksWorkspace() *schema.Resource {
 			"sku": {
 				Type:     schema.TypeString,
 				Required: true,
-				ForceNew: true,
 				ValidateFunc: validation.StringInSlice([]string{
 					"standard",
 					"premium",
@@ -123,6 +122,21 @@ func resourceDatabricksWorkspace() *schema.Resource {
 				Computed: true,
 			},
 		},
+
+		CustomizeDiff: func(d *schema.ResourceDiff, v interface{}) error {
+			if d.HasChange("sku") {
+				sku, changedSKU := d.GetChange("sku")
+
+				if changedSKU == "trial" {
+					log.Printf("[DEBUG] recreate databricks workspace, could't be migrated to %s", changedSKU)
+					d.ForceNew("sku")
+				} else {
+					log.Printf("[DEBUG] databricks workspace can be upgraded from %s to %s", sku, changedSKU)
+				}
+			}
+
+			return nil
+		},
 	}
 }
 

diff --git a/azurerm/internal/services/databricks/databricks_workspace_resource_test.go b/azurerm/internal/services/databricks/databricks_workspace_resource_test.go
@@ -113,7 +113,7 @@ func TestAccDatabricksWorkspace_basic(t *testing.T) {
 
 	data.ResourceTest(t, r, []resource.TestStep{
 		{
-			Config: r.basic(data),
+			Config: r.basic(data, "standard"),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 				check.That(data.ResourceName).Key("managed_resource_group_id").Exists(),
@@ -131,7 +131,7 @@ func TestAccDatabricksWorkspace_requiresImport(t *testing.T) {
 
 	data.ResourceTest(t, r, []resource.TestStep{
 		{
-			Config: r.basic(data),
+			Config: r.basic(data, "standard"),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
@@ -193,6 +193,35 @@ func TestAccDatabricksWorkspace_update(t *testing.T) {
 	})
 }
 
+func TestAccDatabricksWorkspace_updateSKU(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_databricks_workspace", "test")
+	r := DatabricksWorkspaceResource{}
+
+	data.ResourceTest(t, r, []resource.TestStep{
+		{
+			Config: r.basic(data, "trial"),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.basic(data, "standard"),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.basic(data, "trial"),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func (DatabricksWorkspaceResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) {
 	id, err := parse.WorkspaceID(state.ID)
 	if err != nil {
@@ -207,7 +236,7 @@ func (DatabricksWorkspaceResource) Exists(ctx context.Context, clients *clients.
 	return utils.Bool(resp.WorkspaceProperties != nil), nil
 }
 
-func (DatabricksWorkspaceResource) basic(data acceptance.TestData) string {
+func (DatabricksWorkspaceResource) basic(data acceptance.TestData, sku string) string {
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
@@ -222,13 +251,13 @@ resource "azurerm_databricks_workspace" "test" {
   name                = "acctestDBW-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  sku                 = "standard"
+  sku                 = "%s"
 }
-`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
+`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, sku)
 }
 
 func (DatabricksWorkspaceResource) requiresImport(data acceptance.TestData) string {
-	template := DatabricksWorkspaceResource{}.basic(data)
+	template := DatabricksWorkspaceResource{}.basic(data, "standard")
 	return fmt.Sprintf(`
 %s
 

diff --git a/website/docs/r/databricks_workspace.html.markdown b/website/docs/r/databricks_workspace.html.markdown
@@ -40,7 +40,9 @@ The following arguments are supported:
 
 * `location` - (Required) Specifies the supported Azure location where the resource has to be created. Changing this forces a new resource to be created.
 
-* `sku` - (Required) The `sku` to use for the Databricks Workspace. Possible values are `standard`, `premium`, or `trial`. Changing this forces a new resource to be created.
+* `sku` - (Required) The `sku` to use for the Databricks Workspace. Possible values are `standard`, `premium`, or `trial`. Changing this can force a new resource to be created in some circumstances.
+
+~> **NOTE** While downgrading to `trial`, the Databricks Workspace resource would be recreated.
 
 * `managed_resource_group_name` - (Optional) The name of the resource group where Azure should place the managed Databricks resources. Changing this forces a new resource to be created.