Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_databricks_workspace - Fix propagation of tags to connected resources #11405

Merged
merged 5 commits into from
Apr 21, 2021
Merged

azurerm_databricks_workspace - Fix propagation of tags to connected resources #11405

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
996477e
Fix propagation of tags to connected resources
WodansSon Apr 21, 2021
d8e44b4
Merge branch 'master' into b-adb-icm
WodansSon Apr 21, 2021
6bd61a8
Fix lint issue
WodansSon Apr 21, 2021
a83c42f
Update err msgs to new format
WodansSon Apr 21, 2021
64059c5
Add reference to SDK issue in comments
WodansSon Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions azurerm/internal/services/databricks/databricks_workspace_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func resourceDatabricksWorkspaceCreateUpdate(d *schema.ResourceData, meta interf
existing, err := client.Get(ctx, resourceGroup, name)
if err != nil {
if !utils.ResponseWasNotFound(existing.Response) {
return fmt.Errorf("Error checking for presence of existing Databricks Workspace %q (Resource Group %q): %s", name, resourceGroup, err)
return fmt.Errorf("checking for presence of existing Databricks Workspace %q (Resource Group %q): %s", name, resourceGroup, err)
}
}

Expand Down Expand Up @@ -184,6 +184,8 @@ func resourceDatabricksWorkspaceCreateUpdate(d *schema.ResourceData, meta interf
customParamsRaw := d.Get("custom_parameters").([]interface{})
customParams := expandWorkspaceCustomParameters(customParamsRaw)

// Including the Tags in the workspace parameters will update the tags on
// the workspace only
tombuildsstuff marked this conversation as resolved.
Show resolved Hide resolved
workspace := databricks.Workspace{
Sku: &databricks.Sku{
Name: utils.String(skuName),
Expand All @@ -198,16 +200,34 @@ func resourceDatabricksWorkspaceCreateUpdate(d *schema.ResourceData, meta interf

future, err := client.CreateOrUpdate(ctx, workspace, resourceGroup, name)
if err != nil {
return fmt.Errorf("Error creating/updating Databricks Workspace %q (Resource Group %q): %+v", name, resourceGroup, err)
return fmt.Errorf("creating/updating Databricks Workspace %q (Resource Group %q): %+v", name, resourceGroup, err)
}

if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("Error waiting for the completion of the creating/updating of Databricks Workspace %q (Resource Group %q): %+v", name, resourceGroup, err)
return fmt.Errorf("waiting for the completion of the creating/updating of Databricks Workspace %q (Resource Group %q): %+v", name, resourceGroup, err)
}

// Only call Update(e.g. PATCH) if it is not a new resource and the Tags have changed
// this will cause the updated tags to be propagated to all of the connected
// workspace resources
if !d.IsNewResource() && d.HasChange("tags") {
workspaceUpdate := databricks.WorkspaceUpdate{
Tags: expandedTags,
}

future, err := client.Update(ctx, workspaceUpdate, resourceGroup, name)
if err != nil {
return fmt.Errorf("updating Databricks Workspace %q (Resource Group %q) Tags: %+v", name, resourceGroup, err)
}

if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("waiting for Databricks Workspace %q (Resource Group %q) Tags to be updated: %+v", name, resourceGroup, err)
}
}

read, err := client.Get(ctx, resourceGroup, name)
if err != nil {
return fmt.Errorf("Error retrieving Databricks Workspace %q (Resource Group %q): %+v", name, resourceGroup, err)
return fmt.Errorf("retrieving Databricks Workspace %q (Resource Group %q): %+v", name, resourceGroup, err)
}
if read.ID == nil {
return fmt.Errorf("Cannot read Databricks Workspace %q (Resource Group %q) ID", name, resourceGroup)
Expand Down Expand Up @@ -236,7 +256,7 @@ func resourceDatabricksWorkspaceRead(d *schema.ResourceData, meta interface{}) e
return nil
}

return fmt.Errorf("Error making Read request on Azure Databricks Workspace %s: %s", id.Name, err)
return fmt.Errorf("making Read request on Azure Databricks Workspace %s: %s", id.Name, err)
}

d.Set("name", id.Name)
Expand Down Expand Up @@ -281,12 +301,12 @@ func resourceDatabricksWorkspaceDelete(d *schema.ResourceData, meta interface{})

future, err := client.Delete(ctx, id.ResourceGroup, id.Name)
if err != nil {
return fmt.Errorf("Error deleting Databricks Workspace %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
return fmt.Errorf("deleting Databricks Workspace %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
}

if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
if !response.WasNotFound(future.Response()) {
return fmt.Errorf("Error waiting for deletion of Databricks Workspace %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
return fmt.Errorf("waiting for deletion of Databricks Workspace %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
}
}

Expand Down