fix(mock): normalize database catalog key; drop broken example (#189)

* fix(mock): normalize database catalog key to strip /catalog suffix

Write and read paths keyed on different forms of the name — writes used
patch.Name (with /catalog suffix) while reads used the bare databaseName
argument — so any write-then-read round-trip through the mock failed.
Normalize both sides to use the bare name.

This unblocks the first catalog acceptance test (BYT-9296 prerequisite).

* docs: remove stale bytebase_database_catalog data source from example

The data source referenced here was never registered in provider.go, so
the example failed terraform validate. Drop the broken block; a catalog
example will be reintroduced alongside object_schema_json support.

Author: vsai12

examples/database/main.tf

@@ -27,11 +27,3 @@ data "bytebase_database_list" "all" {
 output "all_databases" {
   value = data.bytebase_database_list.all
 }
-
-data "bytebase_database_catalog" "employee" {
-  database = "instances/test-sample-instance/databases/employee"
-}
-
-output "employee_catalog" {
-  value = data.bytebase_database_catalog.employee
-}

provider/internal/mock_client.go

@@ -463,7 +463,10 @@ func (c *mockClient) GetDatabaseCatalog(_ context.Context, databaseName string)
 func (c *mockClient) UpdateDatabaseCatalog(_ context.Context, patch *v1pb.DatabaseCatalog) (*v1pb.DatabaseCatalog, error) {
 	mu.Lock()
 	defer mu.Unlock()
-	c.databaseCatalogMap[patch.Name] = patch
+	// The catalog proto's Name carries the "/catalog" suffix. Key by the
+	// bare database name so GetDatabaseCatalog(databaseName) round-trips.
+	key := strings.TrimSuffix(patch.Name, DatabaseCatalogNameSuffix)
+	c.databaseCatalogMap[key] = patch
 	return patch, nil
 }
 

provider/internal/mock_client_catalog_test.go

@@ -0,0 +1,33 @@
+package internal
+
+import (
+	"context"
+	"testing"
+
+	v1pb "buf.build/gen/go/bytebase/bytebase/protocolbuffers/go/v1"
+)
+
+// Verify that a catalog written via UpdateDatabaseCatalog is readable via
+// GetDatabaseCatalog using the database name the real client would pass in.
+// The real client calls GetDatabaseCatalog(ctx, databaseName) where
+// databaseName does NOT include the "/catalog" suffix; the suffix is added
+// inside the catalog proto's Name field by convertToV1DatabaseCatalog.
+func TestMockDatabaseCatalog_WriteThenReadRoundTrip(t *testing.T) {
+	c := &mockClient{
+		databaseCatalogMap: map[string]*v1pb.DatabaseCatalog{},
+	}
+	databaseName := "instances/test-inst/databases/test-db"
+	patch := &v1pb.DatabaseCatalog{
+		Name: databaseName + DatabaseCatalogNameSuffix,
+	}
+	if _, err := c.UpdateDatabaseCatalog(context.Background(), patch); err != nil {
+		t.Fatalf("update: %v", err)
+	}
+	got, err := c.GetDatabaseCatalog(context.Background(), databaseName)
+	if err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if got.Name != patch.Name {
+		t.Errorf("catalog name mismatch: got %q want %q", got.Name, patch.Name)
+	}
+}