13547: if an instance of KeepClient has an api_client object with the insecure

flag set, and the ARVADOS_API_HOST_INSECURE environment variable is not set,
set the insecure flag on the KeepClient instance. Also set that flag on any
KeepService instances created by that KeepClient instance.

This makes arv-copy respect the ARVADOS_API_HOST_INSECURE value in the config
file(s) for the Arvados instances, when talking to keep proxy.

refs #13547

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index 1150bb6b4e52741e13fbfa3f1aa4f5935cb3468a..ee1850ff3487b702ed3e732650c0e23a50707649 100644 (file)
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -292,7 +292,7 @@ class KeepClient(object):
         def __init__(self, root, user_agent_pool=queue.LifoQueue(),
                      upload_counter=None,
                      download_counter=None,
-                     headers={}):
+                     headers={},insecure=False):
             self.root = root
             self._user_agent_pool = user_agent_pool
             self._result = {'error': None}
@@ -304,6 +304,7 @@ class KeepClient(object):
             self.put_headers = headers
             self.upload_counter = upload_counter
             self.download_counter = download_counter
+            self.insecure = insecure
 
         def usable(self):
             """Is it worth attempting a request?"""
@@ -771,6 +772,10 @@ class KeepClient(object):
         else:
             self.insecure = False
 
+        if api_client is not None:
+            if not self.insecure and api_client.insecure:
+                self.insecure = True
+
         self.block_cache = block_cache if block_cache else KeepBlockCache()
         self.timeout = timeout
         self.proxy_timeout = proxy_timeout
@@ -943,7 +948,7 @@ class KeepClient(object):
                     root, self._user_agent_pool,
                     upload_counter=self.upload_counter,
                     download_counter=self.download_counter,
-                    headers=headers)
+                    headers=headers,insecure=self.insecure)
         return local_roots
 
     @staticmethod
@@ -1044,7 +1049,7 @@ class KeepClient(object):
                 root: self.KeepService(root, self._user_agent_pool,
                                        upload_counter=self.upload_counter,
                                        download_counter=self.download_counter,
-                                       headers=headers)
+                                       headers=headers,insecure=self.insecure)
                 for root in hint_roots
             }