Merge pull request #759 from pharindoko/release/1.7

Release/1.7

Author: pharindoko

packages/cli/package-lock.json

@@ -63,7 +63,16 @@
   ],
   "homepage": "https://github.com/pharindoko/json-serverless",
   "keywords": [
-    "oclif"
+    "api",
+    "graphql",
+    "aws",
+    "json",
+    "rest",
+    "serverless",
+    "rest-api",
+    "serverless-framework",
+    "swagger-ui",
+    "json-server"
   ],
   "license": "MIT",
   "main": "lib/index.js",

packages/cli/package.json

@@ -1,22 +1,11 @@
-process.env.AWS_SDK_LOAD_CONFIG = 'true';
 import AWS = require('aws-sdk');
 
-const ec2: AWS.EC2 = new AWS.EC2();
+const ec2: AWS.EC2 = new AWS.EC2({ region: 'us-east-1' });
 const cloudformation: AWS.CloudFormation = new AWS.CloudFormation();
 const sts: AWS.STS = new AWS.STS();
-/* if (!AWS.config.region) {
-    AWS.config.update({ region: 'us-east-1' });
-}
- */
 
 export class AWSActions {
   constructor() {}
-  static getCurrentRegion(): string {
-    if (!AWS.config.region) {
-      AWS.config.update({ region: 'us-east-1' });
-    }
-    return AWS.config.region!;
-  }
 
   static async checkValidAWSIdentity(): Promise<
     AWS.STS.GetCallerIdentityResponse
@@ -32,15 +21,13 @@ export class AWSActions {
 
   static async getAllRegionsByName(): Promise<Array<Object>> {
     try {
-      let regions: Object[];
+      let regions: string[] = [];
       const result = await ec2.describeRegions({ AllRegions: true }).promise();
 
       regions = result
         .Regions!.sort((a, b) => a.RegionName!.localeCompare(b.RegionName!))
         .map((x) => {
-          return new Object({
-            name: x.RegionName,
-          });
+          return x.RegionName!;
         });
       return regions;
     } catch (error) {

packages/cli/src/actions/aws-actions.ts

@@ -139,6 +139,7 @@ export class CreateStackCommand extends Command {
     let region: string | undefined;
     if (flags.region) {
       region = flags.region;
+      await this.verifyRegion(region);
     } else {
       region = await this.getRegion();
     }
@@ -312,6 +313,17 @@ export class CreateStackCommand extends Command {
     }
   }
 
+  private async verifyRegion(region: string | undefined) {
+    let regions = await AWSActions.getAllRegionsByName();
+    if (!regions.find((x) => x === region)) {
+      this.error(
+        'Please check the value for the region parameter - the region ' +
+          region +
+          ' cannot be found in aws and is not valid'
+      );
+    }
+  }
+
   private async checkIdentity() {
     cli.action.start(
       `${chalk.blueBright('Check AWS Identity')}`,
@@ -364,8 +376,7 @@ export class CreateStackCommand extends Command {
 
   private async getRegion() {
     let regions = await AWSActions.getAllRegionsByName();
-    regions.unshift({ name: AWSActions.getCurrentRegion() });
-    let region = '';
+    let region = null;
 
     let responses: any = await inquirer.prompt([
       {

packages/cli/src/commands/create-stack.ts

@@ -3,7 +3,7 @@ import { JSONValidator, Output } from 'json-serverless-lib';
 import { Helpers } from '../actions/helpers';
 import chalk from 'chalk';
 export class Validate extends Command {
-  static description = 'describe the command here';
+  static description = 'validate the json file against specific rules';
 
   static flags = {
     help: flags.help({ char: 'h' }),

packages/cli/src/commands/validate.ts

@@ -10,8 +10,9 @@
   },
   "scripts": {
     "test": "npx jest",
-    "debug": "tsc-watch --onSuccess \"node --inspect-brk ./lib/example/simple.js\"",
-    "start": "tsc-watch --onSuccess \"node ./lib/example/simple.js\"",
+    "debug": "tsc-watch --onSuccess \"node --inspect-brk ./lib/example/simple.s3.js\"",
+    "start": "tsc-watch --onSuccess \"node ./lib/example/simple.s3.js\"",
+    "start:dynamodb": "tsc-watch --onSuccess \"node ./lib/example/simple.dynamodb.js\"",
     "start:advanced": "tsc-watch --onSuccess \"node ./lib/example/advanced.js\"",
     "type-check": "tsc --noEmit",
     "type-check:watch": "npm run type-check -- --watch",
@@ -33,24 +34,24 @@
   "dependencies": {
     "@types/lowdb": "1.0.9",
     "@types/pino": "6.3.3",
-    "ajv": "^7.0.0",
+    "ajv": "^7.0.3",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "express-graphql": "^0.12.0",
     "express-list-endpoints": "^5.0.0",
     "graphql": "^15.4.0",
-    "helmet": "^4.2.0",
+    "helmet": "^4.3.1",
     "json-server": "^0.16.3",
     "lowdb": "^1.0.0",
     "lowdb-adapter-aws-s3": "^1.1.2",
     "node-fetch": "^2.6.0",
     "passport": "^0.4.1",
     "passport-headerapikey": "^1.2.2",
-    "pino": "^6.7.0",
+    "pino": "^6.9.0",
     "serverless-http": "^2.6.0",
     "swagger-to-graphql": "^4.0.2",
-    "swagger-ui-express": "^4.1.5",
-    "table": "^6.0.4"
+    "swagger-ui-express": "^4.1.6",
+    "table": "^6.0.6"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -61,10 +62,8 @@
     "@types/express-serve-static-core": "4.17.13",
     "@types/jest": "26.0.15",
     "@types/json-server": "0.14.2",
-    "@types/lowdb": "1.0.9",
     "@types/node": "10.14.16",
     "@types/passport": "1.0.4",
-    "@types/pino": "6.3.3",
     "@types/supertest": "2.0.10",
     "@types/swagger-schema-official": "2.0.21",
     "@types/swagger-ui-express": "4.1.2",