Fix: Address review comments on PR #2958

Author: anikasharma03

.ci/integration.cloudbuild.yaml

@@ -330,7 +330,7 @@ steps:
     entrypoint: /bin/bash
     env:
       - "GOPATH=/gopath"
-      - "DATAPLEX_PROJECT=$PROJECT_ID"
+      - "KNOWLEDGE_CATALOG_PROJECT=$PROJECT_ID"
       - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
     secretEnv: ["CLIENT_ID"]
     volumes:

.github/blunderbuss.yml

@@ -44,7 +44,7 @@ assign_issues_by:
     to:
     - 'googleapis/toolbox-cloud-sql-postgres-team'
   - labels:
-    - 'product: dataplex'
+    - 'product: knowledge-catalog'
     to:
     - 'googleapis/toolbox-dataplex-team'
   - labels:

.github/labels.yaml

@@ -120,9 +120,9 @@
 - name: 'product: couchbase'
   color: 5065c7
   description: 'Couchbase'
-- name: 'product: dataplex'
+- name: 'product: knowledge-catalog'
   color: 5065c7
-  description: 'Dataplex'
+  description: 'Knowledge Catalog'
 - name: 'product: dgraph'
   color: 5065c7
   description: 'Dgraph'

cmd/internal/config_test.go

@@ -1445,7 +1445,7 @@ func TestPrebuiltTools(t *testing.T) {
 	t.Setenv("API_KEY", "your_api_key")
 
 	t.Setenv("BIGQUERY_PROJECT", "your_gcp_project_id")
-	t.Setenv("DATAPLEX_PROJECT", "your_gcp_project_id")
+	t.Setenv("KNOWLEDGE_CATALOG_PROJECT", "your_gcp_project_id")
 	t.Setenv("FIRESTORE_PROJECT", "your_gcp_project_id")
 	t.Setenv("FIRESTORE_DATABASE", "your_firestore_db_name")
 

docs/KNOWLEDGECATALOG_README.md

@@ -58,7 +58,7 @@ The Knowledge Catalog MCP server provides the following tools:
 The MCP server is configured using environment variables.
 
 ```bash
-export DATAPLEX_PROJECT="<your-gcp-project-id>"
+export KNOWLEDGE_CATALOG_PROJECT="<your-gcp-project-id>"
 ```
 
 Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
@@ -70,7 +70,7 @@ Add the following configuration to your MCP client (e.g., `settings.json` for Ge
       "command": "npx",
       "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "knowledge-catalog", "--stdio"],
       "env": {
-        "DATAPLEX_PROJECT": "your-project-id"
+        "KNOWLEDGE_CATALOG_PROJECT": "your-project-id"
       }
     }
   }

docs/en/integrations/knowledge-catalog/prebuilt-configs/knowledge-catalog.md

@@ -8,7 +8,7 @@ description: "Details of the Knowledge Catalog(formerly known as Dataplex) prebu
 
 *   `--prebuilt` value: `knowledge-catalog`
 *   **Environment Variables:**
-    *   `DATAPLEX_PROJECT`: The GCP project ID.
+    *   `KNOWLEDGE_CATALOG_PROJECT`: The GCP project ID.
 *   **Permissions:**
     *   **Knowledge Catalog Reader** (`roles/dataplex.viewer`) to search and look up
         entries.

internal/prebuiltconfigs/tools/knowledge-catalog.yaml

@@ -15,7 +15,7 @@
 sources:
   knowledge-catalog-source:
     kind: "knowledge-catalog"
-    project: ${DATAPLEX_PROJECT}
+    project: ${KNOWLEDGE_CATALOG_PROJECT}
 
 tools:
   search_entries:

tests/knowledge-catalog/knowledge_catalog_integration_test.go

@@ -45,13 +45,13 @@ var (
 	KnowledgeCatalogSearchEntriesToolType     = "knowledge-catalog-search-entries"
 	KnowledgeCatalogLookupEntryToolType       = "knowledge-catalog-lookup-entry"
 	KnowledgeCatalogSearchAspectTypesToolType = "knowledge-catalog-search-aspect-types"
-	KnowledgeCatalogProject                   = os.Getenv("DATAPLEX_PROJECT")
+	KnowledgeCatalogProject                   = os.Getenv("KNOWLEDGE_CATALOG_PROJECT")
 )
 
 func getKnowledgeCatalogVars(t *testing.T) map[string]any {
 	switch "" {
 	case KnowledgeCatalogProject:
-		t.Fatal("'DATAPLEX_PROJECT' not set")
+		t.Fatal("'KNOWLEDGE_CATALOG_PROJECT' not set")
 	}
 	return map[string]any{
 		"type":    KnowledgeCatalogSourceType,