From 2a9ea85ed8d4d7c838fe4bc7b61496ee5fe52e7c Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Thu, 13 Apr 2017 14:39:03 -0400
Subject: [PATCH] #339 add region to .env

---
 README.md                                      | 2 ++
 client/modules/IDE/actions/uploader.js         | 2 +-
 client/modules/IDE/components/FileUploader.jsx | 2 +-
 server/controllers/aws.controller.js           | 3 ++-
 server/migrations/db_reformat.js               | 2 +-
 server/migrations/s3UnderUser.js               | 4 ++--
 webpack.config.dev.js                          | 3 ++-
 webpack.config.prod.js                         | 3 ++-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 68137494..c8c17607 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ This project is currently in development! It will be announced when there is a (
   SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production
   AWS_ACCESS_KEY=<your-aws-access-key>
   AWS_SECRET_KEY=<your-aws-secret-key>
+  AWS_REGION=<your-aws-region>
   S3_BUCKET=<your-s3-bucket>
   GITHUB_ID=<your-github-client-id>
   GITHUB_SECRET=<your-github-client-secret>
@@ -49,6 +50,7 @@ The automatic redirection to HTTPS is turned off by default in development. If y
   SESSION_SECRET=make_this_a_long-random_string_like_maybe_126_characters_long
   AWS_ACCESS_KEY=<your-aws-access-key>
   AWS_SECRET_KEY=<your-aws-secret-key>
+  AWS_REGION=<your-aws-region>
   S3_BUCKET=<your-s3-bucket>
   GITHUB_ID=<your-github-client-id>
   GITHUB_SECRET=<your-github-client-secret>
diff --git a/client/modules/IDE/actions/uploader.js b/client/modules/IDE/actions/uploader.js
index 3081a344..223a38bd 100644
--- a/client/modules/IDE/actions/uploader.js
+++ b/client/modules/IDE/actions/uploader.js
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { createFile } from './files';
 
 const textFileRegex = /(text\/|application\/json)/;
-const s3BucketHttps = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`;
+const s3BucketHttps = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/`;
 const ROOT_URL = process.env.API_URL;
 const MAX_LOCAL_FILE_SIZE = 80000; // bytes, aka 80 KB
 
diff --git a/client/modules/IDE/components/FileUploader.jsx b/client/modules/IDE/components/FileUploader.jsx
index c97bffae..0b523efd 100644
--- a/client/modules/IDE/components/FileUploader.jsx
+++ b/client/modules/IDE/components/FileUploader.jsx
@@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import * as UploaderActions from '../actions/uploader';
 
-const s3Bucket = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`;
+const s3Bucket = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/`;
 
 class FileUploader extends React.Component {
   componentDidMount() {
diff --git a/server/controllers/aws.controller.js b/server/controllers/aws.controller.js
index 5e548d9c..5f252c45 100644
--- a/server/controllers/aws.controller.js
+++ b/server/controllers/aws.controller.js
@@ -11,10 +11,11 @@ const client = s3.createClient({
   s3Options: {
     accessKeyId: `${process.env.AWS_ACCESS_KEY}`,
     secretAccessKey: `${process.env.AWS_SECRET_KEY}`,
+    region: `${process.env.AWS_REGION}`
   },
 });
 
-const s3Bucket = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`;
+const s3Bucket = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/`;
 
 function getExtension(filename) {
   const i = filename.lastIndexOf('.');
diff --git a/server/migrations/db_reformat.js b/server/migrations/db_reformat.js
index 76bff7c0..82dadcf4 100644
--- a/server/migrations/db_reformat.js
+++ b/server/migrations/db_reformat.js
@@ -24,7 +24,7 @@ let client = s3.createClient({
   s3Options: {
     accessKeyId: `${process.env.AWS_ACCESS_KEY}`,
     secretAccessKey: `${process.env.AWS_SECRET_KEY}`,
-    region: 'us-west-2'
+    region: `${process.env.AWS_REGION}`
   },
 });
 
diff --git a/server/migrations/s3UnderUser.js b/server/migrations/s3UnderUser.js
index a124f0de..a0fbb967 100644
--- a/server/migrations/s3UnderUser.js
+++ b/server/migrations/s3UnderUser.js
@@ -20,7 +20,7 @@ let client = s3.createClient({
   s3Options: {
     accessKeyId: `${process.env.AWS_ACCESS_KEY}`,
     secretAccessKey: `${process.env.AWS_SECRET_KEY}`,
-    region: 'us-west-2'
+    region: `${process.env.AWS_REGION}`
   },
 });
 
@@ -42,7 +42,7 @@ Project.find({}, (err, projects) => {
           console.log(err);
         })
         .on('end', () => {
-          file.url = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/${userId}/${key}`;
+          file.url = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/${userId}/${key}`;
           project.save((err, savedProject) => {
             console.log(`updated file ${key}`);
           });
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 6356c2e2..acb9f5e0 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -40,7 +40,8 @@ module.exports = {
           JSON.stringify(true) :
           JSON.stringify(false),
         'NODE_ENV': JSON.stringify('development'),
-        'S3_BUCKET': '"' + process.env.S3_BUCKET + '"'
+        'S3_BUCKET': '"' + process.env.S3_BUCKET + '"',
+        'AWS_REGION': '"' + process.env.AWS_REGION + '"',
       }
     })
   ],
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 35adad95..d99403bc 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -78,7 +78,8 @@ module.exports = {
       'process.env': {
         'API_URL': '"' + process.env.API_URL + '"',
         'NODE_ENV': JSON.stringify('production'),
-        'S3_BUCKET': '"' + process.env.S3_BUCKET + '"'
+        'S3_BUCKET': '"' + process.env.S3_BUCKET + '"',
+        'AWS_REGION': '"' + process.env.AWS_REGION + '"'
       }
     }),
     new webpack.optimize.CommonsChunkPlugin({