From 76c671f72b984ecdfb217fff712bf4682bb971ab Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Mon, 27 Jan 2025 17:03:52 +0100 Subject: [PATCH] Update acceptance tests --- .../include_locations/output.dev.json | 187 +++++++++--------- .../include_locations/output.prod.json | 187 +++++++++--------- 2 files changed, 180 insertions(+), 194 deletions(-) diff --git a/acceptance/bundle/validate/include_locations/output.dev.json b/acceptance/bundle/validate/include_locations/output.dev.json index 9f72f6675..3b75ffa46 100644 --- a/acceptance/bundle/validate/include_locations/output.dev.json +++ b/acceptance/bundle/validate/include_locations/output.dev.json @@ -1,100 +1,93 @@ { - "bundle": [ - { - "column": 3, - "file": "databricks.yml", - "line": 2 - } + "files": [ + "databricks.yml", + "job.yml", + "override.yml" ], - "bundle.name": [ - { - "column": 9, - "file": "databricks.yml", - "line": 2 - } - ], - "include": [ - { - "column": 3, - "file": "databricks.yml", - "line": 5 - } - ], - "include[0]": [ - { - "column": 5, - "file": "databricks.yml", - "line": 5 - } - ], - "include[1]": [ - { - "column": 5, - "file": "databricks.yml", - "line": 6 - } - ], - "resources": [ - { - "column": 3, - "file": "job.yml", - "line": 2 - } - ], - "resources.jobs": [ - { - "column": 5, - "file": "job.yml", - "line": 3 - } - ], - "resources.jobs.my_job": [ - { - "column": 7, - "file": "job.yml", - "line": 4 - } - ], - "resources.jobs.my_job.name": [ - { - "column": 17, - "file": "override.yml", - "line": 6 - } - ], - "resources.jobs.my_job.tasks": [ - { - "column": 9, - "file": "job.yml", - "line": 6 - } - ], - "resources.jobs.my_job.tasks[0]": [ - { - "column": 11, - "file": "job.yml", - "line": 6 - } - ], - "resources.jobs.my_job.tasks[0].notebook_task": [ - { - "column": 13, - "file": "job.yml", - "line": 8 - } - ], - "resources.jobs.my_job.tasks[0].notebook_task.notebook_path": [ - { - "column": 32, - "file": "override.yml", - "line": 10 - } - ], - "targets": [ - { - "column": 3, - "file": "databricks.yml", - "line": 9 - } - ] + "locations": { + "bundle": [ + [ + 0, + 2, + 3 + ] + ], + "bundle.name": [ + [ + 0, + 2, + 9 + ] + ], + "include": [ + [ + 0, + 5, + 3 + ] + ], + "include[0]": [ + [ + 0, + 5, + 5 + ] + ], + "include[1]": [ + [ + 0, + 6, + 5 + ] + ], + "resources": [ + [ + 1, + 2, + 3 + ], + [ + 2, + 4, + 7 + ] + ], + "resources.jobs": [ + [ + 1, + 3, + 5 + ], + [ + 2, + 5, + 9 + ] + ], + "resources.jobs.my_job": [ + [ + 1, + 4, + 7 + ], + [ + 2, + 6, + 11 + ] + ], + "targets": [ + [ + 0, + 9, + 3 + ], + [ + 2, + 2, + 3 + ] + ] + }, + "version": 1 } diff --git a/acceptance/bundle/validate/include_locations/output.prod.json b/acceptance/bundle/validate/include_locations/output.prod.json index 7123aee1d..961c8ce6e 100644 --- a/acceptance/bundle/validate/include_locations/output.prod.json +++ b/acceptance/bundle/validate/include_locations/output.prod.json @@ -1,100 +1,93 @@ { - "bundle": [ - { - "column": 3, - "file": "databricks.yml", - "line": 2 - } + "files": [ + "databricks.yml", + "job.yml", + "override.yml" ], - "bundle.name": [ - { - "column": 9, - "file": "databricks.yml", - "line": 2 - } - ], - "include": [ - { - "column": 3, - "file": "databricks.yml", - "line": 5 - } - ], - "include[0]": [ - { - "column": 5, - "file": "databricks.yml", - "line": 5 - } - ], - "include[1]": [ - { - "column": 5, - "file": "databricks.yml", - "line": 6 - } - ], - "resources": [ - { - "column": 3, - "file": "job.yml", - "line": 2 - } - ], - "resources.jobs": [ - { - "column": 5, - "file": "job.yml", - "line": 3 - } - ], - "resources.jobs.my_job": [ - { - "column": 7, - "file": "job.yml", - "line": 4 - } - ], - "resources.jobs.my_job.name": [ - { - "column": 17, - "file": "override.yml", - "line": 16 - } - ], - "resources.jobs.my_job.tasks": [ - { - "column": 9, - "file": "job.yml", - "line": 6 - } - ], - "resources.jobs.my_job.tasks[0]": [ - { - "column": 11, - "file": "job.yml", - "line": 6 - } - ], - "resources.jobs.my_job.tasks[0].notebook_task": [ - { - "column": 13, - "file": "job.yml", - "line": 8 - } - ], - "resources.jobs.my_job.tasks[0].notebook_task.notebook_path": [ - { - "column": 32, - "file": "override.yml", - "line": 20 - } - ], - "targets": [ - { - "column": 3, - "file": "databricks.yml", - "line": 9 - } - ] + "locations": { + "bundle": [ + [ + 0, + 2, + 3 + ] + ], + "bundle.name": [ + [ + 0, + 2, + 9 + ] + ], + "include": [ + [ + 0, + 5, + 3 + ] + ], + "include[0]": [ + [ + 0, + 5, + 5 + ] + ], + "include[1]": [ + [ + 0, + 6, + 5 + ] + ], + "resources": [ + [ + 1, + 2, + 3 + ], + [ + 2, + 14, + 7 + ] + ], + "resources.jobs": [ + [ + 1, + 3, + 5 + ], + [ + 2, + 15, + 9 + ] + ], + "resources.jobs.my_job": [ + [ + 1, + 4, + 7 + ], + [ + 2, + 16, + 11 + ] + ], + "targets": [ + [ + 0, + 9, + 3 + ], + [ + 2, + 2, + 3 + ] + ] + }, + "version": 1 }