Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEXT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### CLI

* JSON output for single objects now uses standard `"key": "value"` spacing (matching list output and `encoding/json` defaults).

### Bundles

### Dependency updates
4 changes: 0 additions & 4 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,6 @@ mattn/go-isatty - https://github.com/mattn/go-isatty
Copyright (c) Yasuhiro MATSUMOTO <mattn.jp@gmail.com>
License - https://github.com/mattn/go-isatty/blob/master/LICENSE

nwidger/jsoncolor - https://github.com/nwidger/jsoncolor
Copyright (c) 2016 Niels Widger
License - https://github.com/nwidger/jsoncolor/blob/master/LICENSE

sabhiram/go-gitignore - https://github.com/sabhiram/go-gitignore
Copyright (c) 2015 Shaba Abhiram
License - https://github.com/sabhiram/go-gitignore/blob/master/LICENSE
Expand Down
10 changes: 5 additions & 5 deletions acceptance/apps/deploy/bundle-with-appname/output.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

>>> [CLI] apps deploy test-app --no-wait
{
"deployment_id":"dep-123",
"mode":"SNAPSHOT",
"source_code_path":"/Workspace/apps/test-app",
"deployment_id": "dep-123",
"mode": "SNAPSHOT",
"source_code_path": "/Workspace/apps/test-app",
"status": {
"message":"Deployment pending",
"state":"PENDING"
"message": "Deployment pending",
"state": "PENDING"
}
}
10 changes: 5 additions & 5 deletions acceptance/apps/deploy/no-bundle-with-appname/output.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

>>> [CLI] apps deploy test-app --no-wait
{
"deployment_id":"dep-123",
"mode":"SNAPSHOT",
"source_code_path":"/Workspace/apps/test-app",
"deployment_id": "dep-123",
"mode": "SNAPSHOT",
"source_code_path": "/Workspace/apps/test-app",
"status": {
"message":"Deployment pending",
"state":"PENDING"
"message": "Deployment pending",
"state": "PENDING"
}
}
4 changes: 2 additions & 2 deletions acceptance/auth/credentials/basic/output.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"id":"[USERID]",
"userName":"[USERNAME]"
"id": "[USERID]",
"userName": "[USERNAME]"
}
4 changes: 2 additions & 2 deletions acceptance/auth/credentials/oauth/output.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"id":"[USERID]",
"userName":"[USERNAME]"
"id": "[USERID]",
"userName": "[USERNAME]"
}
4 changes: 2 additions & 2 deletions acceptance/auth/credentials/pat/output.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"id":"[USERID]",
"userName":"[USERNAME]"
"id": "[USERID]",
"userName": "[USERNAME]"
}
20 changes: 10 additions & 10 deletions acceptance/auth/host-metadata-cache/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
{
"profiles": [
{
"name":"cached",
"host":"[DATABRICKS_URL]",
"cloud":"aws",
"auth_type":"",
"valid":false
"name": "cached",
"host": "[DATABRICKS_URL]",
"cloud": "aws",
"auth_type": "",
"valid": false
}
]
}
Expand All @@ -16,11 +16,11 @@
{
"profiles": [
{
"name":"cached",
"host":"[DATABRICKS_URL]",
"cloud":"aws",
"auth_type":"",
"valid":false
"name": "cached",
"host": "[DATABRICKS_URL]",
"cloud": "aws",
"auth_type": "",
"valid": false
}
]
}
Expand Down
24 changes: 12 additions & 12 deletions acceptance/bundle/deployment/bind/job/noop-job/out.job.direct.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"created_time":[UNIX_TIME_MILLIS],
"creator_user_name":"[USERNAME]",
"job_id":[NUMID],
"run_as_user_name":"[USERNAME]",
"created_time": [UNIX_TIME_MILLIS],
"creator_user_name": "[USERNAME]",
"job_id": [NUMID],
"run_as_user_name": "[USERNAME]",
"settings": {
"deployment": {
"kind":"BUNDLE",
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
"kind": "BUNDLE",
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
},
"edit_mode":"UI_LOCKED",
"edit_mode": "UI_LOCKED",
"email_notifications": {},
"format":"MULTI_TASK",
"max_concurrent_runs":1,
"name":"Updated Job",
"format": "MULTI_TASK",
"max_concurrent_runs": 1,
"name": "Updated Job",
"queue": {
"enabled":true
"enabled": true
},
"timeout_seconds":0,
"timeout_seconds": 0,
"webhook_notifications": {}
}
}
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"created_time":[UNIX_TIME_MILLIS],
"creator_user_name":"[USERNAME]",
"job_id":[NUMID],
"run_as_user_name":"[USERNAME]",
"created_time": [UNIX_TIME_MILLIS],
"creator_user_name": "[USERNAME]",
"job_id": [NUMID],
"run_as_user_name": "[USERNAME]",
"settings": {
"deployment": {
"kind":"BUNDLE",
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
"kind": "BUNDLE",
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
},
"edit_mode":"UI_LOCKED",
"edit_mode": "UI_LOCKED",
"email_notifications": {},
"format":"MULTI_TASK",
"max_concurrent_runs":1,
"name":"Updated Job",
"format": "MULTI_TASK",
"max_concurrent_runs": 1,
"name": "Updated Job",
"queue": {
"enabled":true
"enabled": true
},
"run_as": {
"user_name":"[USERNAME]"
"user_name": "[USERNAME]"
},
"timeout_seconds":0,
"timeout_seconds": 0,
"webhook_notifications": {}
}
}
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"created_time":[UNIX_TIME_MILLIS],
"creator_user_name":"[USERNAME]",
"job_id":[NUMID],
"run_as_user_name":"[USERNAME]",
"created_time": [UNIX_TIME_MILLIS],
"creator_user_name": "[USERNAME]",
"job_id": [NUMID],
"run_as_user_name": "[USERNAME]",
"settings": {
"deployment": {
"kind":"BUNDLE",
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
"kind": "BUNDLE",
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
},
"edit_mode":"UI_LOCKED",
"edit_mode": "UI_LOCKED",
"email_notifications": {},
"format":"MULTI_TASK",
"max_concurrent_runs":1,
"name":"Updated Job",
"format": "MULTI_TASK",
"max_concurrent_runs": 1,
"name": "Updated Job",
"queue": {
"enabled":true
"enabled": true
},
"timeout_seconds":0,
"timeout_seconds": 0,
"webhook_notifications": {}
}
}
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"created_time":[UNIX_TIME_MILLIS],
"creator_user_name":"[USERNAME]",
"job_id":[NUMID],
"run_as_user_name":"[USERNAME]",
"created_time": [UNIX_TIME_MILLIS],
"creator_user_name": "[USERNAME]",
"job_id": [NUMID],
"run_as_user_name": "[USERNAME]",
"settings": {
"deployment": {
"kind":"BUNDLE",
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
"kind": "BUNDLE",
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
},
"edit_mode":"UI_LOCKED",
"edit_mode": "UI_LOCKED",
"email_notifications": {},
"format":"MULTI_TASK",
"max_concurrent_runs":1,
"name":"Updated Job",
"format": "MULTI_TASK",
"max_concurrent_runs": 1,
"name": "Updated Job",
"queue": {
"enabled":true
"enabled": true
},
"run_as": {
"user_name":"[USERNAME]"
"user_name": "[USERNAME]"
},
"timeout_seconds":0,
"timeout_seconds": 0,
"webhook_notifications": {}
}
}
16 changes: 8 additions & 8 deletions acceptance/bundle/deployment/bind/quality-monitor/output.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

>>> [CLI] quality-monitors create catalog.schema.table --json @input.json
{
"assets_dir":"/Users/user/databricks_lakehouse_monitoring",
"dashboard_id":"(redacted)",
"drift_metrics_table_name":"catalog.schema.table_drift_metrics",
"monitor_version":0,
"output_schema_name":"catalog.schema",
"profile_metrics_table_name":"catalog.schema.table_profile_metrics",
"assets_dir": "/Users/user/databricks_lakehouse_monitoring",
"dashboard_id": "(redacted)",
"drift_metrics_table_name": "catalog.schema.table_drift_metrics",
"monitor_version": 0,
"output_schema_name": "catalog.schema",
"profile_metrics_table_name": "catalog.schema.table_profile_metrics",
"snapshot": {},
"status":"MONITOR_STATUS_ACTIVE",
"table_name":"catalog.schema.table"
"status": "MONITOR_STATUS_ACTIVE",
"table_name": "catalog.schema.table"
}

