if included, ok := tmp["included"]; ok && included == nil {
tmp["included"] = make([]interface{}, 0)
}
-
defaultItemKind := ""
if strings.HasSuffix(respKind, "List") {
defaultItemKind = strings.TrimSuffix(respKind, "List")
}
- if items, ok := tmp["items"].([]interface{}); ok {
+ var items, included []interface{}
+ var itemsOK, includedOK bool
+ items, itemsOK = tmp["items"].([]interface{})
+ included, includedOK = tmp["included"].([]interface{})
+ if includedOK && len(included) > 0 {
+ items = append(items, included...)
+ }
+
+ if itemsOK {
for i, item := range items {
// Fill in "kind" by inspecting UUID/PDH if
// possible; fall back on assuming each
ModifiedByUserUUID string `json:"modified_by_user_uuid"`
ModifiedAt time.Time `json:"modified_at"`
Href string `json:"href"`
- Kind string `json:"kind"`
Etag string `json:"etag"`
Name string `json:"name"`
Description string `json:"description"`
GroupClass string `json:"group_class"`
Etag string `json:"etag"`
Href string `json:"href"`
- Kind string `json:"kind"`
TrashAt *time.Time `json:"trash_at"`
CreatedAt time.Time `json:"created_at"`
ModifiedAt time.Time `json:"modified_at"`
Description string `json:"description"`
State string `json:"state"`
ArvadosSDKVersion string `json:"arvados_sdk_version"`
- Kind string `json:"kind"`
Components string `json:"components"`
ScriptParametersDigest string `json:"script_parameters_digest"`
WritableBy []string `json:"writable_by,omitempty"`
StartedAt time.Time `json:"started_at"`
FinishedAt time.Time `json:"finished_at"`
Description string `json:"description"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
Components string `json:"components"`
UpdatedAt time.Time `json:"updated_at"`
Description string `json:"description"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
Name string `json:"name"`
Properties string `json:"properties"`
UpdatedAt time.Time `json:"updated_at"`
- Kind string `json:"kind"`
WritableBy []string `json:"writable_by,omitempty"`
}
Email string `json:"email"`
FullName string `json:"full_name"`
FirstName string `json:"first_name"`
- Kind string `json:"kind"`
LastName string `json:"last_name"`
IdentityURL string `json:"identity_url"`
IsInvited bool `json:"is_invited"`