Update to support Minio endpoints secured by TLS

Author: AndrewEckart

.vscode/settings.json

@@ -18,6 +18,7 @@
         "SXPASS",
         "SXTYPE",
         "SXUSER",
+        "SXTOKEN",
         "Servivce",
         "Topo",
         "accesskey",

servicex/minio_adaptor.py

@@ -44,17 +44,19 @@ class MinioAdaptor:
     # uses blocking http requests, so we can't use asyncio to interleave them.
     _download_executor = ThreadPoolExecutor(max_workers=5)
 
-    def __init__(self, mino_endpoint: str,
+    def __init__(self, minio_endpoint: str,
+                 secured: bool = False,
                  access_key: str = 'miniouser',
                  secretkey: str = 'leftfoot1'):
-        self._endpoint = mino_endpoint
+        self._endpoint = minio_endpoint
+        self._secured = secured
         self._access_key = access_key
         self._secretkey = secretkey
 
         self._client = Minio(self._endpoint,
                              access_key=self._access_key,
                              secret_key=self._secretkey,
-                             secure=False)
+                             secure=self._secured)
 
     @on_exception(backoff.constant, ResponseError, interval=0.1)
     def get_files(self, request_id):
@@ -118,7 +120,7 @@ def __init__(self, c: Optional[ConfigView] = None,
         if self._always is None and c is not None:
             self._config_adaptor = self._from_config(c)
 
-    def from_best(self, transation_info: Optional[Dict[str, str]] = None) -> MinioAdaptor:
+    def from_best(self, transaction_info: Optional[Dict[str, str]] = None) -> MinioAdaptor:
         '''Using the information we have, create the proper Minio Adaptor with the correct
         endpoint and login information. Order of adaptor generation:
 
@@ -136,14 +138,14 @@ def from_best(self, transation_info: Optional[Dict[str, str]] = None) -> MinioAd
         if self._always is not None:
             logging.getLogger(__name__).debug('Using the pre-defined minio_adaptor')
             return self._always
-        if transation_info is not None:
-            if 'minio-endpoint' in transation_info \
-                    and 'minio-access-key' in transation_info \
-                    and 'minio-secret-key' in transation_info:
+        if transaction_info is not None:
+            keys = ['minio-endpoint', 'minio-secured', 'minio-access-key', 'minio-secret-key']
+            if all(k in transaction_info for k in keys):
                 logging.getLogger(__name__).debug('Using the request-specific minio_adaptor')
-                return MinioAdaptor(transation_info['minio-endpoint'],
-                                    transation_info['minio-access-key'],
-                                    transation_info['minio-secret-key'])
+                return MinioAdaptor(transaction_info['minio-endpoint'],
+                                    transaction_info['minio-secured'],
+                                    transaction_info['minio-access-key'],
+                                    transaction_info['minio-secret-key'])
         if self._config_adaptor is not None:
             logging.getLogger(__name__).debug('Using the config-file minio_adaptor')
             return self._config_adaptor

tests/test_minio_adaptor.py

@@ -231,10 +231,12 @@ def test_factory_from_request():
     info = {
         'minio-access-key': 'miniouser',
         'minio-endpoint': 'minio.servicex.com:9000',
+        'minio-secured': False,
         'minio-secret-key': 'leftfoot1',
     }
     m = MinioAdaptorFactory().from_best(info)
     assert m._endpoint == 'minio.servicex.com:9000'
+    assert not m._secured
     assert m._access_key == "miniouser"
     assert m._secretkey == "leftfoot1"