.github/workflows/push.yml

@@ -107,18 +107,11 @@ jobs:
         run: npm install -g ajv-cli@5.0.0
 
       # Assert that the generated bundle schema is a valid JSON schema by using
-      # ajv-cli to validate it against bundle configuration files.
+      # ajv-cli to validate it against a sample configuration file.
       # By default the ajv-cli runs in strict mode which will fail if the schema
       # itself is not valid. Strict mode is more strict than the JSON schema
       # specification. See for details: https://ajv.js.org/options.html#strict-mode-options
       - name: Validate bundle schema
         run: |
           go run main.go bundle schema > schema.json
-
+          ajv -s schema.json -d ./bundle/tests/basic/databricks.yml
-          for file in ./bundle/internal/schema/testdata/pass/*.yml; do
-            ajv test -s schema.json -d $file --valid
-          done
-
-          for file in ./bundle/internal/schema/testdata/fail/*.yml; do
-            ajv test -s schema.json -d $file --invalid
-          done

bundle/config/generate/job.go

@@ -25,20 +25,6 @@ func ConvertJobToValue(job *jobs.Job) (dyn.Value, error) {
 		value["tasks"] = dyn.NewValue(tasks, []dyn.Location{{Line: jobOrder.Get("tasks")}})
 	}
 
-	// We're processing job.Settings.Parameters separately to retain empty default values.
-	if len(job.Settings.Parameters) > 0 {
-		params := make([]dyn.Value, 0)
-		for _, parameter := range job.Settings.Parameters {
-			p := map[string]dyn.Value{
-				"name":    dyn.NewValue(parameter.Name, []dyn.Location{{Line: 0}}), // We use Line: 0 to ensure that the name goes first.
-				"default": dyn.NewValue(parameter.Default, []dyn.Location{{Line: 1}}),
-			}
-			params = append(params, dyn.NewValue(p, []dyn.Location{}))
-		}
-
-		value["parameters"] = dyn.NewValue(params, []dyn.Location{{Line: jobOrder.Get("parameters")}})
-	}
-
 	return yamlsaver.ConvertToMapValue(job.Settings, jobOrder, []string{"format", "new_cluster", "existing_cluster_id"}, value)
 }
 

bundle/internal/schema/testdata/fail/basic.yml

@@ -1,3 +0,0 @@
-bundle:
-  # expected type is 'string'
-  name: 1234

bundle/internal/schema/testdata/fail/invalid_enum_value_in_job.yml

@@ -1,4 +0,0 @@
-resources:
-  jobs:
-    myjob:
-      format: INVALID_VALUE

bundle/internal/schema/testdata/fail/invalid_enum_value_in_model.yml

@@ -1,6 +0,0 @@
-resources:
-  models:
-    mymodel:
-      latest_versions:
-        - creation_timestamp: 123
-          status: INVALID_VALUE

bundle/internal/schema/testdata/fail/invalid_reference_in_job.yml

@@ -1,8 +0,0 @@
-resources:
-  jobs:
-    outer:
-      name: outer job
-      tasks:
-        - task_key: run job task 1
-          run_job_task:
-            job_id: ${invalid.reference}

bundle/internal/schema/testdata/fail/invalid_reference_in_model.yml

@@ -1,5 +0,0 @@
-resources:
-  models:
-    mymodel:
-      latest_versions:
-        - creation_timestamp: ${invalid.reference}

bundle/internal/schema/testdata/fail/required_field_missing_in_job.yml

@@ -1,9 +0,0 @@
-resources:
-  jobs:
-    foo:
-      name: my job
-      tasks:
-        # All tasks need to have a task_key.
-        - notebook_task:
-            notebook_path: /Users/abc/notebooks/inner
-          existing_cluster_id: abcd

bundle/internal/schema/testdata/fail/unknown_field_in_job.yml

@@ -1,5 +0,0 @@
-resources:
-  jobs:
-    myjob:
-      # unknown fields should cause schema failure.
-      unknown_field: "value"

bundle/internal/schema/testdata/fail/unknown_field_in_model.yml

@@ -1,6 +0,0 @@
-resources:
-  models:
-    mymodel:
-      creation_timestamp: 123
-      description: "my model"
-      unknown: "value"

bundle/internal/schema/testdata/fail/unknown_top_level_field.yml

@@ -1 +0,0 @@
-unknown: value

bundle/internal/schema/testdata/pass/artifact_references.yml

@@ -1,11 +0,0 @@
-artifacts:
-  abc:
-    path: /Workspace/a/b/c
-    type: wheel
-    files:
-      - source: ./x.whl
-
-resources:
-  jobs:
-    foo:
-      name: ${artifacts.abc.type}

bundle/internal/schema/testdata/pass/basic.yml

@@ -1,2 +0,0 @@
-bundle:
-  name: basic

bundle/internal/schema/testdata/pass/direct_value_in_target.yml

@@ -1,4 +0,0 @@
-targets:
-  development:
-    variables:
-      myvar: value

bundle/internal/schema/testdata/pass/job.yml

@@ -1,63 +0,0 @@
-bundle:
-  name: a job
-
-workspace:
-  host: "https://myworkspace.com"
-  root_path: /abc
-
-presets:
-  name_prefix: "[DEV]"
-  jobs_max_concurrent_runs: 10
-
-variables:
-  simplevar:
-    default: true
-    description: "simplevar description"
-
-  complexvar:
-    default:
-      key1: value1
-      key2: value2
-      key3:
-        - value3
-        - value4
-    description: "complexvar description"
-
-run_as:
-  service_principal_name: myserviceprincipal
-
-resources:
-  jobs:
-    myjob:
-      name: myjob
-      continuous:
-        pause_status: PAUSED
-      edit_mode: EDITABLE
-      max_concurrent_runs: 10
-      description: "my job description"
-      email_notifications:
-        no_alert_for_skipped_runs: true
-      environments:
-        - environment_key: venv
-          spec:
-            dependencies:
-              - python=3.7
-            client: "myclient"
-      format: MULTI_TASK
-      tags:
-        foo: bar
-        bar: baz
-      tasks:
-        - task_key: mytask
-          notebook_task:
-            notebook_path: ${var.simplevar}
-          existing_cluster_id: abcd
-        - task_key: mytask2
-          for_each_task:
-            inputs: av
-            concurrency: 10
-            task:
-              task_key: inside_for_each
-              notebook_task:
-                notebook_path: ${var.complexvar.key3[0]}
-        - ${var.complexvar}

bundle/internal/schema/testdata/pass/ml.yml

@@ -1,72 +0,0 @@
-bundle:
-  name: ML
-
-workspace:
-  host: "https://myworkspace.com"
-  root_path: /abc
-
-presets:
-  name_prefix: "[DEV]"
-  jobs_max_concurrent_runs: 10
-
-variables:
-  simplevar:
-    default: "true"
-    description: "simplevar description"
-
-  complexvar:
-    default:
-      key1: value1
-      key2: value2
-      key3:
-        - value3
-        - value4
-    description: "complexvar description"
-
-resources:
-  models:
-    mymodel:
-      creation_timestamp: 123
-      description: "my model"
-      latest_versions:
-        - creation_timestamp: 123
-          tags: ${var.complexvar.key1}
-          status: READY
-      permissions:
-        - service_principal_name: myserviceprincipal
-          level: CAN_MANAGE
-
-  experiments:
-    myexperiment:
-      artifact_location: /dbfs/myexperiment
-      last_update_time: ${var.complexvar.key2}
-      lifecycle_stage: ${var.simplevar}
-      permissions:
-        - service_principal_name: myserviceprincipal
-          level: CAN_MANAGE
-
-  model_serving_endpoints:
-    myendpoint:
-      config:
-        served_models:
-          - model_name: ${resources.models.mymodel.name}
-            model_version: abc
-            scale_to_zero_enabled: true
-            workload_size: Large
-      name: myendpoint
-
-  schemas:
-    myschema:
-      catalog_name: mycatalog
-      name: myschema
-
-  registered_models:
-    myregisteredmodel:
-      catalog_name: mycatalog
-      name: myregisteredmodel
-      schema_name: ${resources.schemas.myschema.name}
-      grants:
-        - principal: abcd
-          privileges:
-            - SELECT
-            - INSERT

bundle/internal/schema/testdata/pass/pipeline.yml

@@ -1,54 +0,0 @@
-bundle:
-  name: a pipeline
-
-workspace:
-  host: "https://myworkspace.com"
-  root_path: /abc
-
-presets:
-  name_prefix: "[DEV]"
-  jobs_max_concurrent_runs: 10
-
-variables:
-  simplevar:
-    default: true
-    description: "simplevar description"
-
-  complexvar:
-    default:
-      key1: value1
-      key2: value2
-      key3:
-        - value3
-        - value4
-    description: "complexvar description"
-
-artifacts:
-  mywheel:
-    path: ./mywheel.whl
-    type: WHEEL
-
-run_as:
-  service_principal_name: myserviceprincipal
-
-resources:
-  jobs:
-    myjob:
-      name: myjob
-      tasks:
-        - task_key: ${bundle.name} pipeline trigger
-          pipeline_task:
-            pipeline_id: ${resources.mypipeline.id}
-
-  pipelines:
-    mypipeline:
-      name: mypipeline
-      libraries:
-        - whl: ./mywheel.whl
-      catalog: 3{var.complexvar.key2}
-      development: true
-      clusters:
-        - autoscale:
-            mode: ENHANCED
-            max_workers: 10
-            min_workers: 1

bundle/internal/schema/testdata/pass/quality_monitor.yml

@@ -1,16 +0,0 @@
-bundle:
-  name: quality_monitor
-
-resources:
-  quality_monitors:
-    myqualitymonitor:
-      inference_log:
-        granularities:
-          - a
-          - b
-        model_id_col: a
-        prediction_col: b
-        timestamp_col: c
-        problem_type: PROBLEM_TYPE_CLASSIFICATION
-      assets_dir: /dbfs/mnt/abc
-      output_schema_name: default

bundle/internal/schema/testdata/pass/run_job_task.yml

@@ -1,56 +0,0 @@
-bundle:
-  name: a run job task
-  databricks_cli_version: 0.200.0
-  compute_id: "mycompute"
-
-
-variables:
-  simplevar:
-    default: 5678
-    description: "simplevar description"
-
-  complexvar:
-    default:
-      key1: 1234
-      key2: value2
-      key3:
-        - value3
-        - 9999
-    description: "complexvar description"
-
-resources:
-  jobs:
-    inner:
-      permissions:
-        - user_name: user1
-          level: CAN_MANAGE
-
-      name: inner job
-      tasks:
-        - task_key: inner notebook task
-          notebook_task:
-            notebook_path: /Users/abc/notebooks/inner
-          existing_cluster_id: abcd
-
-    outer:
-      name: outer job
-      tasks:
-        - task_key: run job task 1
-          run_job_task:
-            job_id: 1234
-
-        - task_key: run job task 2
-          run_job_task:
-            job_id: ${var.complexvar.key1}
-
-        - task_key: run job task 3
-          run_job_task:
-            job_id: ${var.simplevar}
-
-        - task_key: run job task 4
-          run_job_task:
-            job_id: ${resources.inner.id}
-
-        - task_key: run job task 5
-          run_job_task:
-            job_id: ${var.complexvar.key3[1]}

bundle/internal/schema/testdata/pass/schema.yml

@@ -1,24 +0,0 @@
-bundle:
-  name: basic
-
-variables:
-  complexvar:
-    default:
-      key1: 1234
-      key2: value2
-      key3:
-        - value3
-        - 9999
-    description: complexvar description
-
-resources:
-  schemas:
-    myschema:
-      name: myschema
-      catalog_name: main
-      grants:
-        - ${var.complexvar}
-        - principal: ${workspace.current_user.me}
-          privileges:
-            - ${var.complexvar.key3[0]}
-            - ${var.complexvar.key2}

cmd/bundle/generate/generate_test.go

@@ -152,12 +152,6 @@ func TestGenerateJobCommand(t *testing.T) {
 					},
 				},
 			},
-			Parameters: []jobs.JobParameterDefinition{
-				{
-					Name:    "empty",
-					Default: "",
-				},
-			},
 		},
 	}, nil)
 
@@ -204,9 +198,6 @@ func TestGenerateJobCommand(t *testing.T) {
         - task_key: notebook_task
           notebook_task:
             notebook_path: %s
-      parameters:
-        - name: empty
-          default: ""
 `, filepath.Join("..", "src", "notebook.py")), string(data))
 
 	data, err = os.ReadFile(filepath.Join(srcDir, "notebook.py"))

internal/bundle/artifacts_test.go

@@ -37,7 +37,6 @@ func TestAccUploadArtifactFileToCorrectRemotePath(t *testing.T) {
 
 	b := &bundle.Bundle{
 		RootPath: dir,
-		SyncRootPath: dir,
 		Config: config.Root{
 			Bundle: config.Bundle{
 				Target: "whatever",
@@ -102,7 +101,6 @@ func TestAccUploadArtifactFileToCorrectRemotePathWithEnvironments(t *testing.T)
 
 	b := &bundle.Bundle{
 		RootPath: dir,
-		SyncRootPath: dir,
 		Config: config.Root{
 			Bundle: config.Bundle{
 				Target: "whatever",
@@ -172,7 +170,6 @@ func TestAccUploadArtifactFileToCorrectRemotePathForVolumes(t *testing.T) {
 
 	b := &bundle.Bundle{
 		RootPath: dir,
-		SyncRootPath: dir,
 		Config: config.Root{
 			Bundle: config.Bundle{
 				Target: "whatever",

libs/dyn/yamlsaver/saver.go

@@ -151,8 +151,6 @@ func isScalarValueInString(v dyn.Value) bool {
 	switch v.MustString() {
 	case "true", "false":
 		return true
-	case "":
-		return true
 	default:
 		_, err := parseNumber(v.MustString())
 		return err == nil