[ARVADOS] updated: 1.3.0-1444-g2c7b49e87
Git user
git at public.curoverse.com
Tue Aug 6 13:09:55 UTC 2019
Summary of changes:
doc/admin/upgrading.html.textile.liquid | 6 +++++-
services/keep-web/handler.go | 1 +
services/keep-web/handler_test.go | 12 ++++++------
services/keep-web/server_test.go | 1 +
4 files changed, 13 insertions(+), 7 deletions(-)
via 2c7b49e8791154db907616243c930c552aeb3df3 (commit)
via 8f78a0332d530f9987f18e6c982e30b0ea8e943e (commit)
from 63756e0e8a1188e01d0c238394db71af278863cd (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 2c7b49e8791154db907616243c930c552aeb3df3
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Tue Aug 6 10:08:54 2019 -0300
14716: Analyzing integration test fix failure
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 083040b21..fab004c89 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -281,6 +281,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
stripParts = 4
pathToken = true
} else {
+ log.Info(" !!!! ATTN: Into /collections/uuid/path with anon token: ", h.Config.cluster.Users.AnonymousUserToken)
// /collections/ID/PATH...
collectionID = parseCollectionIDFromURL(pathParts[1])
tokens = []string{h.Config.cluster.Users.AnonymousUserToken}
diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 386326561..17719601a 100644
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -594,12 +594,12 @@ func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
cutDirs: 1,
},
// This test case fails
- // {
- // uri: "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/",
- // header: authHeader,
- // expect: []string{"dir1/foo", "dir1/bar"},
- // cutDirs: 2,
- // },
+ {
+ uri: "download.example.com/collections/" + arvadostest.FooAndBarFilesInDirUUID + "/",
+ header: authHeader,
+ expect: []string{"dir1/foo", "dir1/bar"},
+ cutDirs: 2,
+ },
{
uri: "download.example.com/users/active/foo_file_in_dir/",
header: authHeader,
diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index 534ed9b30..b398f3406 100644
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -501,6 +501,7 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
cfg.cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: listen}] = arvados.ServiceInstance{}
cfg.cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: listen}] = arvados.ServiceInstance{}
cfg.cluster.ManagementToken = arvadostest.ManagementToken
+ cfg.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
s.testServer = &server{Config: cfg}
err = s.testServer.Start()
c.Assert(err, check.Equals, nil)
commit 8f78a0332d530f9987f18e6c982e30b0ea8e943e
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Mon Aug 5 18:10:55 2019 -0300
14716: Adds upgrade notes for keep-web.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index da37d743d..de7eeaca0 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -39,7 +39,11 @@ table(table table-bordered table-condensed).
|"v1.1.4":#v1_1_4|"v1.1.3":#v1_1_3|"v1.1.2":#v1_1_2|"v1.1.1":#v1_1_1|"v1.1.0":#v1_1_0|
|\5. "older":#older|
-h3(#master). development master (as of 2019-06-07)
+h3(#master). development master (as of 2019-08-05)
+
+h4. Keep-web dropped support on command line flags configuration
+
+As we're migrating to a central cluster configuration file, the already deprecated way of getting configurations via environment variables and command line flags isn't valid anymore. Current keep-web supports both the now legacy @keep-web.yml@ config format (used by Arvados 1.4) and the new cluster config file format. Please check "keep-web's install guide":{{site.baseurl}}/install/install-keep-web.html for more details.
h4. No longer stripping ':' from strings in serialized database columns
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list