Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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: 1 addition & 1 deletion acceptance/bundle/generate/alert/alert.json.tmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"display_name": "test alert",
"parent_path": "/Workspace/test-$UNIQUE_NAME",
"parent_path": "/Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME",
"query_text": "SELECT 1\n as value",
"warehouse_id": "$TEST_DEFAULT_WAREHOUSE_ID",
"evaluation": {
Expand Down
4 changes: 3 additions & 1 deletion acceptance/bundle/generate/alert/output.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

>>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME]
>>> [CLI] workspace mkdirs /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]

>>> [CLI] bundle generate alert --existing-id [ALERT_ID] --source-dir out/alert --config-dir out/resource
Alert configuration successfully saved to [TEST_TMP_DIR]/out/resource/test_alert.alert.yml
Expand All @@ -12,3 +12,5 @@ so it will not be deployed. Add a matching entry to the 'include' section, for e
include:
- out/resource/*.yml


>>> [CLI] workspace delete /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME] --recursive
2 changes: 1 addition & 1 deletion acceptance/bundle/generate/alert/script
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME
trace $CLI workspace mkdirs /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME

# create an alert to import
envsubst < alert.json.tmpl > alert.json
Expand Down
1 change: 1 addition & 0 deletions acceptance/bundle/generate/alert/script.cleanup
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
trace $CLI workspace delete /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME --recursive
2 changes: 1 addition & 1 deletion acceptance/bundle/generate/auto-bind/databricks.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ bundle:
name: auto-bind-test

workspace:
root_path: /tmp/${UNIQUE_NAME}
root_path: ~/.bundle/auto-bind-test-${UNIQUE_NAME}

include:
- resources/*.yml
4 changes: 2 additions & 2 deletions acceptance/bundle/generate/auto-bind/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test.py

=== Deploy the bound job:
>>> [CLI] bundle deploy
Uploading bundle files to /Workspace/tmp/[UNIQUE_NAME]/files...
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME]/files...
Deploying resources...
Updating deployment state...
Deployment complete!
Expand All @@ -31,7 +31,7 @@ Deployment complete!
The following resources will be deleted:
delete resources.jobs.test_job

All files and directories at the following location will be deleted: /Workspace/tmp/[UNIQUE_NAME]
All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME]

Deleting files...
Destroy complete!
Expand Down
2 changes: 1 addition & 1 deletion acceptance/bundle/generate/dashboard/dashboard.json.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"display_name": "test dashboard",
"parent_path": "/Workspace/test-$UNIQUE_NAME",
"parent_path": "/Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME",
"serialized_dashboard": "{\"pages\":[{\"displayName\":\"New Page\",\"layout\":[],\"name\":\"12345678\"}]}"
}
4 changes: 3 additions & 1 deletion acceptance/bundle/generate/dashboard/output.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

>>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME]
>>> [CLI] workspace mkdirs /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]

>>> [CLI] bundle generate dashboard --existing-id [DASHBOARD_ID] --dashboard-dir out/dashboard --resource-dir out/resource
Writing dashboard to out/dashboard/test_dashboard.lvdash.json
Expand All @@ -12,3 +12,5 @@ so it will not be deployed. Add a matching entry to the 'include' section, for e
include:
- out/resource/*.yml


>>> [CLI] workspace delete /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME] --recursive
2 changes: 1 addition & 1 deletion acceptance/bundle/generate/dashboard/script
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME
trace $CLI workspace mkdirs /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME

# create a dashboard to import
envsubst < dashboard.json.tmpl > dashboard.json
Expand Down
1 change: 1 addition & 0 deletions acceptance/bundle/generate/dashboard/script.cleanup
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
trace $CLI workspace delete /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME --recursive
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "test genie space",
"description": "test description",
"parent_path": "/Workspace/test-$UNIQUE_NAME",
"parent_path": "/Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME",
"warehouse_id": "test-warehouse-id",
"serialized_space": "{\"tables\":[],\"questions\":[]}"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ resources:
warehouse_id: test-warehouse-id
file_path: ../genie_space/test_genie_space.geniespace.json
description: test description
parent_path: /Workspace/test-[UNIQUE_NAME]
parent_path: /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]
4 changes: 3 additions & 1 deletion acceptance/bundle/generate/genie_space/output.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

>>> [CLI] workspace mkdirs /Workspace/test-[UNIQUE_NAME]
>>> [CLI] workspace mkdirs /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME]

>>> [CLI] bundle generate genie-space --existing-id [GENIE_SPACE_ID] --genie-space-dir out/genie_space --resource-dir out/resource
Writing genie space to out/genie_space/test_genie_space.geniespace.json
Expand All @@ -12,3 +12,5 @@ so it will not be deployed. Add a matching entry to the 'include' section, for e
include:
- out/resource/*.yml


>>> [CLI] workspace delete /Workspace/Users/[USERNAME]/test-[UNIQUE_NAME] --recursive
2 changes: 1 addition & 1 deletion acceptance/bundle/generate/genie_space/script
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
trace $CLI workspace mkdirs /Workspace/test-$UNIQUE_NAME
trace $CLI workspace mkdirs /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME

# create a genie space to import
envsubst < genie_space.json.tmpl > genie_space.json
Expand Down
1 change: 1 addition & 0 deletions acceptance/bundle/generate/genie_space/script.cleanup
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
trace $CLI workspace delete /Workspace/Users/$CURRENT_USER_NAME/test-$UNIQUE_NAME --recursive
Loading