[ARVADOS] updated: 57647945b08a74bab02fed6adf947eb9adb8321f
Git user
git at public.curoverse.com
Mon Aug 7 17:57:34 EDT 2017
Summary of changes:
.../app/controllers/collections_controller.rb | 8 +-
.../app/controllers/healthcheck_controller.rb | 2 +-
apps/workbench/config/application.default.yml | 6 +-
.../controllers/healthcheck_controller_test.rb | 2 +-
.../test/integration/anonymous_access_test.rb | 13 +-
apps/workbench/test/integration/jobs_test.rb | 10 +-
apps/workbench/test/integration_helper.rb | 16 +++
build/run-build-packages.sh | 1 +
build/run-library.sh | 18 ++-
sdk/cli/bin/crunch-job | 39 ++++--
sdk/cli/test/test_crunch-job.rb | 2 +-
sdk/cwl/arvados_cwl/__init__.py | 1 +
sdk/cwl/arvados_cwl/arvdocker.py | 7 +-
sdk/cwl/arvados_cwl/fsaccess.py | 3 +
sdk/cwl/arvados_cwl/pathmapper.py | 10 ++
sdk/cwl/arvados_cwl/runner.py | 2 +
sdk/cwl/setup.py | 4 +-
sdk/cwl/tests/test_submit.py | 14 ++-
sdk/cwl/tests/wf/expect_packed.cwl | 2 +-
sdk/perl/lib/Arvados/Request.pm | 5 +-
sdk/python/arvados/util.py | 2 +
.../arvados/v1/healthcheck_controller.rb | 2 +-
services/api/app/models/user.rb | 13 +-
services/api/config/application.default.yml | 2 +-
.../arvados/v1/healthcheck_controller_test.rb | 2 +-
services/arv-git-httpd/integration_test.go | 7 +-
services/arv-git-httpd/main.go | 15 ++-
services/arv-git-httpd/server.go | 5 +
services/arv-git-httpd/server_test.go | 17 +++
services/fuse/arvados_fuse/__init__.py | 33 ++---
services/fuse/arvados_fuse/command.py | 16 ++-
services/fuse/arvados_fuse/fresh.py | 3 +
services/fuse/arvados_fuse/fusedir.py | 133 +++++++++++++++++----
services/fuse/tests/test_mount.py | 106 ++++++++--------
services/keep-web/handler.go | 20 +++-
services/keep-web/handler_test.go | 21 ++++
services/keep-web/main.go | 6 +
services/keepproxy/keepproxy.go | 12 +-
services/keepproxy/keepproxy_test.go | 20 +++-
services/keepproxy/usage.go | 4 +
services/keepstore/s3_volume.go | 2 +-
services/nodemanager/arvnodeman/config.py | 3 +-
services/nodemanager/arvnodeman/jobqueue.py | 52 ++++++--
services/nodemanager/arvnodeman/status.py | 22 ++++
services/nodemanager/tests/integration_test.py | 51 +++++++-
services/nodemanager/tests/test_jobqueue.py | 102 ++++++++++------
services/nodemanager/tests/test_status.py | 40 +++++++
vendor/vendor.json | 58 ++-------
48 files changed, 658 insertions(+), 276 deletions(-)
via 57647945b08a74bab02fed6adf947eb9adb8321f (commit)
via 5f215fab16860dfa066fcc4e35bc89337b1af7d9 (commit)
via cd94cea680540c12d4d6a44e4c528e7c44ad5268 (commit)
via 323a439a98cec4d97989e42d8d365fc36338ae35 (commit)
via f007b09f1469e189ba1f459de03181df04ac4c5d (commit)
via 3149e7de8530b592b366a62bc5563dac6b2d62ce (commit)
via f12b4e8995e88f9763b74ad48d0618f98879a31b (commit)
via 9c6540b9d42adc4a397a28be1ac23f357ba14ab5 (commit)
via b3884a22d82254d016adfc767a274e98e4303e44 (commit)
via 64b837f87103a59efb6d4dac2b8dfa3c7c40c09a (commit)
via a4ce464efa14acefeaa314f1be8b1c7b3b740778 (commit)
via 70ec5fc0c8c149e75de7a4a9b1c502fba0992743 (commit)
via 581cd8822cd5fe0893de04c2222e3b1b413debb4 (commit)
via 106c66fbd7a45abf0cfe49e02c23f5afc885a14a (commit)
via 962a6b5be87305054a87b665dcc85d144840bb98 (commit)
via a736ea9adc93ec88d4fffd7262e880cdb619acd6 (commit)
via e474fe9c62aa1fce6151d48b10605151a7ab3c0a (commit)
via 560ecc87e4eace1ff7ad4f68ac3a4054eb715423 (commit)
via 43afe5cf4364c64b5022f912eaba2240c7cb0999 (commit)
via c0e203e7f3e9e40736eac63cbe440d5e46e379c0 (commit)
via 3e46aaf6469db111d549a9a5058f3ee4926e0200 (commit)
via 386e1eefaac2021805f73732b10e9f543c221593 (commit)
via afb710394b65fc82da8e4edd024a3a5fc1a18d54 (commit)
via 3ad999b1f769ef53d1bf069a5981db959b33b9d4 (commit)
via d69024a630b907c930070fbfd24e61aad1070a70 (commit)
via dfc4c2c74dc7a31ff0c0d307846b7e9525fdcf0e (commit)
via 8ae04f9f4d252a99985d7ac047413318d2f1068b (commit)
via 286cb3b9021ad74786d7746370594b9bb81d50a6 (commit)
via 8d24a8224decd26726dcfdeb239df4e12bd0d315 (commit)
via 42c0668947436ae07fa0fa249414d3952758af26 (commit)
via 153ffc8536bd1f3fdcd1901fbbb7453ef2fcf2e2 (commit)
via 26e095318c7c368089ea368e6e4854b62a6c7830 (commit)
via bd96be714db6730701c12755758f9be09c304470 (commit)
via 408cbfd4f3737ef5bfbf908d96ac9c469fcf6cdd (commit)
via 5d0cd36a015e2479cc18a68c6484857cdaf3737a (commit)
via bffd1e4ee8532992b3790e4f232804a6731a9685 (commit)
via 007d544703715904e492c584412233fd37873f99 (commit)
via d0379cea8627ec6a2f507def8b5587bbd6edd72b (commit)
via 14032da4e6df97baf353f2783c7e6be2efc907c1 (commit)
via e2ec2f6f9930ad850b22338866b3f59df006f012 (commit)
via 0c817f2f98fc9f15bf36ec226da2e72afb34edd5 (commit)
via 2d16a410f0121806bf847f9e6290dae66e96fc5f (commit)
via dc929c778e967d626bf065554e1403f002f7cf03 (commit)
via 1af8267a0d11ad9f986aec5ec7853299f3cfeb0e (commit)
via 6164f448f5828e1f4649fae4fe7866b8f082614c (commit)
via 8cbabbbe014628574a10a48148d179c14137d61f (commit)
via a7a0772310dcca61434b3b2d09b7e7596f32bd63 (commit)
via c55c3953219cdc1616a0ccd9e7ff91c6427e1b03 (commit)
via 86b16fe1166b6dd261eebc3637a26573cf780ba3 (commit)
via f49e418e217e3dcfcfc01b267fe45e2fed09030c (commit)
via 91f976b99d4e7f00d2c1fbfee75812c3b1b780c6 (commit)
via 7d4a10bcc197e909a7a9d5aeb4ba18c91a218976 (commit)
via 17cd77ac947e2c8f4ca51aa930ffc235051d7f72 (commit)
via f507162f3974797b741a0f740b407daefceab0b6 (commit)
via f77d08dd57a1021525717c8669296eb3e463c5f7 (commit)
via 3dad67f271492790f63e72ffcbba432cf8e00fa5 (commit)
from 08b59c7e5670b139346b0412c8a8bb9f3d3bf9ee (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 57647945b08a74bab02fed6adf947eb9adb8321f
Merge: 5f215fa f12b4e8
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Mon Aug 7 18:55:59 2017 -0300
11167: Merge branch 'master' into 11167-wb-remove-arvget
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>
commit 5f215fab16860dfa066fcc4e35bc89337b1af7d9
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Mon Aug 7 18:52:47 2017 -0300
11167: Refactored tests to use new helper function.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index fef83ba..6971c39 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -122,17 +122,8 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
use_keep_web_config
magic = rand(2**512).to_s 36
- token = api_fixture('api_client_authorizations')['admin']['api_token']
- datablock = `echo -n #{magic.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
- assert $?.success?, $?
- col = nil
- use_token 'admin' do
- mtxt = ". #{datablock} 0:#{magic.length}:Hello\\040world.txt\n"
- col = Collection.create(
- manifest_text: mtxt,
- owner_uuid: api_fixture('groups')['anonymously_accessible_project']['uuid'])
- end
-
+ owner = api_fixture('groups')['anonymously_accessible_project']['uuid']
+ col = upload_data_and_get_collection(magic, 'admin', "Hello\\040world.txt", owner)
visit '/collections/' + col.uuid
find('tr,li', text: 'Hello world.txt').
find('a[title~=View]').click
diff --git a/apps/workbench/test/integration/jobs_test.rb b/apps/workbench/test/integration/jobs_test.rb
index 8e49aaf..4b89b5d 100644
--- a/apps/workbench/test/integration/jobs_test.rb
+++ b/apps/workbench/test/integration/jobs_test.rb
@@ -45,16 +45,12 @@ class JobsTest < ActionDispatch::IntegrationTest
# This config will be restored during teardown by ../test_helper.rb:
Rails.configuration.log_viewer_max_bytes = 100
- token = api_fixture('api_client_authorizations')['active']['api_token']
logdata = fakepipe_with_log_data.read
- logblock = `echo -n #{logdata.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
- assert $?.success?, $?
-
+ job_uuid = api_fixture('jobs')['running']['uuid']
+ logcollection = upload_data_and_get_collection(logdata, 'active', "#{job_uuid}.log.txt")
job = nil
use_token 'active' do
- job = Job.find api_fixture('jobs')['running']['uuid']
- mtxt = ". #{logblock} 0:#{logdata.length}:#{job.uuid}.log.txt\n"
- logcollection = Collection.create(manifest_text: mtxt)
+ job = Job.find job_uuid
job.update_attributes log: logcollection.portable_data_hash
end
visit page_with_token 'active', '/jobs/'+job.uuid
commit cd94cea680540c12d4d6a44e4c528e7c44ad5268
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Mon Aug 7 18:44:17 2017 -0300
11167: Added response header whitelisting needed when using CORS
request to fetch partial content.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>
diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 769c2f5..23c38ca 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -136,6 +136,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
// SSL certificates. See
// http://www.w3.org/TR/cors/#user-credentials).
w.Header().Set("Access-Control-Allow-Origin", "*")
+ w.Header().Set("Access-Control-Expose-Headers", "Content-Range")
}
arv := h.clientPool.Get()
commit 323a439a98cec4d97989e42d8d365fc36338ae35
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Mon Aug 7 18:36:12 2017 -0300
11167: Documented default keep_web_url setting on workbench config file.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index d851f47..2557b47 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -99,7 +99,9 @@ test:
profiling_enabled: true
secret_token: <%= rand(2**256).to_s(36) %>
secret_key_base: <%= rand(2**256).to_s(36) %>
- keep_web_url: http://example/c=%{uuid_or_pdh}
+ # This setting is to allow workbench start when running tests, it should be
+ # set to a correct value when testing relevant features.
+ keep_web_url: http://example.com/c=%{uuid_or_pdh}
# When you run the Workbench's integration tests, it starts the API
# server as a dependency. These settings should match the API
commit f007b09f1469e189ba1f459de03181df04ac4c5d
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Mon Aug 7 18:34:15 2017 -0300
11167: Added helper function to be used on collection access tests via keep-web
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>
diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index efe6bd2..ef2779c 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -240,3 +240,19 @@ class ActionDispatch::IntegrationTest
end
end
end
+
+def upload_data_and_get_collection(data, user, filename, owner_uuid=nil)
+ token = api_fixture('api_client_authorizations')[user]['api_token']
+ datablock = `echo -n #{data.shellescape} | ARVADOS_API_TOKEN=#{token.shellescape} arv-put --no-progress --raw -`.strip
+ assert $?.success?, $?
+ col = nil
+ use_token user do
+ mtxt = ". #{datablock} 0:#{data.length}:#{filename}\n"
+ if owner_uuid
+ col = Collection.create(manifest_text: mtxt, owner_uuid: owner_uuid)
+ else
+ col = Collection.create(manifest_text: mtxt)
+ end
+ end
+ return col
+end
commit 3149e7de8530b592b366a62bc5563dac6b2d62ce
Author: Lucas Di Pentima <lucas at curoverse.com>
Date: Mon Aug 7 18:02:52 2017 -0300
11167: Removed conditional code
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>
diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 151b3a5..dcd47e1 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -115,13 +115,7 @@ class CollectionsController < ApplicationController
end
def show_file_links
- if Rails.configuration.keep_web_url || Rails.configuration.keep_web_download_url
- # show_file will redirect to keep-web's directory listing
- return show_file
- end
- Thread.current[:reader_tokens] = [params[:reader_token]]
- return if false.equal?(find_object_by_uuid)
- render layout: false
+ return show_file
end
def show_file
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list