This PR simplifies the seed data import configuration based on maintainer feedback by removing command line flags and using a clearer environment variable name. ## Key Changes ### Configuration Simplification - **Renamed**: `MCP_REGISTRY_SEED_FILE_PATH` → `MCP_REGISTRY_SEED_FROM` - **Removed**: `--seed-file-path` command line flag to eliminate configuration complexity ### Improved User Experience Users now configure seed data import using a single, clear environment variable: ```bash # Before (multiple ways to configure) MCP_REGISTRY_SEED_FILE_PATH=data/seed.json ./registry ./registry --seed-file-path=data/seed.json # After (simplified single method) MCP_REGISTRY_SEED_FROM=data/seed.json ./registry ``` ### Registry Composability The composability workflow is now simplified while maintaining all functionality: ```bash # Start first registry with seed data MCP_REGISTRY_SEED_FROM=data/seed.json ./registry # Start second registry importing from first via pagination MCP_REGISTRY_SEED_FROM=http://localhost:8080 ./registry ``` ## Technical Implementation - Maintains full backward compatibility for import functionality - All existing seed data sources continue to work (local files, HTTP URLs, registry URLs) - Automatic pagination through `/v0/servers` endpoint remains unchanged - Configurable delays between requests preserved ## Benefits - **Reduced complexity**: Single configuration method instead of multiple - **Clearer naming**: `SEED_FROM` better describes the source of seed data - **Easier maintenance**: Fewer configuration paths to test and document - **Consistent patterns**: Aligns with other environment-variable-only configuration All existing functionality is preserved while providing a cleaner, more maintainable configuration interface. <!-- START COPILOT CODING AGENT TIPS --> --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey.alchemer.com/s3/8343779/Copilot-Coding-agent) to start the survey. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Avinash Sridhar <sridharavinash@users.noreply.github.com> Co-authored-by: Toby Padilla <toby@toby.sh> Co-authored-by: toby <83556+toby@users.noreply.github.com>
168 lines
4.6 KiB
Go
168 lines
4.6 KiB
Go
// validate-examples validates JSON examples in docs/server-json/examples.md
|
|
// against both schema.json and registry-schema.json.
|
|
//
|
|
// For more information, see docs/server-json/README.md
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
|
|
jsonschema "github.com/santhosh-tekuri/jsonschema/v5"
|
|
)
|
|
|
|
const (
|
|
// expectedExampleCount is the number of JSON examples we expect to find in examples.md
|
|
// IMPORTANT: Only change this count if you have intentionally added or removed examples
|
|
// from the examples.md file. This check prevents accidental formatting changes from
|
|
// causing examples to be skipped during validation.
|
|
expectedExampleCount = 9
|
|
)
|
|
|
|
func main() {
|
|
log.SetFlags(0) // Remove timestamp from logs
|
|
|
|
if err := runValidation(); err != nil {
|
|
log.Fatalf("Error: %v", err)
|
|
}
|
|
}
|
|
|
|
func runValidation() error {
|
|
basePath := filepath.Join("docs", "server-json")
|
|
|
|
examplesPath := filepath.Join(basePath, "examples.md")
|
|
schemaPath := filepath.Join(basePath, "schema.json")
|
|
registrySchemaPath := filepath.Join(basePath, "registry-schema.json")
|
|
|
|
examples, err := extractExamples(examplesPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to extract examples: %w", err)
|
|
}
|
|
|
|
log.Printf("Found %d examples in examples.md\n", len(examples))
|
|
|
|
if len(examples) != expectedExampleCount {
|
|
return fmt.Errorf("expected %d examples but found %d - if this is intentional, update expectedExampleCount in %s",
|
|
expectedExampleCount, len(examples), "tools/validate-examples/main.go")
|
|
}
|
|
|
|
log.Println()
|
|
|
|
baseSchema, err := compileSchema(schemaPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to compile schema.json: %w", err)
|
|
}
|
|
|
|
registrySchema, err := compileSchema(registrySchemaPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to compile registry-schema.json: %w", err)
|
|
}
|
|
|
|
validatedCount := 0
|
|
for i, example := range examples {
|
|
log.Printf("Example %d:", i+1)
|
|
|
|
var data any
|
|
if err := json.Unmarshal([]byte(example.content), &data); err != nil {
|
|
log.Printf(" ❌ Invalid JSON: %v", err)
|
|
continue
|
|
}
|
|
|
|
baseValid := false
|
|
registryValid := false
|
|
|
|
if err := baseSchema.Validate(data); err != nil {
|
|
log.Printf(" Validating against schema.json: ❌")
|
|
log.Printf(" Error: %v", err)
|
|
} else {
|
|
log.Printf(" Validating against schema.json: ✅")
|
|
baseValid = true
|
|
}
|
|
|
|
if err := registrySchema.Validate(data); err != nil {
|
|
log.Printf(" Validating against registry-schema.json: ❌")
|
|
log.Printf(" Error: %v", err)
|
|
} else {
|
|
log.Printf(" Validating against registry-schema.json: ✅")
|
|
registryValid = true
|
|
}
|
|
|
|
// Only count as validated if both schemas passed
|
|
if baseValid && registryValid {
|
|
validatedCount++
|
|
}
|
|
|
|
log.Println()
|
|
}
|
|
|
|
if validatedCount != expectedExampleCount {
|
|
return fmt.Errorf("validation failed: expected %d examples to pass both validations but only %d did",
|
|
expectedExampleCount, validatedCount)
|
|
}
|
|
|
|
log.Printf("Successfully validated all %d examples!", validatedCount)
|
|
return nil
|
|
}
|
|
|
|
type example struct {
|
|
content string
|
|
line int
|
|
}
|
|
|
|
func extractExamples(path string) ([]example, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
content := string(data)
|
|
|
|
// Regex to match JSON code blocks in markdown
|
|
// Captures everything between ```json and ```
|
|
re := regexp.MustCompile("(?s)```json\n(.*?)\n```")
|
|
matches := re.FindAllStringSubmatchIndex(content, -1)
|
|
|
|
var examples []example
|
|
for _, match := range matches {
|
|
if len(match) < 4 {
|
|
// should never happen
|
|
return nil, fmt.Errorf("invalid match - expected at least 4 indices but got %d", len(match))
|
|
}
|
|
start, end := match[2], match[3]
|
|
// line numbers start at 1
|
|
line := 1 + strings.Count(content[:start], "\n")
|
|
examples = append(examples, example{
|
|
content: content[start:end],
|
|
line: line,
|
|
})
|
|
}
|
|
|
|
return examples, nil
|
|
}
|
|
|
|
func compileSchema(path string) (*jsonschema.Schema, error) {
|
|
compiler := jsonschema.NewCompiler()
|
|
compiler.Draft = jsonschema.Draft7
|
|
|
|
// For registry-schema.json, we need to register the base schema it references
|
|
if strings.Contains(path, "registry-schema.json") {
|
|
basePath := filepath.Join(filepath.Dir(path), "schema.json")
|
|
baseData, err := os.ReadFile(basePath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to read base schema: %w", err)
|
|
}
|
|
|
|
// Add the base schema to the compiler with the expected URL
|
|
if err := compiler.AddResource("https://modelcontextprotocol.io/schemas/draft/2025-07-09/server.json", bytes.NewReader(baseData)); err != nil {
|
|
return nil, fmt.Errorf("failed to add base schema resource: %w", err)
|
|
}
|
|
}
|
|
|
|
return compiler.Compile(path)
|
|
}
|