bundle: don't set edition/channel defaults for ingestion pipelines

acceptance/bundle/resources/pipelines/ingestion-defaults/databricks.yml.tmpl

@@ -0,0 +1,16 @@
+bundle:
+  name: test-ingestion-defaults-$UNIQUE_NAME
+
+resources:
+  pipelines:
+    ingestion:
+      name: test-ingestion-$UNIQUE_NAME
+      catalog: main
+      target: default
+      ingestion_definition:
+        connection_name: $INGESTION_CONNECTION_NAME
+        objects: []
+
+targets:
+  dev:
+    default: true

acceptance/bundle/resources/pipelines/ingestion-defaults/output.txt

@@ -0,0 +1,13 @@
+
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-ingestion-defaults-[UNIQUE_NAME]/dev/files...
+Deploying resources...
+Updating deployment state...
+Deployment complete!
+
+>>> jq -s .[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body | {name, edition, channel} out.requests.txt
+{
+  "name": "test-ingestion-[UNIQUE_NAME]",
+  "edition": null,
+  "channel": null
+}

acceptance/bundle/resources/pipelines/ingestion-defaults/script

@@ -0,0 +1,15 @@
+envsubst < databricks.yml.tmpl > databricks.yml
+
+cleanup() {
+    trace $CLI bundle destroy --auto-approve 2>/dev/null || true
+    rm -f out.requests.txt
+}
+trap cleanup EXIT
+
+# Deploy the ingestion pipeline. Verifies that:
+#   1. Deployment succeeds without "cluster settings" errors
+#   2. edition and channel are absent from the created pipeline's spec
+trace $CLI bundle deploy
+
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body | {name, edition, channel}' out.requests.txt
+rm -f out.requests.txt

acceptance/bundle/resources/pipelines/ingestion-defaults/test.toml

@@ -0,0 +1,16 @@
+Local = false
+Cloud = true
+RecordRequests = true
+
+# The Terraform engine still injects edition/channel at provider level (SetDefault in
+# resource_pipeline.go:253); companion fix: terraform-provider-databricks#5783.
+# Only test with direct engine here so we cleanly validate the DABs-side fix.
+[EnvMatrix]
+DATABRICKS_BUNDLE_ENGINE = ["direct"]
+
+[Env]
+# MySQL connection present in the azure test workspace.
+INGESTION_CONNECTION_NAME = "name-sbggefbaaidkb"
+
+[CloudEnvs]
+azure = true

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.pipeline_get.direct.json

@@ -0,0 +1,31 @@
+{
+  "creator_user_name": "[USERNAME]",
+  "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE",
+  "last_modified": [UNIX_TIME_MILLIS],
+  "name": "test-pipeline-[UNIQUE_NAME]",
+  "pipeline_id": "[MY_ID_2]",
+  "run_as_user_name": "[USERNAME]",
+  "spec": {
+    "deployment": {
+      "kind": "BUNDLE",
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
+    },
+    "id": "[MY_ID_2]",
+    "ingestion_definition": {
+      "connection_name": "my_new_connection",
+      "objects": [
+        {}
+      ]
+    },
+    "libraries": [
+      {
+        "file": {
+          "path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files/foo.py"
+        }
+      }
+    ],
+    "name": "test-pipeline-[UNIQUE_NAME]",
+    "storage": "dbfs:/pipelines/[MY_ID_2]"
+  },
+  "state": "IDLE"
+}

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.pipeline_get.terraform.json

@@ -0,0 +1,33 @@
+{
+  "creator_user_name": "[USERNAME]",
+  "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE",
+  "last_modified": [UNIX_TIME_MILLIS],
+  "name": "test-pipeline-[UNIQUE_NAME]",
+  "pipeline_id": "[MY_ID_2]",
+  "run_as_user_name": "[USERNAME]",
+  "spec": {
+    "channel": "CURRENT",
+    "deployment": {
+      "kind": "BUNDLE",
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
+    },
+    "edition": "ADVANCED",
+    "id": "[MY_ID_2]",
+    "ingestion_definition": {
+      "connection_name": "my_new_connection",
+      "objects": [
+        {}
+      ]
+    },
+    "libraries": [
+      {
+        "file": {
+          "path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files/foo.py"
+        }
+      }
+    ],
+    "name": "test-pipeline-[UNIQUE_NAME]",
+    "storage": "dbfs:/pipelines/[MY_ID_2]"
+  },
+  "state": "IDLE"
+}

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.plan_create.direct.json

@@ -6,12 +6,10 @@
       "action": "create",
       "new_state": {
         "value": {
-          "channel": "CURRENT",
           "deployment": {
             "kind": "BUNDLE",
             "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
           },
-          "edition": "ADVANCED",
           "ingestion_definition": {
             "connection_name": "my_connection",
             "objects": [

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.plan_recreate.direct.json

@@ -8,12 +8,10 @@
       "action": "recreate",
       "new_state": {
         "value": {
-          "channel": "CURRENT",
           "deployment": {
             "kind": "BUNDLE",
             "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
           },
-          "edition": "ADVANCED",
           "ingestion_definition": {
             "connection_name": "my_new_connection",
             "objects": [
@@ -31,13 +29,11 @@
         }
       },
       "remote_state": {
-        "channel": "CURRENT",
         "creator_user_name": "[USERNAME]",
         "deployment": {
           "kind": "BUNDLE",
           "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
         },
-        "edition": "ADVANCED",
         "effective_publishing_mode": "DEFAULT_PUBLISHING_MODE",
         "id": "[MY_ID]",
         "ingestion_definition": {

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.requests.create.direct.json

@@ -0,0 +1,24 @@
+{
+  "body": {
+    "deployment": {
+      "kind": "BUNDLE",
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
+    },
+    "ingestion_definition": {
+      "connection_name": "my_connection",
+      "objects": [
+        {}
+      ]
+    },
+    "libraries": [
+      {
+        "file": {
+          "path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files/foo.py"
+        }
+      }
+    ],
+    "name": "test-pipeline-[UNIQUE_NAME]"
+  },
+  "method": "POST",
+  "path": "/api/2.0/pipelines"
+}

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.requests.create.terraform.json

@@ -0,0 +1,26 @@
+{
+  "body": {
+    "channel": "CURRENT",
+    "deployment": {
+      "kind": "BUNDLE",
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
+    },
+    "edition": "ADVANCED",
+    "ingestion_definition": {
+      "connection_name": "my_connection",
+      "objects": [
+        {}
+      ]
+    },
+    "libraries": [
+      {
+        "file": {
+          "path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files/foo.py"
+        }
+      }
+    ],
+    "name": "test-pipeline-[UNIQUE_NAME]"
+  },
+  "method": "POST",
+  "path": "/api/2.0/pipelines"
+}

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.requests.destroy.json

@@ -0,0 +1,4 @@
+{
+  "method": "DELETE",
+  "path": "/api/2.0/pipelines/[MY_ID_2]"
+}

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.requests.recreate.direct.json

@@ -0,0 +1,28 @@
+{
+  "method": "DELETE",
+  "path": "/api/2.0/pipelines/[MY_ID]"
+}
+{
+  "body": {
+    "deployment": {
+      "kind": "BUNDLE",
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
+    },
+    "ingestion_definition": {
+      "connection_name": "my_new_connection",
+      "objects": [
+        {}
+      ]
+    },
+    "libraries": [
+      {
+        "file": {
+          "path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files/foo.py"
+        }
+      }
+    ],
+    "name": "test-pipeline-[UNIQUE_NAME]"
+  },
+  "method": "POST",
+  "path": "/api/2.0/pipelines"
+}

acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/out.requests.recreate.terraform.json

@@ -0,0 +1,30 @@
+{
+  "method": "DELETE",
+  "path": "/api/2.0/pipelines/[MY_ID]"
+}
+{
+  "body": {
+    "channel": "CURRENT",
+    "deployment": {
+      "kind": "BUNDLE",
+      "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/state/metadata.json"
+    },
+    "edition": "ADVANCED",
+    "ingestion_definition": {
+      "connection_name": "my_new_connection",
+      "objects": [
+        {}
+      ]
+    },
+    "libraries": [
+      {
+        "file": {
+          "path": "/Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files/foo.py"
+        }
+      }
+    ],
+    "name": "test-pipeline-[UNIQUE_NAME]"
+  },
+  "method": "POST",
+  "path": "/api/2.0/pipelines"
+}