acc: record how includes and target overrides merge, and how nulls are handled

acceptance/bundle/run/ambiguous_key_from_target/databricks.yml

@@ -0,0 +1,15 @@
+bundle:
+  name: test-bundle
+
+resources:
+  jobs:
+    foo:
+      name: foo-job
+
+targets:
+  dev:
+    default: true
+    resources:
+      pipelines:
+        foo:
+          name: foo-pipeline

acceptance/bundle/run/ambiguous_key_from_target/out.test.toml

@@ -0,0 +1,2 @@
+Cloud = false
+EnvMatrix.DMS = ["", "true"]

acceptance/bundle/run/ambiguous_key_from_target/output.txt

@@ -0,0 +1,37 @@
+
+>>> [CLI] bundle validate
+Name: test-bundle
+Target: dev
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev
+
+Validation OK!
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files...
+Created jobs.foo
+Created pipelines.foo
+Files: 1 uploaded, 0 deleted
+Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
+
+>>> [CLI] bundle summary
+Name: test-bundle
+Target: dev
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev
+Resources:
+  Jobs:
+    foo:
+      Name: foo-job
+      URL:  [DATABRICKS_URL]/jobs/[FOO_ID]?w=[WORKSPACE_ID]
+  Pipelines:
+    foo:
+      Name: foo-pipeline
+      URL:  [DATABRICKS_URL]/pipelines/[FOO_ID_2]?w=[WORKSPACE_ID]
+
+>>> [CLI] bundle run foo
+Error: multiple resources with key "foo" found
+
+Exit code: 1

acceptance/bundle/run/ambiguous_key_from_target/script

@@ -0,0 +1,6 @@
+# A target adds pipelines.foo next to jobs.foo: validate, deploy and summary accept it, run fails as ambiguous.
+trace $CLI bundle validate
+trace $CLI bundle deploy
+replace_ids.py
+trace $CLI bundle summary
+errcode trace $CLI bundle run foo

acceptance/bundle/run/ambiguous_key_from_target/test.toml

@@ -0,0 +1 @@
+Badness = 'Resource keys must be unique across resource types (see select/ambiguous), but the check runs before target overrides, so a target can add pipelines.foo next to jobs.foo and only commands that look up the key fail.'

acceptance/bundle/validate/include_vs_target/include/databricks.yml

@@ -0,0 +1,53 @@
+bundle:
+  name: test-bundle
+  cluster_id: root-cluster
+  git:
+    branch: root-branch
+
+workspace:
+  root_path: /Workspace/root
+  file_path: /Workspace/root/files
+
+artifacts:
+  whl:
+    type: whl
+    build: build-root
+    files:
+      - source: root.whl
+
+experimental:
+  skip_name_prefix_for_schema: true
+
+presets:
+  name_prefix: root-
+  tags:
+    root: "1"
+
+sync:
+  include:
+    - databricks.yml
+
+permissions:
+  - level: CAN_MANAGE
+    user_name: ${workspace.current_user.userName}
+
+variables:
+  scalar:
+    description: from root
+    default: root
+  complex:
+    type: complex
+    default:
+      root: root
+      shared: root
+      list: [root]
+
+scripts:
+  root_script:
+    content: echo root
+
+run_as:
+  user_name: root@example.com
+
+include:
+  - override.yml

acceptance/bundle/validate/include_vs_target/include/override.yml

@@ -0,0 +1,45 @@
+bundle:
+  cluster_id: override-cluster
+  git:
+    origin_url: https://override.example.com
+
+workspace:
+  root_path: /Workspace/override
+
+artifacts:
+  whl:
+    build: build-override
+    files:
+      - source: override.whl
+
+experimental:
+  python_wheel_wrapper: true
+
+presets:
+  name_prefix: override-
+  tags:
+    override: "1"
+
+sync:
+  include:
+    - "*.yml"
+
+permissions:
+  - level: CAN_VIEW
+    group_name: viewers
+
+variables:
+  scalar:
+    default: override
+  complex:
+    default:
+      override: override
+      shared: override
+      list: [override]
+
+scripts:
+  override_script:
+    content: echo override
+
+run_as:
+  service_principal_name: override-sp

acceptance/bundle/validate/include_vs_target/out.test.toml

