correct handling of actual keys and secrets for S3

Author: valeriupredoi

activestorage/active.py

@@ -348,8 +348,21 @@ def _from_storage(self, stripped_indexer, drop_axes, out_shape, out_dtype,
 
         # Create a shared session object.
         if self.storage_type == "s3":
-            session = reductionist.get_session(S3_ACCESS_KEY, S3_SECRET_KEY,
-                                               S3_ACTIVE_STORAGE_CACERT)
+            if self.storage_options is not None:
+                key, secret = None, None
+                if "key" in self.storage_options:
+                    key = self.storage_options["key"]
+                if "secret" in self.storage_options:
+                    secret = self.storage_options["secret"]
+                if key and secret:
+                    session = reductionist.get_session(key, secret,
+                                                       S3_ACTIVE_STORAGE_CACERT)
+                else:
+                    session = reductionist.get_session(S3_ACCESS_KEY, S3_SECRET_KEY,
+                                                       S3_ACTIVE_STORAGE_CACERT)
+            else:
+                session = reductionist.get_session(S3_ACCESS_KEY, S3_SECRET_KEY,
+                                                   S3_ACTIVE_STORAGE_CACERT)
         else:
             session = None