update schema and depreation message

hashicorp · Nov 15, 2024 · eb448b5 · eb448b5
1 parent 23503be
commit eb448b5
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/internal/services/databricks/databricks_workspace_resource.go b/internal/services/databricks/databricks_workspace_resource.go
@@ -289,14 +289,14 @@ func resourceDatabricksWorkspace() *pluginsdk.Resource {
 				Type:          pluginsdk.TypeString,
 				Optional:      true,
 				ValidateFunc:  hsmValidate.ManagedHSMDataPlaneVersionedKeyID,
-				ConflictsWith: []string{"managed_services_cmk_key_vault_id"},
+				ConflictsWith: []string{"managed_services_cmk_key_vault_key_id", "managed_services_cmk_key_vault_id"},
 			},
 
 			"managed_services_cmk_key_vault_id": {
 				Type:         pluginsdk.TypeString,
 				Optional:     true,
 				ValidateFunc: commonids.ValidateKeyVaultID,
-				Deprecated:   "Use 'managed_services_cmk_key_vault_key_id' instead, this field is not needed for cross subscription key vaults anymore",
+				Deprecated:   "'managed_services_cmk_key_vault_id' has been deprecated in favor of 'managed_services_cmk_key_vault_key_id' and will be removed in v5.0 of the provider",
 			},
 
 			"managed_disk_cmk_key_vault_key_id": {
@@ -310,20 +310,19 @@ func resourceDatabricksWorkspace() *pluginsdk.Resource {
 				Type:          pluginsdk.TypeString,
 				Optional:      true,
 				ValidateFunc:  hsmValidate.ManagedHSMDataPlaneVersionedKeyID,
-				ConflictsWith: []string{"managed_disk_cmk_key_vault_key_id"},
+				ConflictsWith: []string{"managed_disk_cmk_key_vault_key_id", "managed_disk_cmk_key_vault_id"},
 			},
 
 			"managed_disk_cmk_key_vault_id": {
 				Type:         pluginsdk.TypeString,
 				Optional:     true,
 				ValidateFunc: commonids.ValidateKeyVaultID,
-				Deprecated:   "Use 'managed_disk_cmk_key_vault_key_id' instead, this field is not needed for cross subscription key vaults anymore",
+				Deprecated:   "'managed_disk_cmk_key_vault_id' has been deprecated in favor of 'managed_disk_cmk_key_vault_key_id' and will be removed in v5.0 of the provider",
 			},
 
 			"managed_disk_cmk_rotation_to_latest_version_enabled": {
-				Type:         pluginsdk.TypeBool,
-				Optional:     true,
-				RequiredWith: []string{"managed_disk_cmk_key_vault_key_id", "managed_disk_cmk_managed_hsm_key_id"},
+				Type:     pluginsdk.TypeBool,
+				Optional: true,
 			},
 
 			"disk_encryption_set_id": {