mirror of
https://github.com/googleapis/genai-toolbox.git
synced 2026-01-14 01:48:29 -05:00
This PR fixes #1232 by allowing the `CLOUD_SQL_MYSQL_IP_TYPE` environment variable to control the connection type for the `cloud-sql-mysql` prebuilt tool, defaulting to "PUBLIC". **Changes:** * **`internal/prebuiltconfigs/tools/cloud-sql-mysql.yaml`:** Updated `ipType` to use `${CLOUD_SQL_MYSQL_IP_TYPE:PUBLIC}`. * **`internal/sources/cloudsqlmysql/cloud_sql_mysql.go`:** Removed `validate:"required"` from the `IPType` field in the `Config` struct to allow the default to be used when the env var is unset. * **Documentation:** Updated relevant documentation to reflect the new `CLOUD_SQL_MYSQL_IP_TYPE` environment variable usage. **Testing:** Built a local Docker image and tested on a GCE VM: * Setting `CLOUD_SQL_MYSQL_IP_TYPE="private"` connects via Private IP. * Setting `CLOUD_SQL_MYSQL_IP_TYPE="PUBLIC"` connects via Public IP. * Leaving `CLOUD_SQL_MYSQL_IP_TYPE` unset defaults to Public IP. All tests initialized the toolbox successfully. Fixes #1232 ## Description --- > Should include a concise description of the changes (bug or feature), it's > impact, along with a summary of the solution ## PR Checklist --- > Thank you for opening a Pull Request! Before submitting your PR, there are a > few things you can do to make sure it goes smoothly: - [x] Make sure you reviewed [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md) - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/genai-toolbox/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) - [ ] Make sure to add `!` if this involve a breaking change 🛠️ Fixes #1232 --------- Co-authored-by: Averi Kitsch <akitsch@google.com>
133 lines
3.7 KiB
Go
133 lines
3.7 KiB
Go
// 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.
|
|
|
|
package cloudsqlmysql
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"fmt"
|
|
"slices"
|
|
|
|
"cloud.google.com/go/cloudsqlconn/mysql/mysql"
|
|
"github.com/goccy/go-yaml"
|
|
"github.com/googleapis/genai-toolbox/internal/sources"
|
|
"github.com/googleapis/genai-toolbox/internal/util"
|
|
"go.opentelemetry.io/otel/trace"
|
|
)
|
|
|
|
const SourceKind string = "cloud-sql-mysql"
|
|
|
|
// validate interface
|
|
var _ sources.SourceConfig = Config{}
|
|
|
|
func init() {
|
|
if !sources.Register(SourceKind, newConfig) {
|
|
panic(fmt.Sprintf("source kind %q already registered", SourceKind))
|
|
}
|
|
}
|
|
|
|
func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources.SourceConfig, error) {
|
|
actual := Config{Name: name, IPType: "public"} // Default IPType
|
|
if err := decoder.DecodeContext(ctx, &actual); err != nil {
|
|
return nil, err
|
|
}
|
|
return actual, nil
|
|
}
|
|
|
|
type Config struct {
|
|
Name string `yaml:"name" validate:"required"`
|
|
Kind string `yaml:"kind" validate:"required"`
|
|
Project string `yaml:"project" validate:"required"`
|
|
Region string `yaml:"region" validate:"required"`
|
|
Instance string `yaml:"instance" validate:"required"`
|
|
IPType sources.IPType `yaml:"ipType"`
|
|
User string `yaml:"user" validate:"required"`
|
|
Password string `yaml:"password" validate:"required"`
|
|
Database string `yaml:"database" validate:"required"`
|
|
}
|
|
|
|
func (r Config) SourceConfigKind() string {
|
|
return SourceKind
|
|
}
|
|
|
|
func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
|
|
pool, err := initCloudSQLMySQLConnectionPool(ctx, tracer, r.Name, r.Project, r.Region, r.Instance, r.IPType.String(), r.User, r.Password, r.Database)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to create pool: %w", err)
|
|
}
|
|
|
|
err = pool.PingContext(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to connect successfully: %w", err)
|
|
}
|
|
|
|
s := &Source{
|
|
Name: r.Name,
|
|
Kind: SourceKind,
|
|
Pool: pool,
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
var _ sources.Source = &Source{}
|
|
|
|
type Source struct {
|
|
Name string `yaml:"name"`
|
|
Kind string `yaml:"kind"`
|
|
Pool *sql.DB
|
|
}
|
|
|
|
func (s *Source) SourceKind() string {
|
|
return SourceKind
|
|
}
|
|
|
|
func (s *Source) MySQLPool() *sql.DB {
|
|
return s.Pool
|
|
}
|
|
|
|
func initCloudSQLMySQLConnectionPool(ctx context.Context, tracer trace.Tracer, name, project, region, instance, ipType, user, pass, dbname string) (*sql.DB, error) {
|
|
//nolint:all // Reassigned ctx
|
|
ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
|
|
defer span.End()
|
|
|
|
// Create a new dialer with options
|
|
userAgent, err := util.UserAgentFromContext(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
opts, err := sources.GetCloudSQLOpts(ipType, userAgent, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if !slices.Contains(sql.Drivers(), "cloudsql-mysql") {
|
|
_, err = mysql.RegisterDriver("cloudsql-mysql", opts...)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to register driver: %w", err)
|
|
}
|
|
}
|
|
|
|
// Tell the driver to use the Cloud SQL Go Connector to create connections
|
|
dsn := fmt.Sprintf("%s:%s@cloudsql-mysql(%s:%s:%s)/%s", user, pass, project, region, instance, dbname)
|
|
db, err := sql.Open(
|
|
"cloudsql-mysql",
|
|
dsn,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return db, nil
|
|
}
|