From 3db06e9ec6746e4555b137adb8f482cc9357ed1b Mon Sep 17 00:00:00 2001 From: Yuan Teoh Date: Wed, 29 Jan 2025 13:46:43 -0800 Subject: [PATCH] fix(mysql): fix mysql tool kind to mysql-sql --- internal/server/config.go | 6 +++--- .../tools/{mysql/mysql.go => mysqlsql/mysqlsql.go} | 4 ++-- .../{mysql/mysql_test.go => mysqlsql/mysqlsql_test.go} | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) rename internal/tools/{mysql/mysql.go => mysqlsql/mysqlsql.go} (98%) rename internal/tools/{mysql/mysql_test.go => mysqlsql/mysqlsql_test.go} (93%) diff --git a/internal/server/config.go b/internal/server/config.go index 16caa940b..872d95993 100644 --- a/internal/server/config.go +++ b/internal/server/config.go @@ -30,7 +30,7 @@ import ( spannersrc "github.com/googleapis/genai-toolbox/internal/sources/spanner" "github.com/googleapis/genai-toolbox/internal/tools" "github.com/googleapis/genai-toolbox/internal/tools/mssql" - "github.com/googleapis/genai-toolbox/internal/tools/mysql" + "github.com/googleapis/genai-toolbox/internal/tools/mysqlsql" neo4jtool "github.com/googleapis/genai-toolbox/internal/tools/neo4j" "github.com/googleapis/genai-toolbox/internal/tools/postgressql" "github.com/googleapis/genai-toolbox/internal/tools/spanner" @@ -254,8 +254,8 @@ func (c *ToolConfigs) UnmarshalYAML(unmarshal func(interface{}) error) error { return fmt.Errorf("unable to parse as %q: %w", k.Kind, err) } (*c)[name] = actual - case mysql.ToolKind: - actual := mysql.Config{Name: name} + case mysqlsql.ToolKind: + actual := mysqlsql.Config{Name: name} if err := u.Unmarshal(&actual); err != nil { return fmt.Errorf("unable to parse as %q: %w", k.Kind, err) } diff --git a/internal/tools/mysql/mysql.go b/internal/tools/mysqlsql/mysqlsql.go similarity index 98% rename from internal/tools/mysql/mysql.go rename to internal/tools/mysqlsql/mysqlsql.go index f8cb1e3fe..968f4abdf 100644 --- a/internal/tools/mysql/mysql.go +++ b/internal/tools/mysqlsql/mysqlsql.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package mysql +package mysqlsql import ( "context" @@ -25,7 +25,7 @@ import ( "github.com/googleapis/genai-toolbox/internal/tools" ) -const ToolKind string = "mysql" +const ToolKind string = "mysql-sql" type compatibleSource interface { MySQLPool() *sql.DB diff --git a/internal/tools/mysql/mysql_test.go b/internal/tools/mysqlsql/mysqlsql_test.go similarity index 93% rename from internal/tools/mysql/mysql_test.go rename to internal/tools/mysqlsql/mysqlsql_test.go index f40ee87f1..d9699507b 100644 --- a/internal/tools/mysql/mysql_test.go +++ b/internal/tools/mysqlsql/mysqlsql_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package mysql_test +package mysqlsql_test import ( "testing" @@ -21,7 +21,7 @@ import ( "github.com/googleapis/genai-toolbox/internal/server" "github.com/googleapis/genai-toolbox/internal/testutils" "github.com/googleapis/genai-toolbox/internal/tools" - "github.com/googleapis/genai-toolbox/internal/tools/mysql" + "github.com/googleapis/genai-toolbox/internal/tools/mysqlsql" "gopkg.in/yaml.v3" ) @@ -36,7 +36,7 @@ func TestParseFromYamlMySQL(t *testing.T) { in: ` tools: example_tool: - kind: mysql + kind: mysql-sql source: my-mysql-instance description: some description statement: | @@ -55,9 +55,9 @@ func TestParseFromYamlMySQL(t *testing.T) { field: user_id `, want: server.ToolConfigs{ - "example_tool": mysql.Config{ + "example_tool": mysqlsql.Config{ Name: "example_tool", - Kind: mysql.ToolKind, + Kind: mysqlsql.ToolKind, Source: "my-mysql-instance", Description: "some description", Statement: "SELECT * FROM SQL_STATEMENT;\n",