X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/864c3b0afd16c77e046f0072d8517d34c5a44792..94081a34c4972cd65a20cbeb4d1837149f057378:/lib/controller/router/response.go diff --git a/lib/controller/router/response.go b/lib/controller/router/response.go index 03cdcf18d2..42b3435593 100644 --- a/lib/controller/router/response.go +++ b/lib/controller/router/response.go @@ -26,6 +26,10 @@ type responseOptions struct { func (rtr *router) responseOptions(opts interface{}) (responseOptions, error) { var rOpts responseOptions switch opts := opts.(type) { + case *arvados.CreateOptions: + rOpts.Select = opts.Select + case *arvados.UpdateOptions: + rOpts.Select = opts.Select case *arvados.GetOptions: rOpts.Select = opts.Select case *arvados.ListOptions: @@ -134,6 +138,7 @@ func (rtr *router) sendError(w http.ResponseWriter, err error) { } var infixMap = map[string]interface{}{ + "gj3su": arvados.APIClientAuthorization{}, "4zz18": arvados.Collection{}, "xvhdp": arvados.ContainerRequest{}, "dz642": arvados.Container{}, @@ -146,6 +151,11 @@ var infixMap = map[string]interface{}{ "7fd4e": arvados.Workflow{}, } +var specialKindTransforms = map[string]string{ + "arvados.APIClientAuthorization": "arvados#apiClientAuthorization", + "arvados.APIClientAuthorizationList": "arvados#apiClientAuthorizationList", +} + var mungeKind = regexp.MustCompile(`\..`) func kind(resp interface{}) string { @@ -153,6 +163,9 @@ func kind(resp interface{}) string { if !strings.HasPrefix(t, "arvados.") { return "" } + if k, ok := specialKindTransforms[t]; ok { + return k + } return mungeKind.ReplaceAllStringFunc(t, func(s string) string { // "arvados.CollectionList" => "arvados#collectionList" return "#" + strings.ToLower(s[1:]) @@ -195,7 +208,7 @@ func (rtr *router) mungeItemFields(tmp map[string]interface{}) { // they appear in responses as null, rather than a // zero value. switch k { - case "output_uuid", "output_name", "log_uuid", "description", "requesting_container_uuid", "container_uuid": + case "output_uuid", "output_name", "log_uuid", "description", "requesting_container_uuid", "container_uuid", "modified_by_client_uuid", "frozen_by_uuid": if v == "" { tmp[k] = nil }