projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18308: Merge branch 'main' into 18308-enable-collection-versioning
[arvados.git]
/
lib
/
controller
/
router
/
response.go
diff --git
a/lib/controller/router/response.go
b/lib/controller/router/response.go
index 500fb307171c4f59442aca8cbf503092ee7232a6..01126bcb49a130440ec56bae76dbb78590dc9a3b 100644
(file)
--- 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) {
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:
case *arvados.GetOptions:
rOpts.Select = opts.Select
case *arvados.ListOptions:
@@
-57,7
+61,7
@@
func applySelectParam(selectParam []string, orig map[string]interface{}) map[str
return selected
}
return selected
}
-func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp interface{}, opts responseOptions
, reqId string
) {
+func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp interface{}, opts responseOptions) {
var tmp map[string]interface{}
if resp, ok := resp.(http.Handler); ok {
var tmp map[string]interface{}
if resp, ok := resp.(http.Handler); ok {
@@
-67,7
+71,6
@@
func (rtr *router) sendResponse(w http.ResponseWriter, req *http.Request, resp i
return
}
return
}
- w.Header().Set("X-Request-Id", reqId)
err := rtr.transcode(resp, &tmp)
if err != nil {
rtr.sendError(w, err)
err := rtr.transcode(resp, &tmp)
if err != nil {
rtr.sendError(w, err)