Support file:// schema when adding servers (#326)

* Support file:// schema for adding servers.

* chore: recognize .yml extension on file import/export.

* Lint fixes.

Author: cmrigney

pkg/catalog/types.go

@@ -15,8 +15,8 @@ type topLevel struct {
 // MCP Servers
 
 type Server struct {
-	Name           string    `yaml:"name,omitempty" json:"name,omitempty"`
-	Type           string    `yaml:"type" json:"type"`
+	Name           string    `yaml:"name,omitempty" json:"name,omitempty" validate:"required,min=1"`
+	Type           string    `yaml:"type" json:"type" validate:"required,oneof=server remote poci"`
 	Image          string    `yaml:"image" json:"image"`
 	Description    string    `yaml:"description,omitempty" json:"description,omitempty"`
 	Title          string    `yaml:"title,omitempty" json:"title,omitempty"`
@@ -33,7 +33,7 @@ type Server struct {
 	DisableNetwork bool      `yaml:"disableNetwork,omitempty" json:"disableNetwork,omitempty"`
 	AllowHosts     []string  `yaml:"allowHosts,omitempty" json:"allowHosts,omitempty"`
 	ExtraHosts     []string  `yaml:"extraHosts,omitempty" json:"extraHosts,omitempty"`
-	Tools          []Tool    `yaml:"tools,omitempty" json:"tools,omitempty"`
+	Tools          []Tool    `yaml:"tools,omitempty" json:"tools,omitempty" validate:"dive"`
 	Config         []any     `yaml:"config,omitempty" json:"config,omitempty"`
 	Prefix         string    `yaml:"prefix,omitempty" json:"prefix,omitempty"`
 	Metadata       *Metadata `yaml:"metadata,omitempty" json:"metadata,omitempty"`
@@ -107,7 +107,7 @@ type ToolGroup struct {
 }
 
 type Tool struct {
-	Name        string     `yaml:"name" json:"name"`
+	Name        string     `yaml:"name" json:"name" validate:"required,min=1"`
 	Description string     `yaml:"description" json:"description"`
 	Container   Container  `yaml:"container" json:"container"`
 	Parameters  Parameters `yaml:"parameters" json:"parameters"`

pkg/catalog_next/catalog.go

@@ -138,7 +138,19 @@ func (catalog *Catalog) Validate() error {
 	if err := validate.Get().Struct(catalog); err != nil {
 		return err
 	}
-	return catalog.validateUniqueServerNames()
+	if err := catalog.validateUniqueServerNames(); err != nil {
+		return err
+	}
+	return catalog.validateServerSnapshots()
+}
+
+func (catalog *Catalog) validateServerSnapshots() error {
+	for _, server := range catalog.Servers {
+		if err := server.Snapshot.ValidateInnerConfig(); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 func (catalog *Catalog) validateUniqueServerNames() error {

pkg/catalog_next/create_test.go

@@ -211,6 +211,8 @@ func TestCreateFromWorkingSetWithSnapshot(t *testing.T) {
 		Server: catalog.Server{
 			Name:        "test-server",
 			Description: "Test server",
+			Type:        "server",
+			Image:       "docker/test:latest",
 		},
 	}
 

pkg/workingset/create_test.go

@@ -18,14 +18,14 @@ func getMockOciService() oci.Service {
 		{
 			Ref: "myimage:latest",
 			Labels: map[string]string{
-				"io.docker.server.metadata": "name: My Image",
+				"io.docker.server.metadata": "name: My Image\ntype: server\nimage: myimage:latest",
 			},
 			DigestString: "sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
 		},
 		{
 			Ref: "anotherimage:v1.0",
 			Labels: map[string]string{
-				"io.docker.server.metadata": "name: Another Image",
+				"io.docker.server.metadata": "name: Another Image\ntype: server\nimage: anotherimage:v1.0",
 			},
 			DigestString: "sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
 		},

pkg/workingset/export.go

@@ -26,7 +26,7 @@ func Export(ctx context.Context, dao db.DAO, id string, filename string) error {
 	workingSet := NewFromDb(dbSet)
 
 	var data []byte
-	if strings.HasSuffix(strings.ToLower(filename), ".yaml") {
+	if strings.HasSuffix(strings.ToLower(filename), ".yaml") || strings.HasSuffix(strings.ToLower(filename), ".yml") {
 		data, err = yaml.Marshal(workingSet)
 	} else if strings.HasSuffix(strings.ToLower(filename), ".json") {
 		data, err = json.MarshalIndent(workingSet, "", "  ")

pkg/workingset/import.go

@@ -22,7 +22,7 @@ func Import(ctx context.Context, dao db.DAO, ociService oci.Service, filename st
 	}
 
 	var workingSet WorkingSet
-	if strings.HasSuffix(strings.ToLower(filename), ".yaml") {
+	if strings.HasSuffix(strings.ToLower(filename), ".yaml") || strings.HasSuffix(strings.ToLower(filename), ".yml") {
 		if err := yaml.Unmarshal(workingSetBuf, &workingSet); err != nil {
 			return fmt.Errorf("failed to unmarshal profile: %w", err)
 		}

pkg/workingset/testdata/invalid-type.yaml

@@ -0,0 +1,20 @@
+name: my-mcp
+title: My MCP
+type: invalid
+image: myimage:latest
+description: Server that runs my MCP code
+env:
+  - name: MODE
+    value: "{{my-mcp.mode}}"
+secrets:
+  - name: my-mcp.SECRET_KEY
+    env: SECRET_KEY
+config:
+  - name: my-mcp
+    description: The configuration for the mcp server
+    type: object
+    properties:
+      mode:
+        type: string
+    required:
+      - mode

pkg/workingset/testdata/invalid-yaml.yaml

@@ -0,0 +1 @@
+invalid: yaml: [syntax

pkg/workingset/testdata/legacy-catalog.yaml

@@ -0,0 +1,24 @@
+version: 2
+name: my-mcp-catalog
+displayName: My MCP Catalog
+registry:
+  my-mcp:
+    title: My MCP
+    type: server
+    image: myimage:latest
+    description: Server that runs my MCP code
+    env:
+      - name: MODE
+        value: "{{my-mcp.mode}}"
+    secrets:
+      - name: my-mcp.SECRET_KEY
+        env: SECRET_KEY
+    config:
+      - name: my-mcp
+        description: The configuration for the mcp server
+        type: object
+        properties:
+          mode:
+            type: string
+        required:
+          - mode

pkg/workingset/testdata/server.json

@@ -0,0 +1,28 @@
+{
+	"name": "my-mcp",
+	"title": "My MCP",
+	"type": "server",
+	"image": "myimage:latest",
+	"description": "Server that runs my MCP code",
+	"env": [{
+		"name": "MODE",
+		"value": "{{my-mcp.mode}}"
+	}],
+	"secrets": [{
+		"name": "my-mcp.SECRET_KEY",
+		"env": "SECRET_KEY"
+	}],
+	"config": [
+		{
+			"name": "my-mcp",
+			"description": "The configuration for the mcp server",
+			"type": "object",
+			"properties": {
+				"mode": {
+					"type": "string"
+				}
+			},
+			"required": ["mode"]
+		}
+	]
+}