@@ -0,0 +1,2 @@
+Cloud = false
+EnvMatrix.DMS = ["", "true"]

acceptance/bundle/validate/include_vs_target/output.include.json

@@ -0,0 +1,98 @@
+{
+  "bundle": {
+    "cluster_id": "override-cluster",
+    "git": {
+      "branch": "root-branch",
+      "origin_url": "https://override.example.com"
+    }
+  },
+  "workspace": {
+    "root_path": "/Workspace/override",
+    "file_path": "/Workspace/root/files"
+  },
+  "artifacts": {
+    "whl": {
+      "build": "build-override",
+      "files": [
+        {
+          "source": "[BUNDLE_ROOT]/root.whl"
+        },
+        {
+          "source": "[BUNDLE_ROOT]/override.whl"
+        }
+      ],
+      "path": "[BUNDLE_ROOT]",
+      "type": "whl"
+    }
+  },
+  "experimental": {
+    "python_wheel_wrapper": true,
+    "skip_name_prefix_for_schema": true
+  },
+  "presets": {
+    "name_prefix": "override-",
+    "tags": {
+      "override": "1",
+      "root": "1"
+    }
+  },
+  "sync": {
+    "include": [
+      "databricks.yml",
+      "*.yml"
+    ],
+    "paths": [
+      "."
+    ]
+  },
+  "permissions": [
+    {
+      "level": "CAN_MANAGE",
+      "user_name": "[USERNAME]"
+    },
+    {
+      "group_name": "viewers",
+      "level": "CAN_VIEW"
+    }
+  ],
+  "variables": {
+    "complex": {
+      "default": {
+        "list": [
+          "root",
+          "override"
+        ],
+        "override": "override",
+        "root": "root",
+        "shared": "override"
+      },
+      "type": "complex",
+      "value": {
+        "list": [
+          "root",
+          "override"
+        ],
+        "override": "override",
+        "root": "root",
+        "shared": "override"
+      }
+    },
+    "scalar": {
+      "default": "override",
+      "description": "from root",
+      "value": "override"
+    }
+  },
+  "scripts": {
+    "override_script": {
+      "content": "echo override"
+    },
+    "root_script": {
+      "content": "echo root"
+    }
+  },
+  "run_as": {
+    "service_principal_name": "override-sp",
+    "user_name": "root@example.com"
+  }
+}

acceptance/bundle/validate/include_vs_target/output.target.json

@@ -0,0 +1,89 @@
+{
+  "bundle": {
+    "cluster_id": "override-cluster",
+    "git": {
+      "branch": "root-branch",
+      "origin_url": "https://override.example.com"
+    }
+  },
+  "workspace": {
+    "root_path": "/Workspace/override",
+    "file_path": "/Workspace/root/files"
+  },
+  "artifacts": {
+    "whl": {
+      "build": "build-override",
+      "files": [
+        {
+          "source": "[BUNDLE_ROOT]/root.whl"
+        },
+        {
+          "source": "[BUNDLE_ROOT]/override.whl"
+        }
+      ],
+      "path": "[BUNDLE_ROOT]",
+      "type": "whl"
+    }
+  },
+  "experimental": {
+    "skip_name_prefix_for_schema": true
+  },
+  "presets": {
+    "name_prefix": "override-",
+    "tags": {
+      "override": "1",
+      "root": "1"
+    }
+  },
+  "sync": {
+    "include": [
+      "databricks.yml",
+      "*.yml"
+    ],
+    "paths": [
+      "."
+    ]
+  },
+  "permissions": [
+    {
+      "level": "CAN_MANAGE",
+      "user_name": "[USERNAME]"
+    },
+    {
+      "group_name": "viewers",
+      "level": "CAN_VIEW"
+    }
+  ],
+  "variables": {
+    "complex": {
+      "default": {
+        "list": [
+          "override"
+        ],
+        "override": "override",
+        "shared": "override"
+      },
+      "type": "complex",
+      "value": {
+        "list": [
+          "override"
+        ],
+        "override": "override",
+        "shared": "override"
+      }
+    },
+    "scalar": {
+      "default": "override",
+      "description": "from root",
+      "value": "override"
+    }
+  },
+  "scripts": {
+    "root_script": {
+      "content": "echo root"
+    }
+  },
+  "run_as": {
+    "service_principal_name": "override-sp"
+  }
+}