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

9785 - prepare_encryption and infrastructure_encryption_enabled #12310

Closed
wants to merge 4 commits into from
Closed

9785 - prepare_encryption and infrastructure_encryption_enabled #12310

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b64c5d
9785 - Adding boolean flags for encryption in custom parameters
istairbn Jun 21, 2021
009e802
Formatting tweaks
istairbn Jun 22, 2021
f694c05
Changelog
istairbn Jun 22, 2021
a3b62b4
Removing changelog
Jun 28, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ENHANCEMENTS:
* dependencies: updating to `v0.11.19` of `github.com/Azure/go-autorest/autorest` [GH-12209]
* dependencies: updating to `v0.9.14` of `github.com/Azure/go-autorest/autorest/adal` [GH-12209]
* dependencies: updating the embedded SDK for Eventhub Namespaces to use API Version `2021-01-01-preview` [GH-12290]
* `azurerm_databricks_workspace` - support for `infrastructure_encryption_enabled` and `prepare_encryption` ([#9785](https://github.com/terraform-providers/terraform-provider-azurerm/issues/9785))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @istairbn - Could you remove this from the PR please? The changelog is updated by maintainers at the point PR's are merged so they correctly reflect releases.
Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jackofallops my bad - makes sense.
PR updated to strike the CHANGELOG changes


BUG FIXES:

Expand Down
50 changes: 46 additions & 4 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 @@ -84,7 +84,7 @@ func resourceDatabricksWorkspace() *pluginsdk.Resource {
ForceNew: true,
Optional: true,
AtLeastOneOf: []string{"custom_parameters.0.no_public_ip", "custom_parameters.0.public_subnet_name",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id", "custom_parameters.0.prepare_encryption", "custom_parameters.0.infrastructure_encryption_enabled",
},
},

Expand All @@ -93,7 +93,7 @@ func resourceDatabricksWorkspace() *pluginsdk.Resource {
ForceNew: true,
Optional: true,
AtLeastOneOf: []string{"custom_parameters.0.no_public_ip", "custom_parameters.0.public_subnet_name",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id", "custom_parameters.0.prepare_encryption", "custom_parameters.0.infrastructure_encryption_enabled",
},
},

Expand All @@ -102,7 +102,7 @@ func resourceDatabricksWorkspace() *pluginsdk.Resource {
ForceNew: true,
Optional: true,
AtLeastOneOf: []string{"custom_parameters.0.no_public_ip", "custom_parameters.0.public_subnet_name",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id", "custom_parameters.0.prepare_encryption", "custom_parameters.0.infrastructure_encryption_enabled",
},
},

Expand All @@ -112,7 +112,25 @@ func resourceDatabricksWorkspace() *pluginsdk.Resource {
Optional: true,
ValidateFunc: azure.ValidateResourceIDOrEmpty,
AtLeastOneOf: []string{"custom_parameters.0.no_public_ip", "custom_parameters.0.public_subnet_name",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id", "custom_parameters.0.prepare_encryption", "custom_parameters.0.infrastructure_encryption_enabled",
},
},

"prepare_encryption": {
Type: pluginsdk.TypeBool,
ForceNew: true,
Optional: true,
AtLeastOneOf: []string{"custom_parameters.0.no_public_ip", "custom_parameters.0.public_subnet_name",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id", "custom_parameters.0.prepare_encryption", "custom_parameters.0.infrastructure_encryption_enabled",
},
},

"infrastructure_encryption_enabled": {
Type: pluginsdk.TypeBool,
ForceNew: true,
Optional: true,
AtLeastOneOf: []string{"custom_parameters.0.no_public_ip", "custom_parameters.0.public_subnet_name",
"custom_parameters.0.private_subnet_name", "custom_parameters.0.virtual_network_id", "custom_parameters.0.prepare_encryption", "custom_parameters.0.infrastructure_encryption_enabled",
},
},
},
Expand Down Expand Up @@ -341,6 +359,18 @@ func flattenWorkspaceCustomParameters(p *databricks.WorkspaceCustomParameters) [
}
}

if v := p.PrepareEncryption; v != nil {
if v.Value != nil {
parameters["prepare_encryption"] = *v.Value
}
}

if v := p.RequireInfrastructureEncryption; v != nil {
if v.Value != nil {
parameters["infrastructure_encryption_enabled"] = *v.Value
}
}

return []interface{}{parameters}
}

Expand Down Expand Up @@ -376,5 +406,17 @@ func expandWorkspaceCustomParameters(input []interface{}) *databricks.WorkspaceC
}
}

if v, ok := config["prepare_encryption"].(bool); ok {
parameters.PrepareEncryption = &databricks.WorkspaceCustomBooleanParameter{
Value: &v,
}
}

if v, ok := config["infrastructure_encryption_enabled"].(bool); ok {
parameters.RequireInfrastructureEncryption = &databricks.WorkspaceCustomBooleanParameter{
Value: &v,
}
}

return &parameters
}
16 changes: 11 additions & 5 deletions azurerm/internal/services/databricks/databricks_workspace_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ func TestAccDatabricksWorkspace_complete(t *testing.T) {
check.That(data.ResourceName).Key("managed_resource_group_id").Exists(),
check.That(data.ResourceName).Key("managed_resource_group_name").Exists(),
check.That(data.ResourceName).Key("custom_parameters.0.virtual_network_id").Exists(),
check.That(data.ResourceName).Key("custom_parameters.0.prepare_encryption").HasValue("true"),
check.That(data.ResourceName).Key("custom_parameters.0.infrastructure_encryption_enabled").HasValue("true"),
check.That(data.ResourceName).Key("tags.%").HasValue("2"),
check.That(data.ResourceName).Key("tags.Environment").HasValue("Production"),
check.That(data.ResourceName).Key("tags.Pricing").HasValue("Standard"),
Expand Down Expand Up @@ -265,10 +267,12 @@ resource "azurerm_databricks_workspace" "test" {
managed_resource_group_name = "acctestRG-DBW-%[1]d-managed"

custom_parameters {
no_public_ip = true
public_subnet_name = azurerm_subnet.public.name
private_subnet_name = azurerm_subnet.private.name
virtual_network_id = azurerm_virtual_network.test.id
no_public_ip = true
public_subnet_name = azurerm_subnet.public.name
private_subnet_name = azurerm_subnet.private.name
virtual_network_id = azurerm_virtual_network.test.id
prepare_encryption = true
infrastructure_encryption_enabled = true
}

tags = {
Expand Down Expand Up @@ -302,7 +306,9 @@ resource "azurerm_databricks_workspace" "test" {
}

custom_parameters {
no_public_ip = false
no_public_ip = false
prepare_encryption = true
infrastructure_encryption_enabled = true
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger)
Expand Down
4 changes: 4 additions & 0 deletions website/docs/r/databricks_workspace.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ The following arguments are supported:

* `virtual_network_id` - (Optional) The ID of a Virtual Network where this Databricks Cluster should be created.

* `prepare_encryption` - (Optional) Boolean value. If true, prepare the workspace for encryption. Enables the Managed Identity for managed storage account.

* `infrastructure_encryption_enabled` - (Optional) Boolean value. If true, DBFS root file system has secondary layer of encryption with platform managed keys enabled for data at rest.

~> **NOTE** Databricks requires that a network security group is associated with public and private subnets when `virtual_network_id` is set. Also, both public and private subnets must be delegated to `Microsoft.Databricks/workspaces`.

## Attributes Reference
Expand Down