Merge pull request #78 from andreciornavei/develop

fix aws bucket credentials
andreciornavei · Mar 8, 2024 · f0915ac · f0915ac
2 parents 4238117 + 0885d77
commit f0915ac
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -72,8 +72,8 @@ jobs:
           echo "DB_URI=${DB_URI}" >> .env
           echo "JWT_SECRET=${JWT_SECRET}" >> .env
           echo "AWS_HOSTED_ZONE_ID=${AWS_HOSTED_ZONE_ID}" >> .env
-          echo "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" >> .env
-          echo "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" >> .env
+          echo "AWS_BUCKET_KEY=${AWS_ACCESS_KEY_ID}" >> .env
+          echo "AWS_BUCKET_SECRET=${AWS_SECRET_ACCESS_KEY}" >> .env
           serverless deploy --config serverless.yml --stage ${BRANCH} --region ${AWS_DEFAULT_REGION} --verbose
         if: success()
 

diff --git a/backend/.env.example b/backend/.env.example
@@ -11,7 +11,7 @@ DB_URI=
 JWT_SECRET=
 
 AWS_BUCKET=
-AWS_REGION=sa-east-1
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
+AWS_BUCKET_REGION=sa-east-1
+AWS_BUCKET_KEY=
+AWS_BUCKET_SECRET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
diff --git a/backend/app/Infrastructure/Providers/Storage/AwsS3Provider.php b/backend/app/Infrastructure/Providers/Storage/AwsS3Provider.php
@@ -17,13 +17,13 @@ class AwsS3Provider implements IStorageProvider
     public function __construct()
     {
         $args = [
-            'region' => env('AWS_REGION', "sa-east-1"),
+            'region' => env('AWS_BUCKET_REGION', "sa-east-1"),
             'version' => 'latest',
         ];
-        if (getenv("AWS_ACCESS_KEY_ID") && getenv("AWS_SECRET_ACCESS_KEY")) {
+        if (getenv("AWS_BUCKET_KEY") && getenv("AWS_BUCKET_SECRET")) {
             $args["credentials"] = new Credentials(
-                env('AWS_ACCESS_KEY_ID'),
-                env('AWS_SECRET_ACCESS_KEY'),
+                env('AWS_BUCKET_KEY'),
+                env('AWS_BUCKET_SECRET'),
             );
         }
         $sdk = new Sdk($args);

diff --git a/backend/serverless.yml b/backend/serverless.yml
@@ -27,8 +27,8 @@ params:
     AWS_HOSTED_ZONE_ID: ${env:AWS_HOSTED_ZONE_ID}
     SUBDOMAIN: ${env:SUBDOMAIN}.${sls:stage}.${env:DOMAIN}
     BUCKET_NAME: bnb-bank-upload.${sls:stage}.${env:DOMAIN}
-    AWS_ACCESS_KEY_ID: ${env:AWS_ACCESS_KEY_ID}
-    AWS_SECRET_ACCESS_KEY: ${env:AWS_SECRET_ACCESS_KEY}
+    AWS_BUCKET_KEY: ${env:AWS_BUCKET_KEY}
+    AWS_BUCKET_SECRET: ${env:AWS_BUCKET_SECRET}
   production:
     SUBDOMAIN: ${env:SUBDOMAIN}.${env:DOMAIN}
     BUCKET_NAME: bnb-bank-upload.${env:DOMAIN}
@@ -66,9 +66,9 @@ functions:
       APP_NAME: ${param:APP_NAME}
       DB_URI: ${param:DB_URI}
       AWS_BUCKET: ${param:BUCKET_NAME}
-      AWS_REGION: ${param:REGION}
-      AWS_ACCESS_KEY_ID: ${param:AWS_ACCESS_KEY_ID}
-      AWS_SECRET_ACCESS_KEY: ${param:AWS_SECRET_ACCESS_KEY}
+      AWS_BUCKET_REGION: ${param:REGION}
+      AWS_BUCKET_KEY: ${param:AWS_BUCKET_KEY}
+      AWS_BUCKET_SECRET: ${param:AWS_BUCKET_SECRET}
       AWS_USE_PATH_STYLE_ENDPOINT: false
       JWT_SECRET: ${param:JWT_SECRET}
     events: