Skip to content

fix: Sort dependsOn to avoid diff #4363

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

Open
orslow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Sort dependsOn to avoid diff #4363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions bundle/deploy/terraform/tfdyn/convert_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ func convertJobResource(ctx context.Context, vin dyn.Value) (dyn.Value, error) {
var err error
tasks, ok := vin.Get("tasks").AsSequence()
if ok {
// Sort tasks by task_key
sort.Slice(tasks, func(i, j int) bool {
// We sort the tasks by their task key. Tasks without task keys are ordered
// before tasks with task keys. We do not error for those tasks
Expand All @@ -146,6 +147,24 @@ func convertJobResource(ctx context.Context, vin dyn.Value) (dyn.Value, error) {
}
return tk1 < tk2
})

// Sort depends_on within each task by task_key to avoid false diffs.
// The Databricks API returns depends_on sorted by task_key.
for i, task := range tasks {
dependsOn, ok := task.Get("depends_on").AsSequence()
if ok && len(dependsOn) > 1 {
sort.Slice(dependsOn, func(a, b int) bool {
tk1, _ := dependsOn[a].Get("task_key").AsString()
tk2, _ := dependsOn[b].Get("task_key").AsString()
return tk1 < tk2
})
tasks[i], err = dyn.Set(task, "depends_on", dyn.V(dependsOn))
if err != nil {
return dyn.InvalidValue, err
}
}
}

vout, err = dyn.Set(vin, "tasks", dyn.V(tasks))
if err != nil {
return dyn.InvalidValue, err
Expand Down