filesystem s3 fix

Author: mostafa6765

drf_friend/__init__.py

@@ -1,6 +1,6 @@
 
 __title__ = 'DRF Friend'
-__version__ = '0.0.11'
+__version__ = '0.0.29'
 __author__ = 'Mostafa'
 
 # Version synonym

drf_friend/filesystem/storage.py

@@ -6,12 +6,14 @@ def __init__(self, disk='local'):
         self.disk = disk
         self.local_storage = LocalStorage()
         self.s3_storage = None
+        self.set_disk(disk)
+        
 
-    def disk(self, storage_type):
-        self.disk = storage_type
-
+    def set_disk(self, storage_type):
         if self.disk == 's3':
-            self.s3_storage = S3Storage('your-s3-bucket')
+            self.s3_storage = S3Storage()
+        else:
+            self.disk = storage_type
 
     def put(self, path, contents):
         if self.disk == 'local':

drf_friend/filesystem/the_disks/s3.py

@@ -1,10 +1,22 @@
 import boto3
 from botocore.exceptions import ClientError
+from drf_friend.env import getEnv
+
+# Retrieve environment variables
+aws_access_key_id = getEnv('AWS_ACCESS_KEY_ID')
+aws_secret_access_key = getEnv('AWS_SECRET_ACCESS_KEY')
+aws_region = getEnv('AWS_REGION')
+bucket_name = getEnv('BUCKET_NAME')
 
 class S3Storage:
-    def __init__(self, s3_bucket):
-        self.s3_bucket = s3_bucket
-        self.s3_client = boto3.client('s3')
+    def __init__(self):
+        self.s3_bucket = bucket_name
+        self.s3_client = boto3.client(
+            's3',
+            aws_access_key_id=aws_access_key_id,
+            aws_secret_access_key=aws_secret_access_key,
+            region_name=aws_region
+        )
 
     def put(self, path, contents):
         try:

setup.py

@@ -36,7 +36,7 @@ def read(f):
 setup(
     # Package metadata
     name='drf-friend',
-    version='0.0.28',
+    version='0.0.29',
     url='https://drf-friend.code4mk.org/',
     author='Mostafa Kamal',
     author_email='[email protected]',