fix(scripts) - apply PR change requests

Author: Niicck

.DS_Store

@@ -67,7 +67,22 @@ yarn deploy
 
 ## Setting up a Lambda endpoint manually
 
-If you prefer not to use the serverless.js framewwork, you can also deploy your lambda function manually.
+If you prefer not to use the serverless.js framework, you can also deploy your lambda function manually.
+
+Note 1: Change your process.env.AWS_STAGE_NAME to "/default" to match the default stage name for manually deployed API Gateways.
+
+Note 2: To enable cors with a manual deployment, you should add cors middleware to the top of combineMiddleware() in index.js.
+
+```
+const cors = require('cors');
+const app = combineMiddlewares([
+  // CORS middleware to permit cross-site API requests. Configure to taste
+  cors(),
+
+  (req, res, next) => { ... },
+  postgraphile(...)
+  ...
+```
 
 0. Run `yarn build` to create `lambda.zip` file that you can upload to Amazon Lambda.
 1. Visit https://console.aws.amazon.com/lambda/home and click 'Create function'

README.md

@@ -3,26 +3,22 @@ const s3 = new aws.S3();
 
 const bucketName = process.env.AWS_SERVICE_NAME;
 
-s3.listBuckets((err, data) => {
-  if (err) {
-    console.log('Error', err);
-    process.exit(1);
-  }
+async function main() {
+  const { Buckets } = await s3.listBuckets().promise();
 
-  if (data.Buckets.find(bucket => bucket.Name === bucketName)) {
+  if (Buckets.find(bucket => bucket.Name === bucketName)) {
     console.log(`Bucket "${bucketName}" already exists.`);
   } else {
     const bucketParams = {
       Bucket: bucketName
     };
 
-    s3.createBucket(bucketParams, (err, data) => {
-      if (err) {
-        console.log(`Bucket "${bucketName}" failed to build.`, err);
-        process.exit(1);
-      } else {
-        console.log(`Bucket "${bucketName}" built in region ${data.Location}`);
-      }
-    });
+    await s3.createBucket(bucketParams).promise();
+    console.log(`Bucket "${bucketName}" created.`);
   }
+};
+
+main().catch(err => {
+  console.log('Error', err);
+  process.exit(1);
 });

scripts/createS3Bucket.js

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 CURRENT_DIR=`dirname $BASH_SOURCE`
 
 # Source env variables
@@ -7,15 +8,15 @@ if [ -x .env ]; then
   . ./.env
   echo "... done"
 else
-  echo "... no .env file found"
+  echo "... no executable .env file found"
 fi
 
 if [ "$DATABASE_URL" = "" ]; then
   echo "No DATABASE_URL envvar found; cannot continue."
   exit 1
 fi
 
-rm -rf .serverless
+rm -rf $CURRENT_DIR/../.serverless
 
 echo "Phase 1: Create serverless package"
 sls package

scripts/serverless

@@ -2,20 +2,18 @@ exports.options = {
   dynamicJson: true,
   cors: true,
   graphiql: false,
-  externalUrlBase: '',
   graphqlRoute: '/graphql',
+  externalUrlBase: `/${process.env.AWS_STAGE}`,
 
   // If consuming JWT:
   jwtSecret: process.env.JWT_SECRET || String(Math.random()),
   // If generating JWT:
-  jwtPgTypeIdentifier: 'floods.jwt_token',
-  pgDefaultRole: 'floods_anonymous',
+  jwtPgTypeIdentifier: 'forum_example.jwt_token',
 
   /* If you want to enable GraphiQL, you must use `externalUrlBase` so PostGraphile
    * knows where to tell the browser to find the assets.  Doing this is
    * strongly discouraged, you should use an external GraphQL client instead.
 
-    externalUrlBase: '/default',
     graphiql: true,
     enhanceGraphiql: true,
     graphqlRoute: '/',