Skip to content

azurerm_databricks_workspace_root_dbfs_customer_managed_key - fix panics, allow managed hsm, and allow versionless keys #31336

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

Merged
sreallymatt merged 2 commits into from
Dec 11, 2025
Merged

azurerm_databricks_workspace_root_dbfs_customer_managed_key - fix panics, allow managed hsm, and allow versionless keys #31336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8ef9f
`azurerm_databricks_workspace_root_dbfs_customer_managed_key` - rewri…
sreallymatt Dec 10, 2025
4154697
fix incorrect field in ImportStep ignore
sreallymatt Dec 11, 2025
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
Next Next commit
azurerm_databricks_workspace_root_dbfs_customer_managed_key - rewri… 
…te resource to prevent panics, allow managed hsm, and allow versionless keys
  • Loading branch information
@sreallymatt
sreallymatt committed Dec 10, 2025
commit fb8ef9f43e32f6f3a53789cf9e5448e9c4fa705e
16 changes: 8 additions & 8 deletions 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 @@ -22,8 +22,8 @@ import (
type DatabricksWorkspaceResource struct{}

type DatabricksWorkspaceAlternateSubscription struct {
tenant_id string
subscription_id string
tenantID string
subscriptionID string
}

func TestAccDatabricksWorkspace_basic(t *testing.T) {
Expand Down Expand Up @@ -578,8 +578,8 @@ func altSubscriptionCheck() *DatabricksWorkspaceAlternateSubscription {
}

return &DatabricksWorkspaceAlternateSubscription{
tenant_id: altTenantID,
subscription_id: altSubscriptonID,
tenantID: altTenantID,
subscriptionID: altSubscriptonID,
}
}

Expand Down Expand Up @@ -2659,7 +2659,7 @@ resource "azurerm_key_vault_access_policy" "managed" {
"SetRotationPolicy",
]
}
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenant_id, alt.subscription_id)
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenantID, alt.subscriptionID)
}

func (DatabricksWorkspaceResource) altSubscriptionCmkKeysInDifferentKeyVaultsAcrossDifferentSubscriptions(data acceptance.TestData, databricksPrincipalID string, alt *DatabricksWorkspaceAlternateSubscription) string {
Expand Down Expand Up @@ -2860,7 +2860,7 @@ resource "azurerm_key_vault_access_policy" "managedAlt" {
"SetRotationPolicy",
]
}
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenant_id, alt.subscription_id)
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenantID, alt.subscriptionID)
}

func (DatabricksWorkspaceResource) altSubscriptionCmkServicesOnly(data acceptance.TestData, databricksPrincipalID string, alt *DatabricksWorkspaceAlternateSubscription) string {
Expand Down Expand Up @@ -2986,7 +2986,7 @@ resource "azurerm_key_vault_access_policy" "managed" {
"SetRotationPolicy",
]
}
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenant_id, alt.subscription_id)
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenantID, alt.subscriptionID)
}

func (DatabricksWorkspaceResource) altSubscriptionCmkDiskOnly(data acceptance.TestData, databricksPrincipalID string, alt *DatabricksWorkspaceAlternateSubscription) string {
Expand Down Expand Up @@ -3112,7 +3112,7 @@ resource "azurerm_key_vault_access_policy" "managed" {
"SetRotationPolicy",
]
}
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenant_id, alt.subscription_id)
`, data.RandomInteger, data.Locations.Secondary, data.RandomString, databricksPrincipalID, alt.tenantID, alt.subscriptionID)
}

func (DatabricksWorkspaceResource) enhancedSecurityCompliance(data acceptance.TestData, sku string, automaticClusterUpdateEnabled bool, complianceSecurityProfileEnabled bool, complianceSecurityProfileStandards []string, enhancedSecurityMonitoringEnabled bool) string {
Expand Down
Loading
Loading