Make Repository field properly optional in server.json (#717)
<!-- Provide a brief summary of your changes -->
## Motivation and Context
<!-- Why is this change needed? What problem does it solve? -->
The Repository field in ServerJSON was not properly omitting empty
values
when marshaling to JSON. Even when a server had no repository
configured,
the JSON would include `"repository": {"url": "", "source": ""}` due to:
1. Repository struct fields (URL, Source) lacking omitempty tags
2. Repository being a value type instead of pointer in ServerJSON
This caused validation warnings for servers without repository URLs.
Changes:
- Add omitempty tags to Repository.URL and Repository.Source fields
- Change ServerJSON.Repository from model.Repository to
*model.Repository
- Update validateRepository to handle nil pointers
- Update all code creating Repository instances to use pointers
Now, servers without repository information correctly omit the field
entirely from JSON output, eliminating spurious validation warnings.
## How Has This Been Tested?
<!-- Have you tested this in a real application? Which scenarios were
tested? -->
## Breaking Changes
<!-- Will users need to update their code or configurations? -->
## Types of changes
<!-- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
## Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply. -->
- [ ] I have read the [MCP
Documentation](https://modelcontextprotocol.io)
- [ ] My code follows the repository's style guidelines
- [ ] New and existing tests pass locally
- [ ] I have added appropriate error handling
- [ ] I have added or updated documentation as needed
## Additional context
<!-- Add any other context, implementation notes, or design decisions
-->
Signed-off-by: Radoslav Dimitrov <radoslav@stacklok.com>
This commit is contained in:
parent
88c2e1be16
commit
ef4a60505e
2 changed files with 95 additions and 92 deletions
|
|
@ -387,14 +387,17 @@ func createServerJSON(
|
|||
}
|
||||
|
||||
// Create repository with optional subfolder
|
||||
repo := model.Repository{
|
||||
URL: repoURL,
|
||||
Source: repoSource,
|
||||
}
|
||||
var repo *model.Repository
|
||||
if repoURL != "" && repoSource != "" {
|
||||
repo = &model.Repository{
|
||||
URL: repoURL,
|
||||
Source: repoSource,
|
||||
}
|
||||
|
||||
// Only set subfolder if we're actually in a subdirectory
|
||||
if subfolder != "" {
|
||||
repo.Subfolder = subfolder
|
||||
// Only set subfolder if we're actually in a subdirectory
|
||||
if subfolder != "" {
|
||||
repo.Subfolder = subfolder
|
||||
}
|
||||
}
|
||||
|
||||
// Create server structure
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ func TestPublishCommand_DeprecatedSchema(t *testing.T) {
|
|||
Name: "com.example/test-server",
|
||||
Description: "A test server",
|
||||
Version: "1.0.0",
|
||||
Repository: model.Repository{
|
||||
Repository: &model.Repository{
|
||||
URL: "https://github.com/example/test",
|
||||
Source: "github",
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue