[ARVADOS] updated: 1.1.3-177-gb77abbe

Git user git at public.curoverse.com
Mon Mar 12 10:43:44 EDT 2018


Summary of changes:
 apps/workbench/app/models/container_work_unit.rb   |   2 +-
 .../test/controllers/disabled_api_test.rb          |   3 +
 .../controllers/healthcheck_controller_test.rb     |   3 +
 apps/workbench/test/test_helper.rb                 |   6 +-
 build/build.list                                   |   5 +-
 .../package-testing/test-package-python-cwltest.sh |   1 +
 .../test-package-python27-python-cwltest.sh        |   4 +-
 build/package-testing/test-packages-debian9.sh     |  41 +----
 sdk/cwl/arvados_cwl/crunch_script.py               |   1 +
 services/api/Gemfile                               |  10 +-
 services/api/Gemfile.lock                          | 205 +++++++++++----------
 .../controllers/arvados/v1/schema_controller.rb    |   2 +-
 12 files changed, 132 insertions(+), 151 deletions(-)
 create mode 120000 build/package-testing/test-package-python-cwltest.sh
 copy tools/arvbox/lib/arvbox/docker/logger => build/package-testing/test-package-python27-python-cwltest.sh (74%)
 mode change 100755 => 120000 build/package-testing/test-packages-debian9.sh

       via  b77abbed6a747e46b98b1e8478158b27ff320151 (commit)
       via  d28a8e316ea10873f55a9d3e106dd0d7b26ab712 (commit)
       via  0ee50ba86dd58c64384af28a55105421e8b0ad36 (commit)
       via  61ed8053bd7aa76460ea0ac7a023c85a3f791ba9 (commit)
       via  20153f57b0bebe11a12ee9462851c18342edff1f (commit)
       via  0ecd6b502fbf721896d620c67502c8eb9ec4c0a7 (commit)
       via  4176b6f82084d1bc2d55092f0b79c5723015bd51 (commit)
       via  50223437ddc7f06924d90cfd211b6d2819a4faae (commit)
       via  98d6c8c5743e0fd6be85af3b9f30286a358bd1d4 (commit)
       via  885b200c41ca322477e5d7400d95c50eccf4b93f (commit)
      from  4dd3d867e590ff54b9e2c1abeea879bcdf87c529 (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 b77abbed6a747e46b98b1e8478158b27ff320151
Merge: d28a8e3 0ecd6b5
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Mar 12 10:43:26 2018 -0400

    13143: Merge branch 'master' into 13143-secret-mounts
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit d28a8e316ea10873f55a9d3e106dd0d7b26ab712
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Mar 12 10:42:33 2018 -0400

    13143: Skip some unneeded deep_dup.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 230d4a9..5bde629 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -89,7 +89,7 @@ module ApiFixtureLoader
           ob.reject! { |k, v| k == 'secret_mounts' }
         end
       end
-      keys.inject(@@api_fixtures[name]) { |hash, key| hash[key].deep_dup }
+      keys.inject(@@api_fixtures[name]) { |hash, key| hash[key] }.deep_dup
     end
   end
   def api_fixture(name, *keys)

commit 0ee50ba86dd58c64384af28a55105421e8b0ad36
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Mar 12 10:42:01 2018 -0400

    13143: Don't advertise secret_* columns in discovery doc.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 91685f5..adac996 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -123,7 +123,7 @@ class Arvados::V1::SchemaController < ApplicationController
         end
         object_properties = {}
         k.columns.
-          select { |col| col.name != 'id' }.
+          select { |col| col.name != 'id' && !col.name.start_with?('secret_') }.
           collect do |col|
           if k.serialized_attributes.has_key? col.name
             object_properties[col.name] = {

commit 61ed8053bd7aa76460ea0ac7a023c85a3f791ba9
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Mar 12 10:24:08 2018 -0400

    13143: Don't load secret_mounts from test fixtures.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 503db08..230d4a9 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -85,7 +85,9 @@ module ApiFixtureLoader
         file = IO.read(path)
         trim_index = file.index('# Test Helper trims the rest of the file')
         file = file[0, trim_index] if trim_index
-        YAML.load(file)
+        YAML.load(file).each do |name, ob|
+          ob.reject! { |k, v| k == 'secret_mounts' }
+        end
       end
       keys.inject(@@api_fixtures[name]) { |hash, key| hash[key].deep_dup }
     end

commit 20153f57b0bebe11a12ee9462851c18342edff1f
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Mar 12 10:32:09 2018 -0400

    13143: Skip some unneeded database resets.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/test/controllers/disabled_api_test.rb b/apps/workbench/test/controllers/disabled_api_test.rb
index 90cb23b..913f2b9 100644
--- a/apps/workbench/test/controllers/disabled_api_test.rb
+++ b/apps/workbench/test/controllers/disabled_api_test.rb
@@ -6,6 +6,9 @@ require 'test_helper'
 require 'helpers/share_object_helper'
 
 class DisabledApiTest < ActionController::TestCase
+  reset_api_fixtures :after_each_test, false
+  reset_api_fixtures :after_suite, false
+
   test "dashboard recent processes when pipeline_instance index API is disabled" do
     @controller = ProjectsController.new
 
diff --git a/apps/workbench/test/controllers/healthcheck_controller_test.rb b/apps/workbench/test/controllers/healthcheck_controller_test.rb
index 9a63a29..45726e5 100644
--- a/apps/workbench/test/controllers/healthcheck_controller_test.rb
+++ b/apps/workbench/test/controllers/healthcheck_controller_test.rb
@@ -5,6 +5,9 @@
 require 'test_helper'
 
 class HealthcheckControllerTest < ActionController::TestCase
+  reset_api_fixtures :after_each_test, false
+  reset_api_fixtures :after_suite, false
+
   [
     [false, nil, 404, 'disabled'],
     [true, nil, 401, 'authorization required'],

commit 4176b6f82084d1bc2d55092f0b79c5723015bd51
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Mar 9 16:47:19 2018 -0500

    13143: Do not try to select container secret_mounts column.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/app/models/container_work_unit.rb b/apps/workbench/app/models/container_work_unit.rb
index dbc81c5..7f1052e 100644
--- a/apps/workbench/app/models/container_work_unit.rb
+++ b/apps/workbench/app/models/container_work_unit.rb
@@ -23,7 +23,7 @@ class ContainerWorkUnit < ProxyWorkUnit
     items = []
     container_uuid = if @proxied.is_a?(Container) then uuid else get(:container_uuid) end
     if container_uuid
-      cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts)
+      cols = ContainerRequest.columns.map(&:name) - %w(id updated_at mounts secret_mounts)
       my_children = @child_proxies || ContainerRequest.select(cols).where(requesting_container_uuid: container_uuid).results if !my_children
       my_child_containers = my_children.map(&:container_uuid).compact.uniq
       grandchildren = {}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list