[ARVADOS] updated: fcb385a7ac13e5e5f3a5c0e3b4435bdcfca64295
git at public.curoverse.com
git at public.curoverse.com
Tue Jun 17 10:34:25 EDT 2014
Summary of changes:
.../app/controllers/application_controller.rb | 2 +-
apps/workbench/config/application.default.yml | 7 +-
apps/workbench/config/application.yml.example | 4 -
sdk/cli/bin/crunch-job | 43 ++++++--
sdk/python/arvados/commands/keepdocker.py | 3 +-
services/api/app/models/arvados_model.rb | 24 +++--
services/api/app/models/collection.rb | 45 +++++++++
services/api/app/models/job.rb | 18 ++++
.../20140611173003_add_docker_locator_to_jobs.rb | 5 +
services/api/db/schema.rb | 3 +-
services/api/script/crunch-dispatch.rb | 34 ++++++-
services/api/test/fixtures/collections.yml | 11 +++
services/api/test/fixtures/links.yml | 95 +++++++++++++++++-
services/api/test/fixtures/repositories.yml | 5 +
.../arvados/v1/commits_controller_test.rb | 17 +++-
.../api/test/integration/crunch_dispatch_test.rb | 38 ++++++++
services/api/test/integration/select_test.rb | 14 ++-
.../test/integration/serialized_encoding_test.rb | 2 +-
services/api/test/test.git.tar | Bin 112640 -> 153600 bytes
services/api/test/unit/job_test.rb | 108 ++++++++++++++++++++-
20 files changed, 438 insertions(+), 40 deletions(-)
create mode 100644 services/api/db/migrate/20140611173003_add_docker_locator_to_jobs.rb
create mode 100644 services/api/test/integration/crunch_dispatch_test.rb
via fcb385a7ac13e5e5f3a5c0e3b4435bdcfca64295 (commit)
via 439e1417599cad4e65d506a11b583a6ebabc7604 (commit)
via 035ad9ea52c05ce5bce347f26226602fd98d4eec (commit)
via f6572fcdead970fbf4eeace0e72ea7a9096591c7 (commit)
via ac2d25e6b90c6d9bbab7e620b57b11113a60b28f (commit)
via 3176c5136e9500fb663db84ba6f0198fa81fec6b (commit)
via e88deba4b916f22abc14355b4b4640c8ccc4148a (commit)
via 95811b3a901df3ceab701fe18e9ec1bb614bef90 (commit)
via 0143d26db80dabb66825246cd15b0bd06a12eec8 (commit)
via 46ab8685bda121f07f356bc42407f4bf7b10bac7 (commit)
via 783343e5aca00f730315d943cecf74e4277a38e7 (commit)
via 525c942524426cb3ddc48ea63c18c4f300d47cb3 (commit)
via d7e23d9ae16310f9efe16a6a74ff2fc95ae4ccb4 (commit)
via 54e43ffa674583332713d980b5ba6701b4fa4d02 (commit)
via 0dffc025de9ebc7a54596e1018a589a6f5b8a03e (commit)
via 4a72800f68ab43d2ed50895fa4ce83e512b4719b (commit)
from e27463ce59b16bb4e0392cba50d7ab894f73cbdf (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 fcb385a7ac13e5e5f3a5c0e3b4435bdcfca64295
Merge: e27463c 439e141
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 17 10:33:18 2014 -0400
Merge branch 'master' into 2659-anonymous-group
Conflicts:
services/api/db/schema.rb
services/api/test/fixtures/links.yml
diff --cc apps/workbench/app/controllers/application_controller.rb
index a369cb1,ebd8661..3d706ad
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@@ -353,20 -353,6 +353,20 @@@ class ApplicationController < ActionCon
def thread_with_api_token(login_optional = false)
begin
try_redirect_to_login = true
+
+ using_anonymous_user_token = false
+ if !params[:api_token] && !session[:arvados_api_token]
+ if session && (session['arv-referrer'] == 'logout')
+ # do not use anonymous user token and let logout happen
+ else
+ anonymous_user_token = Rails.configuration.anonymous_user_token
- if anonymous_user_token.andand.size == 50
++ if anonymous_user_token
+ params[:api_token] = anonymous_user_token
+ using_anonymous_user_token = true
+ end
+ end
+ end
+
if params[:api_token]
try_redirect_to_login = false
Thread.current[:arvados_api_token] = params[:api_token]
diff --cc apps/workbench/config/application.default.yml
index fd4a9c5,2fe701a..7c5fbdc
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@@ -74,7 -74,3 +74,8 @@@ common
secret_key_base: false
default_openid_prefix: https://www.google.com/accounts/o8/id
send_user_setup_notification_email: true
+
- # Set anonymous user token to enable anonymous user access.
- # Get this using get_anonymous_user_token.rb and set here.
- anonymous_user_token: none
++ # Set anonymous user token to enable anonymous user access. You can get
++ # the token by running "bundle exec ./script/get_anonymous_user_token.rb"
++ # in the directory where you API server is running.
++ anonymous_user_token: false
diff --cc services/api/test/fixtures/links.yml
index 6b54690,ae2511b..d230d3e
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@@ -441,41 -441,95 +441,134 @@@ bug2931_link_with_null_head_uuid
head_uuid: ~
properties: {}
+anonymous_group_can_read_anonymously_accessible_project:
+ uuid: zzzzz-o0j2j-15gpzezqjg4bc4z
+ owner_uuid: zzzzz-tpzed-000000000000000
+ created_at: 2014-05-30 14:30:00.184389725 Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-05-30 14:30:00.184019565 Z
+ updated_at: 2014-05-30 14:30:00.183829316 Z
+ link_class: permission
+ name: can_read
+ tail_uuid: zzzzz-j7d0g-anonymouspublic
+ head_uuid: zzzzz-j7d0g-zhxawtyetzwc5f0
+ properties: {}
+
+user_agreement_in_anonymously_accessible_project:
+ uuid: zzzzz-o0j2j-k0ukddp35mt6ok1
+ owner_uuid: zzzzz-j7d0g-zhxawtyetzwc5f0
+ created_at: 2014-06-13 20:42:26 -0800
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+ modified_at: 2014-06-13 20:42:26 -0800
+ updated_at: 2014-06-13 20:42:26 -0800
+ link_class: name
+ name: GNU General Public License, version 3
+ tail_uuid: zzzzz-j7d0g-zhxawtyetzwc5f0
+ head_uuid: b519d9cb706a29fc7ea24dbea2f05851+249025
+ properties: {}
+
+user_agreement_readable_by_anonymously_accessible_project:
+ uuid: zzzzz-o0j2j-o5ds5gvhkztdc8h
+ owner_uuid: zzzzz-j7d0g-zhxawtyetzwc5f0
+ created_at: 2014-06-13 20:42:26 -0800
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+ modified_at: 2014-06-13 20:42:26 -0800
+ updated_at: 2014-06-13 20:42:26 -0800
+ link_class: permission
+ name: can_read
++
+ active_user_permission_to_docker_image_collection:
+ uuid: zzzzz-o0j2j-dp1d8395ldqw33s
+ owner_uuid: zzzzz-tpzed-000000000000000
+ created_at: 2014-01-24 20:42:26 -0800
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-01-24 20:42:26 -0800
+ updated_at: 2014-01-24 20:42:26 -0800
+ tail_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ link_class: permission
+ name: can_read
+ head_uuid: fa3c1a9cb6783f85f2ecda037e07b8c3+167
+ properties: {}
+
+ docker_image_collection_hash:
+ uuid: zzzzz-o0j2j-dockercollhasha
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-06-11 14:30:00.184389725 Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-06-11 14:30:00.184019565 Z
+ updated_at: 2014-06-11 14:30:00.183829316 Z
+ link_class: docker_image_hash
+ name: d8309758b8fe2c81034ffc8a10c36460b77db7bc5e7b448c4e5b684f9d95a678
+ tail_uuid: ~
+ head_uuid: fa3c1a9cb6783f85f2ecda037e07b8c3+167
+ properties:
+ image_timestamp: 2014-06-10T14:30:00.184019565Z
+
+ docker_image_collection_repository:
+ uuid: zzzzz-o0j2j-dockercollrepos
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-06-11 14:30:00.184389725 Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-06-11 14:30:00.184019565 Z
+ updated_at: 2014-06-11 14:30:00.183829316 Z
+ link_class: docker_image_repository
+ name: arvados/apitestfixture
+ tail_uuid: ~
+ head_uuid: fa3c1a9cb6783f85f2ecda037e07b8c3+167
+ properties:
+ image_timestamp: 2014-06-10T14:30:00.184019565Z
+
+ docker_image_collection_tag:
+ uuid: zzzzz-o0j2j-dockercolltagbb
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-06-11 14:30:00.184389725 Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-06-11 14:30:00.184019565 Z
+ updated_at: 2014-06-11 14:30:00.183829316 Z
+ link_class: docker_image_repo+tag
+ name: arvados/apitestfixture:latest
+ tail_uuid: ~
+ head_uuid: fa3c1a9cb6783f85f2ecda037e07b8c3+167
+ properties:
+ image_timestamp: 2014-06-10T14:30:00.184019565Z
+
+ docker_image_collection_tag2:
+ uuid: zzzzz-o0j2j-dockercolltagbc
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-06-11 14:30:00.184389725 Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-06-11 14:30:00.184019565 Z
+ updated_at: 2014-06-11 14:30:00.183829316 Z
+ link_class: docker_image_repo+tag
+ name: arvados/apitestfixture:june10
+ tail_uuid: ~
+ head_uuid: fa3c1a9cb6783f85f2ecda037e07b8c3+167
+ properties:
+ image_timestamp: 2014-06-10T14:30:00.184019565Z
+
+ ancient_docker_image_collection_hash:
+ # This image helps test that searches for Docker images find
+ # the latest available image: the hash is the same as
+ # docker_image_collection_hash, but it points to a different
+ # Collection and has an older image timestamp.
+ uuid: zzzzz-o0j2j-dockercollhashz
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-06-12 14:30:00.184389725 Z
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-06-12 14:30:00.184019565 Z
+ updated_at: 2014-06-12 14:30:00.183829316 Z
+ link_class: docker_image_hash
+ name: d8309758b8fe2c81034ffc8a10c36460b77db7bc5e7b448c4e5b684f9d95a678
+ tail_uuid: ~
+ head_uuid: b519d9cb706a29fc7ea24dbea2f05851+249025
+ properties:
+ image_timestamp: 2010-06-10T14:30:00.184019565Z
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list