Merge branch 'main' into cloud-sql-package

cmd/root_test.go

@@ -1234,8 +1234,11 @@ func TestPrebuiltTools(t *testing.T) {
 	bigquery_config, _ := prebuiltconfigs.Get("bigquery")
 	clickhouse_config, _ := prebuiltconfigs.Get("clickhouse")
 	cloudsqlpg_config, _ := prebuiltconfigs.Get("cloud-sql-postgres")
+	cloudsqlpg_admin_config, _ := prebuiltconfigs.Get("cloud-sql-postgres-admin")
 	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
+	cloudsqlmysql_admin_config, _ := prebuiltconfigs.Get("cloud-sql-mysql-admin")
 	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
+	cloudsqlmssql_admin_config, _ := prebuiltconfigs.Get("cloud-sql-mssql-admin")
 	dataplex_config, _ := prebuiltconfigs.Get("dataplex")
 	firestoreconfig, _ := prebuiltconfigs.Get("firestore")
 	mysql_config, _ := prebuiltconfigs.Get("mysql")
@@ -1346,6 +1349,36 @@ func TestPrebuiltTools(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "cloudsql pg admin prebuilt tools",
+			in:   cloudsqlpg_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_postgres_admin_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_postgres_admin_tools",
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation"},
+				},
+			},
+		},
+		{
+			name: "cloudsql mysql admin prebuilt tools",
+			in:   cloudsqlmysql_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mysql_admin_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mysql_admin_tools",
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation"},
+				},
+			},
+		},
+		{
+			name: "cloudsql mssql admin prebuilt tools",
+			in:   cloudsqlmssql_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mssql_admin_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mssql_admin_tools",
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation"},
+				},
+			},
+		},
 		{
 			name: "alloydb prebuilt tools",
 			in:   alloydb_config,

internal/prebuiltconfigs/prebuiltconfigs_test.go

@@ -26,10 +26,13 @@ var expectedToolSources = []string{
 	"alloydb-postgres",
 	"bigquery",
 	"clickhouse",
+	"cloud-sql-mssql-admin",
 	"cloud-sql-mssql-observability",
 	"cloud-sql-mssql",
+	"cloud-sql-mysql-admin",
 	"cloud-sql-mysql-observability",
 	"cloud-sql-mysql",
+	"cloud-sql-postgres-admin",
 	"cloud-sql-postgres-observability",
 	"cloud-sql-postgres",
 	"dataplex",
@@ -96,6 +99,9 @@ func TestGetPrebuiltTool(t *testing.T) {
 	clickhouse_config, _ := Get("clickhouse")
 	cloudsqlpg_observability_config, _ := Get("cloud-sql-postgres-observability")
 	cloudsqlpg_config, _ := Get("cloud-sql-postgres")
+	cloudsqlpg_admin_config, _ := Get("cloud-sql-postgres-admin")
+	cloudsqlmysql_admin_config, _ := Get("cloud-sql-mysql-admin")
+	cloudsqlmssql_admin_config, _ := Get("cloud-sql-mssql-admin")
 	cloudsqlmysql_observability_config, _ := Get("cloud-sql-mysql-observability")
 	cloudsqlmysql_config, _ := Get("cloud-sql-mysql")
 	cloudsqlmssql_observability_config, _ := Get("cloud-sql-mssql-observability")
@@ -131,6 +137,12 @@ func TestGetPrebuiltTool(t *testing.T) {
 	if len(cloudsqlpg_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch cloud sql pg prebuilt tools yaml")
 	}
+	if len(cloudsqlpg_admin_config) <= 0 {
+		t.Fatalf("unexpected error: could not fetch cloud sql pg admin prebuilt tools yaml")
+	}
+	if len(cloudsqlmysql_admin_config) <= 0 {
+		t.Fatalf("unexpected error: could not fetch cloud sql mysql admin prebuilt tools yaml")
+	}
 	if len(cloudsqlmysql_observability_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch cloud sql mysql observability prebuilt tools yaml")
 	}
@@ -140,6 +152,9 @@ func TestGetPrebuiltTool(t *testing.T) {
 	if len(cloudsqlmssql_observability_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch cloud sql mssql observability prebuilt tools yaml")
 	}
+	if len(cloudsqlmssql_admin_config) <= 0 {
+		t.Fatalf("unexpected error: could not fetch cloud sql mssql admin prebuilt tools yaml")
+	}
 	if len(cloudsqlmssql_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch cloud sql mssql prebuilt tools yaml")
 	}

internal/prebuiltconfigs/tools/cloud-sql-mssql-admin.yaml

@@ -0,0 +1,50 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sources:
+  cloud-sql-admin-source:
+    kind: cloud-sql-admin
+
+tools:
+  create_instance:
+    kind: cloud-sql-mssql-create-instance
+    source: cloud-sql-admin-source
+  get_instance:
+    kind: cloud-sql-get-instance
+    source: cloud-sql-admin-source
+  list_instances:
+    kind: cloud-sql-list-instances
+    source: cloud-sql-admin-source
+  create_database:
+    kind: cloud-sql-create-database
+    source: cloud-sql-admin-source
+  list_databases:
+    kind: cloud-sql-list-databases
+    source: cloud-sql-admin-source
+  create_user:
+    kind: cloud-sql-create-users
+    source: cloud-sql-admin-source
+  wait_for_operation:
+    kind: cloud-sql-wait-for-operation
+    source: cloud-sql-admin-source
+
+toolsets:
+  cloud_sql_mssql_admin_tools:
+    - create_instance
+    - get_instance
+    - list_instances
+    - create_database
+    - list_databases
+    - create_user
+    - wait_for_operation

internal/prebuiltconfigs/tools/cloud-sql-mysql-admin.yaml

@@ -0,0 +1,50 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sources:
+  cloud-sql-admin-source:
+    kind: cloud-sql-admin
+
+tools:
+  create_instance:
+    kind: cloud-sql-mysql-create-instance
+    source: cloud-sql-admin-source
+  get_instance:
+    kind: cloud-sql-get-instance
+    source: cloud-sql-admin-source
+  list_instances:
+    kind: cloud-sql-list-instances
+    source: cloud-sql-admin-source
+  create_database:
+    kind: cloud-sql-create-database
+    source: cloud-sql-admin-source
+  list_databases:
+    kind: cloud-sql-list-databases
+    source: cloud-sql-admin-source
+  create_user:
+    kind: cloud-sql-create-users
+    source: cloud-sql-admin-source
+  wait_for_operation:
+    kind: cloud-sql-wait-for-operation
+    source: cloud-sql-admin-source
+
+toolsets:
+  cloud_sql_mysql_admin_tools:
+    - create_instance
+    - get_instance
+    - list_instances
+    - create_database
+    - list_databases
+    - create_user
+    - wait_for_operation

internal/prebuiltconfigs/tools/cloud-sql-postgres-admin.yaml

@@ -0,0 +1,50 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sources:
+  cloud-sql-admin-source:
+    kind: cloud-sql-admin
+
+tools:
+  create_instance:
+    kind: cloud-sql-postgres-create-instance
+    source: cloud-sql-admin-source
+  get_instance:
+    kind: cloud-sql-get-instance
+    source: cloud-sql-admin-source
+  list_instances:
+    kind: cloud-sql-list-instances
+    source: cloud-sql-admin-source
+  create_database:
+    kind: cloud-sql-create-database
+    source: cloud-sql-admin-source
+  list_databases:
+    kind: cloud-sql-list-databases
+    source: cloud-sql-admin-source
+  create_user:
+    kind: cloud-sql-create-users
+    source: cloud-sql-admin-source
+  wait_for_operation:
+    kind: cloud-sql-wait-for-operation
+    source: cloud-sql-admin-source
+
+toolsets:
+  cloud_sql_postgres_admin_tools:
+    - create_instance
+    - get_instance
+    - list_instances
+    - create_database
+    - list_databases
+    - create_user
+    - wait_for_operation