Skip to content

fix(FindAllResources): handle single-object responses without panic #106

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

Open
writesz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(FindAllResources): handle single-object responses without panic #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions service/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,14 +737,22 @@ func (c *NitroClient) FindAllResources(resourceType string) ([]map[string]interf
c.logger.Trace(" FindAllResources: resource not found", "resourceType", resourceType)
return make([]map[string]interface{}, 0, 0), nil
}
resources := data[resourceType].([]interface{})

ret := make([]map[string]interface{}, len(resources), len(resources))
for i, v := range resources {
ret[i] = v.(map[string]interface{})
// The NITRO API returns a JSON array for most resource types, but a few
// (e.g. nsversion) return a single JSON object. Guard against the panic
// that occurs when the type assertion to []interface{} fails.
switch v := rsrcs.(type) {
case []interface{}:
ret := make([]map[string]interface{}, len(v))
for i, item := range v {
ret[i] = item.(map[string]interface{})
}
return ret, nil
case map[string]interface{}:
return []map[string]interface{}{v}, nil
default:
c.logger.Warn("FindAllResources: unexpected response shape", "resourceType", resourceType)
return make([]map[string]interface{}, 0, 0), nil
}

return ret, nil
}

// ResourceBindingExists returns true if the supplied binding exists
Expand Down