updated dev bucket name

OpenConceptLab · Dec 11, 2020 · 43dcfcc · 43dcfcc
1 parent be1eb56
commit 43dcfcc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/core/common/tests.py b/core/common/tests.py
@@ -226,13 +226,13 @@ class S3Test(TestCase):
     @mock_s3
     def test_upload(self):
         _conn = boto3.resource('s3', region_name='us-east-1')
-        _conn.create_bucket(Bucket='ocl-api-dev')
+        _conn.create_bucket(Bucket='oclapi2-dev')
 
         S3.upload('some/path', 'content')
 
         self.assertEqual(
             _conn.Object(
-                'ocl-api-dev',
+                'oclapi2-dev',
                 'some/path'
             ).get()['Body'].read().decode("utf-8"),
             'content'
@@ -248,7 +248,7 @@ def test_upload_public(self, client_mock):
 
         conn_mock.upload_fileobj.assert_called_once_with(
             'content',
-            'ocl-api-dev',
+            'oclapi2-dev',
             'some/path',
             ExtraArgs={'ACL': 'public-read'},
         )
@@ -333,12 +333,12 @@ def test_upload_base64_no_ext(self, s3_upload_mock):
     @mock_s3
     def test_remove(self):
         _conn = boto3.resource('s3', region_name='us-east-1')
-        _conn.create_bucket(Bucket='ocl-api-dev')
+        _conn.create_bucket(Bucket='oclapi2-dev')
 
         S3.upload('some/path', 'content')
         self.assertEqual(
             _conn.Object(
-                'ocl-api-dev',
+                'oclapi2-dev',
                 'some/path'
             ).get()['Body'].read().decode("utf-8"),
             'content'
@@ -347,18 +347,18 @@ def test_remove(self):
         S3.remove(key='some/path')
 
         with self.assertRaises(ClientError):
-            _conn.Object('ocl-api-dev', 'some/path').get()
+            _conn.Object('oclapi2-dev', 'some/path').get()
 
     @mock_s3
     def test_url_for(self):
         _conn = boto3.resource('s3', region_name='us-east-1')
-        _conn.create_bucket(Bucket='ocl-api-dev')
+        _conn.create_bucket(Bucket='oclapi2-dev')
 
         S3.upload('some/path', 'content')
         _url = S3.url_for('some/path')
 
         self.assertTrue(
-            'https://ocl-api-dev.s3.amazonaws.com/some/path' in _url
+            'https://oclapi2-dev.s3.amazonaws.com/some/path' in _url
         )
         self.assertTrue(
             '&X-Amz-Credential=' in _url
@@ -373,7 +373,7 @@ def test_url_for(self):
     def test_public_url_for(self):
         self.assertEqual(
             S3.public_url_for('some/path'),
-            'http://ocl-api-dev.s3.amazonaws.com/some/path'
+            'http://oclapi2-dev.s3.amazonaws.com/some/path'
         )
 
 

diff --git a/core/settings.py b/core/settings.py
@@ -253,7 +253,7 @@
 DEFAULT_LOCALE = os.environ.get('DEFAULT_LOCALE', 'en')
 AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', '')
 AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', '')
-AWS_STORAGE_BUCKET_NAME = os.environ.get('AWS_STORAGE_BUCKET_NAME', 'ocl-api-dev')
+AWS_STORAGE_BUCKET_NAME = os.environ.get('AWS_STORAGE_BUCKET_NAME', 'oclapi2-dev')
 AWS_REGION_NAME = os.environ.get('AWS_REGION_NAME', 'us-east-1')
 DISABLE_VALIDATION = os.environ.get('DISABLE_VALIDATION', False)
 API_SUPERUSER_PASSWORD = os.environ.get('API_SUPERUSER_PASSWORD', 'Root123')  # password for ocladmin superuser