reuse existing AioBotoCore session (#19)

Author: guilhermef

.gitignore

@@ -131,3 +131,5 @@ test-results/
 cobertura.xml
 coverage
 cc-test-reporter
+
+.vscode

tests/__init__.py

@@ -15,7 +15,7 @@
 from thumbor.importer import Importer
 from thumbor.testing import TestCase
 
-from thumbor_aws.s3_client import S3Client
+import thumbor_aws.s3_client
 
 
 class BaseS3TestCase(TestCase):
@@ -106,7 +106,7 @@ def get_context(self) -> Context:
 
     async def ensure_bucket(self):
         """Ensures the test bucket is created"""
-        s3client = S3Client(self.context)
+        s3client = thumbor_aws.s3_client.S3Client(self.context)
         if self.context.config.THUMBOR_AWS_RUN_IN_COMPATIBILITY_MODE is True:
             s3client.configuration["region_name"] = self.config.TC_AWS_REGION
             s3client.configuration[

tests/test_loader.py

@@ -16,7 +16,7 @@
 from tornado.testing import gen_test
 
 from tests import BaseS3TestCase
-from thumbor_aws.loader import load
+import thumbor_aws.loader
 from thumbor_aws.storage import Storage
 
 
@@ -41,23 +41,31 @@ async def test_can_load_file_from_s3(self):
         exists = await storage.exists(filepath)
         expect(exists).to_be_true()
 
-        result = await load(self.context, filepath)
+        result = await thumbor_aws.loader.load(self.context, filepath)
 
         expect(result.successful).to_be_true()
         expect(result.buffer).to_equal(expected)
         expect(result.metadata["size"]).to_equal(len(expected))
         expect(result.metadata["updated_at"]).not_to_be_null()
 
+    @gen_test
+    async def test_result_false_when_file_not_in_s3(self):
+        """
+        Verifies that result is false when image not present in S3
+        """
+        await self.ensure_bucket()
+        filepath = f"/test/can_put_file_{uuid4()}"
+
+        result = await thumbor_aws.loader.load(self.context, filepath)
+
+        expect(result.successful).to_be_false()
+
 
 @pytest.mark.usefixtures("test_images")
 class LoaderCompatibilityModeTestCase(LoaderTestCase):
     def get_config(self) -> Config:
         return self.get_compatibility_config()
 
-    @property
-    def _prefix(self):
-        return "/test-compat-st"
-
     @property
     def bucket_name(self):
         """Name of the bucket to put test files in"""
@@ -66,10 +74,10 @@ def bucket_name(self):
 
 @pytest.mark.usefixtures("test_images")
 class EmptyBucketConfigLoaderTestCase(BaseS3TestCase):
-    @property
-    def bucket_name(self):
-        """Name of the bucket to put test files in"""
-        return self.context.config.AWS_LOADER_BUCKET_NAME
+    def get_config(self) -> Config:
+        cfg = super().get_config()
+        cfg.AWS_LOADER_BUCKET_NAME = ""
+        return cfg
 
     @gen_test
     async def test_can_load_file_from_s3(self):
@@ -86,14 +94,25 @@ async def test_can_load_file_from_s3(self):
         expect(exists).to_be_true()
 
         filepath_with_bucket = (
-            f"/{self.context.config.AWS_LOADER_BUCKET_NAME}{filepath}"
+            f"/{self.context.config.AWS_STORAGE_BUCKET_NAME}{filepath}"
         )
 
-        self.context.config.AWS_LOADER_BUCKET_NAME = ""
-
-        result = await load(self.context, filepath_with_bucket)
+        result = await thumbor_aws.loader.load(
+            self.context, filepath_with_bucket
+        )
 
         expect(result.successful).to_be_true()
         expect(result.buffer).to_equal(expected)
         expect(result.metadata["size"]).to_equal(len(expected))
         expect(result.metadata["updated_at"]).not_to_be_null()
+
+
+@pytest.mark.usefixtures("test_images")
+class LoaderNoPrefixTestCase(LoaderTestCase):
+    def get_config(self) -> Config:
+        cfg = super().get_config()
+        cfg.AWS_LOADER_BUCKET_NAME = "test-bucket-loader-no-prefix"
+        cfg.AWS_STORAGE_BUCKET_NAME = "test-bucket-loader-no-prefix"
+        cfg.AWS_LOADER_ROOT_PATH = ""
+        cfg.AWS_STORAGE_ROOT_PATH = ""
+        return cfg

thumbor_aws/s3_client.py

@@ -9,7 +9,7 @@
 # Copyright (c) 2021 Bernardo Heynemann heynemann@gmail.com
 
 import datetime
-from typing import Any, Dict, Mapping, Optional
+from typing import Any, Dict, Mapping, Optional, Tuple
 
 from aiobotocore.client import AioBaseClient
 from aiobotocore.session import AioSession, get_session
@@ -84,9 +84,9 @@ def file_acl(self) -> str:
     @property
     def session(self) -> AioSession:
         """Singleton Session used for connecting with AWS"""
-        if self.__session is None:
-            self.__session = get_session()
-        return self.__session
+        if S3Client.__session is None:
+            S3Client.__session = get_session()
+        return S3Client.__session
 
     def get_client(self) -> AioBaseClient:
         """Gets a connected client to use for S3"""
@@ -145,7 +145,7 @@ async def upload(
 
     async def get_data(
         self, bucket: str, path: str, expiration: int = _default
-    ) -> (int, bytes, bytes, Optional[datetime.datetime]):
+    ) -> Tuple[int, bytes, bytes, Optional[datetime.datetime]]:
         """Gets an object's data from S3"""
         async with self.get_client() as client:
             try:
@@ -212,7 +212,7 @@ async def get_body(self, response: Any) -> bytes:
         async with response["Body"] as stream:
             return await stream.read()
 
-    def _get_bucket_and_path(self, path) -> (str, str):
+    def _get_bucket_and_path(self, path) -> Tuple[str, str]:
         bucket = self.bucket_name
         real_path = path
         if not self.bucket_name: