diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/out.requests.terraform.json b/acceptance/bundle/resources/postgres_endpoints/basic/out.requests.terraform.json deleted file mode 100644 index 90fcc42649..0000000000 --- a/acceptance/bundle/resources/postgres_endpoints/basic/out.requests.terraform.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "method": "POST", - "path": "/api/2.0/postgres/projects", - "q": { - "project_id": "test-pg-proj-[UNIQUE_NAME]" - }, - "body": { - "spec": { - "default_endpoint_settings": { - "autoscaling_limit_max_cu": 4, - "autoscaling_limit_min_cu": 0.5, - "suspend_timeout_duration": "300s" - }, - "display_name": "Test Project for Endpoint", - "history_retention_duration": "604800s", - "pg_version": 16 - } - } -} -{ - "method": "POST", - "path": "/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches", - "q": { - "branch_id": "main" - }, - "body": { - "parent": "projects/test-pg-proj-[UNIQUE_NAME]", - "spec": { - "no_expiry": true - } - } -} -{ - "method": "POST", - "path": "/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints", - "q": { - "endpoint_id": "custom" - }, - "body": { - "parent": "projects/test-pg-proj-[UNIQUE_NAME]/branches/main", - "spec": { - "autoscaling_limit_max_cu": 2, - "autoscaling_limit_min_cu": 0.5, - "endpoint_type": "ENDPOINT_TYPE_READ_ONLY" - } - } -} -{ - "method": "GET", - "path": "/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/custom" -} diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml b/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml index 7035e08bad..f3d5b03e2e 100644 --- a/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml +++ b/acceptance/bundle/resources/postgres_endpoints/basic/out.test.toml @@ -7,4 +7,4 @@ RequiresUnityCatalog = true gcp = false [EnvMatrix] - DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"] + DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/test.toml b/acceptance/bundle/resources/postgres_endpoints/basic/test.toml index f8b3bbe49d..ff6cbed8bf 100644 --- a/acceptance/bundle/resources/postgres_endpoints/basic/test.toml +++ b/acceptance/bundle/resources/postgres_endpoints/basic/test.toml @@ -1 +1,4 @@ -# All configuration inherited from parent test.toml +# Skip terraform variant: TF provider doesn't retry on 409 "endpoint reconciliation +# in progress" during delete. Tracked in: +# https://github.com/databricks/terraform-provider-databricks/issues/5482 +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.create.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.create.terraform.json deleted file mode 100644 index b4425b9687..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.create.terraform.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "action": "create" -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.no_change.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.no_change.terraform.json deleted file mode 100644 index b2f23a5015..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.no_change.terraform.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "action": "skip" -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.restore.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.restore.terraform.json deleted file mode 100644 index 375b496fef..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.restore.terraform.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "action": "update" -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.update.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.update.terraform.json deleted file mode 100644 index 375b496fef..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.plan.update.terraform.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "action": "update" -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.create.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.create.terraform.json deleted file mode 100644 index c9d08e089b..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.create.terraform.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "method": "POST", - "path": "/api/2.0/postgres/projects", - "q": { - "project_id": "test-pg-proj-[UNIQUE_NAME]" - }, - "body": { - "spec": { - "default_endpoint_settings": { - "autoscaling_limit_max_cu": 4, - "autoscaling_limit_min_cu": 0.5, - "suspend_timeout_duration": "300s" - }, - "display_name": "Original Name", - "history_retention_duration": "604800s", - "pg_version": 16 - } - } -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.no_change.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.no_change.terraform.json deleted file mode 100644 index 1d6880d333..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.no_change.terraform.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "method": "GET", - "path": "/api/2.0/postgres/[MY_PROJECT_ID]" -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.restore.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.restore.terraform.json deleted file mode 100644 index 85a5668aa3..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.restore.terraform.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "method": "GET", - "path": "/api/2.0/postgres/[MY_PROJECT_ID]" -} -{ - "method": "PATCH", - "path": "/api/2.0/postgres/[MY_PROJECT_ID]", - "q": { - "update_mask": "initial_endpoint_spec,spec" - }, - "body": { - "name": "[MY_PROJECT_ID]", - "spec": { - "default_endpoint_settings": { - "autoscaling_limit_max_cu": 4, - "autoscaling_limit_min_cu": 0.5, - "suspend_timeout_duration": "300s" - }, - "display_name": "Original Name", - "history_retention_duration": "604800s", - "pg_version": 16 - } - } -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.update.terraform.json b/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.update.terraform.json deleted file mode 100644 index daa3b4c7d9..0000000000 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.requests.update.terraform.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "method": "GET", - "path": "/api/2.0/postgres/[MY_PROJECT_ID]" -} -{ - "method": "PATCH", - "path": "/api/2.0/postgres/[MY_PROJECT_ID]", - "q": { - "update_mask": "initial_endpoint_spec,spec" - }, - "body": { - "name": "[MY_PROJECT_ID]", - "spec": { - "default_endpoint_settings": { - "autoscaling_limit_max_cu": 4, - "autoscaling_limit_min_cu": 0.5, - "suspend_timeout_duration": "300s" - }, - "display_name": "Updated Name", - "history_retention_duration": "604800s", - "pg_version": 16 - } - } -} diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml b/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml index 7035e08bad..f3d5b03e2e 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/out.test.toml @@ -7,4 +7,4 @@ RequiresUnityCatalog = true gcp = false [EnvMatrix] - DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"] + DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/test.toml b/acceptance/bundle/resources/postgres_projects/update_display_name/test.toml index f8b3bbe49d..bbc6e22fd4 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/test.toml +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/test.toml @@ -1 +1,4 @@ -# All configuration inherited from parent test.toml +# Skip terraform variant: TF provider includes invalid 'initial_endpoint_spec' in +# update_mask, causing "Unknown field path" error. Tracked in: +# https://github.com/databricks/terraform-provider-databricks/issues/5481 +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]