Merge branch 'main' of github.com:databricks/cli into config-sync-new-defaults

Author: ilyakuz-db

NEXT_CHANGELOG.md

@@ -15,6 +15,7 @@
 * Added support for UC catalogs (only in direct mode) ([#4342](https://github.com/databricks/cli/pull/4342))
 * engine/direct: Fix updates to fields being ignored for database_catalogs, synced_database_tables (([#4388](https://github.com/databricks/cli/pull/4388)))
 * engine/direct: Fix migration for database_instances, database_catalog, synced_database_tables ([#4424](https://github.com/databricks/cli/pull/4424))
+* Show warning message if valueFrom is used instead of value_from in app config section ([$4429](https://github.com/databricks/cli/pull/4429))
 
 ### Dependency updates
 

acceptance/bin/contains.py

@@ -18,7 +18,7 @@
             found.add(t)
     for t in must_not_find:
         if t in line:
-            sys.stderr.write(f"contains error: {t!r} was not expected\n")
+            sys.stderr.write(f"contains error: {t!r} was not expected: {line.strip()!r}\n")
 
 sys.stdout.flush()
 

acceptance/bundle/apps/value_from_warning/app/app.py

@@ -0,0 +1 @@
+print("Hello from the app!")

acceptance/bundle/apps/value_from_warning/databricks.yml

@@ -0,0 +1,12 @@
+bundle:
+  name: test-bundle
+
+resources:
+  apps:
+    myapp:
+      name: myapp
+      source_code_path: ./app
+      config:
+        env:
+          - name: MY_SECRET
+            valueFrom: secret://my_secret

acceptance/bundle/apps/value_from_warning/out.test.toml

@@ -0,0 +1,15 @@
+
+>>> [CLI] bundle validate
+Warning: Use 'value_from' instead of 'valueFrom'
+  at resources.apps.myapp.config.env[0]
+  in databricks.yml:12:13
+
+The field 'valueFrom' should be 'value_from' (snake_case). The 'valueFrom' field will be ignored.
+
+Name: test-bundle
+Target: default
+Workspace:
+  User: [USERNAME]
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
+
+Found 1 warning

acceptance/bundle/apps/value_from_warning/output.txt

@@ -0,0 +1 @@
+trace $CLI bundle validate

acceptance/bundle/apps/value_from_warning/script

@@ -0,0 +1,5 @@
+RecordRequests = false
+
+Ignore = [
+    '.databricks',
+]

acceptance/bundle/apps/value_from_warning/test.toml

@@ -18,7 +18,7 @@ cp databricks.yml LOG.config
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve &> LOG.destroy
-    cat LOG.destroy | contains.py '!panic' '!internal error' > /dev/null
+    cat LOG.destroy | contains.py '!panic:' '!internal error' > /dev/null
 
     # Run cleanup script if present
     CLEANUP_SCRIPT="$TESTDIR/../configs/$INPUT_CONFIG-cleanup.sh"
@@ -30,14 +30,14 @@ cleanup() {
 trap cleanup EXIT
 
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy &> LOG.deploy
-cat LOG.deploy | contains.py '!panic' '!internal error' > /dev/null
+cat LOG.deploy | contains.py '!panic:' '!internal error' > /dev/null
 
 echo INPUT_CONFIG_OK
 
 trace $CLI bundle deployment migrate &> LOG.migrate
 
-cat LOG.migrate | contains.py '!panic' '!internal error' > /dev/null
+cat LOG.migrate | contains.py '!panic:' '!internal error' > /dev/null
 
 $CLI bundle plan -o json &> plan.json
-cat plan.json | contains.py '!panic' '!internal error' > /dev/null
+cat plan.json | contains.py '!panic:' '!internal error' > /dev/null
 verify_no_drift.py plan.json

acceptance/bundle/invariant/migrate/script

@@ -20,7 +20,7 @@ Failed script
 === This should complain about Hello present in output
 >>> python3 ./success.py
 Hello world
-contains error: 'Hello' was not expected
+contains error: 'Hello' was not expected: 'Hello world'
 
 === This should not complain
 >>> python3 ./success.py