change the acceptance test to make the test code to be more idiomatic

Author: anton-107

acceptance/acceptance_test.go

@@ -80,7 +80,11 @@ var Ignored = map[string]bool{
 }
 
 func TestAccept(t *testing.T) {
-	testAccept(t, InprocessMode, "")
+	testAccept(t, InprocessMode, "bundle/deployment/bind/dashboard")
+}
+
+func TestAcceptLocal(t *testing.T) {
+	testAccept(t, InprocessMode, "bundle/deployment/bind/dashboard")
 }
 
 func TestInprocessMode(t *testing.T) {

…deployment/bind/dashboard/databricks.yml …yment/bind/dashboard/databricks.yml.tmplacceptance/bundle/deployment/bind/dashboard/databricks.yml renamed to acceptance/bundle/deployment/bind/dashboard/databricks.yml.tmpl acceptance/bundle/deployment/bind/dashboard/databricks.yml renamed to acceptance/bundle/deployment/bind/dashboard/databricks.yml.tmpl

@@ -1,5 +1,5 @@
 bundle:
-  name: bind-dashboard-test-$BUNDLE_NAME_SUFFIX
+  name: bind-dashboard-test-$UNIQUE_NAME
 
 resources:
   dashboards:

acceptance/bundle/deployment/bind/dashboard/output.txt

@@ -1,37 +1,38 @@
 
-=== Bind dashboard test: 
-=== Substitute variables in the template: 
 === Create a pre-defined dashboard: 
-=== Bind dashboard: Updating deployment state...
+>>> [CLI] bundle deployment bind dashboard1 [DASHBOARD_ID] --auto-approve
+Updating deployment state...
 Successfully bound databricks_dashboard with an id '[DASHBOARD_ID]'. Run 'bundle deploy' to deploy changes to your workspace
 
-=== Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UUID]/default/files...
+>>> [CLI] bundle deploy
+Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UNIQUE_NAME]/default/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
 
-=== Read the pre-defined dashboard: {
+>>> [CLI] lakeview get [DASHBOARD_ID]
+{
   "display_name": "test dashboard [UUID]",
   "lifecycle_state": "ACTIVE",
   "path": "/Users/[USERNAME]/test dashboard [UUID].lvdash.json",
   "parent_path": "/Users/[USERNAME]",
   "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Page One\"}]}"
 }
 
-=== Unbind the dashboard: Updating deployment state...
+>>> [CLI] bundle deployment unbind dashboard1
+Updating deployment state...
 
-=== Destroy the bundle: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UUID]/default
+>>> [CLI] bundle destroy --auto-approve
+All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-dashboard-test-[UNIQUE_NAME]/default
 
 Deleting files...
 Destroy complete!
 
-=== Read the pre-defined dashboard again (expecting it still exists and is not deleted): {
+>>> [CLI] lakeview get [DASHBOARD_ID]
+{
   "display_name": "test dashboard [UUID]",
   "lifecycle_state": "ACTIVE",
   "path": "/Users/[USERNAME]/test dashboard [UUID].lvdash.json",
   "parent_path": "/Users/[USERNAME]",
   "serialized_dashboard": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Page One\"}]}"
 }
-
-=== Test cleanup: 
-=== Delete the pre-defined dashboard [DASHBOARD_ID]: 0

acceptance/bundle/deployment/bind/dashboard/script

@@ -1,43 +1,29 @@
-title "Bind dashboard test: "
-
-title "Substitute variables in the template: "
-BUNDLE_NAME_SUFFIX=$(uuid)
-export BUNDLE_NAME_SUFFIX
-
 DASHBOARD_DISPLAY_NAME="test dashboard $(uuid)"
 if [ -z "$CLOUD_ENV" ]; then
     DASHBOARD_DISPLAY_NAME="test dashboard 6260d50f-e8ff-4905-8f28-812345678903"   # use hard-coded uuid when running locally
     export TEST_DEFAULT_WAREHOUSE_ID="warehouse-1234"
 fi
 
 export DASHBOARD_DISPLAY_NAME
-envsubst < databricks.yml > out.yml && mv out.yml databricks.yml
+envsubst < databricks.yml.tmpl > databricks.yml
 
 title "Create a pre-defined dashboard: "
 DASHBOARD_ID=$($CLI lakeview create --display-name "${DASHBOARD_DISPLAY_NAME}" --warehouse-id "${TEST_DEFAULT_WAREHOUSE_ID}" --serialized-dashboard '{"pages":[{"name":"02724bf2","displayName":"Untitled page"}]}' | jq -r '.dashboard_id')
 
 cleanupRemoveDashboard() {
-    title "Test cleanup: "
-    title "Delete the pre-defined dashboard ${DASHBOARD_ID}: "
     $CLI lakeview trash "${DASHBOARD_ID}"
-    echo $?
 }
 trap cleanupRemoveDashboard EXIT
 
-title "Bind dashboard: "
-$CLI bundle deployment bind dashboard1 "${DASHBOARD_ID}" --auto-approve
+trace $CLI bundle deployment bind dashboard1 "${DASHBOARD_ID}" --auto-approve
 
-title "Deploy bundle: "
-$CLI bundle deploy
+trace $CLI bundle deploy
 
-title "Read the pre-defined dashboard: "
-$CLI lakeview get "${DASHBOARD_ID}" | jq '{display_name, lifecycle_state, path, parent_path, serialized_dashboard}'
+trace $CLI lakeview get "${DASHBOARD_ID}" | jq '{display_name, lifecycle_state, path, parent_path, serialized_dashboard}'
 
-title "Unbind the dashboard: "
-$CLI bundle deployment unbind dashboard1
+trace $CLI bundle deployment unbind dashboard1
 
-title "Destroy the bundle: "
-$CLI bundle destroy --auto-approve
+trace $CLI bundle destroy --auto-approve
 
-title "Read the pre-defined dashboard again (expecting it still exists and is not deleted): "
-$CLI lakeview get "${DASHBOARD_ID}" | jq '{display_name, lifecycle_state, path, parent_path, serialized_dashboard}'
+# Read the pre-defined dashboard again (expecting it still exists and is not deleted):
+trace $CLI lakeview get "${DASHBOARD_ID}" | jq '{display_name, lifecycle_state, path, parent_path, serialized_dashboard}'

acceptance/bundle/deployment/bind/dashboard/test.toml

@@ -2,6 +2,10 @@ Local = true
 Cloud = true
 RequiresWarehouse = true
 
+Ignore = [
+    "databricks.yml",
+]
+
 [[Repls]]
 Old = "[0-9a-f]{32}"
 New = "[DASHBOARD_ID]"