From: Peter Amstutz <peter.amstutz@curii.com>
Date: Fri, 11 Jun 2021 21:19:36 +0000 (-0400)
Subject: 17464: Fix shadowed "sess" variable
X-Git-Tag: 2.2.1~53
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/fdc9c14982f0f40a51037f3fbdfa4b164868e6e0

17464: Fix shadowed "sess" variable

Testing WIP

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 350e95ce88..a52af80484 100644
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -225,7 +225,7 @@ func (c *cache) GetSession(token string) (arvados.CustomFileSystem, *cachedSessi
 	expired := false
 	if sess == nil {
 		c.metrics.sessionMisses.Inc()
-		sess := &cachedSession{
+		sess = &cachedSession{
 			expire: now.Add(c.config.TTL.Duration()),
 		}
 		var err error
diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 8715ab24f3..b8c7443f0c 100644
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -1178,6 +1178,27 @@ func (s *IntegrationSuite) TestCacheWriteCollectionSamePDH(c *check.C) {
 	checkWithID(colls[0].UUID, http.StatusOK)
 }
 
+// func (s *IntegrationSuite) TestUploadDownloadLogging(c *check.C) {
+// 	u := mustParseURL("http://" + arvadostest.FooCollection + ".keep-web.example/foo")
+// 	req := &http.Request{
+// 		Method:     "GET",
+// 		Host:       u.Host,
+// 		URL:        u,
+// 		RequestURI: u.RequestURI(),
+// 		Header: http.Header{
+// 			"Authorization": {"Bearer " + arvadostest.ActiveToken},
+// 		},
+// 	}
+
+// 	var logbuf bytes.Buffer
+// 	logger := logrus.New()
+// 	logger.Out = &logbuf
+// 	req = req.WithContext(ctxlog.Context(context.Background(), logger))
+// 	s.doReq(req)
+
+// 	c.Check(logbuf.String(), check.Matches, `Download file*`)
+// }
+
 func copyHeader(h http.Header) http.Header {
 	hc := http.Header{}
 	for k, v := range h {