From fdfae0af659d0b6bd16f22a3cba91552e70c2e24 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 8 Oct 2026 18:16:03 +0200 Subject: [PATCH] acc: normalize per-cloud postgres branch_logical_size_limit_bytes Co-authored-by: Isaac --- .../add_default_endpoint_settings/out.plan.json | 2 +- .../bundle/resources/postgres_projects/basic/output.txt | 2 +- .../factcheck/update_mask_spec/output.txt | 8 ++++---- .../factcheck/update_mask_star/output.txt | 6 +++--- .../postgres_projects/purge_on_delete/output.txt | 4 ++-- .../postgres_projects/recreate/out.get_project.txt | 2 +- .../remove_history_retention/out.project.txt | 2 +- .../postgres_projects/remove_history_retention/output.txt | 2 +- acceptance/bundle/resources/postgres_projects/test.toml | 5 +++++ .../update_default_endpoint_suspend/output.txt | 4 ++-- .../update_display_name/out.plan.no_change.json | 2 +- .../update_display_name/out.plan.restore.json | 2 +- .../update_display_name/out.plan.update.json | 2 +- .../postgres_projects/update_display_name/output.txt | 6 +++--- .../postgres_projects/update_history_retention/output.txt | 4 ++-- 15 files changed, 29 insertions(+), 24 deletions(-) diff --git a/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json b/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json index 6e6d97aac27..90a8ddd5c91 100644 --- a/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json +++ b/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/out.plan.json @@ -23,7 +23,7 @@ "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, diff --git a/acceptance/bundle/resources/postgres_projects/basic/output.txt b/acceptance/bundle/resources/postgres_projects/basic/output.txt index d73f3a8f118..b9f0a693743 100644 --- a/acceptance/bundle/resources/postgres_projects/basic/output.txt +++ b/acceptance/bundle/resources/postgres_projects/basic/output.txt @@ -30,7 +30,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, 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 7f5977e30ec..315e46f8061 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 @@ -5,7 +5,7 @@ "name": "projects/factcheck-spec-[UNIQUE_NAME]", "project_id": "factcheck-spec-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/factcheck-spec-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, @@ -29,7 +29,7 @@ "name": "projects/factcheck-spec-[UNIQUE_NAME]", "project_id": "factcheck-spec-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/factcheck-spec-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, @@ -68,7 +68,7 @@ "name": "projects/factcheck-spec-[UNIQUE_NAME]", "project_id": "factcheck-spec-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/factcheck-spec-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, @@ -131,7 +131,7 @@ Exit code: 1 "name": "projects/factcheck-spec-[UNIQUE_NAME]", "project_id": "factcheck-spec-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/factcheck-spec-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, 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 2ccecba10f4..e968375589b 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 @@ -5,7 +5,7 @@ "name": "projects/factcheck-star-[UNIQUE_NAME]", "project_id": "factcheck-star-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/factcheck-star-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, @@ -50,7 +50,7 @@ Exit code: 1 "name": "projects/factcheck-star-[UNIQUE_NAME]", "project_id": "factcheck-star-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/factcheck-star-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, @@ -113,7 +113,7 @@ Exit code: 1 "name": "projects/factcheck-star-[UNIQUE_NAME]", "project_id": "factcheck-star-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/factcheck-star-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, 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 060aa7c997b..d0a4f3b91b8 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt @@ -20,7 +20,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-hard-[UNIQUE_NAME]", "project_id": "test-pg-proj-hard-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-hard-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, @@ -43,7 +43,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-soft-[UNIQUE_NAME]", "project_id": "test-pg-proj-soft-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-soft-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, diff --git a/acceptance/bundle/resources/postgres_projects/recreate/out.get_project.txt b/acceptance/bundle/resources/postgres_projects/recreate/out.get_project.txt index 6bf20a18468..be906bc896d 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/out.get_project.txt +++ b/acceptance/bundle/resources/postgres_projects/recreate/out.get_project.txt @@ -2,7 +2,7 @@ "name": "[MY_PROJECT_ID_2]", "project_id": "test-pg-new-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "[MY_PROJECT_ID_2]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, diff --git a/acceptance/bundle/resources/postgres_projects/remove_history_retention/out.project.txt b/acceptance/bundle/resources/postgres_projects/remove_history_retention/out.project.txt index 50943239c89..fc67fa188ff 100644 --- a/acceptance/bundle/resources/postgres_projects/remove_history_retention/out.project.txt +++ b/acceptance/bundle/resources/postgres_projects/remove_history_retention/out.project.txt @@ -2,7 +2,7 @@ "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, 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 9de5206534c..ec3dd1a62e4 100644 --- a/acceptance/bundle/resources/postgres_projects/remove_history_retention/output.txt +++ b/acceptance/bundle/resources/postgres_projects/remove_history_retention/output.txt @@ -11,7 +11,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, diff --git a/acceptance/bundle/resources/postgres_projects/test.toml b/acceptance/bundle/resources/postgres_projects/test.toml index 6ef50148760..0f0da63edf4 100644 --- a/acceptance/bundle/resources/postgres_projects/test.toml +++ b/acceptance/bundle/resources/postgres_projects/test.toml @@ -28,3 +28,8 @@ Order = 1 Old = '/operations/[A-Za-z0-9+/=]+' New = '/operations/[OPERATION_ID]' Order = 2000 + +[[Repls]] +# Backend default that differs per cloud (8 TiB on the testserver and gcp, 32 TiB on aws). +Old = '"branch_logical_size_limit_bytes": \d+' +New = '"branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT]' 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 a9ee77c8ce1..e074e12a5e7 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 @@ -11,7 +11,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, @@ -52,7 +52,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.no_change.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.no_change.json index c7a2dc7fc3e..0336f39f4a1 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.no_change.json +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.no_change.json @@ -5,7 +5,7 @@ "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "[MY_PROJECT_ID]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.restore.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.restore.json index b67022262b1..92ddb203f42 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.restore.json +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.restore.json @@ -18,7 +18,7 @@ "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "[MY_PROJECT_ID]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.update.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.update.json index a1cb80c5e19..771d76a009f 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.update.json +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.update.json @@ -18,7 +18,7 @@ "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "[MY_PROJECT_ID]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, 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 1ad3f9ed70f..874ecf991fb 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt @@ -29,7 +29,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "[MY_PROJECT_ID]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, @@ -102,7 +102,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "[MY_PROJECT_ID]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, @@ -143,7 +143,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged "name": "[MY_PROJECT_ID]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "[MY_PROJECT_ID]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 4, 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 63c086dc510..71fbe88c3b9 100644 --- a/acceptance/bundle/resources/postgres_projects/update_history_retention/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_history_retention/output.txt @@ -11,7 +11,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1, @@ -52,7 +52,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged "name": "projects/test-pg-proj-[UNIQUE_NAME]", "project_id": "test-pg-proj-[UNIQUE_NAME]", "status": { - "branch_logical_size_limit_bytes": 8796093022208, + "branch_logical_size_limit_bytes": [BRANCH_SIZE_LIMIT], "default_branch": "projects/test-pg-proj-[UNIQUE_NAME]/branches/production", "default_endpoint_settings": { "autoscaling_limit_max_cu": 1,