Ignore this LMAO

dotkom · Feb 19, 2024 · 2e238b2 · 2e238b2
1 parent 9baef19
commit 2e238b2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -44,8 +44,6 @@ jobs:
  NEXT_PUBLIC_AUTH_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_AUTH_CLIENT_ID }}
  NEXT_PUBLIC_OW4_ADDRESS: ${{ secrets.NEXT_PUBLIC_OW4_ADDRESS }}
  NEXT_PUBLIC_SENTRY_DSN: ${{ secrets.NEXT_PUBLIC_SENTRY_DSN }}
- NEXT_AWS_REGION: ${{ secrets.NEXT_AWS_REGION }}
- NEXT_AWS_S3_BUCKET_NAME: ${{ secrets.NEXT_AWS_S3_BUCKET_NAME }}
  - name: Trigger deploy.sh remotely
  uses: appleboy/ssh-action@master
  with:

diff --git a/src/utils/downloadFileFromS3Bucket.ts b/src/utils/downloadFileFromS3Bucket.ts
@@ -1,14 +1,14 @@
 import AWS from "aws-sdk";
 
-const credentials = (process.env.NEXT_AWS_ACCESS_KEY_ID && process.env.NEXT_AWS_SECRET_ACCESS_KEY) ?
+const credentials = (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ?
  {
- accessKeyId: process.env.NEXT_AWS_ACCESS_KEY_ID,
- secretAccessKey: process.env.NEXT_AWS_SECRET_ACCESS_KEY,
+ accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+ secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
  } :
  undefined;
 
 AWS.config.update({
- region: process.env.NEXT_AWS_REGION,
+ region: process.env.AWS_REGION,
  credentials,
 })
 
@@ -18,7 +18,7 @@ export async function downloadFileFromS3Bucket(key: string): Promise<File> {
  });
 
  const params = {
- Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME as string,
+ Bucket: process.env.AWS_S3_BUCKET_NAME as string,
  Key: key,
  };
 

diff --git a/src/utils/getPresignedS3URL.ts b/src/utils/getPresignedS3URL.ts
@@ -1,25 +1,25 @@
 import AWS from "aws-sdk";
 
-const credentials = (process.env.NEXT_AWS_ACCESS_KEY_ID && process.env.NEXT_AWS_SECRET_ACCESS_KEY) ?
+const credentials = (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ?
  {
- accessKeyId: process.env.NEXT_AWS_ACCESS_KEY_ID,
- secretAccessKey: process.env.NEXT_AWS_SECRET_ACCESS_KEY,
+ accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+ secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
  } :
  undefined;
 
 AWS.config.update({
- region: process.env.NEXT_AWS_REGION,
+ region: process.env.AWS_REGION,
  credentials,
 })
 
 export const getPresignedS3URL = async (name: string, contentType: string) => {
  const s3 = new AWS.S3({
  apiVersion: '2006-03-01',
- params: { Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME },
+ params: { Bucket: process.env.AWS_S3_BUCKET_NAME },
  })
 
  const params = {
- Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME,
+ Bucket: process.env.AWS_S3_BUCKET_NAME,
  Key: `uploads/${+new Date()}-${name}`,
  ContentType: contentType,
  }

diff --git a/src/utils/uploadFileToS3Bucket.ts b/src/utils/uploadFileToS3Bucket.ts
@@ -1,26 +1,26 @@
 import AWS from "aws-sdk";
 
-const credentials = (process.env.NEXT_AWS_ACCESS_KEY_ID && process.env.NEXT_AWS_SECRET_ACCESS_KEY) ?
+const credentials = (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ?
  {
- accessKeyId: process.env.NEXT_AWS_ACCESS_KEY_ID,
- secretAccessKey: process.env.NEXT_AWS_SECRET_ACCESS_KEY,
+ accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+ secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
  } :
  undefined;
 
 AWS.config.update({
- region: process.env.NEXT_AWS_REGION,
+ region: process.env.AWS_REGION,
  credentials,
 })
 
 // upload file to S3 bucket and make it publicly downloadable
 export async function uploadFileToS3Bucket(file: Uint8Array, key: string): Promise<string> {
  const s3 = new AWS.S3({
  apiVersion: '2006-03-01',
- params: { Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME as string },
+ params: { Bucket: process.env.AWS_S3_BUCKET_NAME as string },
  });
 
  const params = {
- Bucket: process.env.NEXT_AWS_S3_BUCKET_NAME as string,
+ Bucket: process.env.AWS_S3_BUCKET_NAME as string,
  Key: key,
  Body: file,
  ACL: 'public-read',