Drop redundant postgres_catalogs lifecycle rules

The hand-written `branch`, `postgres_database`, and `create_database_if_missing` entries under `ignore_remote_changes` are already produced by the OpenAPI autogen (`spec:input_only`); `postgres_database` is also autogen'd under `recreate_on_changes` (`spec:immutable`). Drop the duplicates from `resources.yml`.

`catalog_id` was in `ignore_remote_changes` only to mask the cosmetic `catalogs/` prefix that the old `RemapState` propagated from `remote.Name`. Source it from `remote.Status.CatalogId` instead — semantic contract from the API rather than string manipulation on the hierarchical path — and drop the entry. `catalog_id` stays in `recreate_on_changes` (synthetic hierarchical key, not in the API spec) along with `branch` and `create_database_if_missing` (no UpdateCatalog endpoint).

Co-authored-by: Isaac

Author: pietern

bundle/direct/dresources/postgres_catalog.go

@@ -26,16 +26,20 @@ func (*ResourcePostgresCatalog) PrepareState(input *resources.PostgresCatalog) *
 }
 
 func (*ResourcePostgresCatalog) RemapState(remote *postgres.Catalog) *PostgresCatalogState {
-	// The server-side ID is the full hierarchical name `catalogs/<catalog_id>`.
-	// Keep it as-is — the `catalogs/` prefix is an inherent part of the ID, not
-	// noise to strip.
+	// Status.CatalogId is the short identifier and matches the user-supplied
+	// config. Prefer it over parsing remote.Name — semantic contract from the
+	// API rather than string manipulation on the hierarchical path.
 	//
 	// GET does not return the spec today (only status). Return an empty spec
-	// and rely on the ignore_remote_changes / input_only classifications in
-	// resources.yml to suppress phantom drift until the backend starts
+	// and rely on the spec:input_only classifications generated from the
+	// OpenAPI schema to suppress phantom drift until the backend starts
 	// echoing spec values on GET.
+	var catalogId string
+	if remote.Status != nil {
+		catalogId = remote.Status.CatalogId
+	}
 	return &PostgresCatalogState{
-		CatalogId: remote.Name,
+		CatalogId: catalogId,
 		CatalogCatalogSpec: postgres.CatalogCatalogSpec{
 			Branch:                  "",
 			CreateDatabaseIfMissing: false,

bundle/direct/dresources/resources.yml

@@ -513,31 +513,14 @@ resources:
       # catalog_id is part of the hierarchical name and immutable.
       - field: catalog_id
         reason: immutable
-      # The Postgres SDK has no UpdateCatalog endpoint, so any local change to
-      # a spec field requires delete+create. recreate_on_changes fires on the
-      # intent diff (local config vs. persisted state); ignore_remote_changes
-      # below silences the orthogonal drift diff (persisted state vs. RemapState).
+      # The Postgres SDK has no UpdateCatalog endpoint, so any local change
+      # requires delete+create. The OpenAPI spec only marks postgres_database
+      # as IMMUTABLE (handled by autogen); branch and create_database_if_missing
+      # need explicit entries here.
       - field: branch
         reason: immutable
-      - field: postgres_database
-        reason: immutable
       - field: create_database_if_missing
         reason: immutable
-    ignore_remote_changes:
-      # The remote .Name always carries the "catalogs/" prefix while the
-      # user-supplied catalog_id does not. The framework's state ID still
-      # holds the full prefixed name; this just suppresses the cosmetic diff.
-      - field: catalog_id
-        reason: input_only
-      # The catalog API does not currently echo back spec values on GET; the
-      # missing remote values would otherwise trigger phantom drift. Lift
-      # these once the backend starts returning spec on GET.
-      - field: branch
-        reason: input_only
-      - field: postgres_database
-        reason: input_only
-      - field: create_database_if_missing
-        reason: input_only
 
   vector_search_endpoints:
     recreate_on_changes: