[ARVADOS] updated: 2.1.0-1099-gbba516847

[Git user]

Summary of changes:
 lib/controller/router/router.go   | 1 -
 sdk/go/httpserver/id_generator.go | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

       via  bba51684725db4155b142812bffb4a4a3935e131 (commit)
      from  91f7e961f18c0ef8ae584d1c8a53d322b617efee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bba51684725db4155b142812bffb4a4a3935e131
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Tue Jul 27 18:19:54 2021 -0300

    17830: Moves header setting code to cover more use cases.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/lib/controller/router/router.go b/lib/controller/router/router.go
index 0325e0c98..5ceabbfb1 100644
--- a/lib/controller/router/router.go
+++ b/lib/controller/router/router.go
@@ -506,7 +506,6 @@ func (rtr *router) addRoute(endpoint arvados.APIEndpoint, defaultOpts func() int
 		}
 		ctx := auth.NewContext(req.Context(), creds)
 		ctx = arvados.ContextWithRequestID(ctx, req.Header.Get("X-Request-Id"))
-		w.Header().Set("X-Request-Id", req.Header.Get("X-Request-Id"))
 		logger.WithFields(logrus.Fields{
 			"apiEndpoint": endpoint,
 			"apiOptsType": fmt.Sprintf("%T", opts),
diff --git a/sdk/go/httpserver/id_generator.go b/sdk/go/httpserver/id_generator.go
index 14d89873b..5b661ae9f 100644
--- a/sdk/go/httpserver/id_generator.go
+++ b/sdk/go/httpserver/id_generator.go
@@ -54,6 +54,7 @@ func AddRequestIDs(h http.Handler) http.Handler {
 			}
 			req.Header.Set(HeaderRequestID, gen.Next())
 		}
+		w.Header().Set("X-Request-Id", req.Header.Get("X-Request-Id"))
 		h.ServeHTTP(w, req)
 	})
 }

-----------------------------------------------------------------------


hooks/post-receive
--