merge

Author: shreyas-goenka

.wsignore

@@ -25,7 +25,6 @@ acceptance/bundle/artifacts/shell/err-sh/output.txt
 acceptance/bundle/templates-machinery/helpers-error/output.txt
 
 # "bundle deploy" with apps has trailing whitespace:
-acceptance/bundle/apps/config_section/output.txt
 integration/bundle/testdata/apps/bundle_deploy.txt
 
 # Extra whitespace in test output:

NEXT_CHANGELOG.md

@@ -9,6 +9,8 @@
 ### Dependency updates
 
 ### Bundles
+* Remove resources.apps.config section ([#3680](https://github.com/databricks/cli/pull/3680))
+* Prompt for serverless compute in `dbt-sql` template (defaults to `yes`) ([#3668](https://github.com/databricks/cli/pull/3668))
 
 ### API Changes
 * Added `databricks account account-groups-v2` command group.

acceptance/bundle/apps/config_section/app/app.py

@@ -6,7 +6,7 @@
   "browse_only": false,
   "catalog_name": "main",
   "catalog_type": "MANAGED_CATALOG",
-  "created_at": [UNIX_TIME_MILLIS],
+  "created_at": [UNIX_TIME_MILLIS][0],
   "created_by": "[USERNAME]",
   "effective_predictive_optimization_flag": {
     "inherited_from_type": "METASTORE",
@@ -18,7 +18,7 @@
   "name": "schema-[UNIQUE_NAME]",
   "owner": "[USERNAME]",
   "schema_id": "[UUID]",
-  "updated_at": [UNIX_TIME_MILLIS],
+  "updated_at": [UNIX_TIME_MILLIS][0],
   "updated_by": "[USERNAME]"
 }
 

acceptance/bundle/apps/config_section/databricks.yml

@@ -6,7 +6,7 @@
   "browse_only": false,
   "catalog_name": "main",
   "catalog_type": "MANAGED_CATALOG",
-  "created_at": [UNIX_TIME_MILLIS],
+  "created_at": [UNIX_TIME_MILLIS][0],
   "created_by": "[USERNAME]",
   "effective_predictive_optimization_flag": {
     "inherited_from_type": "METASTORE",
@@ -18,7 +18,7 @@
   "name": "schema-[UNIQUE_NAME]",
   "owner": "[USERNAME]",
   "schema_id": "[UUID]",
-  "updated_at": [UNIX_TIME_MILLIS],
+  "updated_at": [UNIX_TIME_MILLIS][0],
   "updated_by": "[USERNAME]"
 }
 

acceptance/bundle/apps/config_section/out.app.yml.txt

@@ -26,29 +26,29 @@
 
 >>> [CLI] bundle deploy
 Building my_test_code...
-Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
-Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
+Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl...
+Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
 
 === There are 2 original wheels and 2 patched ones
 >>> find.py --expect 4 whl
-.databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl
-.databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl
+.databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl
+.databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl
 my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 prebuilt/other_test_code-0.0.1-py3-none-any.whl
 
 === Verify contents of the zip file
 >>> find.py --expect 1 .databricks/.*my_test_code.*whl
 src/__init__.py
 src/__main__.py
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/METADATA
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/WHEEL
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/entry_points.txt
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/top_level.txt
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
+my_test_code-0.0.1+[UNIX_TIME_NANOS][1].dist-info/METADATA
+my_test_code-0.0.1+[UNIX_TIME_NANOS][1].dist-info/WHEEL
+my_test_code-0.0.1+[UNIX_TIME_NANOS][1].dist-info/entry_points.txt
+my_test_code-0.0.1+[UNIX_TIME_NANOS][1].dist-info/top_level.txt
+my_test_code-0.0.1+[UNIX_TIME_NANOS][1].dist-info/RECORD
 
 === Expecting 2 patched wheels in libraries section in /jobs/create
 >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
@@ -69,7 +69,7 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
         "existing_cluster_id": "0717-132531-5opeqon1",
         "libraries": [
           {
-            "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+            "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl"
           }
         ],
         "python_wheel_task": {
@@ -81,10 +81,10 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
     },
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl"
       },
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -97,16 +97,16 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
 
 === Expecting 2 patched wheels to be uploaded
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/prebuilt/other_test_code-0.0.1-py3-none-any.whl"
 
 === Updating the local wheel and deploying again
 >>> [CLI] bundle deploy
 Building my_test_code...
-Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
-Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
+Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl...
+Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deploying resources...
 Updating deployment state...
@@ -117,11 +117,11 @@ Deployment complete!
 src/__init__.py
 src/__main__.py
 src/new_module.py
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/METADATA
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/WHEEL
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/entry_points.txt
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/top_level.txt
-my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
+my_test_code-0.0.1+[UNIX_TIME_NANOS][2].dist-info/METADATA
+my_test_code-0.0.1+[UNIX_TIME_NANOS][2].dist-info/WHEEL
+my_test_code-0.0.1+[UNIX_TIME_NANOS][2].dist-info/entry_points.txt
+my_test_code-0.0.1+[UNIX_TIME_NANOS][2].dist-info/top_level.txt
+my_test_code-0.0.1+[UNIX_TIME_NANOS][2].dist-info/RECORD
 
 === Expecting 2 patched wheels in libraries section in /jobs/reset
 >>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks out.requests.txt
@@ -142,7 +142,7 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
         "existing_cluster_id": "0717-132531-5opeqon1",
         "libraries": [
           {
-            "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+            "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
           }
         ],
         "python_wheel_task": {
@@ -154,10 +154,10 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
     },
     "libraries": [
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
       },
       {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
       }
     ],
     "python_wheel_task": {
@@ -170,6 +170,6 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS].dist-info/RECORD
 
 === Expecting 2 pached wheels to be uploaded (Bad: it is currently uploaded twice)
 >>> jq .path
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
+"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"