Merge pull request #674 from eywalker/master

Add support for secure S3 connection. Fix #663

Author: guzman-raphael

datajoint/s3.py

@@ -13,8 +13,8 @@ class Folder:
     """
     A Folder instance manipulates a flat folder of objects within an S3-compatible object store
     """
-    def __init__(self, endpoint, bucket, access_key, secret_key, **_):
-        self.client = minio.Minio(endpoint, access_key=access_key, secret_key=secret_key, secure=False)
+    def __init__(self, endpoint, bucket, access_key, secret_key, *, secure=False, **_):
+        self.client = minio.Minio(endpoint, access_key=access_key, secret_key=secret_key, secure=secure)
         self.bucket = bucket
         if not self.client.bucket_exists(bucket):
             warnings.warn('Creating bucket "%s"' % self.bucket)

datajoint/settings.py

@@ -137,7 +137,7 @@ def get_store_spec(self, store):
         spec['subfolding'] = spec.get('subfolding', DEFAULT_SUBFOLDING)
         spec_keys = {  # REQUIRED in uppercase and allowed in lowercase
             'file': ('PROTOCOL', 'LOCATION', 'subfolding', 'stage'),
-            's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION', 'subfolding', 'stage')}
+            's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION', 'secure', 'subfolding', 'stage')}
 
         try:
             spec_keys = spec_keys[spec.get('protocol', '').lower()]
@@ -147,7 +147,7 @@ def get_store_spec(self, store):
 
         # check that all required keys are present in spec
         try:
-            raise DataJointError('dj.config["stores"]["{store}" is missing "{k}"'.format(
+            raise DataJointError('dj.config["stores"]["{store}"] is missing "{k}"'.format(
                 store=store, k=next(k.lower() for k in spec_keys if k.isupper() and k.lower() not in spec)))
         except StopIteration:
             pass