Skip to content

Support nested 'schema' field in artifact definition response #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisghill merged 2 commits into from
Apr 29, 2025
Merged

Support nested 'schema' field in artifact definition response #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad3eb0
Support nested 'schema' field in artifact definition response
chrisghill Apr 29, 2025
40e5c49
lint check
chrisghill Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/definition/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ func Get(c *restclient.MassdriverClient, definitionType string) (map[string]inte
}
defer resp.Body.Close()

if resp.StatusCode != http.StatusOK {
return definition, errors.New("received non-200 response from Massdriver: " + resp.Status + " " + definitionType)
}

respBodyBytes, err := io.ReadAll(resp.Body)
if err != nil {
return definition, err
}

if resp.StatusCode != http.StatusOK {
return definition, errors.New("received non-200 response from Massdriver: " + resp.Status + " " + definitionType)
}

err = json.Unmarshal(respBodyBytes, &definition)
if err != nil {
return definition, err
Expand Down
8 changes: 8 additions & 0 deletions pkg/jsonschema/dereference.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ func dereferenceMassdriverRef(hydratedSchema map[string]interface{}, schema map[
return hydratedSchema, err
}

if nestedSchema, exists := referencedSchema["schema"]; exists {
var ok bool
referencedSchema, ok = nestedSchema.(map[string]interface{})
if !ok {
return hydratedSchema, fmt.Errorf("schema is not a map")
}
}

hydratedSchema, err = replaceRef(schema, referencedSchema, opts)
if err != nil {
return hydratedSchema, err
Expand Down
Loading