>>> [CLI] bundle deployment bind monitor1 catalog.schema.table
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/deployment/bind/quality-monitor/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ Local = true
Cloud = false

[[Repls]]
Old = '"dashboard_id":"[0-9a-f]+",'
New = '"dashboard_id":"(redacted)",'
Old = '"dashboard_id": "[0-9a-f]+",'
New = '"dashboard_id": "(redacted)",'
24 changes: 12 additions & 12 deletions acceptance/bundle/deployment/unbind/job/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ Deployment complete!

>>> [CLI] jobs get [NUMID] --output json
{
"created_time":[UNIX_TIME_MILLIS],
"creator_user_name":"[USERNAME]",
"job_id":[NUMID],
"run_as_user_name":"[USERNAME]",
"created_time": [UNIX_TIME_MILLIS],
"creator_user_name": "[USERNAME]",
"job_id": [NUMID],
"run_as_user_name": "[USERNAME]",
"settings": {
"deployment": {
"kind":"BUNDLE",
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
"kind": "BUNDLE",
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
},
"edit_mode":"UI_LOCKED",
"edit_mode": "UI_LOCKED",
"email_notifications": {},
"format":"MULTI_TASK",
"max_concurrent_runs":1,
"name":"My Job",
"format": "MULTI_TASK",
"max_concurrent_runs": 1,
"name": "My Job",
"queue": {
"enabled":true
"enabled": true
},
"timeout_seconds":0,
"timeout_seconds": 0,
"webhook_notifications": {}
}
}
24 changes: 12 additions & 12 deletions acceptance/bundle/deployment/unbind/python-job/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ Deployment complete!

>>> [CLI] jobs get [NUMID] --output json
{
"created_time":[UNIX_TIME_MILLIS],
"creator_user_name":"[USERNAME]",
"job_id":[NUMID],
"run_as_user_name":"[USERNAME]",
"created_time": [UNIX_TIME_MILLIS],
"creator_user_name": "[USERNAME]",
"job_id": [NUMID],
"run_as_user_name": "[USERNAME]",
"settings": {
"deployment": {
"kind":"BUNDLE",
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
"kind": "BUNDLE",
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/my_project/default/state/metadata.json"
},
"edit_mode":"UI_LOCKED",
"edit_mode": "UI_LOCKED",
"email_notifications": {},
"format":"MULTI_TASK",
"max_concurrent_runs":1,
"name":"My Job",
"format": "MULTI_TASK",
"max_concurrent_runs": 1,
"name": "My Job",
"queue": {
"enabled":true
"enabled": true
},
"timeout_seconds":0,
"timeout_seconds": 0,
"webhook_notifications": {}
}
}
22 changes: 11 additions & 11 deletions acceptance/bundle/generate/app_not_yet_deployed/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
>>> [CLI] apps create my-app --no-compute --no-wait
{
"app_status": {
"message":"Application is running.",
"state":"RUNNING"
"message": "Application is running.",
"state": "RUNNING"
},
"compute_size":"MEDIUM",
"compute_size": "MEDIUM",
"compute_status": {
"message":"App compute is stopped.",
"state":"STOPPED"
"message": "App compute is stopped.",
"state": "STOPPED"
},
"id":"1000",
"name":"my-app",
"service_principal_client_id":"[UUID]",
"service_principal_id":[NUMID],
"service_principal_name":"app-my-app",
"url":"my-app-123.cloud.databricksapps.com"
"id": "1000",
"name": "my-app",
"service_principal_client_id": "[UUID]",
"service_principal_id": [NUMID],
"service_principal_name": "app-my-app",
"url": "my-app-123.cloud.databricksapps.com"
}

>>> [CLI] bundle generate app --existing-app-name my-app --config-dir . --key out
Expand Down
Loading
Loading