direct: Handle data_security_mode aliases for clusters

Author: andrewnester

acceptance/bundle/resources/clusters/deploy/data_security_mode/out.direct-exp.txt

@@ -1,4 +1,19 @@
 
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> [CLI] bundle plan
+Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
 >>> [CLI] bundle destroy --auto-approve
 The following resources will be deleted:
   delete cluster test_cluster

acceptance/bundle/resources/clusters/deploy/data_security_mode/out.plan.direct-exp.txt

@@ -6,10 +6,6 @@ cleanup() {
 }
 trap cleanup EXIT
 
-trace $CLI bundle deploy > out.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
-print_requests.py --get //clusters > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt
-
-trace $CLI bundle plan >> out.plan.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
-
-trace errcode $CLI bundle deploy >> out.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
-print_requests.py --get //clusters > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt
+trace $CLI bundle deploy
+trace $CLI bundle plan
+trace $CLI bundle deploy

acceptance/bundle/resources/clusters/deploy/data_security_mode/out.plan.terraform.txt

@@ -1,6 +1,6 @@
 Local = false
 Cloud = true
-RecordRequests = true
+RecordRequests = false
 
 Ignore = [
     "databricks.yml",

acceptance/bundle/resources/clusters/deploy/data_security_mode/out.requests.direct-exp.txt

@@ -102,12 +102,24 @@ func (r *ResourceCluster) DoDelete(ctx context.Context, id string) error {
 }
 
 func (r *ResourceCluster) ClassifyChange(change structdiff.Change, remoteState *compute.ClusterDetails, _ bool) (deployplan.ActionType, error) {
+	changedPath := change.Path.String()
+	if changedPath == "data_security_mode" {
+		if change.Old == compute.DataSecurityModeDataSecurityModeStandard && change.New == compute.DataSecurityModeUserIsolation {
+			return deployplan.ActionTypeSkip, nil
+		}
+		if change.Old == compute.DataSecurityModeDataSecurityModeDedicated && change.New == compute.DataSecurityModeSingleUser {
+			return deployplan.ActionTypeSkip, nil
+		}
+		if change.Old == compute.DataSecurityModeDataSecurityModeAuto && (change.New == compute.DataSecurityModeSingleUser || change.New == compute.DataSecurityModeUserIsolation) {
+			return deployplan.ActionTypeSkip, nil
+		}
+	}
+
 	// Always update if the cluster is not running.
 	if remoteState.State != compute.StateRunning {
 		return deployplan.ActionTypeUpdate, nil
 	}
 
-	changedPath := change.Path.String()
 	if changedPath == "num_workers" || strings.HasPrefix(changedPath, "autoscale") {
 		return deployplan.ActionTypeResize, nil
 	}