[ARVADOS] updated: 1.3.0-1468-gacb1d98cd
Git user
git at public.curoverse.com
Tue Aug 6 19:37:06 UTC 2019
Summary of changes:
build/run-tests.sh | 48 +++++---
.../install-dispatch.html.textile.liquid | 132 +++++++++++----------
doc/install/install-ws.html.textile.liquid | 36 +++---
lib/config/config.default.yml | 2 +
lib/config/deprecated.go | 8 ++
lib/config/export.go | 5 +
lib/config/export_test.go | 9 +-
lib/config/generated_config.go | 2 +
sdk/go/arvados/config.go | 7 +-
sdk/python/arvados/events.py | 13 +-
.../controllers/arvados/v1/schema_controller.rb | 4 +-
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 4 +-
.../crunch-dispatch-slurm_test.go | 15 ++-
services/keep-web/handler.go | 20 ++--
services/keep-web/handler_test.go | 23 +++-
services/keep-web/server_test.go | 1 +
tools/arvbox/lib/arvbox/docker/api-setup.sh | 45 ++-----
tools/arvbox/lib/arvbox/docker/cluster-config.sh | 37 ++++++
.../lib/arvbox/docker/service/certificate/run | 2 +
.../lib/arvbox/docker/service/controller/run | 2 +-
.../lib/arvbox/docker/service/sso/run-service | 6 -
.../arvbox/docker/service/workbench/run-service | 3 -
22 files changed, 245 insertions(+), 179 deletions(-)
via acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2 (commit)
via 1ea751256b6817e0c841e0a9c4b99d559de6f0b0 (commit)
via f89544af7f3d38bd61b4216527d66897eb08dcd0 (commit)
via 75310a63472361ad0a84801024193cc9f34393e0 (commit)
via 45a018dedd306a21745522eaa7fbaeb796a0ff5d (commit)
via e6c087eba687597c30d07459504c077d0f97a5b9 (commit)
via 5dbee91f63a39f19b1b8a63f0fda0f7115e7356e (commit)
via ee1a7e406e5a20d142db752ab6b2a9eb0421bba7 (commit)
via caf81587353b5e490e01f7f45aef78aef0ef18c0 (commit)
via a5e9c92d5d9e3a5575f9a103723d1814f5a51b66 (commit)
via 247006e2b7e3e3e1860b093d2a8d23d4536255d3 (commit)
via f5bba33140f89648ef07098e582b022e1ea1f9f9 (commit)
via e3566cdd48dd5c67ef9d0b1a45321f773b44b2a6 (commit)
via 590c491796ece16caa4251dd443412f323492fea (commit)
via dbbb649c9b797da8f6805af3a7e74e57b075d294 (commit)
via 3990a4b1c7c1eb266367b42fa49bb540d8099cd3 (commit)
via e634faf85ba8158b0dd679de606c734ef8fb84dc (commit)
via 56c87b7cea95bdb373fd0a195b57f2e18cc5a70d (commit)
via 8829652bd4d963bf9371a4ca92a6fb5b9a3f0e2b (commit)
via 327e331c0d421d805b380bc4f9dc8d17f683eadf (commit)
via 1d0a332825dfdb9f72c76eefacdca50f01bd67ed (commit)
via bb0794b3323e93d45d85a0e86a497e8afe5a0983 (commit)
via 94f1f08184b135d10245fa782e66d43247a107d3 (commit)
via fdb22c767bb60ebe931a6a86b2fb812dd2073950 (commit)
from 2c7b49e8791154db907616243c930c552aeb3df3 (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 acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2
Merge: 2c7b49e87 1ea751256
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Tue Aug 6 16:36:27 2019 -0300
Merge branch 'master' into 14716-webdav-cluster-config
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --cc services/keep-web/handler.go
index fab004c89,837579fe2..863b91a7e
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@@ -348,10 -351,7 +351,7 @@@ func (h *handler) ServeHTTP(wOrig http.
}
if tokens == nil {
- if credentialsOK {
- reqTokens = auth.CredentialsFromRequest(r).Tokens
- }
- tokens = append(reqTokens, h.Config.AnonymousTokens...)
+ tokens = append(reqTokens, h.Config.cluster.Users.AnonymousUserToken)
}
if len(targetPath) > 0 && targetPath[0] == "_" {
diff --cc services/keep-web/handler_test.go
index 17719601a,dd91df354..fe8e767c4
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@@ -569,8 -559,18 +569,18 @@@ func (s *IntegrationSuite) testVhostRed
return resp
}
- func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
+ func (s *IntegrationSuite) TestDirectoryListingWithAnonymousToken(c *check.C) {
- s.testServer.Config.AnonymousTokens = []string{arvadostest.AnonymousToken}
++ s.testServer.Config.cluster.Users.AnonymousUserToken = arvadostest.AnonymousToken
+ s.testDirectoryListing(c)
+ }
+
+ func (s *IntegrationSuite) TestDirectoryListingWithNoAnonymousToken(c *check.C) {
- s.testServer.Config.AnonymousTokens = nil
++ s.testServer.Config.cluster.Users.AnonymousUserToken = ""
+ s.testDirectoryListing(c)
+ }
+
+ func (s *IntegrationSuite) testDirectoryListing(c *check.C) {
- s.testServer.Config.AttachmentOnlyHost = "download.example.com"
+ s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = "download.example.com"
authHeader := http.Header{
"Authorization": {"OAuth2 " + arvadostest.ActiveToken},
}
diff --cc services/keep-web/server_test.go
index b398f3406,0263dcf08..12596b16b
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@@ -301,6 -298,7 +301,7 @@@ func (s *IntegrationSuite) runCurl(c *c
}
func (s *IntegrationSuite) TestMetrics(c *check.C) {
- s.testServer.Config.AttachmentOnlyHost = s.testServer.Addr
++ s.testServer.Config.cluster.Services.WebDAVDownload.ExternalURL.Host = s.testServer.Addr
origin := "http://" + s.testServer.Addr
req, _ := http.NewRequest("GET", origin+"/notfound", nil)
_, err := http.DefaultClient.Do(req)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list