diff --git a/acceptance/bundle/resources/pipelines/photon-false/script b/acceptance/bundle/resources/pipelines/photon-false/script deleted file mode 100644 index 23e775610c..0000000000 --- a/acceptance/bundle/resources/pipelines/photon-false/script +++ /dev/null @@ -1,2 +0,0 @@ -trace $CLI bundle deploy -print_requests.py //api/2.0/pipelines > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1 diff --git a/acceptance/bundle/resources/pipelines/photon-false/test.toml b/acceptance/bundle/resources/pipelines/photon-false/test.toml deleted file mode 100644 index ab302df438..0000000000 --- a/acceptance/bundle/resources/pipelines/photon-false/test.toml +++ /dev/null @@ -1,7 +0,0 @@ -Badness = "photon: false is not sent in the terraform deployment" -Local = true -Cloud = false -RecordRequests = true - -[EnvMatrix] - DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"] diff --git a/acceptance/bundle/resources/pipelines/photon-false/databricks.yml b/acceptance/bundle/resources/pipelines/zero-value-fields/databricks.yml similarity index 60% rename from acceptance/bundle/resources/pipelines/photon-false/databricks.yml rename to acceptance/bundle/resources/pipelines/zero-value-fields/databricks.yml index 07bee678b1..6559797a86 100644 --- a/acceptance/bundle/resources/pipelines/photon-false/databricks.yml +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/databricks.yml @@ -1,11 +1,14 @@ bundle: - name: photon-false + name: zero-value-fields resources: pipelines: my: name: test-pipeline photon: false + serverless: false + continuous: false + development: false libraries: - file: path: "./foo.py" diff --git a/acceptance/bundle/resources/pipelines/photon-false/foo.py b/acceptance/bundle/resources/pipelines/zero-value-fields/foo.py similarity index 100% rename from acceptance/bundle/resources/pipelines/photon-false/foo.py rename to acceptance/bundle/resources/pipelines/zero-value-fields/foo.py diff --git a/acceptance/bundle/resources/pipelines/photon-false/out.requests.direct.txt b/acceptance/bundle/resources/pipelines/zero-value-fields/out.requests.direct.txt similarity index 58% rename from acceptance/bundle/resources/pipelines/photon-false/out.requests.direct.txt rename to acceptance/bundle/resources/pipelines/zero-value-fields/out.requests.direct.txt index 9307782443..e4b82109cf 100644 --- a/acceptance/bundle/resources/pipelines/photon-false/out.requests.direct.txt +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/out.requests.direct.txt @@ -3,19 +3,22 @@ "path": "/api/2.0/pipelines", "body": { "channel": "CURRENT", + "continuous": false, "deployment": { "kind": "BUNDLE", - "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/photon-false/default/state/metadata.json" + "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/state/metadata.json" }, + "development": false, "edition": "ADVANCED", "libraries": [ { "file": { - "path": "/Workspace/Users/[USERNAME]/.bundle/photon-false/default/files/foo.py" + "path": "/Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/files/foo.py" } } ], "name": "test-pipeline", - "photon": false + "photon": false, + "serverless": false } } diff --git a/acceptance/bundle/resources/pipelines/photon-false/out.requests.terraform.txt b/acceptance/bundle/resources/pipelines/zero-value-fields/out.requests.terraform.txt similarity index 70% rename from acceptance/bundle/resources/pipelines/photon-false/out.requests.terraform.txt rename to acceptance/bundle/resources/pipelines/zero-value-fields/out.requests.terraform.txt index 4069fbcd8c..2975d5a195 100644 --- a/acceptance/bundle/resources/pipelines/photon-false/out.requests.terraform.txt +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/out.requests.terraform.txt @@ -5,13 +5,13 @@ "channel": "CURRENT", "deployment": { "kind": "BUNDLE", - "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/photon-false/default/state/metadata.json" + "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/state/metadata.json" }, "edition": "ADVANCED", "libraries": [ { "file": { - "path": "/Workspace/Users/[USERNAME]/.bundle/photon-false/default/files/foo.py" + "path": "/Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/files/foo.py" } } ], diff --git a/acceptance/bundle/resources/pipelines/photon-false/out.test.toml b/acceptance/bundle/resources/pipelines/zero-value-fields/out.test.toml similarity index 100% rename from acceptance/bundle/resources/pipelines/photon-false/out.test.toml rename to acceptance/bundle/resources/pipelines/zero-value-fields/out.test.toml diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/out.tf.terraform.json b/acceptance/bundle/resources/pipelines/zero-value-fields/out.tf.terraform.json new file mode 100644 index 0000000000..26a43c316f --- /dev/null +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/out.tf.terraform.json @@ -0,0 +1,22 @@ +{ + "my": { + "channel": "CURRENT", + "continuous": false, + "deployment": { + "kind": "BUNDLE", + "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/state/metadata.json" + }, + "development": false, + "edition": "ADVANCED", + "library": [ + { + "file": { + "path": "/Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/files/foo.py" + } + } + ], + "name": "test-pipeline", + "photon": false, + "serverless": false + } +} diff --git a/acceptance/bundle/resources/pipelines/photon-false/output.txt b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt similarity index 50% rename from acceptance/bundle/resources/pipelines/photon-false/output.txt rename to acceptance/bundle/resources/pipelines/zero-value-fields/output.txt index 2cd4fc51a7..e6f9d14858 100644 --- a/acceptance/bundle/resources/pipelines/photon-false/output.txt +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/photon-false/default/files... +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/files... Deploying resources... Updating deployment state... Deployment complete! diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/script b/acceptance/bundle/resources/pipelines/zero-value-fields/script new file mode 100644 index 0000000000..06f64fc53f --- /dev/null +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/script @@ -0,0 +1,6 @@ +trace $CLI bundle deploy +print_requests.py //api/2.0/pipelines > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1 + +if [ -f .databricks/bundle/default/terraform/bundle.tf.json ]; then + jq .resource.databricks_pipeline .databricks/bundle/default/terraform/bundle.tf.json > out.tf.$DATABRICKS_BUNDLE_ENGINE.json +fi diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/test.toml b/acceptance/bundle/resources/pipelines/zero-value-fields/test.toml new file mode 100644 index 0000000000..bb392535cb --- /dev/null +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/test.toml @@ -0,0 +1,7 @@ +Badness = "zero-value bool fields (photon, serverless, continuous, development) are not sent in the terraform deployment" +Local = true +Cloud = false +RecordRequests = true + +[EnvMatrix] + DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"]