[ARVADOS] updated: 1.1.4-323-g76a2c8a1e

[Git user]

Summary of changes:
 sdk/python/arvados/keep.py           | 19 +++++++++----------
 sdk/python/tests/test_keep_client.py |  2 ++
 2 files changed, 11 insertions(+), 10 deletions(-)

       via  76a2c8a1eb1771b5255e8582b7e9823d072e8ef4 (commit)
       via  62f6a306eb965cee6bd814b194bf5ce3bb910116 (commit)
      from  088268fc00cb466c4b4576a2dbbaff720cb3e3af (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 76a2c8a1eb1771b5255e8582b7e9823d072e8ef4
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jun 29 15:40:22 2018 -0400

    13547: Avoid leaking insecure flag between different configs.
    
    Even if the default configuration file/environment indicates a local
    cluster that doesn't need verification, a program like arv-copy can
    also connect to a remote cluster using a settings/config file that has
    verification enabled. In this case, TLS verification should be
    enabled.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index dab4d271a..71e101cf4 100644
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -768,14 +768,10 @@ class KeepClient(object):
         if local_store is None:
             local_store = os.environ.get('KEEP_LOCAL_STORE')
 
-        if config.flag_is_true('ARVADOS_API_HOST_INSECURE'):
-            self.insecure = True
+        if api_client is None:
+            self.insecure = config.flag_is_true('ARVADOS_API_HOST_INSECURE')
         else:
-            self.insecure = False
-
-        if api_client is not None:
-            if not self.insecure and api_client.insecure:
-                self.insecure = True
+            self.insecure = api_client.insecure
 
         self.block_cache = block_cache if block_cache else KeepBlockCache()
         self.timeout = timeout
diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py
index 872c93bae..7c9ff735a 100644
--- a/sdk/python/tests/test_keep_client.py
+++ b/sdk/python/tests/test_keep_client.py
@@ -1257,6 +1257,8 @@ class KeepClientAPIErrorTest(unittest.TestCase):
             def __getattr__(self, r):
                 if r == "api_token":
                     return "abc"
+                elif r == "insecure":
+                    return False
                 else:
                     raise arvados.errors.KeepReadError()
         keep_client = arvados.KeepClient(api_client=ApiMock(),

commit 62f6a306eb965cee6bd814b194bf5ce3bb910116
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jun 29 14:52:48 2018 -0400

    13547: Fix up formatting.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index ee1850ff3..dab4d271a 100644
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -292,7 +292,8 @@ class KeepClient(object):
         def __init__(self, root, user_agent_pool=queue.LifoQueue(),
                      upload_counter=None,
                      download_counter=None,
-                     headers={},insecure=False):
+                     headers={},
+                     insecure=False):
             self.root = root
             self._user_agent_pool = user_agent_pool
             self._result = {'error': None}
@@ -948,7 +949,8 @@ class KeepClient(object):
                     root, self._user_agent_pool,
                     upload_counter=self.upload_counter,
                     download_counter=self.download_counter,
-                    headers=headers,insecure=self.insecure)
+                    headers=headers,
+                    insecure=self.insecure)
         return local_roots
 
     @staticmethod
@@ -1049,7 +1051,8 @@ class KeepClient(object):
                 root: self.KeepService(root, self._user_agent_pool,
                                        upload_counter=self.upload_counter,
                                        download_counter=self.download_counter,
-                                       headers=headers,insecure=self.insecure)
+                                       headers=headers,
+                                       insecure=self.insecure)
                 for root in hint_roots
             }
 

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


hooks/post-receive
--