diff --git a/acceptance/bundle/deployment/bind/postgres_data_api/output.txt b/acceptance/bundle/deployment/bind/postgres_data_api/output.txt index 1b9249be911..ee5461e81f4 100644 --- a/acceptance/bundle/deployment/bind/postgres_data_api/output.txt +++ b/acceptance/bundle/deployment/bind/postgres_data_api/output.txt @@ -42,7 +42,7 @@ Updated postgres_data_apis.data_api1 Files: 0 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-data-api projects/test-project/branches/production/databases/test-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-project/branches/production/databases/test-database/data-api { "name": "projects/test-project/branches/production/databases/test-database/data-api", "status": { @@ -71,7 +71,7 @@ Resources: data_api1: Name: ->>> [CLI] postgres get-data-api projects/test-project/branches/production/databases/test-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-project/branches/production/databases/test-database/data-api { "name": "projects/test-project/branches/production/databases/test-database/data-api" } @@ -93,7 +93,7 @@ Destroy: 1 deleted >>> musterr [CLI] postgres get-data-api projects/test-project/branches/production/databases/test-database/data-api Error: Data API is not enabled for this database ->>> [CLI] postgres get-database projects/test-project/branches/production/databases/test-database +>>> retry [CLI] postgres get-database projects/test-project/branches/production/databases/test-database { "name": "projects/test-project/branches/production/databases/test-database" } diff --git a/acceptance/bundle/deployment/bind/postgres_data_api/script b/acceptance/bundle/deployment/bind/postgres_data_api/script index e1e57ea0f20..4a66444ca67 100644 --- a/acceptance/bundle/deployment/bind/postgres_data_api/script +++ b/acceptance/bundle/deployment/bind/postgres_data_api/script @@ -16,16 +16,16 @@ trace $CLI bundle deployment bind data_api1 "${DATA_API_NAME}" --auto-approve trace $CLI bundle summary trace $CLI bundle plan trace $CLI bundle deploy -trace $CLI postgres get-data-api "${DATA_API_NAME}" | jq '{name, status: (.status | {db_schemas, db_max_rows})}' +trace retry $CLI postgres get-data-api "${DATA_API_NAME}" | jq '{name, status: (.status | {db_schemas, db_max_rows})}' trace $CLI bundle plan title "Unbind leaves the Data API enabled" trace $CLI bundle deployment unbind data_api1 trace $CLI bundle summary -trace $CLI postgres get-data-api "${DATA_API_NAME}" | jq '{name}' +trace retry $CLI postgres get-data-api "${DATA_API_NAME}" | jq '{name}' title "Bind again; destroy turns off the Data API" trace $CLI bundle deployment bind data_api1 "${DATA_API_NAME}" --auto-approve trace $CLI bundle destroy --auto-approve trace musterr $CLI postgres get-data-api "${DATA_API_NAME}" -trace $CLI postgres get-database "${DATABASE_NAME}" | jq '{name}' +trace retry $CLI postgres get-database "${DATABASE_NAME}" | jq '{name}' diff --git a/acceptance/bundle/resources/postgres_branches/basic/output.txt b/acceptance/bundle/resources/postgres_branches/basic/output.txt index 548caf6ac30..40384322444 100644 --- a/acceptance/bundle/resources/postgres_branches/basic/output.txt +++ b/acceptance/bundle/resources/postgres_branches/basic/output.txt @@ -29,7 +29,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/main +>>> retry [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/main { "branch_id": "main", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", diff --git a/acceptance/bundle/resources/postgres_branches/basic/script b/acceptance/bundle/resources/postgres_branches/basic/script index 5e498ea738e..8e8206b85c9 100644 --- a/acceptance/bundle/resources/postgres_branches/basic/script +++ b/acceptance/bundle/resources/postgres_branches/basic/script @@ -16,7 +16,7 @@ trace $CLI bundle deploy # Get branch details project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/main" -trace $CLI postgres get-branch "${branch_name}" | branch_fields +trace retry $CLI postgres get-branch "${branch_name}" | branch_fields trace $CLI bundle summary diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt b/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt index ab4490ab49c..540c4654b10 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt @@ -16,7 +16,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/test-pg-branch-hard-[UNIQUE_NAME] +>>> retry [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/test-pg-branch-hard-[UNIQUE_NAME] { "branch_id": "test-pg-branch-hard-[UNIQUE_NAME]", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/test-pg-branch-hard-[UNIQUE_NAME]", @@ -34,7 +34,7 @@ Resources: 3 created, 0 changed, 0 deleted, 0 unchanged "uid": "[BRANCH_UID]" } ->>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/test-pg-branch-soft-[UNIQUE_NAME] +>>> retry [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/test-pg-branch-soft-[UNIQUE_NAME] { "branch_id": "test-pg-branch-soft-[UNIQUE_NAME]", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/test-pg-branch-soft-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete/script b/acceptance/bundle/resources/postgres_branches/purge_on_delete/script index 0a0b9b67823..68e6cdcd623 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete/script +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete/script @@ -19,8 +19,8 @@ trace $CLI bundle validate rm -f "$OUT_REQUESTS" trace $CLI bundle deploy -trace $CLI postgres get-branch "${hard_branch}" | branch_fields -trace $CLI postgres get-branch "${soft_branch}" | branch_fields +trace retry $CLI postgres get-branch "${hard_branch}" | branch_fields +trace retry $CLI postgres get-branch "${soft_branch}" | branch_fields # Deploy requests are split per-engine: Terraform sends "parent" in the branch # create body, the direct engine sends it only as a query parameter. diff --git a/acceptance/bundle/resources/postgres_branches/recreate/script b/acceptance/bundle/resources/postgres_branches/recreate/script index d1d00d8f284..f219d4837ab 100755 --- a/acceptance/bundle/resources/postgres_branches/recreate/script +++ b/acceptance/bundle/resources/postgres_branches/recreate/script @@ -38,7 +38,7 @@ print_requests.py --del-body parent,project_id,branch_id,endpoint_id,database_id title "Fetch new branch ID" branch_id_2=`read_id.py main` # Get output differs between engines (different branch IDs) -$CLI postgres get-branch $branch_id_2 | branch_fields > out.get_branch.txt +retry $CLI postgres get-branch $branch_id_2 | branch_fields > out.get_branch.txt title "Destroy and verify cleanup" trace $CLI bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt b/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt index 25b1d5aa650..6cfa469f0eb 100644 --- a/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt @@ -15,7 +15,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/production +>>> retry [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/production { "branch_id": "production", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/script b/acceptance/bundle/resources/postgres_branches/replace_existing/script index e6e017e634e..fc7ed8f4f28 100644 --- a/acceptance/bundle/resources/postgres_branches/replace_existing/script +++ b/acceptance/bundle/resources/postgres_branches/replace_existing/script @@ -13,7 +13,7 @@ rm -f "$OUT_REQUESTS" trace $CLI bundle deploy # Confirm the implicit production branch is now under management. -trace $CLI postgres get-branch "projects/test-pg-proj-${UNIQUE_NAME}/branches/production" | branch_fields +trace retry $CLI postgres get-branch "projects/test-pg-proj-${UNIQUE_NAME}/branches/production" | branch_fields trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.deploy.json diff --git a/acceptance/bundle/resources/postgres_branches/update_expire_time/output.txt b/acceptance/bundle/resources/postgres_branches/update_expire_time/output.txt index 8519e1e90a7..fed525cfaaf 100644 --- a/acceptance/bundle/resources/postgres_branches/update_expire_time/output.txt +++ b/acceptance/bundle/resources/postgres_branches/update_expire_time/output.txt @@ -8,7 +8,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/dev-branch +>>> retry [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/dev-branch { "branch_id": "dev-branch", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/dev-branch", @@ -46,7 +46,7 @@ Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py --del-body project_id,branch_id --sort //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/dev-branch +>>> retry [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/dev-branch { "branch_id": "dev-branch", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/dev-branch", diff --git a/acceptance/bundle/resources/postgres_branches/update_expire_time/script b/acceptance/bundle/resources/postgres_branches/update_expire_time/script index efca002df59..361501981b5 100644 --- a/acceptance/bundle/resources/postgres_branches/update_expire_time/script +++ b/acceptance/bundle/resources/postgres_branches/update_expire_time/script @@ -11,7 +11,7 @@ branch_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/dev-branch" title "Initial deployment" trace $CLI bundle deploy rm -f "$OUT_REQUESTS" -trace $CLI postgres get-branch "${branch_name}" | branch_fields +trace retry $CLI postgres get-branch "${branch_name}" | branch_fields title "Change expire_time and re-deploy" trace update_file.py databricks.yml "2030-01-01T00:00:00Z" "2031-06-15T12:00:00Z" @@ -23,4 +23,4 @@ trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_branche rm -f "$OUT_REQUESTS" trace $CLI bundle deploy trace print_requests.py --del-body project_id,branch_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.json -trace $CLI postgres get-branch "${branch_name}" | branch_fields +trace retry $CLI postgres get-branch "${branch_name}" | branch_fields diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/output.txt b/acceptance/bundle/resources/postgres_branches/update_protected/output.txt index 9ac72b133b5..351812a8c76 100644 --- a/acceptance/bundle/resources/postgres_branches/update_protected/output.txt +++ b/acceptance/bundle/resources/postgres_branches/update_protected/output.txt @@ -27,7 +27,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-branch [DEV_BRANCH_ID] +>>> retry [CLI] postgres get-branch [DEV_BRANCH_ID] { "branch_id": "dev-branch", "name": "[DEV_BRANCH_ID]", @@ -104,7 +104,7 @@ Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-branch [DEV_BRANCH_ID] +>>> retry [CLI] postgres get-branch [DEV_BRANCH_ID] { "branch_id": "dev-branch", "name": "[DEV_BRANCH_ID]", @@ -141,7 +141,7 @@ Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-branch [DEV_BRANCH_ID] +>>> retry [CLI] postgres get-branch [DEV_BRANCH_ID] { "branch_id": "dev-branch", "name": "[DEV_BRANCH_ID]", diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/script b/acceptance/bundle/resources/postgres_branches/update_protected/script index 9e3d3184846..03b4747d229 100755 --- a/acceptance/bundle/resources/postgres_branches/update_protected/script +++ b/acceptance/bundle/resources/postgres_branches/update_protected/script @@ -24,7 +24,7 @@ print_requests create project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/dev-branch" branch_id_1=`read_id.py dev_branch` -trace $CLI postgres get-branch "${branch_name}" | branch_fields +trace retry $CLI postgres get-branch "${branch_name}" | branch_fields title "Verify no_change (no changes)" trace $CLI bundle plan @@ -46,7 +46,7 @@ trace $CLI bundle deploy print_requests update branch_id_2=`read_id.py dev_branch` -trace $CLI postgres get-branch "${branch_name}" | branch_fields +trace retry $CLI postgres get-branch "${branch_name}" | branch_fields title "Restore is_protected to false" trace update_file.py databricks.yml "is_protected: true" "is_protected: false" @@ -57,4 +57,4 @@ trace $CLI bundle deploy print_requests restore -trace $CLI postgres get-branch "${branch_name}" | branch_fields +trace retry $CLI postgres get-branch "${branch_name}" | branch_fields diff --git a/acceptance/bundle/resources/postgres_catalogs/basic/output.txt b/acceptance/bundle/resources/postgres_catalogs/basic/output.txt index dbc8e80e82f..a6630556b4b 100644 --- a/acceptance/bundle/resources/postgres_catalogs/basic/output.txt +++ b/acceptance/bundle/resources/postgres_catalogs/basic/output.txt @@ -30,7 +30,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-catalog catalogs/lakebase_test_[UNIQUE_NAME] +>>> retry [CLI] postgres get-catalog catalogs/lakebase_test_[UNIQUE_NAME] { "catalog_id": "lakebase_test_[UNIQUE_NAME]", "name": "catalogs/lakebase_test_[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_catalogs/basic/script b/acceptance/bundle/resources/postgres_catalogs/basic/script index 1863fcfce53..45ef0e1e7f1 100644 --- a/acceptance/bundle/resources/postgres_catalogs/basic/script +++ b/acceptance/bundle/resources/postgres_catalogs/basic/script @@ -15,7 +15,7 @@ trace $CLI bundle deploy # Get catalog details. Hide volatile fields so cloud and local match. catalog_name="catalogs/lakebase_test_${UNIQUE_NAME}" -trace $CLI postgres get-catalog "${catalog_name}" | catalog_fields +trace retry $CLI postgres get-catalog "${catalog_name}" | catalog_fields trace $CLI bundle summary diff --git a/acceptance/bundle/resources/postgres_data_apis/basic/output.txt b/acceptance/bundle/resources/postgres_data_apis/basic/output.txt index a8ee6145b38..9d62256826e 100644 --- a/acceptance/bundle/resources/postgres_data_apis/basic/output.txt +++ b/acceptance/bundle/resources/postgres_data_apis/basic/output.txt @@ -52,7 +52,7 @@ Created postgres_roles.owner Files: 0 uploaded, 0 deleted Resources: 5 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database", @@ -111,7 +111,7 @@ Resources: 0 created, 0 changed, 1 deleted, 4 unchanged >>> musterr [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api Error: Data API is not enabled for this database ->>> [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database +>>> retry [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database" } diff --git a/acceptance/bundle/resources/postgres_data_apis/basic/script b/acceptance/bundle/resources/postgres_data_apis/basic/script index 39212785c46..6fc693a6d0c 100644 --- a/acceptance/bundle/resources/postgres_data_apis/basic/script +++ b/acceptance/bundle/resources/postgres_data_apis/basic/script @@ -17,7 +17,7 @@ title "Deploy enables the Data API" rm -f "$OUT_REQUESTS" trace $CLI bundle deploy print_postgres_requests deploy -trace $CLI postgres get-data-api "${data_api_name}" | data_api_fields +trace retry $CLI postgres get-data-api "${data_api_name}" | data_api_fields trace $CLI bundle summary title "Plan after deploy shows no changes" @@ -30,4 +30,4 @@ rm -f "$OUT_REQUESTS" trace $CLI bundle deploy --auto-approve print_postgres_requests remove trace musterr $CLI postgres get-data-api "${data_api_name}" -trace $CLI postgres get-database "${database_name}" | jq '{name}' +trace retry $CLI postgres get-database "${database_name}" | jq '{name}' diff --git a/acceptance/bundle/resources/postgres_data_apis/out-of-band/output.txt b/acceptance/bundle/resources/postgres_data_apis/out-of-band/output.txt index ccaa335d2af..f03b510e7ab 100644 --- a/acceptance/bundle/resources/postgres_data_apis/out-of-band/output.txt +++ b/acceptance/bundle/resources/postgres_data_apis/out-of-band/output.txt @@ -11,7 +11,7 @@ Created postgres_roles.owner Files: 0 uploaded, 0 deleted Resources: 5 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database", @@ -56,7 +56,7 @@ Updated postgres_data_apis.my_data_api Files: 0 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 4 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database", @@ -91,7 +91,7 @@ Created postgres_data_apis.my_data_api Files: 0 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 4 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database", diff --git a/acceptance/bundle/resources/postgres_data_apis/out-of-band/script b/acceptance/bundle/resources/postgres_data_apis/out-of-band/script index ab1d205a1b7..447cd01778c 100644 --- a/acceptance/bundle/resources/postgres_data_apis/out-of-band/script +++ b/acceptance/bundle/resources/postgres_data_apis/out-of-band/script @@ -9,7 +9,7 @@ data_api_name="${database_name}/data-api" title "Deploy enables the Data API" envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle deploy -trace $CLI postgres get-data-api "${data_api_name}" | data_api_fields +trace retry $CLI postgres get-data-api "${data_api_name}" | data_api_fields title "Change the spec out of band" trace $CLI postgres update-data-api "${data_api_name}" spec --json '{"spec": {"db_schemas": ["public"], "db_max_rows": 7}}' | data_api_fields @@ -17,7 +17,7 @@ trace $CLI postgres update-data-api "${data_api_name}" spec --json '{"spec": {"d title "Plan detects the change from status, and deploy restores the config" trace $CLI bundle plan trace $CLI bundle deploy -trace $CLI postgres get-data-api "${data_api_name}" | data_api_fields +trace retry $CLI postgres get-data-api "${data_api_name}" | data_api_fields trace $CLI bundle plan title "Disable the Data API out of band" @@ -26,4 +26,4 @@ trace $CLI postgres delete-data-api "${data_api_name}" title "Plan detects the Data API is gone and re-creates it" trace $CLI bundle plan trace $CLI bundle deploy -trace $CLI postgres get-data-api "${data_api_name}" | data_api_fields +trace retry $CLI postgres get-data-api "${data_api_name}" | data_api_fields diff --git a/acceptance/bundle/resources/postgres_data_apis/recreate/output.txt b/acceptance/bundle/resources/postgres_data_apis/recreate/output.txt index 65346bbb2df..8835de88cff 100644 --- a/acceptance/bundle/resources/postgres_data_apis/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_data_apis/recreate/output.txt @@ -12,7 +12,7 @@ Created postgres_roles.owner Files: 0 uploaded, 0 deleted Resources: 6 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/first-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/first-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/first-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/first-database", @@ -45,7 +45,7 @@ Resources: 1 created, 0 changed, 1 deleted, 5 unchanged >>> musterr [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/first-database/data-api Error: Data API is not enabled for this database ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/second-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/second-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/second-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/second-database", diff --git a/acceptance/bundle/resources/postgres_data_apis/recreate/script b/acceptance/bundle/resources/postgres_data_apis/recreate/script index b28dd1a5c52..d97471dafad 100644 --- a/acceptance/bundle/resources/postgres_data_apis/recreate/script +++ b/acceptance/bundle/resources/postgres_data_apis/recreate/script @@ -9,7 +9,7 @@ branch_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/production" title "Deploy the Data API on the first database" envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle deploy -trace $CLI postgres get-data-api "${branch_name}/databases/first-database/data-api" | data_api_fields +trace retry $CLI postgres get-data-api "${branch_name}/databases/first-database/data-api" | data_api_fields title "Moving the Data API to another database recreates it" trace update_file.py databricks.yml 'postgres_databases.first.name' 'postgres_databases.second.name' @@ -18,4 +18,4 @@ rm -f "$OUT_REQUESTS" trace $CLI bundle deploy print_postgres_requests recreate trace musterr $CLI postgres get-data-api "${branch_name}/databases/first-database/data-api" -trace $CLI postgres get-data-api "${branch_name}/databases/second-database/data-api" | data_api_fields +trace retry $CLI postgres get-data-api "${branch_name}/databases/second-database/data-api" | data_api_fields diff --git a/acceptance/bundle/resources/postgres_data_apis/update/output.txt b/acceptance/bundle/resources/postgres_data_apis/update/output.txt index 0b0e758cea9..ca6d91fee8d 100644 --- a/acceptance/bundle/resources/postgres_data_apis/update/output.txt +++ b/acceptance/bundle/resources/postgres_data_apis/update/output.txt @@ -28,7 +28,7 @@ Updated postgres_data_apis.my_data_api Files: 0 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 4 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database", @@ -56,7 +56,7 @@ Updated postgres_data_apis.my_data_api Files: 0 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 4 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database", diff --git a/acceptance/bundle/resources/postgres_data_apis/update/script b/acceptance/bundle/resources/postgres_data_apis/update/script index 8403ad4a6a0..7b754289e56 100644 --- a/acceptance/bundle/resources/postgres_data_apis/update/script +++ b/acceptance/bundle/resources/postgres_data_apis/update/script @@ -18,7 +18,7 @@ trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_data_ap rm -f "$OUT_REQUESTS" trace $CLI bundle deploy print_postgres_requests update -trace $CLI postgres get-data-api "${data_api_name}" | data_api_fields +trace retry $CLI postgres get-data-api "${data_api_name}" | data_api_fields title "Remove a spec field: update_mask=spec keeps a field the request omits, so it keeps its last value" sed '/server_cors_allowed_origins:/,$d' databricks.yml > databricks.yml.new && mv databricks.yml.new databricks.yml @@ -26,7 +26,7 @@ trace $CLI bundle plan rm -f "$OUT_REQUESTS" trace $CLI bundle deploy print_postgres_requests remove_field -trace $CLI postgres get-data-api "${data_api_name}" | data_api_fields +trace retry $CLI postgres get-data-api "${data_api_name}" | data_api_fields title "Plan after update shows no changes" trace $CLI bundle plan diff --git a/acceptance/bundle/resources/postgres_data_apis/url_reference/output.txt b/acceptance/bundle/resources/postgres_data_apis/url_reference/output.txt index 05549b12d5b..46d5e3a86c9 100644 --- a/acceptance/bundle/resources/postgres_data_apis/url_reference/output.txt +++ b/acceptance/bundle/resources/postgres_data_apis/url_reference/output.txt @@ -12,7 +12,7 @@ Created postgres_roles.owner Files: 0 uploaded, 0 deleted Resources: 6 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api +>>> retry [CLI] postgres get-data-api projects/test-pg-proj-[UNIQUE_NAME]/branches/production/databases/my-database/data-api { "url": "https://[RW_ENDPOINT_HOST]/api/2.0/workspace/[WORKSPACE_ID]/rest/app_db" } diff --git a/acceptance/bundle/resources/postgres_data_apis/url_reference/script b/acceptance/bundle/resources/postgres_data_apis/url_reference/script index e422c0626b7..fdde491387b 100644 --- a/acceptance/bundle/resources/postgres_data_apis/url_reference/script +++ b/acceptance/bundle/resources/postgres_data_apis/url_reference/script @@ -13,8 +13,8 @@ title "The first deploy resolves status.url into the job parameter" trace $CLI bundle deploy rm -f "$OUT_REQUESTS" # The URL is served from the branch's read-write endpoint host. -add_repl "$($CLI postgres get-endpoint "${branch_name}/endpoints/primary" | jq -r .status.hosts.host)" RW_ENDPOINT_HOST -trace $CLI postgres get-data-api "${data_api_name}" | jq '{url: .status.url}' +add_repl "$(retry $CLI postgres get-endpoint "${branch_name}/endpoints/primary" | jq -r .status.hosts.host)" RW_ENDPOINT_HOST +trace retry $CLI postgres get-data-api "${data_api_name}" | jq '{url: .status.url}' trace $CLI jobs get "$(read_id.py my_job)" | jq '.settings.parameters' title "An in-place update of the Data API does not update the job that references status.url" diff --git a/acceptance/bundle/resources/postgres_databases/basic/output.txt b/acceptance/bundle/resources/postgres_databases/basic/output.txt index be1b2be65a1..1dd38ca8ff7 100644 --- a/acceptance/bundle/resources/postgres_databases/basic/output.txt +++ b/acceptance/bundle/resources/postgres_databases/basic/output.txt @@ -37,7 +37,7 @@ Created postgres_roles.owner Files: 0 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database +>>> retry [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database { "database_id": "my-database", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database", diff --git a/acceptance/bundle/resources/postgres_databases/basic/script b/acceptance/bundle/resources/postgres_databases/basic/script index 0be4dc9f3db..95176193644 100644 --- a/acceptance/bundle/resources/postgres_databases/basic/script +++ b/acceptance/bundle/resources/postgres_databases/basic/script @@ -17,7 +17,7 @@ trace $CLI bundle deploy project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/main" database_name="${branch_name}/databases/my-database" -trace $CLI postgres get-database "${database_name}" | database_fields +trace retry $CLI postgres get-database "${database_name}" | database_fields trace $CLI bundle summary diff --git a/acceptance/bundle/resources/postgres_databases/recreate/output.txt b/acceptance/bundle/resources/postgres_databases/recreate/output.txt index fef88268bd2..3ccf313fad2 100644 --- a/acceptance/bundle/resources/postgres_databases/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_databases/recreate/output.txt @@ -187,7 +187,7 @@ Resources: 1 created, 0 changed, 1 deleted, 3 unchanged === Fetch database and verify it exists after recreation ->>> [CLI] postgres get-database [MY_DATABASE_ID]-v2 +>>> retry [CLI] postgres get-database [MY_DATABASE_ID]-v2 { "database_id": "test-database-[UNIQUE_NAME]-v2", "name": "[MY_DATABASE_ID]-v2", diff --git a/acceptance/bundle/resources/postgres_databases/recreate/script b/acceptance/bundle/resources/postgres_databases/recreate/script index 108ac2f69d1..69d10f8d35e 100644 --- a/acceptance/bundle/resources/postgres_databases/recreate/script +++ b/acceptance/bundle/resources/postgres_databases/recreate/script @@ -41,7 +41,7 @@ title "Fetch database and verify it exists after recreation" database_id_2=`read_id.py my_database` # Verify the database was recreated (DELETE/POST in requests proves recreation) -trace $CLI postgres get-database $database_id_2 | database_fields +trace retry $CLI postgres get-database $database_id_2 | database_fields title "Destroy and verify cleanup" trace $CLI bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt b/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt index ec23011d880..e1806df39b1 100644 --- a/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt @@ -31,7 +31,7 @@ Resources: 1 created, 0 changed, 0 deleted, 3 unchanged === Confirm the database is under management again ->>> [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database +>>> retry [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database { "database_id": "my-database", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database", diff --git a/acceptance/bundle/resources/postgres_databases/replace_existing/script b/acceptance/bundle/resources/postgres_databases/replace_existing/script index 2a824739a06..26e2a968e93 100644 --- a/acceptance/bundle/resources/postgres_databases/replace_existing/script +++ b/acceptance/bundle/resources/postgres_databases/replace_existing/script @@ -22,6 +22,6 @@ rm -f "$OUT_REQUESTS" trace $CLI bundle deploy title "Confirm the database is under management again" -trace $CLI postgres get-database "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/databases/my-database" | database_fields +trace retry $CLI postgres get-database "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/databases/my-database" | database_fields trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.deploy.json diff --git a/acceptance/bundle/resources/postgres_databases/update/output.txt b/acceptance/bundle/resources/postgres_databases/update/output.txt index 2a81331e9a4..2199699a9ee 100644 --- a/acceptance/bundle/resources/postgres_databases/update/output.txt +++ b/acceptance/bundle/resources/postgres_databases/update/output.txt @@ -31,7 +31,7 @@ Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-database [MY_DATABASE_ID] +>>> retry [CLI] postgres get-database [MY_DATABASE_ID] { "database_id": "my-database", "name": "[MY_DATABASE_ID]", @@ -110,7 +110,7 @@ Resources: 0 created, 1 changed, 0 deleted, 3 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-database [MY_DATABASE_ID] +>>> retry [CLI] postgres get-database [MY_DATABASE_ID] { "database_id": "my-database", "name": "[MY_DATABASE_ID]", @@ -141,7 +141,7 @@ Resources: 0 created, 1 changed, 0 deleted, 3 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-database [MY_DATABASE_ID] +>>> retry [CLI] postgres get-database [MY_DATABASE_ID] { "database_id": "my-database", "name": "[MY_DATABASE_ID]", diff --git a/acceptance/bundle/resources/postgres_databases/update/script b/acceptance/bundle/resources/postgres_databases/update/script index 93042db7f09..f0e27d97754 100644 --- a/acceptance/bundle/resources/postgres_databases/update/script +++ b/acceptance/bundle/resources/postgres_databases/update/script @@ -25,7 +25,7 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/main" database_name="${branch_name}/databases/my-database" database_id_1=`read_id.py my_database` -trace $CLI postgres get-database "${database_name}" | database_fields +trace retry $CLI postgres get-database "${database_name}" | database_fields title "Verify no changes" trace $CLI bundle plan @@ -47,7 +47,7 @@ trace $CLI bundle deploy print_requests update database_id_2=`read_id.py my_database` -trace $CLI postgres get-database "${database_name}" | database_fields +trace retry $CLI postgres get-database "${database_name}" | database_fields title "Restore postgres_database to original value" trace update_file.py databricks.yml "postgres_database: renamed_db_name" "postgres_database: initial_db_name" @@ -58,4 +58,4 @@ trace $CLI bundle deploy print_requests restore -trace $CLI postgres get-database "${database_name}" | database_fields +trace retry $CLI postgres get-database "${database_name}" | database_fields diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/output.txt b/acceptance/bundle/resources/postgres_endpoints/basic/output.txt index e407cd7ffe7..1b24249da69 100644 --- a/acceptance/bundle/resources/postgres_endpoints/basic/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/basic/output.txt @@ -33,7 +33,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/custom +>>> retry [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/custom { "endpoint_id": "custom", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/custom", diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/script b/acceptance/bundle/resources/postgres_endpoints/basic/script index bdb24f81251..a117da6ba1b 100755 --- a/acceptance/bundle/resources/postgres_endpoints/basic/script +++ b/acceptance/bundle/resources/postgres_endpoints/basic/script @@ -17,7 +17,7 @@ trace $CLI bundle deploy project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/main" endpoint_name="${branch_name}/endpoints/custom" -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields trace $CLI bundle summary diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt b/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt index 634046b4244..825751aa631 100644 --- a/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt @@ -160,7 +160,7 @@ Resources: 1 created, 0 changed, 1 deleted, 2 unchanged === Fetch endpoint and verify it exists after recreation ->>> [CLI] postgres get-endpoint [MY_ENDPOINT_ID]-v2 +>>> retry [CLI] postgres get-endpoint [MY_ENDPOINT_ID]-v2 "ENDPOINT_TYPE_READ_ONLY" === Destroy and verify cleanup diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/script b/acceptance/bundle/resources/postgres_endpoints/recreate/script index 2339fb590df..8c789819fe9 100755 --- a/acceptance/bundle/resources/postgres_endpoints/recreate/script +++ b/acceptance/bundle/resources/postgres_endpoints/recreate/script @@ -37,7 +37,7 @@ title "Fetch endpoint and verify it exists after recreation" endpoint_id_2=`read_id.py my_endpoint` # Verify the endpoint was recreated (DELETE/POST in requests proves recreation) -trace $CLI postgres get-endpoint $endpoint_id_2 | jq 'del(.create_time, .update_time)' | jq '.status.endpoint_type' +trace retry $CLI postgres get-endpoint $endpoint_id_2 | jq 'del(.create_time, .update_time)' | jq '.status.endpoint_type' title "Destroy and verify cleanup" trace $CLI bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/output.txt b/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/output.txt index 59954a2cd43..be1c8956101 100644 --- a/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/output.txt @@ -9,7 +9,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint +>>> retry [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint { "endpoint_id": "my-endpoint", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint", @@ -37,7 +37,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id --sort //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint +>>> retry [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint { "endpoint_id": "my-endpoint", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint", diff --git a/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script b/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script index ecd4e1c3db9..8a1e1bb60f3 100644 --- a/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script +++ b/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script @@ -11,7 +11,7 @@ endpoint_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/main/endpoints/my-e title "Initial deployment with suspend_timeout_duration: 300s" trace $CLI bundle deploy rm -f "$OUT_REQUESTS" -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields title "Remove suspend_timeout_duration: neither engine can apply it" trace update_file.py databricks.yml " suspend_timeout_duration: 300s" "" @@ -30,6 +30,6 @@ trace print_requests.py --del-body project_id,branch_id,endpoint_id --sort '//po # Read the endpoint back to see whether the removal reached it, then plan again to # record the drift it leaves behind: direct still has the removal pending and will # fail again on every deploy, terraform applied it and is clean. -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields trace $CLI bundle plan &> out.plan.drift.txt trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" | {action, changes}' > out.plan.drift.json diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt b/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt index be609b6da13..903342da810 100644 --- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt @@ -16,7 +16,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/develop/endpoints/primary +>>> retry [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/develop/endpoints/primary { "endpoint_id": "primary", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/develop/endpoints/primary", diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/script b/acceptance/bundle/resources/postgres_endpoints/replace_existing/script index ec2575485cc..68c59c80e91 100644 --- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/script +++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/script @@ -15,7 +15,7 @@ trace $CLI bundle deploy # The implicit primary endpoint inherits suspend_timeout_duration from the # project default (300s). After deploy with replace_existing=true, the # bundle's spec must be applied: 600s. -trace $CLI postgres get-endpoint "projects/test-pg-proj-${UNIQUE_NAME}/branches/develop/endpoints/primary" | endpoint_fields +trace retry $CLI postgres get-endpoint "projects/test-pg-proj-${UNIQUE_NAME}/branches/develop/endpoints/primary" | endpoint_fields trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.deploy.json diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt index 0cf262a74a6..4b303360821 100644 --- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt @@ -29,7 +29,7 @@ Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --unique --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-endpoint [MY_ENDPOINT_ID] +>>> retry [CLI] postgres get-endpoint [MY_ENDPOINT_ID] { "endpoint_id": "my-endpoint", "name": "[MY_ENDPOINT_ID]", @@ -107,7 +107,7 @@ Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --unique --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-endpoint [MY_ENDPOINT_ID] +>>> retry [CLI] postgres get-endpoint [MY_ENDPOINT_ID] { "endpoint_id": "my-endpoint", "name": "[MY_ENDPOINT_ID]", @@ -141,7 +141,7 @@ Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --unique --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-endpoint [MY_ENDPOINT_ID] +>>> retry [CLI] postgres get-endpoint [MY_ENDPOINT_ID] { "endpoint_id": "my-endpoint", "name": "[MY_ENDPOINT_ID]", diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script index 52d4f092df3..7ccc05dd83a 100755 --- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script +++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script @@ -25,7 +25,7 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/main" endpoint_name="${branch_name}/endpoints/my-endpoint" endpoint_id_1=`read_id.py my_endpoint` -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields title "Verify no changes" trace $CLI bundle plan @@ -47,7 +47,7 @@ trace $CLI bundle deploy print_requests update endpoint_id_2=`read_id.py my_endpoint` -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields title "Restore endpoint autoscaling to original value" trace update_file.py databricks.yml "autoscaling_limit_max_cu: 4" "autoscaling_limit_max_cu: 8" @@ -58,4 +58,4 @@ trace $CLI bundle deploy print_requests restore -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields diff --git a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/output.txt b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/output.txt index 6bde76314ec..610dd98f5a4 100644 --- a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/output.txt @@ -9,7 +9,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint +>>> retry [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint { "endpoint_id": "my-endpoint", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint", @@ -45,7 +45,7 @@ Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id --sort //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint +>>> retry [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint { "endpoint_id": "my-endpoint", "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/my-endpoint", diff --git a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script index 8c6653dd7ff..f119ff80202 100644 --- a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script +++ b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script @@ -16,7 +16,7 @@ endpoint_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/main/endpoints/my-e title "Initial deployment with suspend_timeout_duration: 300s" trace $CLI bundle deploy rm -f "$OUT_REQUESTS" -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields title "Change suspend_timeout_duration to 600s" trace update_file.py databricks.yml "suspend_timeout_duration: 300s" "suspend_timeout_duration: 600s" @@ -33,4 +33,4 @@ trace $CLI bundle deploy # The update_mask each engine sends is the whole point of this test. trace print_requests.py --del-body project_id,branch_id,endpoint_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.json -trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields +trace retry $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields diff --git a/acceptance/bundle/resources/postgres_projects/basic/output.txt b/acceptance/bundle/resources/postgres_projects/basic/output.txt index b9f0a693743..e86481d9a0a 100644 --- a/acceptance/bundle/resources/postgres_projects/basic/output.txt +++ b/acceptance/bundle/resources/postgres_projects/basic/output.txt @@ -25,7 +25,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_projects/basic/script b/acceptance/bundle/resources/postgres_projects/basic/script index fe9968ef048..97e27a2503b 100755 --- a/acceptance/bundle/resources/postgres_projects/basic/script +++ b/acceptance/bundle/resources/postgres_projects/basic/script @@ -15,7 +15,7 @@ trace $CLI bundle deploy # Direct mode already waits for the project to be READY during deployment # Get project details - exclude timestamps that vary -trace $CLI postgres get-project "projects/test-pg-proj-${UNIQUE_NAME}" | project_fields +trace retry $CLI postgres get-project "projects/test-pg-proj-${UNIQUE_NAME}" | project_fields trace $CLI bundle summary diff --git a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/output.txt b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/output.txt index 32ecc0ddd3d..b6ebece31e2 100644 --- a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/output.txt +++ b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/output.txt @@ -1,7 +1,7 @@ === Create accepts a minimal body; the server materializes the rest ->>> [CLI] postgres get-project projects/factcheck-spec-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/factcheck-spec-[UNIQUE_NAME] { "name": "projects/factcheck-spec-[UNIQUE_NAME]", "project_id": "factcheck-spec-[UNIQUE_NAME]", @@ -66,7 +66,7 @@ === Set default_endpoint_settings to a non-default value (leaf mask) ->>> [CLI] postgres get-project projects/factcheck-spec-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/factcheck-spec-[UNIQUE_NAME] { "name": "projects/factcheck-spec-[UNIQUE_NAME]", "project_id": "factcheck-spec-[UNIQUE_NAME]", @@ -148,7 +148,7 @@ } } ->>> [CLI] postgres get-project projects/factcheck-spec-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/factcheck-spec-[UNIQUE_NAME] { "name": "projects/factcheck-spec-[UNIQUE_NAME]", "project_id": "factcheck-spec-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/script b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/script index 5efc6703f2a..09089e3f3aa 100644 --- a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/script +++ b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_spec/script @@ -8,6 +8,7 @@ # export CLI=databricks UNIQUE_NAME=$(date +%s) # trace() { echo "+ $*" >&2; "$@"; } # errcode() { "$@" || echo "Exit code: $?"; } +# retry() { "$@"; } # title() { printf '\n=== %s\n' "$*"; } # project_fields() { jq '{name, project_id, status}'; } # print_requests.py() { :; } # harness-only request recorder; no-op standalone @@ -23,7 +24,7 @@ trap cleanup EXIT title "Create accepts a minimal body; the server materializes the rest" $CLI postgres create-project "$pid" --json '{"spec":{"display_name":"orig","pg_version":16}}' &> LOG.create -trace $CLI postgres get-project "$name" | project_fields +trace retry $CLI postgres get-project "$name" | project_fields title "update_mask=spec with a partial body (omits history_retention_duration + default_endpoint_settings)" # spec is a patch, not a replace: it applies what is present and leaves the rest. @@ -32,7 +33,7 @@ trace print_requests.py //postgres/projects --method PATCH title "Set default_endpoint_settings to a non-default value (leaf mask)" $CLI postgres update-project "$name" 'spec.default_endpoint_settings.autoscaling_limit_min_cu,spec.default_endpoint_settings.autoscaling_limit_max_cu,spec.default_endpoint_settings.suspension' --json '{"spec":{"default_endpoint_settings":{"autoscaling_limit_min_cu":0.5,"autoscaling_limit_max_cu":4,"suspend_timeout_duration":"300s"}}}' &> LOG.setup -trace $CLI postgres get-project "$name" | project_fields +trace retry $CLI postgres get-project "$name" | project_fields trace print_requests.py //postgres/projects --method PATCH title "update_mask=spec with a body that now omits the non-default default_endpoint_settings" @@ -40,4 +41,4 @@ title "update_mask=spec with a body that now omits the non-default default_endpo # survive. (Until 2026-11-02 the API returned 500 here, after a partial write.) errcode trace $CLI postgres update-project "$name" spec --json '{"spec":{"display_name":"changed2","pg_version":16,"history_retention_duration":"604800s"}}' | project_fields trace print_requests.py //postgres/projects --method PATCH -trace $CLI postgres get-project "$name" | project_fields +trace retry $CLI postgres get-project "$name" | project_fields diff --git a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/output.txt b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/output.txt index c9348d093b1..6c478f98295 100644 --- a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/output.txt +++ b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/output.txt @@ -1,7 +1,7 @@ === Create accepts a minimal body; the server materializes the rest ->>> [CLI] postgres get-project projects/factcheck-star-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/factcheck-star-[UNIQUE_NAME] { "name": "projects/factcheck-star-[UNIQUE_NAME]", "project_id": "factcheck-star-[UNIQUE_NAME]", @@ -48,7 +48,7 @@ Exit code: 1 === Set default_endpoint_settings to a non-default value (leaf mask) ->>> [CLI] postgres get-project projects/factcheck-star-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/factcheck-star-[UNIQUE_NAME] { "name": "projects/factcheck-star-[UNIQUE_NAME]", "project_id": "factcheck-star-[UNIQUE_NAME]", @@ -112,7 +112,7 @@ Exit code: 1 } } ->>> [CLI] postgres get-project projects/factcheck-star-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/factcheck-star-[UNIQUE_NAME] { "name": "projects/factcheck-star-[UNIQUE_NAME]", "project_id": "factcheck-star-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/script b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/script index 8afce5004d1..ea76077ed88 100644 --- a/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/script +++ b/acceptance/bundle/resources/postgres_projects/factcheck/update_mask_star/script @@ -9,6 +9,7 @@ # export CLI=databricks UNIQUE_NAME=$(date +%s) # trace() { echo "+ $*" >&2; "$@"; } # errcode() { "$@" || echo "Exit code: $?"; } +# retry() { "$@"; } # title() { printf '\n=== %s\n' "$*"; } # project_fields() { jq '{name, project_id, status}'; } # print_requests.py() { :; } # harness-only request recorder; no-op standalone @@ -24,7 +25,7 @@ trap cleanup EXIT title "Create accepts a minimal body; the server materializes the rest" $CLI postgres create-project "$pid" --json '{"spec":{"display_name":"orig","pg_version":16}}' &> LOG.create -trace $CLI postgres get-project "$name" | project_fields +trace retry $CLI postgres get-project "$name" | project_fields title "update_mask=* with a partial body (omits history_retention_duration + default_endpoint_settings)" # * requires every field, so it rejects this body field by field. @@ -33,11 +34,11 @@ trace print_requests.py //postgres/projects --method PATCH title "Set default_endpoint_settings to a non-default value (leaf mask)" $CLI postgres update-project "$name" 'spec.default_endpoint_settings.autoscaling_limit_min_cu,spec.default_endpoint_settings.autoscaling_limit_max_cu,spec.default_endpoint_settings.suspension' --json '{"spec":{"default_endpoint_settings":{"autoscaling_limit_min_cu":0.5,"autoscaling_limit_max_cu":4,"suspend_timeout_duration":"300s"}}}' &> LOG.setup -trace $CLI postgres get-project "$name" | project_fields +trace retry $CLI postgres get-project "$name" | project_fields trace print_requests.py //postgres/projects --method PATCH title "update_mask=* with a body that now omits the non-default default_endpoint_settings" # Still rejected: * demands every field regardless of what changed. errcode trace $CLI postgres update-project "$name" '*' --json '{"spec":{"display_name":"changed2","pg_version":16,"history_retention_duration":"604800s"}}' | project_fields trace print_requests.py //postgres/projects --method PATCH -trace $CLI postgres get-project "$name" | project_fields +trace retry $CLI postgres get-project "$name" | project_fields diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt index 7e69ce597c5..bbc3631e21f 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt @@ -15,7 +15,7 @@ Created postgres_projects.soft_delete Files: 0 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-project projects/test-pg-proj-hard-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-hard-[UNIQUE_NAME] { "name": "projects/test-pg-proj-hard-[UNIQUE_NAME]", "project_id": "test-pg-proj-hard-[UNIQUE_NAME]", @@ -38,7 +38,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "uid": "[UUID][0]" } ->>> [CLI] postgres get-project projects/test-pg-proj-soft-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-soft-[UNIQUE_NAME] { "name": "projects/test-pg-proj-soft-[UNIQUE_NAME]", "project_id": "test-pg-proj-soft-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/script b/acceptance/bundle/resources/postgres_projects/purge_on_delete/script index 5d965405116..ac5a9a2a0a6 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/script +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/script @@ -14,8 +14,8 @@ trace $CLI bundle validate rm -f "$OUT_REQUESTS" trace $CLI bundle deploy -trace $CLI postgres get-project "projects/test-pg-proj-hard-${UNIQUE_NAME}" | project_fields -trace $CLI postgres get-project "projects/test-pg-proj-soft-${UNIQUE_NAME}" | project_fields +trace retry $CLI postgres get-project "projects/test-pg-proj-hard-${UNIQUE_NAME}" | project_fields +trace retry $CLI postgres get-project "projects/test-pg-proj-soft-${UNIQUE_NAME}" | project_fields trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --sort --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.deploy.json diff --git a/acceptance/bundle/resources/postgres_projects/recreate/script b/acceptance/bundle/resources/postgres_projects/recreate/script index 6e792e6dfbe..59dbe0c7c6b 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/script +++ b/acceptance/bundle/resources/postgres_projects/recreate/script @@ -38,7 +38,7 @@ print_requests.py --del-body parent,project_id,branch_id,endpoint_id,database_id title "Fetch new project ID" project_id_2=`read_id.py my_project` # Get output differs between engines (different project IDs) -$CLI postgres get-project $project_id_2 | project_fields > out.get_project.txt +retry $CLI postgres get-project $project_id_2 | project_fields > out.get_project.txt title "Destroy and verify cleanup" trace $CLI bundle destroy --auto-approve @@ -47,6 +47,6 @@ print_requests.py --del-body parent,project_id,branch_id,endpoint_id,database_id title "Old project is gone after recreate" # Local testserver returns not found; the cloud soft-deletes and returns the project with delete_time set. -errcode $CLI postgres get-project $project_id_1 &> old_project.tmp +errcode retry $CLI postgres get-project $project_id_1 &> old_project.tmp grep -q -e 'not found' -e '"delete_time"' old_project.tmp && echo "Old project is deleted" || echo "Old project still exists" rm old_project.tmp diff --git a/acceptance/bundle/resources/postgres_projects/remove_history_retention/output.txt b/acceptance/bundle/resources/postgres_projects/remove_history_retention/output.txt index 76bc2a78205..824cbb97c76 100644 --- a/acceptance/bundle/resources/postgres_projects/remove_history_retention/output.txt +++ b/acceptance/bundle/resources/postgres_projects/remove_history_retention/output.txt @@ -7,7 +7,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", @@ -43,7 +43,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> print_requests.py --del-body project_id --sort //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/resources/postgres_projects/remove_history_retention/script b/acceptance/bundle/resources/postgres_projects/remove_history_retention/script index 99ff406c0c0..4a58ab0b222 100644 --- a/acceptance/bundle/resources/postgres_projects/remove_history_retention/script +++ b/acceptance/bundle/resources/postgres_projects/remove_history_retention/script @@ -11,7 +11,7 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}" title "Initial deployment with history_retention_duration: 604800s" trace $CLI bundle deploy rm -f "$OUT_REQUESTS" -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields title "Remove history_retention_duration and re-deploy" trace update_file.py databricks.yml " history_retention_duration: 604800s" "" @@ -23,6 +23,6 @@ trace print_requests.py --del-body project_id --sort '//postgres' '^//workspace- # Read the project back to see whether the removal reached it, then plan again to # record the drift it leaves behind. -trace $CLI postgres get-project "${project_name}" | project_fields > out.project.txt +trace retry $CLI postgres get-project "${project_name}" | project_fields > out.project.txt trace $CLI bundle plan &> out.plan.drift.txt trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" | {action, changes}' > out.plan.drift.json diff --git a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/output.txt b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/output.txt index 5e9334bcba9..292e9cbb499 100644 --- a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/output.txt @@ -24,7 +24,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id --sort //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { "autoscaling_limit_max_cu": 8, "autoscaling_limit_min_cu": 0.5, diff --git a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script index 12c11b7408b..fb285dc9294 100644 --- a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script +++ b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script @@ -22,7 +22,7 @@ trace $CLI bundle plan trace $CLI bundle deploy trace print_requests.py --del-body project_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.json -trace $CLI postgres get-project "${project_name}" | jq '.status.default_endpoint_settings' +trace retry $CLI postgres get-project "${project_name}" | jq '.status.default_endpoint_settings' title "Plan again: the change must leave no drift behind" trace $CLI bundle plan diff --git a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/output.txt b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/output.txt index a12981ce49a..04c984df1a2 100644 --- a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/output.txt @@ -7,7 +7,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", @@ -49,7 +49,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id --sort //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script index 21dafdc6c7e..3e0d37792bc 100644 --- a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script +++ b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script @@ -16,7 +16,7 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}" title "Initial deployment" trace $CLI bundle deploy rm -f "$OUT_REQUESTS" -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields title "Change default_endpoint_settings.suspend_timeout_duration and re-deploy" trace update_file.py databricks.yml "suspend_timeout_duration: 300s" "suspend_timeout_duration: 600s" @@ -29,4 +29,4 @@ trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_project rm -f "$OUT_REQUESTS" trace $CLI bundle deploy trace print_requests.py --del-body project_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.json -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt b/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt index d538708636d..ce549e63c5f 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt @@ -25,7 +25,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-project [MY_PROJECT_ID] +>>> retry [CLI] postgres get-project [MY_PROJECT_ID] { "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", @@ -100,7 +100,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-project [MY_PROJECT_ID] +>>> retry [CLI] postgres get-project [MY_PROJECT_ID] { "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", @@ -142,7 +142,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-project [MY_PROJECT_ID] +>>> retry [CLI] postgres get-project [MY_PROJECT_ID] { "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/script b/acceptance/bundle/resources/postgres_projects/update_display_name/script index f4d4ab3e73e..544027b9952 100755 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/script +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/script @@ -23,7 +23,7 @@ print_requests create project_name="projects/test-pg-proj-${UNIQUE_NAME}" project_id_1=`read_id.py my_project` -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields title "Verify no changes" trace $CLI bundle plan @@ -45,7 +45,7 @@ trace $CLI bundle deploy print_requests update project_id_2=`read_id.py my_project` -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields title "Restore display_name to original value" trace update_file.py databricks.yml "Updated Name" "Original Name" @@ -56,4 +56,4 @@ trace $CLI bundle deploy print_requests restore -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields diff --git a/acceptance/bundle/resources/postgres_projects/update_history_retention/output.txt b/acceptance/bundle/resources/postgres_projects/update_history_retention/output.txt index 0383e390053..e5d26254cd6 100644 --- a/acceptance/bundle/resources/postgres_projects/update_history_retention/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_history_retention/output.txt @@ -7,7 +7,7 @@ Created postgres_projects.my_project Files: 0 uploaded, 0 deleted Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", @@ -49,7 +49,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id --sort //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] +>>> retry [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", diff --git a/acceptance/bundle/resources/postgres_projects/update_history_retention/script b/acceptance/bundle/resources/postgres_projects/update_history_retention/script index 115a7ed034e..bd477ff48bf 100644 --- a/acceptance/bundle/resources/postgres_projects/update_history_retention/script +++ b/acceptance/bundle/resources/postgres_projects/update_history_retention/script @@ -11,7 +11,7 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}" title "Initial deployment with history_retention_duration: 604800s" trace $CLI bundle deploy rm -f "$OUT_REQUESTS" -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields title "Change history_retention_duration to 259200s and re-deploy" trace update_file.py databricks.yml "history_retention_duration: 604800s" "history_retention_duration: 259200s" @@ -24,4 +24,4 @@ trace $CLI bundle deploy # name, so the direct engine's update_mask is accepted and the change applies. trace print_requests.py --del-body project_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.json -trace $CLI postgres get-project "${project_name}" | project_fields +trace retry $CLI postgres get-project "${project_name}" | project_fields diff --git a/acceptance/bundle/resources/postgres_roles/basic/output.txt b/acceptance/bundle/resources/postgres_roles/basic/output.txt index 14911ec09ad..f2325a42f57 100644 --- a/acceptance/bundle/resources/postgres_roles/basic/output.txt +++ b/acceptance/bundle/resources/postgres_roles/basic/output.txt @@ -33,7 +33,7 @@ Created postgres_roles.my_role Files: 0 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role +>>> retry [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", diff --git a/acceptance/bundle/resources/postgres_roles/basic/script b/acceptance/bundle/resources/postgres_roles/basic/script index ebb54463a07..947a36a65fb 100644 --- a/acceptance/bundle/resources/postgres_roles/basic/script +++ b/acceptance/bundle/resources/postgres_roles/basic/script @@ -17,7 +17,7 @@ trace $CLI bundle deploy project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/main" role_name="${branch_name}/roles/test-role" -trace $CLI postgres get-role "${role_name}" | role_fields +trace retry $CLI postgres get-role "${role_name}" | role_fields # Postgres roles have no workspace URL, so opening one reports that rather than # suggesting a deploy. diff --git a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt index a22699e9b4b..366997f3e79 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt +++ b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt @@ -139,7 +139,7 @@ Resources: 1 created, 0 changed, 1 deleted, 2 unchanged === Fetch role and verify the new postgres_role value is live ->>> [CLI] postgres get-role [MY_ROLE_ID] +>>> retry [CLI] postgres get-role [MY_ROLE_ID] { "name": "[MY_ROLE_ID]", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", diff --git a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script index bcbb56aad86..4e384123c44 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script +++ b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script @@ -32,7 +32,7 @@ trace print_requests.py --unique --del-body parent,project_id,branch_id,endpoint title "Fetch role and verify the new postgres_role value is live" role_name=`read_id.py my_role` -trace $CLI postgres get-role $role_name | role_fields +trace retry $CLI postgres get-role $role_name | role_fields title "Destroy and verify cleanup" trace $CLI bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/postgres_roles/recreate/output.txt b/acceptance/bundle/resources/postgres_roles/recreate/output.txt index 7d4882124b9..f9e0a82c195 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_roles/recreate/output.txt @@ -139,7 +139,7 @@ Resources: 1 created, 0 changed, 1 deleted, 2 unchanged === Fetch role and verify it exists after recreation ->>> [CLI] postgres get-role [MY_ROLE_ID]-v2 +>>> retry [CLI] postgres get-role [MY_ROLE_ID]-v2 { "name": "[MY_ROLE_ID]-v2", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", diff --git a/acceptance/bundle/resources/postgres_roles/recreate/script b/acceptance/bundle/resources/postgres_roles/recreate/script index 74c3a7362e7..34edae36b3c 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate/script +++ b/acceptance/bundle/resources/postgres_roles/recreate/script @@ -34,7 +34,7 @@ trace print_requests.py --unique --del-body parent,project_id,branch_id,endpoint title "Fetch role and verify it exists after recreation" role_id_2=`read_id.py my_role` -trace $CLI postgres get-role $role_id_2 | role_fields +trace retry $CLI postgres get-role $role_id_2 | role_fields title "Destroy and verify cleanup" trace $CLI bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt b/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt index 1b558424d80..58e8ad7a249 100644 --- a/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt @@ -30,7 +30,7 @@ Resources: 1 created, 0 changed, 0 deleted, 2 unchanged === Confirm the role is under management again ->>> [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role +>>> retry [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", diff --git a/acceptance/bundle/resources/postgres_roles/replace_existing/script b/acceptance/bundle/resources/postgres_roles/replace_existing/script index 211e0f6458f..e62dd8e86b3 100644 --- a/acceptance/bundle/resources/postgres_roles/replace_existing/script +++ b/acceptance/bundle/resources/postgres_roles/replace_existing/script @@ -22,6 +22,6 @@ rm -f "$OUT_REQUESTS" trace $CLI bundle deploy title "Confirm the role is under management again" -trace $CLI postgres get-role "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/roles/test-role" | role_fields +trace retry $CLI postgres get-role "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/roles/test-role" | role_fields trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.deploy.json diff --git a/acceptance/bundle/resources/postgres_roles/update/output.txt b/acceptance/bundle/resources/postgres_roles/update/output.txt index 5af34ddd97f..942797d0522 100644 --- a/acceptance/bundle/resources/postgres_roles/update/output.txt +++ b/acceptance/bundle/resources/postgres_roles/update/output.txt @@ -29,7 +29,7 @@ Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role +>>> retry [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", @@ -109,7 +109,7 @@ Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role +>>> retry [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", @@ -146,7 +146,7 @@ Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ ->>> [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role +>>> retry [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role", "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", diff --git a/acceptance/bundle/resources/postgres_roles/update/script b/acceptance/bundle/resources/postgres_roles/update/script index c8bc0c7a46c..c39e0ef8a18 100644 --- a/acceptance/bundle/resources/postgres_roles/update/script +++ b/acceptance/bundle/resources/postgres_roles/update/script @@ -24,7 +24,7 @@ print_requests create project_name="projects/test-pg-proj-${UNIQUE_NAME}" branch_name="${project_name}/branches/main" role_name="${branch_name}/roles/test-role" -trace $CLI postgres get-role "${role_name}" | role_fields +trace retry $CLI postgres get-role "${role_name}" | role_fields title "Verify no changes" trace $CLI bundle plan @@ -45,7 +45,7 @@ trace $CLI bundle deploy print_requests update -trace $CLI postgres get-role "${role_name}" | role_fields +trace retry $CLI postgres get-role "${role_name}" | role_fields title "Restore attributes.createdb to original value" trace update_file.py databricks.yml "createdb: true" "createdb: false" @@ -56,4 +56,4 @@ trace $CLI bundle deploy print_requests restore -trace $CLI postgres get-role "${role_name}" | role_fields +trace retry $CLI postgres get-role "${role_name}" | role_fields diff --git a/acceptance/bundle/resources/postgres_snapshot_schedules/basic/output.txt b/acceptance/bundle/resources/postgres_snapshot_schedules/basic/output.txt index c9c9a91f29a..18b66a68865 100644 --- a/acceptance/bundle/resources/postgres_snapshot_schedules/basic/output.txt +++ b/acceptance/bundle/resources/postgres_snapshot_schedules/basic/output.txt @@ -8,7 +8,7 @@ Created postgres_snapshot_schedules.main_schedule Files: 0 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule +>>> retry [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule", "schedule": [ @@ -29,7 +29,7 @@ Updated postgres_snapshot_schedules.main_schedule Files: 0 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged ->>> [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule +>>> retry [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule", "schedule": [ @@ -65,7 +65,7 @@ Deleted postgres_snapshot_schedules.main_schedule Files: 0 uploaded, 0 deleted Resources: 0 created, 0 changed, 1 deleted, 1 unchanged ->>> [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule +>>> retry [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule", "schedule": null diff --git a/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script b/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script index 7f0fb2587c5..0255365fbd6 100644 --- a/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script +++ b/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script @@ -10,20 +10,20 @@ title "Create with a snapshot schedule" envsubst < databricks.yml.tmpl > databricks.yml rm -f "$OUT_REQUESTS" trace $CLI bundle deploy -trace $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields +trace retry $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields print_requests.py --del-body parent,project_id,branch_id --sort --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.create.txt title "Update the schedule cadence" sed "s/hour: 3/hour: 5/" databricks.yml > databricks.yml.new && mv databricks.yml.new databricks.yml trace $CLI bundle deploy --auto-approve -trace $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields +trace retry $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields print_requests.py --del-body parent,project_id,branch_id --sort --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.update.txt title "Remove the snapshot schedule resource (disables automatic snapshots)" sed '/postgres_snapshot_schedules:/,$d' databricks.yml > databricks.yml.new && mv databricks.yml.new databricks.yml trace cat databricks.yml trace $CLI bundle deploy --auto-approve -trace $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields +trace retry $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields print_requests.py --del-body parent,project_id,branch_id --sort --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.remove.txt title "Plan again to confirm no drift after removal" diff --git a/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/output.txt b/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/output.txt index 1d47a0d4c65..9a5775ef6cd 100644 --- a/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/output.txt +++ b/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/output.txt @@ -8,7 +8,7 @@ Created postgres_snapshot_schedules.main_schedule Files: 0 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule +>>> retry [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule", "schedule": [ @@ -51,7 +51,7 @@ Updated postgres_snapshot_schedules.main_schedule Files: 0 uploaded, 0 deleted Resources: 0 created, 1 changed, 0 deleted, 1 unchanged ->>> [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule +>>> retry [CLI] postgres get-snapshot-schedule projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule { "name": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production/snapshot-schedule", "schedule": [ diff --git a/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script b/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script index 563f339418a..4cdb57734b0 100644 --- a/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script +++ b/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script @@ -8,7 +8,7 @@ schedule_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/production/snapshot title "Deploy with a snapshot schedule" envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle deploy -trace $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields +trace retry $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields title "Change the schedule out of band via a direct API call" trace $CLI postgres update-snapshot-schedule "${schedule_name}" schedule --json '{"schedule":[{"daily_schedule":{"hour":9},"retention":"604800s"}]}' | snapshot_schedule_fields @@ -18,4 +18,4 @@ trace $CLI bundle plan title "Deploy reconciles the schedule back to the configured cadence" trace $CLI bundle deploy --auto-approve -trace $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields +trace retry $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields diff --git a/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt b/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt index 9916219e124..ea70f18aef0 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt +++ b/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt @@ -44,7 +44,7 @@ Created schemas.pipeline_storage Files: 0 uploaded, 0 deleted Resources: 4 created, 0 changed, 0 deleted, 0 unchanged ->>> [CLI] postgres get-synced-table synced_tables/lakebase_test_[UNIQUE_NAME].public.trips_synced +>>> retry [CLI] postgres get-synced-table synced_tables/lakebase_test_[UNIQUE_NAME].public.trips_synced { "name": "synced_tables/lakebase_test_[UNIQUE_NAME].public.trips_synced", "unity_catalog_provisioning_state": "ACTIVE" diff --git a/acceptance/bundle/resources/postgres_synced_tables/basic/script b/acceptance/bundle/resources/postgres_synced_tables/basic/script index 7ce35fa0fbd..82b6bec86eb 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/basic/script +++ b/acceptance/bundle/resources/postgres_synced_tables/basic/script @@ -31,7 +31,7 @@ trace $CLI bundle deploy # varies with pipeline-provisioning timing on cloud, ongoing_sync_progress and # project only appear there, and create_time/update_time/uid/pipeline_id are # random per run. -trace $CLI postgres get-synced-table "synced_tables/lakebase_test_${UNIQUE_NAME}.public.trips_synced" | jq '{name, unity_catalog_provisioning_state: .status.unity_catalog_provisioning_state}' +trace retry $CLI postgres get-synced-table "synced_tables/lakebase_test_${UNIQUE_NAME}.public.trips_synced" | jq '{name, unity_catalog_provisioning_state: .status.unity_catalog_provisioning_state}' trace $CLI bundle summary