fix: resource env config incorrectly unmarshaled (#830)

Author: ryan-timothy-albert

.changeset/real-coins-glow.md

@@ -0,0 +1,5 @@
+---
+"server": patch
+---
+
+fix resource env config incorrectly unmarshaled

server/internal/gateway/models.go

@@ -127,12 +127,12 @@ type PromptToolCallPlan struct {
 }
 
 type ResourceFunctionCallPlan struct {
-	FunctionID        string            `json:"function_id" yaml:"function_id"`
-	FunctionsAccessID string            `json:"functions_access_id" yaml:"functions_access_id"`
-	Runtime           string            `json:"runtime" yaml:"runtime"`
-	URI               string            `json:"uri" yaml:"uri"`
-	MimeType          string            `json:"mime_type" yaml:"mime_type"`
-	Variables         map[string]string `json:"variables" yaml:"variables"`
+	FunctionID        string   `json:"function_id" yaml:"function_id"`
+	FunctionsAccessID string   `json:"functions_access_id" yaml:"functions_access_id"`
+	Runtime           string   `json:"runtime" yaml:"runtime"`
+	URI               string   `json:"uri" yaml:"uri"`
+	MimeType          string   `json:"mime_type" yaml:"mime_type"`
+	Variables         []string `json:"variables" yaml:"variables"`
 }
 
 type ToolKind string

server/internal/gateway/proxy_test.go

@@ -1371,7 +1371,7 @@ func TestResourceProxy_ReadResource(t *testing.T) {
 		Runtime:           "nodejs",
 		URI:               "resource://test",
 		MimeType:          "text/plain",
-		Variables:         map[string]string{},
+		Variables:         []string{},
 	}
 
 	resourcePlan := NewResourceFunctionCallPlan(descriptor, plan)

server/internal/toolsets/shared.go

@@ -297,13 +297,15 @@ func (t *Toolsets) extractFunctionResourceCallPlan(ctx context.Context, resource
 		return nil, fmt.Errorf("get project with organization metadata: %w", err)
 	}
 
-	var envconfig map[string]string
+	var envconfig map[string]any
 	if len(resource.Variables) > 0 {
 		if err := json.Unmarshal(resource.Variables, &envconfig); err != nil {
 			return nil, fmt.Errorf("unmarshal function resource env vars: %w", err)
 		}
 	}
 
+	envvars := slices.Collect(maps.Keys(envconfig))
+
 	mimeType := ""
 	if resource.MimeType.Valid {
 		mimeType = resource.MimeType.String
@@ -331,7 +333,7 @@ func (t *Toolsets) extractFunctionResourceCallPlan(ctx context.Context, resource
 		Runtime:           resource.Runtime,
 		URI:               resource.Uri,
 		MimeType:          mimeType,
-		Variables:         envconfig,
+		Variables:         envvars,
 	}
 
 	return gateway.NewResourceFunctionCallPlan(descriptor, plan), nil