chore: fix for configuration file changes

internal/sources/spanneradmin/spanneradmin.go

@@ -27,14 +27,14 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceKind string = "spanner-admin"
+const SourceType string = "spanner-admin"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -48,13 +48,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name           string `yaml:"name" validate:"required"`
-	Kind           string `yaml:"kind" validate:"required"`
+	Type           string `yaml:"type" validate:"required"`
 	DefaultProject string `yaml:"defaultProject"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // Initialize initializes a Spanner Admin Source instance.
@@ -87,8 +87,8 @@ type Source struct {
 	Client *instance.InstanceAdminClient
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/spanneradmin/spanneradmin_test.go

@@ -15,9 +15,9 @@
 package spanneradmin_test
 
 import (
+	"context"
 	"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/sources"
@@ -26,7 +26,6 @@ import (
 )
 
 func TestParseFromYamlSpannerAdmin(t *testing.T) {
-	t.Parallel()
 	tcs := []struct {
 		desc string
 		in   string
@@ -35,14 +34,14 @@ func TestParseFromYamlSpannerAdmin(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-spanner-admin-instance:
-					kind: spanner-admin
+			kind: sources
+			name: my-spanner-admin-instance
+			type: spanner-admin
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-spanner-admin-instance": spanneradmin.Config{
 					Name:           "my-spanner-admin-instance",
-					Kind:           spanneradmin.SourceKind,
+					Type:           spanneradmin.SourceType,
 					UseClientOAuth: false,
 				},
 			},
@@ -50,34 +49,28 @@ func TestParseFromYamlSpannerAdmin(t *testing.T) {
 		{
 			desc: "use client auth example",
 			in: `
-			sources:
-				my-spanner-admin-instance:
-					kind: spanner-admin
-					useClientOAuth: true
+			kind: sources
+			name: my-spanner-admin-instance
+			type: spanner-admin
+			useClientOAuth: true
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-spanner-admin-instance": spanneradmin.Config{
 					Name:           "my-spanner-admin-instance",
-					Kind:           spanneradmin.SourceKind,
+					Type:           spanneradmin.SourceType,
 					UseClientOAuth: true,
 				},
 			},
 		},
 	}
 	for _, tc := range tcs {
-		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
-			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -93,36 +86,30 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-spanner-admin-instance:
-					kind: spanner-admin
-					project: test-project
+			kind: sources
+			name: my-spanner-admin-instance
+			type: spanner-admin
+			project: test-project
 			`,
-			err: `unable to parse source "my-spanner-admin-instance" as "spanner-admin": [2:1] unknown field "project"
-   1 | kind: spanner-admin
+			err: `error unmarshaling sources: unable to parse source "my-spanner-admin-instance" as "spanner-admin": [2:1] unknown field "project"
+   1 | name: my-spanner-admin-instance
 >  2 | project: test-project
        ^
-`,
+   3 | type: spanner-admin`,
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-spanner-admin-instance:
-					useClientOAuth: true
+			kind: sources
+			name: my-spanner-admin-instance
+			useClientOAuth: true
 			`,
-			err: "missing 'kind' field for source \"my-spanner-admin-instance\"",
+			err: "error unmarshaling sources: missing 'type' field or it is not a string",
 		},
 	}
 	for _, tc := range tcs {
-		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
-			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}