diff --git a/acceptance/bundle/deploy/dashboard/nested-folders/output.txt b/acceptance/bundle/deploy/dashboard/nested-folders/output.txt index 299fd52d0c..14f80ee007 100644 --- a/acceptance/bundle/deploy/dashboard/nested-folders/output.txt +++ b/acceptance/bundle/deploy/dashboard/nested-folders/output.txt @@ -10,7 +10,15 @@ Deployment complete! "lifecycle_state": "ACTIVE", "parent_path": "/Users/[USERNAME]", "path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json", - "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}" + "serialized_dashboard": { + "pages": [ + { + "name": "02724bf2", + "displayName": "Dashboard test bundle-deploy-dashboard", + "pageType": "PAGE_TYPE_CANVAS" + } + ] + } } >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/deploy/dashboard/nested-folders/script b/acceptance/bundle/deploy/dashboard/nested-folders/script index 2b03e9e4be..897a57b5c7 100644 --- a/acceptance/bundle/deploy/dashboard/nested-folders/script +++ b/acceptance/bundle/deploy/dashboard/nested-folders/script @@ -1,6 +1,5 @@ DASHBOARD_DISPLAY_NAME="test bundle-deploy-dashboard $(uuid)" if [ -z "$CLOUD_ENV" ]; then - DASHBOARD_DISPLAY_NAME="test bundle/deploy/ 6260d50f-e8ff-4905-8f28-812345678903" # use hard-coded uuid when running locally export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234" fi @@ -15,4 +14,4 @@ trap cleanup EXIT trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') -trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard}' +trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard: (.serialized_dashboard | fromjson | {pages: (.pages | map({name, displayName, pageType}))})}' diff --git a/acceptance/bundle/deploy/dashboard/nested-folders/test.toml b/acceptance/bundle/deploy/dashboard/nested-folders/test.toml index 323ae26344..00f60c8ef2 100644 --- a/acceptance/bundle/deploy/dashboard/nested-folders/test.toml +++ b/acceptance/bundle/deploy/dashboard/nested-folders/test.toml @@ -16,27 +16,3 @@ New = "[DASHBOARD_ID]" # Windows: Old = 'The system cannot find the file specified.' New = 'no such file or directory' - -[[Server]] -Pattern = "POST /api/2.0/lakeview/dashboards" -Response.Body = ''' -{ - "dashboard_id":"1234567890abcdef1234567890abcdef" -} -''' - -[[Server]] -Pattern = "POST /api/2.0/lakeview/dashboards/{dashboard_id}/published" - -[[Server]] -Pattern = "GET /api/2.0/lakeview/dashboards/{dashboard_id}" -Response.Body = ''' -{ - "dashboard_id":"1234567890abcdef1234567890abcdef", - "display_name": "test dashboard 6260d50f-e8ff-4905-8f28-812345678903", - "lifecycle_state": "ACTIVE", - "path": "/Users/[USERNAME]/test bundle-deploy-dashboard 6260d50f-e8ff-4905-8f28-812345678903.lvdash.json", - "parent_path": "/Users/tester@databricks.com", - "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}" -} -''' diff --git a/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/output.txt b/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/output.txt index df710ff2e3..e028e92101 100644 --- a/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/output.txt +++ b/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/output.txt @@ -10,7 +10,15 @@ Deployment complete! "lifecycle_state": "ACTIVE", "parent_path": "/Users/[USERNAME]", "path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json", - "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}" + "serialized_dashboard": { + "pages": [ + { + "name": "02724bf2", + "displayName": "Dashboard test bundle-deploy-dashboard", + "pageType": "PAGE_TYPE_CANVAS" + } + ] + } } >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/script b/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/script index 873d374fbb..b84bef6328 100644 --- a/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/script +++ b/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/script @@ -1,6 +1,5 @@ DASHBOARD_DISPLAY_NAME="test bundle-deploy-dashboard $(uuid)" if [ -z "$CLOUD_ENV" ]; then - DASHBOARD_DISPLAY_NAME="test bundle/deploy/ 6260d50f-e8ff-4905-8f28-812345678903" # use hard-coded uuid when running locally export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234" fi cp $TESTDIR/../simple/sample-dashboard.lvdash.json ../. @@ -15,4 +14,4 @@ trap cleanup EXIT trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') -trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard}' +trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard: (.serialized_dashboard | fromjson | {pages: (.pages | map({name, displayName, pageType}))})}' diff --git a/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/test.toml b/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/test.toml index 2daec5991d..f540a35ba7 100644 --- a/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/test.toml +++ b/acceptance/bundle/deploy/dashboard/simple_outside_bundle_root/test.toml @@ -15,27 +15,3 @@ New = "[DASHBOARD_ID]" # Windows: Old = 'The system cannot find the file specified.' New = 'no such file or directory' - -[[Server]] -Pattern = "POST /api/2.0/lakeview/dashboards" -Response.Body = ''' -{ - "dashboard_id":"1234567890abcdef1234567890abcdef" -} -''' - -[[Server]] -Pattern = "POST /api/2.0/lakeview/dashboards/{dashboard_id}/published" - -[[Server]] -Pattern = "GET /api/2.0/lakeview/dashboards/{dashboard_id}" -Response.Body = ''' -{ - "dashboard_id":"1234567890abcdef1234567890abcdef", - "display_name": "test dashboard 6260d50f-e8ff-4905-8f28-812345678903", - "lifecycle_state": "ACTIVE", - "path": "/Users/[USERNAME]/test bundle-deploy-dashboard 6260d50f-e8ff-4905-8f28-812345678903.lvdash.json", - "parent_path": "/Users/tester@databricks.com", - "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}" -} -''' diff --git a/acceptance/bundle/deploy/dashboard/simple_syncroot/output.txt b/acceptance/bundle/deploy/dashboard/simple_syncroot/output.txt index e9ff6d057b..aca60647e4 100644 --- a/acceptance/bundle/deploy/dashboard/simple_syncroot/output.txt +++ b/acceptance/bundle/deploy/dashboard/simple_syncroot/output.txt @@ -10,7 +10,15 @@ Deployment complete! "lifecycle_state": "ACTIVE", "parent_path": "/Users/[USERNAME]", "path": "/Users/[USERNAME]/test bundle-deploy-dashboard [UUID].lvdash.json", - "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}" + "serialized_dashboard": { + "pages": [ + { + "name": "02724bf2", + "displayName": "Dashboard test bundle-deploy-dashboard", + "pageType": "PAGE_TYPE_CANVAS" + } + ] + } } >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/deploy/dashboard/simple_syncroot/script b/acceptance/bundle/deploy/dashboard/simple_syncroot/script index 4f5ff7805d..cf41bd69bf 100644 --- a/acceptance/bundle/deploy/dashboard/simple_syncroot/script +++ b/acceptance/bundle/deploy/dashboard/simple_syncroot/script @@ -1,6 +1,5 @@ DASHBOARD_DISPLAY_NAME="test bundle-deploy-dashboard $(uuid)" if [ -z "$CLOUD_ENV" ]; then - DASHBOARD_DISPLAY_NAME="test bundle/deploy/ 6260d50f-e8ff-4905-8f28-812345678903" # use hard-coded uuid when running locally export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234" fi cp $TESTDIR/../simple/sample-dashboard.lvdash.json . @@ -16,4 +15,4 @@ trap cleanup EXIT trace $CLI bundle deploy DASHBOARD_ID=$($CLI bundle summary --output json | jq -r '.resources.dashboards.dashboard1.id') -trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard}' +trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path, path, serialized_dashboard: (.serialized_dashboard | fromjson | {pages: (.pages | map({name, displayName, pageType}))})}' diff --git a/acceptance/bundle/deploy/dashboard/simple_syncroot/test.toml b/acceptance/bundle/deploy/dashboard/simple_syncroot/test.toml index 2daec5991d..f540a35ba7 100644 --- a/acceptance/bundle/deploy/dashboard/simple_syncroot/test.toml +++ b/acceptance/bundle/deploy/dashboard/simple_syncroot/test.toml @@ -15,27 +15,3 @@ New = "[DASHBOARD_ID]" # Windows: Old = 'The system cannot find the file specified.' New = 'no such file or directory' - -[[Server]] -Pattern = "POST /api/2.0/lakeview/dashboards" -Response.Body = ''' -{ - "dashboard_id":"1234567890abcdef1234567890abcdef" -} -''' - -[[Server]] -Pattern = "POST /api/2.0/lakeview/dashboards/{dashboard_id}/published" - -[[Server]] -Pattern = "GET /api/2.0/lakeview/dashboards/{dashboard_id}" -Response.Body = ''' -{ - "dashboard_id":"1234567890abcdef1234567890abcdef", - "display_name": "test dashboard 6260d50f-e8ff-4905-8f28-812345678903", - "lifecycle_state": "ACTIVE", - "path": "/Users/[USERNAME]/test bundle-deploy-dashboard 6260d50f-e8ff-4905-8f28-812345678903.lvdash.json", - "parent_path": "/Users/tester@databricks.com", - "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}" -} -'''