Skip to content

Commit 28eb3e5

Browse files
committed
cluster fix
1 parent c86cb78 commit 28eb3e5

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

bundle/direct/dresources/cluster.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,13 @@ func (r *ResourceCluster) OverrideChangeDesc(ctx context.Context, p *structpath.
125125
case "data_security_mode":
126126
// We do change skip here in the same way TF provider does suppress diff if the alias is used.
127127
// https://github.com/databricks/terraform-provider-databricks/blob/main/clusters/resource_cluster.go#L109-L117
128-
if change.Remote == compute.DataSecurityModeDataSecurityModeStandard && change.Old == compute.DataSecurityModeUserIsolation && change.New == change.Old {
128+
if change.New == compute.DataSecurityModeDataSecurityModeStandard && change.Remote == compute.DataSecurityModeUserIsolation && change.New == change.Old {
129129
change.Action = deployplan.ActionTypeSkipString
130130
change.Reason = deployplan.ReasonAlias
131-
}
132-
if change.Remote == compute.DataSecurityModeDataSecurityModeDedicated && change.Old == compute.DataSecurityModeSingleUser && change.New == change.Old {
131+
} else if change.New == compute.DataSecurityModeDataSecurityModeDedicated && change.Remote == compute.DataSecurityModeSingleUser && change.New == change.Old {
133132
change.Action = deployplan.ActionTypeSkipString
134133
change.Reason = deployplan.ReasonAlias
135-
}
136-
if change.Remote == compute.DataSecurityModeDataSecurityModeAuto && (change.Old == compute.DataSecurityModeSingleUser || change.Old == compute.DataSecurityModeUserIsolation) && change.New == change.Old {
134+
} else if change.New == compute.DataSecurityModeDataSecurityModeAuto && (change.Remote == compute.DataSecurityModeSingleUser || change.Remote == compute.DataSecurityModeUserIsolation) && change.New == change.Old {
137135
change.Action = deployplan.ActionTypeSkipString
138136
change.Reason = deployplan.ReasonAlias
139137
}

0 commit comments

Comments
 (0)