[ARVADOS] updated: d843787b4ece9952597d7814cbf10fb383c72625
git at public.curoverse.com
git at public.curoverse.com
Mon Mar 30 13:14:12 EDT 2015
Summary of changes:
.../app/assets/javascripts/job_log_graph.js | 76 +++--
.../app/assets/javascripts/link_to_remote.js | 23 ++
.../app/assets/javascripts/select_modal.js | 2 +-
.../app/controllers/collections_controller.rb | 1 +
apps/workbench/app/helpers/application_helper.rb | 29 ++
apps/workbench/app/helpers/collections_helper.rb | 17 ++
apps/workbench/app/helpers/jobs_helper.rb | 2 +-
apps/workbench/app/models/arvados_api_client.rb | 3 +
.../app/views/application/_show_sharing.html.erb | 6 +
.../app/views/collections/_show_files.html.erb | 3 +-
apps/workbench/config/application.default.yml | 10 +-
apps/workbench/config/initializers/mime_types.rb | 15 +
.../controllers/application_controller_test.rb | 18 +-
.../controllers/collections_controller_test.rb | 29 +-
.../test/controllers/projects_controller_test.rb | 2 +-
apps/workbench/test/diagnostics/pipeline_test.rb | 2 +-
.../test/helpers/collections_helper_test.rb | 34 +++
apps/workbench/test/helpers/share_object_helper.rb | 5 +-
apps/workbench/test/integration/websockets_test.rb | 87 +++---
doc/_config.yml | 1 +
doc/api/schema/User.html.textile.liquid | 1 +
doc/images/publicproject/collection-files.png | Bin 0 -> 340353 bytes
doc/images/publicproject/collection-graph.png | Bin 0 -> 254951 bytes
doc/images/publicproject/collection-show.png | Bin 0 -> 317564 bytes
doc/images/publicproject/collections.png | Bin 0 -> 314736 bytes
doc/images/publicproject/description.png | Bin 0 -> 190137 bytes
doc/images/publicproject/instance-advanced.png | Bin 0 -> 199643 bytes
doc/images/publicproject/instance-components.png | Bin 0 -> 354790 bytes
doc/images/publicproject/instance-graph.png | Bin 0 -> 204494 bytes
doc/images/publicproject/instance-job.png | Bin 0 -> 394176 bytes
doc/images/publicproject/instance-log.png | Bin 0 -> 609108 bytes
doc/images/publicproject/instance-show.png | Bin 0 -> 214755 bytes
doc/images/publicproject/instances.png | Bin 0 -> 218939 bytes
doc/install/index.html.textile.liquid | 10 +-
doc/install/install-docker.html.textile.liquid | 2 +-
doc/install/pre-built-docker.html.textile.liquid | 16 +-
.../publicproject.html.textile.liquid | 128 ++++++++
docker/README.md | 14 +-
docker/api/Dockerfile | 1 +
docker/api/keep_proxy.json | 6 +
docker/api/setup.sh.in | 5 +
docker/arvdock | 63 ++--
docker/build_tools/Makefile | 23 +-
docker/{keep => keepproxy}/Dockerfile | 10 +-
docker/keepproxy/run-keepproxy.in | 9 +
sdk/cli/bin/arv-run-pipeline-instance | 53 +---
sdk/cli/bin/crunch-job | 36 ++-
sdk/go/arvadosclient/arvadosclient.go | 6 +-
sdk/go/keepclient/keepclient.go | 7 +-
sdk/python/arvados/commands/arv_copy.py | 4 +-
sdk/python/arvados/keep.py | 31 +-
.../app/controllers/arvados/v1/jobs_controller.rb | 11 +-
.../app/controllers/arvados/v1/nodes_controller.rb | 4 +-
.../controllers/arvados/v1/schema_controller.rb | 4 +-
services/api/app/models/arvados_model.rb | 6 +-
services/api/app/models/blob.rb | 5 +-
services/api/app/models/job.rb | 10 +-
services/api/app/models/keep_disk.rb | 2 +-
services/api/app/models/log.rb | 4 +-
services/api/app/models/node.rb | 10 +-
services/api/app/models/user.rb | 212 +++++++-------
.../api/config/initializers/db_current_time.rb | 1 +
...tion_portable_data_hash_with_hinted_manifest.rb | 36 ++-
.../20150317132720_add_username_to_users.rb | 127 ++++++++
services/api/db/structure.sql | 16 +-
services/api/lib/db_current_time.rb | 7 +
services/api/lib/simulate_job_log.rb | 10 +-
services/api/test/fixtures/collections.yml | 24 ++
services/api/test/fixtures/logs.yml | 29 +-
services/api/test/fixtures/users.yml | 12 +
.../api_client_authorizations_scopes_test.rb | 2 +-
services/api/test/integration/websocket_test.rb | 8 +-
services/api/test/unit/arvados_model_test.rb | 30 ++
services/api/test/unit/log_test.rb | 45 ++-
services/api/test/unit/repository_test.rb | 26 ++
services/api/test/unit/user_test.rb | 324 +++++++++++----------
.../{basic_go13.go => basic_auth_go13.go} | 6 +-
.../{basic_go14.go => basic_auth_go14.go} | 0
.../{basic_test.go => basic_auth_test.go} | 0
services/arv-git-httpd/server_test.go | 7 +-
services/keepproxy/keepproxy.go | 25 +-
services/keepstore/handler_test.go | 4 +
services/keepstore/handlers.go | 8 -
services/keepstore/keepstore.go | 5 +
services/keepstore/trash_worker.go | 44 +++
services/keepstore/trash_worker_test.go | 280 ++++++++++++++++++
services/keepstore/volume_unix.go | 8 +
.../arvnodeman/computenode/dispatch/__init__.py | 15 +-
.../arvnodeman/computenode/driver/__init__.py | 6 +
.../arvnodeman/computenode/driver/dummy.py | 4 +
.../arvnodeman/computenode/driver/ec2.py | 4 +
.../arvnodeman/computenode/driver/gce.py | 55 +++-
services/nodemanager/arvnodeman/daemon.py | 1 +
.../nodemanager/tests/test_computenode_dispatch.py | 27 +-
.../tests/test_computenode_driver_ec2.py | 8 +-
.../tests/test_computenode_driver_gce.py | 51 +++-
services/nodemanager/tests/testutil.py | 12 +-
97 files changed, 1766 insertions(+), 559 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/link_to_remote.js
create mode 100644 apps/workbench/test/helpers/collections_helper_test.rb
create mode 100644 doc/images/publicproject/collection-files.png
create mode 100644 doc/images/publicproject/collection-graph.png
create mode 100644 doc/images/publicproject/collection-show.png
create mode 100644 doc/images/publicproject/collections.png
create mode 100644 doc/images/publicproject/description.png
create mode 100644 doc/images/publicproject/instance-advanced.png
create mode 100644 doc/images/publicproject/instance-components.png
create mode 100644 doc/images/publicproject/instance-graph.png
create mode 100644 doc/images/publicproject/instance-job.png
create mode 100644 doc/images/publicproject/instance-log.png
create mode 100644 doc/images/publicproject/instance-show.png
create mode 100644 doc/images/publicproject/instances.png
create mode 100644 doc/start/getting_started/publicproject.html.textile.liquid
create mode 100644 docker/api/keep_proxy.json
copy docker/{keep => keepproxy}/Dockerfile (50%)
create mode 100755 docker/keepproxy/run-keepproxy.in
create mode 100644 services/api/config/initializers/db_current_time.rb
create mode 100644 services/api/db/migrate/20150317132720_add_username_to_users.rb
create mode 100644 services/api/lib/db_current_time.rb
rename services/arv-git-httpd/{basic_go13.go => basic_auth_go13.go} (69%)
rename services/arv-git-httpd/{basic_go14.go => basic_auth_go14.go} (100%)
rename services/arv-git-httpd/{basic_test.go => basic_auth_test.go} (100%)
create mode 100644 services/keepstore/trash_worker.go
create mode 100644 services/keepstore/trash_worker_test.go
via d843787b4ece9952597d7814cbf10fb383c72625 (commit)
via ce4e75d03a38fc7e4a644a08e3c6044e3a7df390 (commit)
via 38bc4c0e294817a70b61e7b545cdcaab5737eebd (commit)
via d176328c5a9f95a3e7295d1341b4e6d88c0025f7 (commit)
via 5dfdd042f8931fa7f001256471c0b624f768504c (commit)
via b8261deb6e1035134d7ce8f004cc49deeed1bd27 (commit)
via 46b124cc766e4e35e40c1c3e2c1b388816aa682a (commit)
via d80a6ec2bf1181da1ef5f2b6e575e83ca15562a8 (commit)
via 4f6b424e682892109740f6cb6b8f1af2612e7536 (commit)
via 5faa0d43c8dbb8210bff8476a78c816700cc4176 (commit)
via a1a9b820c16e5526e99d6d1b576ea53e9bddbc24 (commit)
via a7b60f7e2af757d07c57dae6bf2944cd1d4e3dc5 (commit)
via 90198dc6c008ca60889dd4ef5f5def8dd272df82 (commit)
via 8ddb457318d535fadad9a5554e2944cec96b17df (commit)
via d81ed360051af98d7c0fba3afb07a4b5a815ee41 (commit)
via 0d1971f04c8f0674ff8d94bae5dbb7f6b94e7f5f (commit)
via 659a8c75c837ec30e2f9fb6f1a1859b625626c3e (commit)
via febb804129f39963722e530a394f36367220d4b5 (commit)
via 50be38a022fe282c55703c9e3903b0400eaa20fb (commit)
via 9cb7b08709aec196d7cd2170ec60134f2253d46b (commit)
via 9aa1156989884e2e5d07dba055c1a16aac25b1c3 (commit)
via ff8721dd5854279fab712f4a4ff8aed2256c1b87 (commit)
via 655469d6a9e711ace01c018b5c7b7b3111ea6deb (commit)
via 4fce5c64b5bc0b106e14533378de6488fd030f98 (commit)
via 8505cb4000d7e1c776cbc7ea630d9413616f49c3 (commit)
via b01a47b2cc2054e84d51d49d28eb80bbc07fe565 (commit)
via 923077ab9685aa1d264ffa1563f1177d1c239ef8 (commit)
via a329f06e31462d59d853838beffd077ce732d631 (commit)
via e809173d733bc78ce7877f6ed9711b29fd7cee0e (commit)
via 2e59e0a48d1f34df2aa0d0600162012424a0f3ee (commit)
via 67328f09213be59c0acefc9944c854df9af3aaa8 (commit)
via c1b4ee5b62630d6df3037955b68aa77ec3ee1f5a (commit)
via bf207e24d447248b90c25cfdb77a82e85a1fb02c (commit)
via 879ba08f9cba098577e520235bfbbbeffaf4b81d (commit)
via 1fea1b7a0f75765268dc1c461725c8ca841d4b57 (commit)
via 8805632994d42c0e3b31fd5ac010d916cac12de1 (commit)
via f565fb6f6a3be1222ee364d52a15fc7ab467a008 (commit)
via 7f28788a82182d96c9bf0792fe6c1682714ea28f (commit)
via bedc4bf7a64f77b4d0043e217792c130625c336b (commit)
via b01138f2ed3b666fd6075a6d77caddb5d5ca91e1 (commit)
via 23721458d7ec8c44c4b54f45eb7d2a4e6d7cdce1 (commit)
via 8b1d7833a8779f33aab61397a20b02979ee6df73 (commit)
via 17efed0cc6cf658749b67468286d368f4d041cfa (commit)
via 8cda7f9ce25adeff03b9636f70026f5e9263dbe8 (commit)
via d8326579d327530adcf4118b48947d3812845c33 (commit)
via 6381b9e85f278b0c8cb45ffccd89ca1b1bc4d3ee (commit)
via df9955d76e3103e747360d2c27914d79b97fdf6f (commit)
via 5cb7bacb7326d1aae1b5b323614d6b46d93d0e99 (commit)
via a51029fa0b4466ac4f5dff204f5e1977753a88ad (commit)
via 3c3d04e7e6ec2b21fed84faa2789c4bac3fd4355 (commit)
via 10d3f91d4b5619172dd5d8fbf3e8aa863b673e2f (commit)
via 1d20cb1d8ff6c4ba678fb5387265f99b4912a028 (commit)
via 2fdfdc0a6c8fe550f225cbc16e1582406050cd83 (commit)
via cb152be857f9fe25e039202af217656c0ca444d2 (commit)
via d9561b0197cba4a9a0f70929eb03c892df5c4543 (commit)
via fed6d3b24a6c49df01601dfdc27182fd0770b013 (commit)
via 6c14ca8fe128f4db3bafe4edd1cc5551bc85e1ef (commit)
via a307f4b97a91ae47e3498dac36d0a47b1c0eedcd (commit)
via 2ca0934c1daf79d5c1b959c8b3d0f36b5dd57bc4 (commit)
via 4a8dc955e10f0d27afa6a704843d49326bd8d3b5 (commit)
via 2606f4df5861ff34ca9e42389a1509e77c102c5a (commit)
via 7e5416c8d769fa6520dad72cd0612f1776d88219 (commit)
via 1d0aef8fb7bdad6d28976255919f58b719a4342b (commit)
via 03e8ba641e0161f15d96351e2432805977fd9d57 (commit)
via ac037435f2ee9688957f1c0be6bfa9066ac027ba (commit)
via a6ea50199a4aef32094bb6c4e91aa702c02aaca0 (commit)
via ab9955f1ab1aef27b3eecf5d739bf0934d29cdfd (commit)
via b4e040f6864ba10b19009e21744119194a86567f (commit)
via 52f124ea43c941d8500a365945fb9bd9b4b99177 (commit)
via 4925686f6aa7214568ebd60be3acaa49dbf9dd1a (commit)
via c96d48a6a5c06a36fb3931c1c9650131e21d79c5 (commit)
via 165a594bf8606864c62f86405e318c68c2426c38 (commit)
via 4e72d3799b87374412e01805bf8b27a4620cd1db (commit)
via a578a055456693d66ccf4d65a09822380d2cc7a8 (commit)
via 1ed0df4d4b2221a06e37effce42ab5b2e23b29c8 (commit)
via a239e2db534cc36aa8c3e08077383d84bf6ba8e8 (commit)
via 3365d47ab4f504a1e849852691313cddd89d0f15 (commit)
via a9c8f2dd15af7843ac4d86e5820ab0771cc5fd78 (commit)
via f75e2ecbcb1e511e26ae34fb4ebb9bf81e1cbe8f (commit)
via c3604c1cc57556520634f9af57213abc80c86da9 (commit)
via f46eed2ad6bc456cd57ed363e1adc8d60f802f39 (commit)
via 6a13c4e44ce35056fb1ccbdf470a79b8b6b8bfa5 (commit)
via 44823f311ea0328c3a2aeefb7208a74031436d52 (commit)
via 9917d9eef58c161420fe119f19611d332a345507 (commit)
via b38fea181afac08137243a294a502e4605d679d8 (commit)
via fff9d822fdf8857a7d8e22c024bc4f04b3b94129 (commit)
via 3c191493c9c4d778525751d15dea8e83ed61fda6 (commit)
via 18148ec24bf63ec3353a2cd38f6f07c460037db2 (commit)
via 3606f69d567cb34cd3ab53c0fb994e30867450e1 (commit)
via beebf2cbe5edc986e1a268fabdd10a3f710dedd4 (commit)
via fe6bad60cace3d6e0f611b1c07fc7f4cb593c48e (commit)
via 12540bb0c62e2a498a70f64198055f1d48deeb17 (commit)
via a1a1aed711dec0676575bd914cbe1356f7c0bb03 (commit)
via ff04973bb7508493a9cdc29a50d36c9c4a50936d (commit)
via 29dd43933769bf47d0018d967037bc31b679dfd9 (commit)
via 8efc8d844b03a0cb41955eaf0ab18ce53565bbd8 (commit)
via 2507d47331437166d89f6147faaf8aaabb965a94 (commit)
via d8abf0b06cc38a1e1030e04966d0cb616eae8c2e (commit)
via b63b1c67513ee167aa579fa5182341d51e71d2aa (commit)
via c190374af4e3f48c57eae2a63cc7867674716ad0 (commit)
via 471dd5bfde6b7218b72bedff6d92c6150af059e6 (commit)
via f78b9c586f9ffa9846d68d35a10396261691da41 (commit)
via b0c5270a1a88ab2a19bfff5ced4e5e17f5264e9e (commit)
via b5c40a0304a9de42ae0ed3d0517e1365552c0e04 (commit)
via 50e9e5553d2cc194698633753c302789ae5bb2fc (commit)
via 32926d6543e52daa4db8e47c2870bef4d6bdf71d (commit)
via aabde5c5f0cba198c90558a3f3bb100ea9a09b6d (commit)
via 79a18f2eb4c02212d30462b3c8eb4f989ab750d3 (commit)
via 610d9aea55464f9bde956c8df7c97a4a2103e738 (commit)
via 68483f1bc4d5d170471d02a60cebc28e794501b2 (commit)
via 00c2e9b28c1228b2ba327223d5576d44e4fdae4d (commit)
via 94d2af98f5882985e57d8dd1b17a2fd2e8cc8734 (commit)
from 24584338a1937280ac6400f8d5371972185191cd (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 d843787b4ece9952597d7814cbf10fb383c72625
Merge: ce4e75d d176328
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Mar 30 13:00:59 2015 -0400
5416: Merge branch 'master' into 5416-arv-git-httpd
commit ce4e75d03a38fc7e4a644a08e3c6044e3a7df390
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Mar 30 12:56:53 2015 -0400
5416: Add permission-denied tests.
diff --git a/services/api/test/unit/repository_test.rb b/services/api/test/unit/repository_test.rb
index fe99dd4..4e160dd 100644
--- a/services/api/test/unit/repository_test.rb
+++ b/services/api/test/unit/repository_test.rb
@@ -10,4 +10,30 @@ class RepositoryTest < ActiveSupport::TestCase
assert_operator modtime_was, :<, r.modified_at
end
end
+
+ test 'write permission not sufficient for changing name' do
+ act_as_user users(:active) do
+ r = repositories(:foo)
+ name_was = r.name
+ r.name = 'newname'
+ assert_raises ArvadosModel::PermissionDeniedError do
+ r.save!
+ end
+ r.reload
+ assert_equal name_was, r.name
+ end
+ end
+
+ test 'write permission necessary for changing modified_at' do
+ act_as_user users(:spectator) do
+ r = repositories(:foo)
+ modtime_was = r.modified_at
+ r.modified_at = Time.now
+ assert_raises ArvadosModel::PermissionDeniedError do
+ r.save!
+ end
+ r.reload
+ assert_equal modtime_was, r.modified_at
+ end
+ end
end
commit 38bc4c0e294817a70b61e7b545cdcaab5737eebd
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Mar 30 12:56:00 2015 -0400
5416: Improve variable names & filenames. Report original error if git fails with nothing on stderr.
diff --git a/services/arv-git-httpd/basic_go13.go b/services/arv-git-httpd/basic_auth_go13.go
similarity index 69%
rename from services/arv-git-httpd/basic_go13.go
rename to services/arv-git-httpd/basic_auth_go13.go
index 2839b16..087f2c8 100644
--- a/services/arv-git-httpd/basic_go13.go
+++ b/services/arv-git-httpd/basic_auth_go13.go
@@ -9,12 +9,12 @@ import (
)
func BasicAuth(r *http.Request) (username, password string, ok bool) {
- toks := strings.SplitN(r.Header.Get("Authorization"), " ", 2)
- if len(toks) != 2 || toks[0] != "Basic" {
+ tokens := strings.SplitN(r.Header.Get("Authorization"), " ", 2)
+ if len(tokens) != 2 || tokens[0] != "Basic" {
return "", "", false
}
- decoded, err := base64.StdEncoding.DecodeString(toks[1])
+ decoded, err := base64.StdEncoding.DecodeString(tokens[1])
if err != nil {
return "", "", false
}
diff --git a/services/arv-git-httpd/basic_go14.go b/services/arv-git-httpd/basic_auth_go14.go
similarity index 100%
rename from services/arv-git-httpd/basic_go14.go
rename to services/arv-git-httpd/basic_auth_go14.go
diff --git a/services/arv-git-httpd/basic_test.go b/services/arv-git-httpd/basic_auth_test.go
similarity index 100%
rename from services/arv-git-httpd/basic_test.go
rename to services/arv-git-httpd/basic_auth_test.go
diff --git a/services/arv-git-httpd/server_test.go b/services/arv-git-httpd/server_test.go
index 40f0128..751e7e4 100644
--- a/services/arv-git-httpd/server_test.go
+++ b/services/arv-git-httpd/server_test.go
@@ -145,8 +145,11 @@ func (s *IntegrationSuite) runGit(c *check.C, gitCmd, repo string, args ...strin
go w.Close()
output, err := cmd.CombinedOutput()
c.Log("git ", gitargs, " => ", err)
- if err != nil {
- // Easier to match error strings without newlines.
+ if err != nil && len(output) > 0 {
+ // If messages appeared on stderr, they are more
+ // helpful than the err returned by CombinedOutput().
+ //
+ // Easier to match error strings without newlines:
err = errors.New(strings.Replace(string(output), "\n", " // ", -1))
}
return err
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list