Merge branch 'master' into 04182019-1

uniquelyparticular · Apr 18, 2019 · 0db7f5a · 0db7f5a
2 parents 21530cf + f5ab434
commit 0db7f5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -18,9 +18,9 @@ Create a `.env` at the project root with the following credentials:
 MOLTIN_CLIENT_ID=
 MOLTIN_CLIENT_SECRET=
 MOLTIN_WEBHOOK_SECRET=
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_REGION=
+AMAZON_ACCESS_KEY_ID=
+AMAZON_SECRET_ACCESS_KEY=
+AMAZON_REGION=
 EMAIL_FROM=
 SHIPPO_PRIVATE_KEY=
 

diff --git a/now.json b/now.json
@@ -6,9 +6,9 @@
     "MOLTIN_CLIENT_ID": "@demo-moltin-client-id",
     "MOLTIN_CLIENT_SECRET": "@demo-moltin-client-secret",
     "MOLTIN_WEBHOOK_SECRET": "@demo-moltin-webhook-secret",
-    "AWS_ACCESS_KEY_ID": "@demo-aws-access-key-id",
-    "AWS_SECRET_ACCESS_KEY": "@demo-aws-secret-access-key",
-    "AWS_REGION": "@demo-aws-region",
+    "AMAZON_ACCESS_KEY_ID": "@demo-aws-access-key-id",
+    "AMAZON_SECRET_ACCESS_KEY": "@demo-aws-secret-access-key",
+    "AMAZON_REGION": "@demo-aws-region",
     "SHIPPO_PRIVATE_KEY": "@demo-shippo-private-key",
     "EMAIL_FROM": "@demo-email-from"
   },

diff --git a/src/index.js b/src/index.js
@@ -3,9 +3,9 @@ const shippo = require('shippo')(process.env.SHIPPO_PRIVATE_KEY)
 const { createClient } = require('@moltin/request')
 const AWS = require('aws-sdk')
 const SES = new AWS.SES({
-  accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-  secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-  region: process.env.AWS_REGION
+  accessKeyId: process.env.AMAZON_ACCESS_KEY_ID,
+  secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY,
+  region: process.env.AMAZON_REGION
 })
 const moltin = new createClient({
   client_id: process.env.MOLTIN_CLIENT_ID,