update bucket name

Author: eisbilir

README.md

@@ -71,7 +71,7 @@ e.g.
 
 ```
 export AWS_REGION="<AWS Region>"
-export S3_BUCKET="<S3 Bucket Name>"
+export DMZ_BUCKET="<S3 Bucket Name>"
 export ARTIFACT_BUCKET="<Artifact S3 Bucket Name>"
 export ES_HOST="<ES Endpoint>"
 export AUTH0_URL="<Auth0 URL>"
@@ -135,7 +135,7 @@ npm run start
      AWS_ACCESS_KEY_ID=
      AWS_SECRET_ACCESS_KEY=
      AWS_REGION=
-     S3_BUCKET=
+     DMZ_BUCKET=
      ARTIFACT_BUCKET=
 
      # Auth0 config

config/default.js

@@ -15,8 +15,7 @@ module.exports = {
     AWS_REGION: process.env.AWS_REGION || 'us-east-1', // AWS Region to be used by the application
     AWS_READ_UNITS: process.env.AWS_READ_UNITS || 5,
     AWS_WRITE_UNITS: process.env.AWS_WRITE_UNITS || 5,
-    S3_BUCKET: process.env.S3_BUCKET || 'tc-testing-submissions', // S3 Bucket to which submissions need to be uploaded
-    DMZ_BUCKET: process.env.AWS_DMZ_BUCKET,
+    DMZ_BUCKET: process.env.AWS_DMZ_BUCKET || 'tc-testing-submissions', // S3 Bucket to which submissions need to be uploaded
     QUARANTINE_BUCKET: process.env.AWS_QUARANTINE_BUCKET,
     ARTIFACT_BUCKET: process.env.ARTIFACT_BUCKET || 'tc-testing-submissions' // S3 bucket to which artifacts need to be uploaded
   },

config/test.js

@@ -13,7 +13,8 @@ module.exports = {
     AWS_REGION: process.env.AWS_REGION || 'us-east-1', // AWS Region to be used by the application
     AWS_READ_UNITS: process.env.AWS_READ_UNITS || 5,
     AWS_WRITE_UNITS: process.env.AWS_WRITE_UNITS || 5,
-    S3_BUCKET: process.env.S3_BUCKET_TEST || 'tc-testing-submissions' // S3 Bucket to which submissions need to be uploaded
+    DMZ_BUCKET: process.env.AWS_DMZ_BUCKET_TEST || 'tc-testing-submissions', // S3 Bucket to which submissions need to be uploaded
+    QUARANTINE_BUCKET: process.env.AWS_QUARANTINE_BUCKET_TEST
   },
   BUSAPI_EVENTS_URL: 'https://api.topcoder-dev.com/v5/bus/events',
   BUSAPI_URL: 'https://api.topcoder-dev.com/v5',

docker/sample.api.env

@@ -3,6 +3,7 @@ AUTH0_CLIENT_ID=<Auth0 Client ID>
 AUTH0_CLIENT_SECRET=<Auth0 Client Secret>
 AWS_ACCESS_KEY_ID=<AWS Access Key ID>
 AWS_SECRET_ACCESS_KEY=<AWS Secret Access Key>
-S3_BUCKET=<AWS S3 Bucket>
+DMZ_BUCKET=<AWS S3 Bucket>
+QUARANTINE_BUCKET=<AWS S3 Quarantine Bucket>
 ARTIFACT_BUCKET=<AWS S3 Artifact Bucket>
 ES_HOST=<ES Host Endpoint>

src/services/SubmissionService.js

@@ -27,7 +27,7 @@ const table = 'Submission'
 function _uploadToS3 (file, name) {
   return new Promise((resolve, reject) => {
     const params = {
-      Bucket: config.aws.S3_BUCKET,
+      Bucket: config.aws.DMZ_BUCKET,
       Key: name,
       Body: file.data,
       ContentType: file.mimetype,

test/unit/prepare.js

@@ -72,7 +72,7 @@ prepare(function (done) {
       callback(null, {
         Location: `https://test.s3.com/${params.Key}`,
         Key: params.Key,
-        Bucket: config.aws.S3_BUCKET
+        Bucket: config.aws.DMZ_BUCKET
       })
     }
   })