Merge pull request #37 from SqueezerIO/v1.1.14

V1.1.14

Author: nickchisiu

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.1.14 - 2017-07-06
+- fixed CORS issues
+- added "Edit On Github" docs support
+
+## v1.1.13 - 2017-07-01
+- aws profile config issue
+- create project steps
+
 ## v1.1.12 - 2017-05-12
 - npm issues on listing html images 
 

README.md

@@ -61,7 +61,7 @@ You can get various templates for creating a quick project stub :
 | template | description | |
 |-----|--------------|-------|
 |aws-api-nodejs|AWS generic API Hello World template
-|aws-api-nodejs-rest|AWS NodeJS REST API template + DynamoDB + Swagger support
+|aws-api-nodejs-rest|AWS NodeJS REST API template + DynamoDB + Swagger support|[demo](https://s3.amazonaws.com/squeezer-projects/swagger-ui/index.html?url=https://s3.amazonaws.com/squeezer-projects/api-docs.json)
 |aws-web-nodejs-reactjs|AWS NodeJS WebApp template + Pug ( ex-Jade ) + ReactJS support + Material UI + Bootstrap 3 styling|[demo](https://dg3eevr06b.execute-api.us-east-1.amazonaws.com/dev)
 
 
@@ -91,7 +91,7 @@ NOTE: **Windows** users should [enable symlinks](http://answers.perforce.com/art
 
 |    | cmd | description  |
 |----|-----|--------------|
-| 1. | **sqz compile --production**  |  Compile microservices |
+| 1. | **sqz compile --production**  |  Compile microservices for cloud deployments |
 | 2. | **sqz deploy --stage dev**  | Deploy your app into the cloud provider<br>*Note*: initial deployments can take longer <= **40 mins** |
 
 

docs/book.json

@@ -2,6 +2,13 @@
   "author": "Nick Chisiu",
   "gitbook": "3.x.x",
   "plugins": [
+    "edit-link"
   ],
+  "pluginsConfig": {
+    "edit-link": {
+      "base": "https://github.com/SqueezerIO/squeezer/edit/master/docs",
+      "label": "Edit On GitHub"
+    }
+  },
   "title": "Squuezer.IO Framework Documentation"
 }

docs/cli/create.md

@@ -12,13 +12,16 @@
 
  Options:
 
-    --project / -p   Project's name (required)
+    --project / -p      Project's name (required)
 
-    --email / -e     Project's owner email address (required)
+    --email / -e        Project's owner email address (required)
 
-    --template / -t  Project's template , get available templates : sqz templates (required)
+    --template / -t     Project's template , get available templates : sqz templates (required)
+ 
+    --noChecksums / -n  Disable microservices checksum, this will make the deployment sequence considerably slower (optional)
 
 
  Examples:
 
     $ sqz create --name my-first-project --template aws-api-nodejs
+    $ sqz create --name my-first-project --template aws-api-nodejs --noChecksum true

docs/common.md

@@ -128,16 +128,6 @@ Return CLI params
 
 Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
-## Settings
-
-Class representing Squeezer  microservices clouds information
-
-## 
-
-Returns clouds information data
-
-Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
-
 ## Command
 
 Class for running spawning commands

docs/development/command_hooks.md

@@ -5,13 +5,21 @@ directly from your project's directory stored in `PROJECT_DIR/lib/hooks/commands
 separating your project functionality as much as possible, and use Squeezer framework only as a trigger .
 
 ```
-PROJECT_DIR/lib/hooks/commands/
-├── deploy.compile.yml    - compiles source code before a cloud deployment
-├── project.install.yml   - installs projects dependencies on project creation or project install command
-├── run.compile.yml       - compiles source code before running a function
-├── run.execute.yml       - executes your desired function
-├── serve.execute.yml     - commands to run in order to serve/watch your project
-├── test.compile.yml      - compiles source code before running tests
-├── test.execute.yml      - executes tests
-└── test.prepare.yml      - prepare your project before compiling tests
+PROJECT_DIR/lib/hooks/
+└── commands
+    ├── compile
+    │   ├── development
+    │   │   └── microservice.yml  - compile microservices for local development
+    │   └── production
+    │       └── microservice.yml  - compile microservices for cloud deployments 
+    ├── install
+    │   ├── microservice.yml      - install packages required for each microservice
+    │   └── project.yml           - install project required packages
+    ├── run
+    │   └── execute.function.yml  - run a function locally
+    ├── test
+    │   └── execute.yml           - run integration tests for a microservice
+    └── update
+        ├── microservice.yml      - update packages for each microservice
+        └── project.yml           - update project packages
 ```

docs/gitbook/images/getting-started-tutorial-quick.gif

@@ -1,3 +1,3 @@
 
-window.frameworkVersion = '1.1.12';
-window.frameworkVersionReleaseDate = '2017-05-12';
+window.frameworkVersion = '1.1.14';
+window.frameworkVersionReleaseDate = '2017-07-07';

docs/gitbook/js/framework.js

@@ -2,7 +2,7 @@
 
 const _                   = require('lodash');
 const ApiGatewayMainStack = require('../../../../main/apiGateway');
-const Outputs = require('../../outputs');
+const Outputs             = require('../../outputs');
 
 /**
  * Class that manages the API Gateway event
@@ -19,6 +19,8 @@ class awsCompileApiGateway {
 
     event.identifier      = `${_.upperFirst(event.method)}` +
       `${_.upperFirst(_.camelCase(event.path))}`;
+    event.corsIdentifier  = 'Options' +
+      `${_.upperFirst(_.camelCase(event.path))}`;
     event.shortIdentifier = `${_.upperFirst(_.camelCase(event.path))}`;
 
     apiGatewayMainStack.addPathParts(event, lambdaFunction);
@@ -48,6 +50,10 @@ class awsCompileApiGateway {
       resourceParentId = apiGatewayMainStack.getResourceIdentifier(event.path, pathPartsLen - 1);
     }
 
+    // console.log(event.identifier);
+    // console.log(event);
+    // console.log(this.sqz.vars.env);
+    // process.exit(0);
 
     this.template.Resources[`${event.identifier}Method`] = {
       Type       : 'AWS::ApiGateway::Method',
@@ -86,6 +92,64 @@ class awsCompileApiGateway {
       }
     };
 
+    if (this.sqz.vars.env.CORS) {
+      this.template.Resources[`${event.corsIdentifier}Method`] = {
+        Type       : 'AWS::ApiGateway::Method',
+        Properties : {
+          AuthorizationType    : 'NONE',
+          HttpMethod           : 'OPTIONS',
+          Integration          : {
+            Type : 'MOCK',
+            IntegrationResponses : [
+              {
+                ResponseParameters : {
+                  'method.response.header.Access-Control-Allow-Origin'  : "'*'",
+                  'method.response.header.Access-Control-Allow-Headers' : "'Access-Control-Allow-Headers, Origin,Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers'",
+                  'method.response.header.Access-Control-Allow-Methods' : "'*'"
+                },
+                ResponseTemplates  : {
+                  'application/json' : ''
+                },
+                StatusCode         : 200
+              }
+            ],
+            PassthroughBehavior  : 'WHEN_NO_TEMPLATES',
+            RequestTemplates     : {
+              'application/json' : '{"statusCode": 200}'
+            }
+          },
+          // Responses         : {
+          //   default : {
+          //     statusCode : 200,
+          //     headers    : {
+          //       'Access-Control-Allow-Headers' : '*',
+          //       'Access-Control-Allow-Methods' : '*',
+          //       'Access-Control-Allow-Origin'  : '*'
+          //     }
+          //   }
+          // },
+
+          MethodResponses      : [{
+            StatusCode         : 200,
+            ResponseModels     : {
+              'application/json' : 'Empty'
+            },
+            ResponseParameters : {
+              'method.response.header.Access-Control-Allow-Headers' : true,
+              'method.response.header.Access-Control-Allow-Methods' : true,
+              'method.response.header.Access-Control-Allow-Origin'  : true
+            }
+          }],
+          ResourceId           : {
+            Ref : resourceParentId
+          },
+          RestApiId            : {
+            Ref : 'ApiGatewayRestApiId'
+          }
+        }
+      };
+    }
+
     this.template.Parameters.ApiGatewayRestApiId = {
       Type : 'String'
     };

lib/plugins/aws/lib/compile/lib/cloudformation/microservice/lib/events/apiGateway/index.js

@@ -1,6 +1,6 @@
 {
   "name": "squeezer-cli",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "preferGlobal": true,
   "description": "Event-driven APIs & Web apps on microservices, serverless ! Squeezer is a framework designed to help developers to get a better architecture on serverless zero-administration compute platforms with code that runs into [microservices](https://en.wikipedia.org/wiki/Microservices) clouds like [AWS Lambda](https://aws.amazon.com/documentation/lambda/) , [Azure Functions](https://azure.microsoft.com/en-us/services/functions/) , [Google Cloud Functions](https://cloud.google.com/functions/docs/) and [IBM OpenWhisk](https://developer.ibm.com/openwhisk/) .",
   "homepage": "https://squeezer.io/",