mirror of
https://github.com/googleapis/genai-toolbox.git
synced 2026-05-02 03:00:36 -04:00
293c1d6889
This PR introduces a significant update to the Toolbox configuration file format, which is one of the primary **breaking changes** required for the implementation of the Advanced Control Plane. # Summary of Changes The configuration schema has been updated to enforce resource isolation and facilitate atomic, incremental updates. * Resource Isolation: Resource definitions are now separated into individual blocks, using a distinct structure for each resource type (Source, Tool, Toolset, etc.). This improves readability, management, and auditing of configuration files. * Field Name Modification: Internal field names have been modified to align with declarative methodologies. Specifically, the configuration now separates kind (general resource type, e.g., Source) from type (specific implementation, e.g., Postgres). # User Impact Existing tools.yaml configuration files are now in an outdated format. Users must eventually update their files to the new YAML format. # Mitigation & Compatibility Backward compatibility is maintained during this transition to ensure no immediate user action is required for existing files. * Immediate Backward Compatibility: The source code includes a pre-processing layer that automatically detects outdated configuration files (v1 format) and converts them to the new v2 format under the hood. * [COMING SOON] Migration Support: The new toolbox migrate subcommand will be introduced to allow users to automatically convert their old configuration files to the latest format. # Example Example for config file v2: ``` kind: sources name: my-pg-instance type: cloud-sql-postgres project: my-project region: my-region instance: my-instance database: my_db user: my_user password: my_pass --- kind: authServices name: my-google-auth type: google clientId: testing-id --- kind: tools name: example_tool type: postgres-sql source: my-pg-instance description: some description statement: SELECT * FROM SQL_STATEMENT; parameters: - name: country type: string description: some description --- kind: tools name: example_tool_2 type: postgres-sql source: my-pg-instance description: returning the number one statement: SELECT 1; --- kind: toolsets name: example_toolset tools: - example_tool ``` --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Averi Kitsch <akitsch@google.com>
82 lines
2.4 KiB
Go
82 lines
2.4 KiB
Go
// Copyright © 2025, Oracle and/or its affiliates.
|
|
package oraclesql_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/googleapis/genai-toolbox/internal/server"
|
|
"github.com/googleapis/genai-toolbox/internal/testutils"
|
|
"github.com/googleapis/genai-toolbox/internal/tools/oracle/oraclesql"
|
|
)
|
|
|
|
func TestParseFromYamlOracleSql(t *testing.T) {
|
|
ctx, err := testutils.ContextWithNewLogger()
|
|
if err != nil {
|
|
t.Fatalf("unexpected error: %s", err)
|
|
}
|
|
tcs := []struct {
|
|
desc string
|
|
in string
|
|
want server.ToolConfigs
|
|
}{
|
|
{
|
|
desc: "basic example with statement and auth",
|
|
in: `
|
|
kind: tools
|
|
name: get_user_by_id
|
|
type: oracle-sql
|
|
source: my-oracle-instance
|
|
description: Retrieves user details by ID.
|
|
statement: "SELECT id, name, email FROM users WHERE id = :1"
|
|
authRequired:
|
|
- my-google-auth-service
|
|
`,
|
|
want: server.ToolConfigs{
|
|
"get_user_by_id": oraclesql.Config{
|
|
Name: "get_user_by_id",
|
|
Type: "oracle-sql",
|
|
Source: "my-oracle-instance",
|
|
Description: "Retrieves user details by ID.",
|
|
Statement: "SELECT id, name, email FROM users WHERE id = :1",
|
|
AuthRequired: []string{"my-google-auth-service"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
desc: "example with parameters and template parameters",
|
|
in: `
|
|
kind: tools
|
|
name: get_orders
|
|
type: oracle-sql
|
|
source: db-prod
|
|
description: Gets orders for a customer with optional filtering.
|
|
statement: "SELECT * FROM ${SCHEMA}.ORDERS WHERE customer_id = :customer_id AND status = :status"
|
|
`,
|
|
want: server.ToolConfigs{
|
|
"get_orders": oraclesql.Config{
|
|
Name: "get_orders",
|
|
Type: "oracle-sql",
|
|
Source: "db-prod",
|
|
Description: "Gets orders for a customer with optional filtering.",
|
|
Statement: "SELECT * FROM ${SCHEMA}.ORDERS WHERE customer_id = :customer_id AND status = :status",
|
|
AuthRequired: []string{},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tc := range tcs {
|
|
t.Run(tc.desc, func(t *testing.T) {
|
|
// Parse contents
|
|
_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
|
|
if err != nil {
|
|
t.Fatalf("unable to unmarshal: %s", err)
|
|
}
|
|
if diff := cmp.Diff(tc.want, got); diff != "" {
|
|
t.Fatalf("incorrect parse: diff %v", diff)
|
|
}
|
|
})
|
|
}
|
|
|
|
}
|