chore: update yaml tag for tools (#2356)

Update yaml tag in tools from `kind` to `type`.

Upcoming PRs: 
* Update config in `/tests` and `/docs`

Will resolve other unit tests failure in the final PR to keep things
simpler.

internal/tools/sqlite/sqlitesql/sqlitesql.go

@@ -26,11 +26,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "sqlite-sql"
+const resourceType string = "sqlite-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool type %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +49,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Type               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -62,7 +62,7 @@ type Config struct {
 var _ tools.ToolConfig = Config{}
 
 func (cfg Config) ToolConfigType() string {
-	return kind
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {

internal/tools/sqlite/sqlitesql/sqlitesql_test.go

@@ -17,7 +17,6 @@ package sqlitesql_test
 import (
 	"testing"
 
-	yaml "github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"
 	"github.com/googleapis/genai-toolbox/internal/server"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
@@ -39,25 +38,25 @@ func TestParseFromYamlSQLite(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: sqlite-sql
-					source: my-sqlite-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: sqlite-sql
+            source: my-sqlite-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": sqlitesql.Config{
@@ -78,15 +77,12 @@ func TestParseFromYamlSQLite(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
 			// Parse contents
-			err := yaml.UnmarshalContext(ctx, testutils.FormatYaml(tc.in), &got)
+			_, _, _, 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.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -107,36 +103,36 @@ func TestParseFromYamlWithTemplateSqlite(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: sqlite-sql
-					source: my-sqlite-db
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: sqlite-sql
+            source: my-sqlite-db
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": sqlitesql.Config{
@@ -161,15 +157,12 @@ func TestParseFromYamlWithTemplateSqlite(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
 			// Parse contents
-			err := yaml.UnmarshalContext(ctx, testutils.FormatYaml(tc.in), &got)
+			_, _, _, 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.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})