diff --git a/README.md b/README.md index b710349bf..81fafabda 100755 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ **The Serverless Framework** – Build applications comprised of microservices that run in response to events, auto-scale for you, and only charge you when they run. This lowers the total cost of maintaining your apps, enabling you to build more logic, faster. -The Framework uses new event-driven compute services, like AWS Lambda, Google CloudFunctions, and more. It's a command line tool, providing scaffolding, workflow automation and best practices for developing and deploying your serverless architecture. It's also completely extensible via plugins. +The Framework uses new event-driven compute services, like AWS Lambda, Google CloudFunctions, and more. It's a command-line tool, providing scaffolding, workflow automation and best practices for developing and deploying your serverless architecture. It's also completely extensible via plugins. Serverless is an MIT open-source project, actively maintained by a full-time, venture-backed team. @@ -38,7 +38,7 @@ Serverless is an MIT open-source project, actively maintained by a full-time, ve * ##### Install via npm: * `npm install -g serverless` -* ##### Set-up your [Provider Credentials](./docs/02-providers/aws/01-setup.md) +* ##### Set-up your [Provider Credentials](./docs/providers/aws/guide/credentials.md) * ##### Create a Service: * Creates a new Serverless Service/Project @@ -69,13 +69,13 @@ Serverless is an MIT open-source project, actively maintained by a full-time, ve * Removes all Functions, Events and Resources from your AWS account. * `serverless remove` -Check out our in-depth [Serverless Framework Guide](./docs/01-guide/README.md) for more information. +Check out our in-depth [Serverless Framework Guide](./docs/providers/aws/guide/README.md) for more information. ## Services (V1.0) The following are services you can instantly install and use by running `serverless install --url ` -* [CRUD](https://github.com/pmuens/serverless-crud) - CRUD service +* [CRUD](https://github.com/pmuens/serverless-crud) - CRUD service, [Scala Port](https://github.com/jahangirmohammed/serverless-crud-scala) * [GraphQL Boilerplate](https://github.com/serverless/serverless-graphql) - GraphQL application Boilerplate service * [Authentication](https://github.com/laardee/serverless-authentication-boilerplate) - Authentication boilerplate service * [Mailer](https://github.com/eahefnawy/serverless-mailer) - Service for sending emails @@ -88,6 +88,7 @@ The following are services you can instantly install and use by running `serverl * [Authorizer](https://github.com/eahefnawy/serverless-authorizer) - Service that uses API Gateway custom authorizers * [Thumbnails](https://github.com/eahefnawy/serverless-thumbnails) - Service that takes an image url and returns a 100x100 thumbnail * [Boilerplate](https://github.com/eahefnawy/serverless-boilerplate) - Opinionated boilerplate +* [ES6 + Jest](https://github.com/americansystems/serverless-es6-jest) - ES6 + Jest Boilerplate **Note**: the `serverless install` command will only work on V1.0 or later. @@ -109,6 +110,7 @@ The following are services you can instantly install and use by running `serverl Use these plugins to overwrite or extend the Framework's functionality… +* [serverless-offline](https://github.com/dherault/serverless-offline) - Emulate AWS Lambda and API Gateway locally to speed up your development cycles. * [serverless-webpack](https://github.com/elastic-coders/serverless-webpack) - Bundle your lambdas with Webpack * [serverless-alexa-plugin](https://github.com/rajington/serverless-alexa-plugin) - Support Alexa Lambda events * [serverless-run-function](https://github.com/lithin/serverless-run-function-plugin) - Run functions locally @@ -119,6 +121,7 @@ Use these plugins to overwrite or extend the Framework's functionality… * [serverless-plugin-stage-variables](https://github.com/svdgraaf/serverless-plugin-stage-variables) * [serverless-dynamodb-local](https://github.com/99xt/serverless-dynamodb-local/tree/v1) * [serverless-wsgi](https://github.com/logandk/serverless-wsgi) - Deploy Python WSGI applications (Flask/Django etc.) +* [serverless-command-line-event-args](https://github.com/horike37/serverless-command-line-event-args) - Event json passes to your Lambda function in commandline ## Example Projects (V1.0) @@ -191,7 +194,6 @@ Serverless Projects are shareable and installable. You can publish them to npm ## Plugins (v0.5.x) Serverless is composed of Plugins. A group of default Plugins ship with the Framework, and here are some others you can add to improve/help your workflow: * [Meta Sync](https://github.com/serverless/serverless-meta-sync) - Securely sync your the variables in your project's `_meta/variables` across your team. -* [Offline](https://github.com/dherault/serverless-offline) - Emulate AWS Lambda and Api Gateway locally to speed up your development cycles. * [Hook Scripts](https://github.com/kennu/serverless-plugin-hookscripts) - Easily create shell script hooks that are run whenever Serverless actions are executed. * [CORS](https://github.com/joostfarla/serverless-cors-plugin) - Adds support for CORS (Cross-origin resource sharing). * [Serve](https://github.com/Nopik/serverless-serve) - Simulate API Gateway locally, so all function calls can be run via localhost. diff --git a/docs/01-guide/01-installing-serverless.md b/docs/01-guide/01-installing-serverless.md deleted file mode 100644 index d5d5ffd46..000000000 --- a/docs/01-guide/01-installing-serverless.md +++ /dev/null @@ -1,41 +0,0 @@ - - -# Installation - -Let's start by installing Node.js and Serverless. - -## Installing Node.js - -Serverless is a [Node.js](https://nodejs.org) CLI tool so the first thing you need to do is to install Node.js on your machine. - -Go to the official [Node.js website](https://nodejs.org), download and follow the [installation instructions](https://nodejs.org/en/download/) to install Node.js on your local machine. - -**Note:** Serverless runs on Node v4 or higher. So make sure that you pick a recent Node version. - -You can verify that Node.js is installed successfully by running `node --version` in your terminal. You should see the corresponding Node version number printed out. - -## Installing Serverless - -Great! Now we've got everything in place to install Serverless. Serverless can be easily installed via -[npm](https://npmjs.org) which was installed alongside Node.js. - -Open up a terminal and type `npm install -g serverless` to install Serverless. - -Once the installation process is done you can verify that Serverless is installed successfully by running `serverless --version` - -## Provider Account Setup - -In order for serverless to act on your behalf, you will need to connect your providers account. (AWS, Azure, etc.) - -[AWS account Setup](../02-providers/aws/01-setup.md) - -## Conclusion - -We've just installed Node.js and Serverless on our local machine and configured our AWS account! Now lets create our first service. - -[Next step > Creating Your First Service](./02-creating-services.md) diff --git a/docs/01-guide/02-creating-services.md b/docs/01-guide/02-creating-services.md deleted file mode 100644 index cb5e472eb..000000000 --- a/docs/01-guide/02-creating-services.md +++ /dev/null @@ -1,66 +0,0 @@ - - -# Creating a service - -You can create a service based on a specific template that specifies which provider and runtime to use. - -To create a service with a `nodejs` runtime running on `aws` just pass the `aws-nodejs` template to the create command: - -``` -serverless create --template aws-nodejs --name my-special-service -``` - -This will create a service and generate `serverless.yml`, `handler.js` and `event.json` files in the current working directory and set the name of the service to `my-special-service` in `serverless.yml`. - -You can also check out the [create command docs](../03-cli-reference/01-create.md) for all the details and options. - -## Open the service inside your editor - -Let's take a closer look at the skeleton Serverless has created for us. - -You'll see the following files in your working directory: -- `serverless.yml` -- `handler.js` -- `event.json` -- `.gitignore` - -### serverless.yml - -Each *Serverless service* configuration is managed in the `serverless.yml` file. The main responsibilities of this file are: - - - Declares a Serverless service - - Defines one or multiple functions in the service - - Defines the provider the service will be deployed to (and the runtime if provided) - - Defines custom plugins to be used - - Defines events that trigger each function to execute (e.g. HTTP requests) - - Defines one set of resources (e.g. 1 AWS CloudFormation stack) required by the functions in this service - - Events listed in the `events` section may automatically create the resources required for the event upon deployment - - Allow flexible configuration using Serverless Variables. - -You can see the name of our service, the provider configuration and the first function inside the `functions` definition which points to the `handler.js` file. Any further service configuration will be done in this file. - -### `handler.js` - -The `handler.js` file includes a function skeleton which returns a simple message. The function definition in `serverless.yml` will point to this `handler.js` file and the function inside of it. - -Check out the code inside of the `handler.js` so you can play around with it once we've deployed the service. - -### `event.json` - -This file contains event data we'll use later on to invoke our function. - -## Other services to get started - -Take a look at the our [list of Serverless services](https://github.com/serverless/serverless/blob/master/README.md#services). - -## Conclusion - -We've just created our very first service with one simple `create` command. With that in place we're ready to deploy -our service (which now includes one example function) to our provider (in this case Amazon Web Services). - -[Next step > Deploying our service](./03-deploying-services.md) diff --git a/docs/01-guide/03-deploying-services.md b/docs/01-guide/03-deploying-services.md deleted file mode 100644 index 2665f6634..000000000 --- a/docs/01-guide/03-deploying-services.md +++ /dev/null @@ -1,43 +0,0 @@ - - -# Deploying a service - -Make sure you're still working in the same directory you created the service in. - -Run `serverless deploy -v` to start the deployment process (make sure that the credentials for your provider are properly configured). This command also prints the progress during the deployment, as we've configured the `verbose` mode. - -Serverless now deploys the whole service to the configured provider. It uses the default `dev` stage and `us-east-1` region. - -If you need to change the default stage and region, in your `serverless.yml` file, set the `stage` and `region` properties inside a `provider` object: - -```yml -# serverless.yml - -service: service-name -provider: - name: aws - stage: beta - region: us-west-2 -``` - -After you run `serverless deploy -v`, the progress of the deployment process displays in your terminal. -A success message tells you when everything is deployed and ready to use! - -## Deploying to a different stage and region - -If you want to deploy to different stages and regions later on, provide corresponding options to the `deploy` command. - -For example, deploy to the `production` stage in the `eu-central-1` region by running a `deploy` command that looks like -this: `serverless deploy --stage production --region eu-central-1`. - -Check out the [deploy command docs](../03-cli-reference/03-deploy.md) for all the details and options. - -## Conclusion - -You've just deployed your service! Let's invoke the services function in the next step. - -[Next step > Invoking a function](./04-invoking-functions.md) diff --git a/docs/01-guide/04-invoking-functions.md b/docs/01-guide/04-invoking-functions.md deleted file mode 100644 index 961ef8227..000000000 --- a/docs/01-guide/04-invoking-functions.md +++ /dev/null @@ -1,51 +0,0 @@ - - -# Invoking a function - -We've just created and deployed our very first service to our cloud provider. - -The service skeleton which Serverless created for us included a function with a corresponding function handler (the `handler.js` file). - -Let's invoke this function to see if the service was deployed successfully. - -## Invoking the `hello` function - -Run `serverless invoke --function hello -p event.json` in the service directory to tell Serverless that you want to run the function on the providers infrastructure. - -The function will be invoked and returns the result back to Serverless which will print it out on the terminal. - -As a result of this you should see the functions message printed out on the console. - -You can also change the message returned by your function in `handler.js` or change the event.json file to see how your function output will change. - -You can also check out the [invoke command docs](../03-cli-reference/04-invoke.md) for all the details and options. - -## Viewing Function Logs - -After you deploy your service, and invoke it to generate some default logs provided by AWS, you can view those logs right from your terminal using the `serverless logs` command. - -### Viewing the `hello` function logs - -Run `serverless logs --function hello` to fetch the logs of the `hello` function from CloudWatch. If your function has never been invoked, you may not see any output/logs. For testing we recommend you invoke your function first before logging. - -By default, Serverless will fetch all the logs that happened in the past 30 minutes. You can overwrite this behavior by providing extra options. (keep reading!). - -The logs will then be displayed on your terminal. By default, AWS logs a `START`, `END` & `REPORT` logs for each invocation, plus of course any logging functionality you have in your code. You should see all these logs on the screen. - -The logs command provides different options you can use. Please take a look at the -[logs command documentation](../03-cli-reference/05-logs.md) to see what else you can do. - -## Conclusion - -We've just invoked a function through the Serverless CLI on the providers infrastructure and got a message back which was printed on the console. - -A service with functions alone is just the beginning. Event sources provide a really easy and great way to empower your service and perform automatic function calls based upon incoming events (e.g. an incoming HTTP request). - -Let's take a closer look at how we can use different event sources and attach them to our function. - -[Next step > Event sources](./05-event-sources.md) diff --git a/docs/01-guide/05-event-sources.md b/docs/01-guide/05-event-sources.md deleted file mode 100644 index 1832f7c7f..000000000 --- a/docs/01-guide/05-event-sources.md +++ /dev/null @@ -1,81 +0,0 @@ - - -# Event sources - -Serverless is used to build event driven architectures. Basically everything which can trigger a function is an event. Events could be HTTP requests, events fired from a cloud storage (like a S3 bucket), scheduled events, etc. - -Events are provider specific, so not every event syntax is available for every provider. We're documenting every event in-depth in the provider specific documentation. Before we deep dive, lets look at how to add a simple HTTP Event to our function. - -## Adding a HTTP event - -Go to the Serverless service directory and open up the `serverless.yml` -file in your editor. First, we need to add an `events` property to the function to tell Serverless that this -function will have events attached: - -```yml -functions: - hello: - handler: handler.hello - events: -``` - -This `events` property is used to store all the event definitions for the function. -Each event will be added inside this `events` section. Events are added as an array as you can have multiple events of the same type associated with a function. - -Let's add a `http` event with a path of `greet` and a method of `get`: - -```yml -functions: - hello: - handler: handler.hello - events: - - http: GET greet -``` - -That's it. There's nothing more to do to setup a `http` event. Let's (re)deploy our service so that Serverless will -translate this event definition to provider specific syntax and sets it up for us. - -## (Re)deploying - -We can redeploy our updated service by simply running `serverless deploy` again. -Serverless will show the progress on the terminal and tell you once the service is updated. - -## Calling our HTTP endpoint - -Let's test our deployed HTTP endpoint. - -After deploying your service you should see the URL for your http endpoint in the terminal: - -```bash -endpoints: - GET - https://dxaynpuzd4.execute-api.us-east-1.amazonaws.com/dev/greet -``` - -We can now simply call it: - -```bash -$ curl https://dxaynpuzd4.execute-api.us-east-1.amazonaws.com/dev/greet -``` - -You've successfully executed the function through the HTTP endpoint! - -Serverless provides more than just a HTTP event source. You can find the full list of all available event sources with -corresponding examples in the provider specific docs: - -* [AWS event documentation](../02-providers/aws/events/). - -## Conclusion - -Event sources are a great way to extend the functionality of your functions. -They are pretty easy to setup. You simply need to add them to the corresponding function in your services `serverless.yml` file and (re)deploy the service. - -But what if you want to add custom provider specific resources to your service which are not yet available as event sources or through plugins? - -Let's take a look at this now. - -[Next step > Managing custom provider resources](./06-custom-provider-resources.md) diff --git a/docs/01-guide/06-custom-provider-resources.md b/docs/01-guide/06-custom-provider-resources.md deleted file mode 100644 index 1f276da99..000000000 --- a/docs/01-guide/06-custom-provider-resources.md +++ /dev/null @@ -1,66 +0,0 @@ - - -# Custom provider resources - -Sometimes you want to add custom provider resources to your service to use provider specific functionality which is not yet available through events or plugins. Serverless has you covered and enables you a convenient way to add those resources with the help of the `resources` section in the `serverless.yml` file. - -**Note:** Your custom resources are merged on top of the resources Serverless defines. This gives you the power to overwrite existing resources easily, even the ones that are created automatically by Serverless. You need to be careful though to not disrupt Serverless functionality. - -## Adding custom provider resources - -Serverless uses the services `resources` object as a place to add more custom resources. - -You can use this place to add custom provider resources by writing the resource definition in the provider specific YAML syntax inside the `resources` object. You can also use [Serverless Variables](./08-serverless-variables.md) for sensitive data or reusable configuration in your resources templates. - -**Note:** You'll have the whole flexibility to overwrite / attach any kind of resource to your CloudFormation stack. You can add `Resources`, `Outputs` or even overwrite the `Description`. Please be cautious as overwriting existing parts of your CloudFormation stack might introduce unexpected behavior. - -```yml -# serverless.yml -resources: - Resources: - CustomProviderResource: - Type: ResourceType - Properties: - Key: Value - Outputs: - CustomOutput: - Description: "Description for my output" - Value: "My Custom Output" -``` - -### Example custom resources - S3 bucket -Sometimes you need an extra S3 bucket to store some data in (say, thumbnails). This works by adding an extra S3 Bucket Resource to your `serverless.yml`: - -```yml -service: lambda-screenshots -provider: aws -functions: - … - -resources: - Resources: - ThumbnailsBucket: - Type: AWS::S3::Bucket - Properties: - # You can also set properties for the resource, based on the CloudFormation properties - BucketName: my-awesome-thumbnails - # Or you could reference an environment variable - # BucketName: ${env:BUCKET_NAME} -``` - -Now that you have this additional resource defined in your `serverless.yml` file, you can simply run `serverless deploy` and that will deploy these custom resources for you along with your service and set up the additional bucket for you. - -## Conclusion - -The `resources` section inside the `serverless.yml` file is a place -where you can add custom, provider specific resource definitions which should be created on service deployment. -It gives you access to the whole feature set your provider offers and makes Serverless even more extensible. - -The last thing we need to learn is how we can remove our service. Let's take a look at this now. - -[Next step > Removing your service](./07-removing-services.md) diff --git a/docs/01-guide/07-removing-services.md b/docs/01-guide/07-removing-services.md deleted file mode 100644 index 18aee6d95..000000000 --- a/docs/01-guide/07-removing-services.md +++ /dev/null @@ -1,28 +0,0 @@ - - -# Removing a service - -The last step we want to introduce in this guide is how to remove the service. - -Removal is done with the help of the `remove` command. Just run `serverless remove -v` to trigger the removal process. As in the deploy step we're also running in the `verbose` mode so you can see all details of the remove process. - -Serverless will start the removal and informs you about it's process on the console. A success message is printed once the whole service is removed. - -**Note:** The removal process will only remove the service on your providers infrastructure. The service directory will still remain on your local machine so you can still modify and (re)deploy it to another stage, region or provider later on. - -## Conclusion - -We've just removed the whole service from our provider with a simple `serverless remove` command. - -## What's next? - -You can either dive deeper into our [Advanced Guides](./#advanced-guides) or read through the provider specific documentation we provide: - -* [AWS Documentation](../02-providers/aws/) - -Have fun with building your Serverless services and if you have feedback on the please let us know in [our Forum](forum.serverless.com) or [open an Issue in our Github repository](https://github.com/serverless/serverless/issues/new) for any bugs you might encounter or if you have an idea for a new feature. diff --git a/docs/01-guide/09-installing-plugins.md b/docs/01-guide/09-installing-plugins.md deleted file mode 100644 index c6f704a3d..000000000 --- a/docs/01-guide/09-installing-plugins.md +++ /dev/null @@ -1,54 +0,0 @@ - - -# Adding custom plugins - -Serverless is extendable through plugins. Plugins can provide new CLI commands or hook into existing plugins to extend their functionality. - -Serverless uses the plugin infrastructure to run the core plugins. The plugin infrastructure is extendable by third party developers too. Using the same system, you can extend the framework to suit your custom needs. - -Let's take a look into this now. - -## Installing a plugin - -First we need to install the corresponding plugin in the services root directory with the help of npm: - -`npm install --save custom-serverless-plugin`. - -Note: Custom plugins are added on a per service basis and are not applied globally - -## Adding the plugin to a service - -We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the plugin to the `plugins` section in the `serverless.yml` file. - -```yml -# serviceXYZ serverless.yml file -plugins: - - custom-serverless-plugin -``` - -Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary -configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there): - -```yml -plugins: - - custom-serverless-plugin - -custom: - customkey: customvalue -``` - -## Load order - -Keep in mind that the order you define your plugins matters. When Serverless loads all the [core plugins](https://github.com/serverless/serverless/tree/master/lib/plugins) and then the custom plugins in the order you've defined them. - -```yml -plugins: - - plugin1 - - plugin2 -``` - -In this case `plugin1` is loaded before `plugin2`. diff --git a/docs/01-guide/10-packaging.md b/docs/01-guide/10-packaging.md deleted file mode 100644 index 8036d1803..000000000 --- a/docs/01-guide/10-packaging.md +++ /dev/null @@ -1,55 +0,0 @@ - - -# Excluding files from packaging - -Sometimes you might like to have more control over your function artifacts and how they are packaged. - -You can use the `package` and `exclude` configuration for more control over the packaging process. - -## Exclude - -Exclude allows you to define globs that will be excluded from the resulting artifact. - -## Artifact -For complete control over the packaging process you can specify your own zip file for your service. Serverless won't zip your service if this is configured so `exclude` will be ignored. - -## Example - -```yaml -service: my-service -package: - exclude: - - tmp/** - - .git - artifact: path/to/my-artifact.zip -``` - -## Packaging functions separately - -If you want even more controls over your functions for deployment you can configure them to be packaged independently. This allows you more control for optimizing your deployment. To enable individual packaging set `individually` to true in the service wide packaging settings. - -Then for every function you can use the same `exclude/artifact` config options as you can service wide. The `exclude` option will be merged with the service wide options to create one `exclude` config per function during packaging. - -```yaml -service: my-service -package: - individually: true - exclude: - - excluded-by-default.json -functions: - hello: - handler: handler.hello - package: - exclude: - # We're excluding this file so it will not be in the final package of this function only - - included-by-default.json - world: - handler: handler.hello - package: - exclude: - - event.json -``` diff --git a/docs/01-guide/11-environment-variable-handling.md b/docs/01-guide/11-environment-variable-handling.md deleted file mode 100644 index 36d0cb4de..000000000 --- a/docs/01-guide/11-environment-variable-handling.md +++ /dev/null @@ -1,21 +0,0 @@ - - -# Environment Variables in Serverless - -Environment variables are a very important and often requested feature in Serverless. It is one of our highest priority features, but to implement it to the extent we want it to be available will take more time as of now. Until then you'll be able to use the following tools for different languages to set environment variables and make them available to your code. - -## Javascript - -You can use [dotenv](https://www.npmjs.com/package/dotenv) to load files with environment variables. Those variables can be set during your CI process or locally and then packaged and deployed together with your function code. - -## Python - -You can use [python-dotenv](https://github.com/theskumar/python-dotenv) to load files with environment variables. Those variables can be set during your CI process or locally and then packaged and deployed together with your function code. - -## Java - -For Java the easiest way to set up environment like configuration is through [property files](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html). While those will not be available as environment variables they are very commonly used configuration mechanisms throughout Java. diff --git a/docs/01-guide/12-serverless-yml-reference.md b/docs/01-guide/12-serverless-yml-reference.md deleted file mode 100644 index 7fd3f2b9f..000000000 --- a/docs/01-guide/12-serverless-yml-reference.md +++ /dev/null @@ -1,39 +0,0 @@ - - -# Serverless.yml reference - -The following is a reference of all non provider specific configuration. The details of those config options and further options can be found in [our guide](./) and the provider [provider configuration](../02-providers). - -```yml -service: aws-nodejs # Name of the Service - -defaults: # default configuration parameters for Serverless - variableSyntax: '\${{([\s\S]+?)}}' # Overwrite the default "${}" variable syntax to be "${{}}" instead. This can be helpful if you want to use "${}" as a string without using it as a variable. - -provider: # Provider specific configuration. Check out each provider for all the variables that are available here - name: aws - -plugins: # Plugins you want to include in this Service - - somePlugin - -custom: # Custom configuration variables that should be used with the variable system - somevar: something - -package: # Packaging include and exclude configuration - exclude: - - exclude-me.js - include: - - include-me.js - artifact: my-service-code.zip - -functions: # Function definitions - hello: - handler: handler.hello - events: # Events triggering this function - -resources: # Provider specific additional resources -``` diff --git a/docs/01-guide/README.md b/docs/01-guide/README.md deleted file mode 100644 index 6f1d36a0f..000000000 --- a/docs/01-guide/README.md +++ /dev/null @@ -1,30 +0,0 @@ - - -# Guide - -This guide will help you build your Serverless services. We'll start by giving you information on how to install Serverless. After that we create and deploy a service, invoke a service's function and add additional event sources to our function. - -At the end we'll add custom provider resources to our service and remove it. - -We always try to make our documentation better, so if you have feedback on the Guide please let us know in [our Forum](http://forum.serverless.com) or [open an Issue in our Github repository](https://github.com/serverless/serverless/issues/new) - -## Getting started - -- [Installing Serverless](./01-installing-serverless.md) -- [Creating a service](./02-creating-services.md) -- [Deploying a service](./03-deploying-services.md) -- [Invoking a function](./04-invoking-functions.md) -- [Event sources](./05-event-sources.md) -- [Custom provider resources](./06-custom-provider-resources.md) -- [Removing a service](./07-removing-services.md) - -## Advanced Guides -- [Serverless Variables](./08-serverless-variables.md) -- [Installing plugins](./09-installing-plugins.md) -- [Including/Excluding files for deployment](./10-packaging.md) -- [Environment variable handling](./11-environment-variable-handling.md) -- [Serverless.yml reference](./12-serverless-yml-reference.md) diff --git a/docs/02-providers/README.md b/docs/02-providers/README.md deleted file mode 100644 index 659680408..000000000 --- a/docs/02-providers/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# Serverless Providers - -* [Amazon Web Services](aws) \ No newline at end of file diff --git a/docs/02-providers/aws/01-setup.md b/docs/02-providers/aws/01-setup.md deleted file mode 100644 index 276583680..000000000 --- a/docs/02-providers/aws/01-setup.md +++ /dev/null @@ -1,208 +0,0 @@ - - -# Provider account setup - -[Watch the video guide here](https://youtu.be/weOsx5rLWX0) - -Serverless needs access to your cloud providers account so that it can create and manage resources on your behalf. - -Here we'll provide setup instructions for different cloud provider accounts. Just pick the one for your -provider and follow the steps to get everything in place for Serverless. - -## Amazon Web Services - -### Creating an administrative IAM User - -We're going to create an admin user which can access and configure the services in your AWS account. -To get you up and running quickly, we're going to create a AWS IAM User with administrative access to your AWS account. - -**Note:** In a production environment we recommend reducing the permissions to the IAM User which the Framework uses. - -Unfortunately, the frameworks functionality is growing so fast, we can't yet offer you a finite set of permissions it needs. In the interim, ensure that your AWS API Keys are kept in a safe, private location. - -1. Create or login to your Amazon Web Services Account and go to the Identity & Access Management (IAM) Page -2. Click on **Users** and then **Create New Users**. Enter `serverless-admin` in the first field and click **Create** -3. **View and copy the API Key & Secret. You'll need it in the next step** -4. In the User record in the AWS IAM Dashboard, look for **Managed Policies** on the **Permissions** tab and click -**Attach Policy** -5. In the next screen, search for and select **AdministratorAccess** then click **Attach** - -### Signing up for an AWS Subscription - -Most AWS services require you to have a credit card set up, otherwise you can't deploy your resources and the following error message will appear: - ->AWS Access Key Id needs a subscription for the service - -If you created a new AWS account make sure that a credit card is set up for the account. - -### Setting the AWS API Key & Secret - -To start using Serverless and access the AWS API you need to set the AWS API Access Key & Secret. - -#### Quick Setup - -As a quick setup to get started you can export them as environment variables so they would be accessible to Serverless and the AWS SDK in your shell: - -```bash -export AWS_ACCESS_KEY_ID= -export AWS_SECRET_ACCESS_KEY= -``` - -OR, if you already have an AWS profile set up… - -```bash -export AWS_PROFILE= -``` - -Continue with [creating your first service](../../01-guide/02-creating-services.md). - -#### Using AWS Profiles - -For a more permanent solution you can also set up credentials through AWS profiles using the `aws-cli`, or by configuring the credentials file directly. - -To set them up through the `aws-cli` [install it first](http://docs.aws.amazon.com/cli/latest/userguide/installing.html) then run `aws configure` [to configure the aws-cli and credentials](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html): - -```bash -$ aws configure -AWS Access Key ID [None]: AKIAIOSFODNN7EXAMPLE -AWS Secret Access Key [None]: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY -Default region name [None]: us-west-2 -Default output format [None]: ENTER -``` - -Credentials are stored in INI format in `~/.aws/credentials`, which you can edit directly if needed. Read more about that file in the [AWS documentation](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-config-files) - -You can even set up different profiles for different accounts, which can be used by Serverless as well. - -#### Specifying Credentials/Profiles to Serverless - -You can specify either credentials or a profile. Each of these can be provided by altering your serverless.yml or your system's environment variables. Each can be specified for all stages or you can specify stage specific credentials. Using variables in your serverless.yml, you could implement more complex credential selection capabilities. - - -One set of credentials for all stages using serverless.yml -```yml -provider: - credentials: - accessKeyId: YOUR_ACCESS_KEY - secretAccessKey: YOUR_SECRET_KEY -``` - -A set of credentials for each stage using serverless.yml -```yml -custom: - test: - credentials: - accessKeyId: YOUR_ACCESS_KEY_FOR_TEST - secretAccessKey: YOUR_SECRET_KEY_FOR_TEST - prod: - credentials: - accessKeyId: YOUR_ACCESS_KEY_FOR_PROD - secretAccessKey: YOUR_SECRET_KEY_FOR_PROD -provider: - credentials: ${self:custom.${opt:stage}.credentials} -``` - -One profile for all stages using serverless.yml -```yml -provider: - profile: your-profile -``` - -A profile for each stage using serverless.yml -```yml -custom: - test: - profile: your-profile-for-test - prod: - profile: your-profile-for-prod -provider: - profile: ${self:custom.${opt:stage}.profile} -``` - -One set of credentials for all stages using environment variables -```bash -export AWS_ACCESS_KEY_ID= -export AWS_SECRET_ACCESS_KEY= -export AWS_SESSION_TOKEN= -serverless <…> -``` - -A set of credentials for each stage using environment variables -```bash -export AWS_TEST_ACCESS_KEY_ID= -export AWS_TEST_SECRET_ACCESS_KEY= -export AWS_TEST_SESSION_TOKEN= - -export AWS_PROD_ACCESS_KEY_ID= -export AWS_PROD_SECRET_ACCESS_KEY= -export AWS_PROD_SESSION_TOKEN= - -serverless <…> -``` - -A profile for all stages using environment variables -```bash -export AWS_PROFILE= -serverless <…> -``` - -A profile for each stage using environment variables -```bash -export AWS_TEST_PROFILE= - -export AWS_PROD_PROFILE= - -serverless <…> -``` - -#### Credential & Profile Overriding - -Sometimes you want to be able to specify a default but to override that default for a special case. This is possible with credentials and profiles in Serverless. You may specify credentials and profiles in various forms. The serverless.yml has the lowest priority and environment variables used for all stages will override values set in serverless.yml. Environment variables that are specific to a stage have the highest priority and will override both broad environment variables as well as serverless.yml. Profile provided credentials will override credentials provided in piece-meal from otherwise equivalent credential sources. A priority listing follows. - -severless.yml credentials < serverless.yml profile credentials < all-stages environment credentials < all stages environment profile credentials < stage-specific environment credentials < stage-specific environment profile credentials - -A default set of `prod` credentials to use overriden by stage specific credentials -```bash -export AWS_ACCESS_KEY_ID= -export AWS_SECRET_ACCESS_KEY= -export AWS_SESSION_TOKEN= - -export AWS_PROD_ACCESS_KEY_ID= -export AWS_PROD_SECRET_ACCESS_KEY= -export AWS_PROD_SESSION_TOKEN= - -serverless <…> -``` - -A default profile to use overriden by a `prod` specific profile -```bash -export AWS_PROFILE= - -export AWS_PROD_PROFILE= - -serverless <…> -``` - -A default profile declared in serverless.yml overridden by a `prod` specific environment variable profile -```yml -provider: - profile: your-profile -``` -```bash -export AWS_PROD_ACCESS_KEY_ID= -export AWS_PROD_SECRET_ACCESS_KEY= -export AWS_PROD_SESSION_TOKEN= - -serverless <…> -``` - -## Conclusion - -With the account setup in place Serverless is now able to create and manage resources on our behalf. -Now it's time to start with our first Serverless service. - -[Next step > Creating a service](../../01-guide/02-creating-services.md) diff --git a/docs/02-providers/aws/02-iam.md b/docs/02-providers/aws/02-iam.md deleted file mode 100644 index 5d671cac5..000000000 --- a/docs/02-providers/aws/02-iam.md +++ /dev/null @@ -1,43 +0,0 @@ - - -# Adding custom IAM role statements -If you want to give permission to your functions to access certain resources on your AWS account, you can add custom IAM role statements to your service by adding the statements in the `iamRoleStatements` array in the `provider` object. As those statements will be merged into the CloudFormation template you can use Join, Ref or any other CloudFormation method or feature. You're also able to either use YAML for defining the statement (including the methods) or use embedded JSON if you prefer it. Here's an example that uses all of the above: - -```yml -# serverless.yml - -service: new-service -provider: - name: aws - iamRoleStatements: - - Effect: "Allow" - Action: - - "s3:ListBucket" - Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket"} ] ] } - - Effect: "Allow" - Action: - - "s3:PutObject" - Resource: - Fn::Join: - - "" - - - "arn:aws:s3:::" - - "Ref" : "ServerlessDeploymentBucket" -``` - -On deployment, all these statements will be added to the IAM role that is assumed by your lambda functions. - -# Using existing IAM role -If you want to use an existing IAM role, you can add your IAM role ARN in the `iamRoleARN`. For example: - -```yml -# serverless.yml - -service: new-service -provider: - name: aws - iamRoleARN: arn:aws:iam::YourAccountNumber:role/YourIamRole -``` diff --git a/docs/02-providers/aws/03-vpc.md b/docs/02-providers/aws/03-vpc.md deleted file mode 100644 index 81c624582..000000000 --- a/docs/02-providers/aws/03-vpc.md +++ /dev/null @@ -1,57 +0,0 @@ - - -# Configuring your functions to run in a VPC - -You can add VPC configuration to a specific function in `serverless.yml` by adding a `vpc` object property in the function configuration. This object should contain the `securityGroupIds` and `subnetIds` array properties needed to construct VPC for this function. Here's an example configuration: - -```yml -# serverless.yml -service: service-name -provider: aws - -functions: - hello: - handler: handler.hello - vpc: - securityGroupIds: - - securityGroupId1 - - securityGroupId2 - subnetIds: - - subnetId1 - - subnetId2 -``` - -Or if you want to apply VPC configuration to all functions in your service, you can add the configuration to the higher level `provider` object, and overwrite these service level config at the function level. For example: - -```yml -# serverless.yml -service: service-name -provider: - name: aws - vpc: - securityGroupIds: - - securityGroupId1 - - securityGroupId2 - subnetIds: - - subnetId1 - - subnetId2 - -functions: - hello: # this function will overwrite the service level vpc config above - handler: handler.hello - vpc: - securityGroupIds: - - securityGroupId1 - - securityGroupId2 - subnetIds: - - subnetId1 - - subnetId2 - users: # this function will inherit the service level vpc config above - handler: handler.users -``` - -Then, when you run `serverless deploy`, VPC configuration will be deployed along with your lambda function. diff --git a/docs/02-providers/aws/04-resource-names-reference.md b/docs/02-providers/aws/04-resource-names-reference.md deleted file mode 100644 index 88886d400..000000000 --- a/docs/02-providers/aws/04-resource-names-reference.md +++ /dev/null @@ -1,37 +0,0 @@ - - -# Cloudformation Resource Reference - -To have consistent naming in the Cloudformation Templates that get deployed we've defined a standard name: - -`{Function Name}{Cloud Formation Resource Type}{ResourceName}{SequentialID or Random String}` - -* `Function Name` this is optional for Resources that should be recreated when the function name gets changed. Those resources are also called *function bound* -* `Cloud Formation Resource Type` e.g. S3Bucket -* `Resource Name` an identifier for the specific resource, e.g. for an S3 Bucket the configured bucket name. -* `SequentialID or Random String` For a few resources we need to add an optional sequential id or random string to identify them - -All resource names that are deployed by Serverless have to follow this naming scheme. The only exception (for backwards compatibility reasons) is the S3 Bucket that is used to upload artifacts so they can be deployed to your function. - -We're also using the term `normalizedName` or similar terms in this guide. This basically just means dropping any characters that aren't allowed in resources names, e.g. special characters. - -| AWS Resource | Name Template | Example | -|--- |--- | --- | -| S3::Bucket | S3Bucket{normalizedBucketName} | S3BucketMybucket | -|IAM::Role | IamRoleLambdaExecution | IamRoleLambdaExecution | -|IAM::Policy | IamPolicyLambdaExecution | IamPolicyLambdaExecution | -|Lambda::Function | {normalizedFunctionName}LambdaFunction | HelloLambdaFunction | -|Lambda::Permission |
  • **Schedule**: {normalizedFunctionName}LambdaPermissionEventsRuleSchedule{index}
  • **S3**: {normalizedFunctionName}LambdaPermissionS3
  • **APIG**: {normalizedFunctionName}LambdaPermissionApiGateway
  • **SNS**: {normalizedFunctionName}LambdaPermission{normalizedTopicName}
|
  • **Schedule**: HelloLambdaPermissionEventsRuleSchedule1
  • **S3**: HelloLambdaPermissionS3
  • **APIG**: HelloLambdaPermissionApiGateway
  • **SNS**: HelloLambdaPermissionSometopic
| -|Events::Rule | {normalizedFuntionName}EventsRuleSchedule{SequentialID} | HelloEventsRuleSchedule1 | -|ApiGateway::RestApi | ApiGatewayRestApi | ApiGatewayRestApi | -|ApiGateway::Resource | ApiGatewayResource{normalizedPath} |
  • ApiGatewayResourceUsers
  • ApiGatewayResourceUsers**Var** for paths containing a variable
  • ApiGatewayResource**Dash** if the path is just a `-`
| -|ApiGateway::Method | ApiGatewayResource{normalizedPath}{normalizedMethod} | ApiGatewayResourceUsersGet | -|ApiGateway::Authorizer | {normalizedFunctionName}ApiGatewayAuthorizer | HelloApiGatewayAuthorizer | -|ApiGateway::Deployment | ApiGatewayDeployment{randomNumber} | ApiGatewayDeployment12356789 | -|ApiGateway::ApiKey | ApiGatewayApiKey{SequentialID} | ApiGatewayApiKey1 | -|SNS::Topic | SNSTopic{normalizedTopicName} | SNSTopicSometopic | -|AWS::Lambda::EventSourceMapping |
  • **DynamoDB**: {normalizedFunctionName}EventSourceMappingDynamodb{tableName}
  • **Kinesis**: {normalizedFunctionName}EventSourceMappingKinesis{streamName}
|
  • **DynamoDB**: HelloLambdaEventSourceMappingDynamodbUsers
  • **Kinesis**: HelloLambdaEventSourceMappingKinesisMystream
| diff --git a/docs/02-providers/aws/README.md b/docs/02-providers/aws/README.md deleted file mode 100644 index 18f368203..000000000 --- a/docs/02-providers/aws/README.md +++ /dev/null @@ -1,94 +0,0 @@ - - -# Serverless AWS Documentation - -Check out the [Getting started guide](../../01-guide/) and the [CLI reference](../../03-cli-reference/) for an introduction to Serverless. - -## Setup and configuration - -Please follow these [setup instructions](./01-setup.md) to start using AWS Lambda and serverless together - -## Provider configuration - -Following are examples and descriptions of all available AWS specific provider configuration settings. - -```yaml -provider: - name: aws # Set the provider you want to use, in this case AWS - runtime: nodejs4.3 # Default runtime for functions in this provider - stage: dev # Set the default stage used. Default is dev - region: us-east-1 # Overwrite the default region used. Default is us-east-1 - deploymentBucket: com.serverless.${self:provider.region}.deploys # Overwrite the default deployment bucket - stackTags: # Optional CF stack tags - key: value - stackPolicy: # Optional CF stack policy. The example below allows updates to all resources except deleting/replacing EC2 instances (use with caution!) - - Effect: Allow - Principal: "*" - Action: "Update:*" - Resource: "*" - - Effect: Deny - Principal: "*" - Action: - - Update:Replace - - Update:Delete - Condition: - StringEquals: - ResourceType: - - AWS::EC2::Instance -``` - -### Deployment S3 Bucket -The bucket must exist beforehand and be in the same region as the Lambda functions you want to deploy. Due to the importance and hard dependency of the deployment bucket, if you want to switch between the core and custom bucket, you have to do the following: - -* **From CloudFormation Bucket to Self Provided Bucket:** You need to manually empty the CloudFormation bucket. On the next deployment the bucket will be removed and we will use the self provided bucket. Without emptying the CloudFormation bucket your next deployment will fail. - -* **From Self Provided Bucket to CloudFormation Bucket:** You'll need to add the following custom resources template to `serverless.yml`: - -```yml -resources: - Resources: - ServerlessDeploymentBucket: - Type: AWS::S3::Bucket -``` -then deploy your service to create the CloudFormation bucket, then remove the `provider.deploymentBucket` property and deploy your service again. This syncs the framework back to the CloudFormation Bucket without conflict. After that deployment you can remove the CloudFormation bucket from the resources section in `serverless.yml` as it will be automatically added from now on. - -## Additional function configuration - -```yaml -functions: - hello: - name: ${self:provider.stage}-lambdaName # Deployed Lambda name - description: Description of what the lambda function does # Description to publish to AWS - handler: handler.hello # handler set in AWS Lambda - runtime: python2.7 # optional overwrite, default is provider runtime - memorySize: 512 # optional, default is 1024 - timeout: 10 # optional, default is 6 -``` - -## General Configuration -* [Configuring IAM resources](./02-iam.md) -* [VPC configuration](./03-vpc.md) -* [Cloudformation Resource naming reference](./04-resource-names-reference.md) - -## AWS events - -* [API Gateway](./events/01-apigateway.md) -* [S3](./events/02-s3.md) -* [Schedule](./events/03-schedule.md) -* [SNS](./events/04-sns.md) -* [Kinesis Streams](./events/05-kinesis-streams.md) -* [Dynamodb Streams](./events/06-dynamodb-streams.md) - -## Examples - -See the [examples folder](./examples) for all AWS serverless examples - -- [hello-world](./examples/hello-world) -- [using-external-libraries](./examples/using-external-libraries) -- [web-api](./examples/web-api) - -To add examples, fork this repo and submit a pull request diff --git a/docs/02-providers/aws/events/README.md b/docs/02-providers/aws/events/README.md deleted file mode 100644 index 89fd5d4f7..000000000 --- a/docs/02-providers/aws/events/README.md +++ /dev/null @@ -1,13 +0,0 @@ - - -# AWS serverless events - -* [API Gateway](./01-apigateway.md) -* [S3](./02-s3.md) -* [Schedule](./03-schedule.md) -* [SNS](./04-sns.md) -* [DynamoDB / Kinesis Streams](./05-streams.md) diff --git a/docs/02-providers/aws/examples/.eslintrc.js b/docs/02-providers/aws/examples/.eslintrc.js deleted file mode 100644 index 4609ba030..000000000 --- a/docs/02-providers/aws/examples/.eslintrc.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - "rules": { - "no-console": "off", - "import/no-unresolved": "off" - } -}; diff --git a/docs/02-providers/aws/examples/README.md b/docs/02-providers/aws/examples/README.md deleted file mode 100644 index 0dbe50cc8..000000000 --- a/docs/02-providers/aws/examples/README.md +++ /dev/null @@ -1,11 +0,0 @@ - - -* [hello-world](./hello-world) -* [using-external-libraries](./using-external-libraries) -* [cron](./cron) -* [web-serving-html](./web-serving-html) \ No newline at end of file diff --git a/docs/02-providers/aws/examples/cron/README.md b/docs/02-providers/aws/examples/cron/README.md deleted file mode 100644 index ded6350b5..000000000 --- a/docs/02-providers/aws/examples/cron/README.md +++ /dev/null @@ -1,14 +0,0 @@ - - -# Schedule Cron - -Create a scheduled task with AWS Lambda and automate all the things! - -For more information on running cron with serverless check out the [Tutorial: Serverless Scheduled Tasks](https://parall.ax/blog/view/3202/tutorial-serverless-scheduled-tasks) by parallax. - -For more information on `schedule` serverless event check out [our docs](/docs/02-providers/aws/events/03-schedule.md). diff --git a/docs/02-providers/aws/examples/cron/node/README.md b/docs/02-providers/aws/examples/cron/node/README.md deleted file mode 100644 index 3b92da677..000000000 --- a/docs/02-providers/aws/examples/cron/node/README.md +++ /dev/null @@ -1,18 +0,0 @@ - - -# AWS Lambda Node Cron Function - -This is an example of creating a function that runs on a scheduled cron. - -To see your cron running tail your logs with: - -```bash -serverless logs -function cron -tail -``` - -[Tutorial: Serverless Scheduled Tasks](https://parall.ax/blog/view/3202/tutorial-serverless-scheduled-tasks) \ No newline at end of file diff --git a/docs/02-providers/aws/examples/hello-world/README.md b/docs/02-providers/aws/examples/hello-world/README.md deleted file mode 100644 index 62bb62495..000000000 --- a/docs/02-providers/aws/examples/hello-world/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Hello World Example - -Welcome to the hello world serverless example. - -We are excited for you to start your serverless journey! - -* [Javascript](./node) -* [Python](./python) - diff --git a/docs/02-providers/aws/examples/hello-world/node/README.md b/docs/02-providers/aws/examples/hello-world/node/README.md deleted file mode 100644 index b0c486a25..000000000 --- a/docs/02-providers/aws/examples/hello-world/node/README.md +++ /dev/null @@ -1,30 +0,0 @@ - - -# Hello World Node.js - -Make sure `serverless` is installed. [See installation guide](/docs/01-guide/01-installing-serverless.md) - -## 1. Deploy - -`serverless deploy` or `sls deploy`. `sls` is shorthand for the serverless CLI command - -## 2. Invoke deployed function - -`serverless invoke --function helloWorld` or `serverless invoke -f helloWorld` - -`-f` is shorthand for `--function` - -In your terminal window you should see the response from AWS Lambda - -```bash -{ - "message": "Hello World" -} -``` - -Congrats you have just deployed and ran your hello world function! diff --git a/docs/02-providers/aws/examples/hello-world/python/README.md b/docs/02-providers/aws/examples/hello-world/python/README.md deleted file mode 100644 index 7cad8a620..000000000 --- a/docs/02-providers/aws/examples/hello-world/python/README.md +++ /dev/null @@ -1,30 +0,0 @@ - - -# Hello World in Python - -Make sure `serverless` is installed. [See installation guide](/docs/01-guide/01-installing-serverless.md) - -## 1. Deploy - -`serverless deploy` or `sls deploy`. `sls` is shorthand for the serverless CLI command - -## 2. Invoke deployed function - -`serverless invoke --function helloWorld` or `serverless invoke -f helloWorld` - -`-f` is shorthand for `--function` - -In your terminal window you should see the response from AWS Lambda - -```bash -{ - "message": "Hello World" -} -``` - -Congrats you have just deployed and ran your hello world function! diff --git a/docs/02-providers/aws/examples/using-external-libraries/README.md b/docs/02-providers/aws/examples/using-external-libraries/README.md deleted file mode 100644 index acc238820..000000000 --- a/docs/02-providers/aws/examples/using-external-libraries/README.md +++ /dev/null @@ -1,14 +0,0 @@ - - -# Using External Libraries Examples - -When creating serverless services you are able to use third party packages from your respective ecosystems package manager. - -For node.js you can leverage the vast ecosystem of NPM and `require` in modules into your project. - -For Python you can use the pip package manager \ No newline at end of file diff --git a/docs/02-providers/aws/examples/using-external-libraries/node/README.md b/docs/02-providers/aws/examples/using-external-libraries/node/README.md deleted file mode 100644 index fdb510168..000000000 --- a/docs/02-providers/aws/examples/using-external-libraries/node/README.md +++ /dev/null @@ -1,39 +0,0 @@ - - -# Using external libraries in Node.js service - -Make sure `serverless` is installed. [See installation guide](/docs/01-guide/01-installing-serverless.md) - -## 1. Install dependencies - -For this example we are going to install the `faker` module from npm. - -`npm install faker --save` - -## 2. Use the faker module in your `handler.js` file - -Inside of `handler.js` require your module. - -`const faker = require('faker');` - -## 3. Deploy - -`serverless deploy` - -## 4. Invoke - -`serverless invoke -f helloRandomName` - -In your terminal window you should see the response from AWS Lambda - -```bash -{ - "message": "Hello Floyd" -} -``` - diff --git a/docs/02-providers/aws/examples/using-external-libraries/node/handler.js b/docs/02-providers/aws/examples/using-external-libraries/node/handler.js deleted file mode 100644 index bc9d601a3..000000000 --- a/docs/02-providers/aws/examples/using-external-libraries/node/handler.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -// Import faker module from node_modules -const faker = require('faker'); - -module.exports.helloRandomName = function (event, context, callback) { - const name = faker.name.firstName(); - const message = { - message: `Hello ${name}`, - }; - - callback(null, message); -}; diff --git a/docs/02-providers/aws/examples/web-serving-html/README.md b/docs/02-providers/aws/examples/web-serving-html/README.md deleted file mode 100644 index aedd806ff..000000000 --- a/docs/02-providers/aws/examples/web-serving-html/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Serving HTML through API Gateway - -These examples illustrate how to hookup an API Gateway endpoint to a Lambda function to render HTML on a `GET` request. - -So instead of returning the default `json` from requests to an endpoint, you can display custom HTML. - -This is useful for dynamic webpages and landing pages for marketing activities. - -* [Javascript](./node) diff --git a/docs/02-providers/aws/examples/web-serving-html/node/README.md b/docs/02-providers/aws/examples/web-serving-html/node/README.md deleted file mode 100644 index 8bbfe1b53..000000000 --- a/docs/02-providers/aws/examples/web-serving-html/node/README.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# Serving Static HTML with NodeJS + API Gateway - -This is an example of serving vanilla HTML/CSS/JS through API Gateway \ No newline at end of file diff --git a/docs/03-cli-reference/02-install.md b/docs/03-cli-reference/02-install.md deleted file mode 100644 index 5aa3e2eca..000000000 --- a/docs/03-cli-reference/02-install.md +++ /dev/null @@ -1,32 +0,0 @@ - - -# Install - -Installs a service from a GitHub URL in the current working directory. - -``` -serverless install --url https://github.com/some/service -``` - -## Options -- `--url` or `-u` The services GitHub URL. **Required**. - -## Provided lifecycle events -- `install:install` - -## Examples - -### Installing a service from a GitHub URL - -``` -serverless install --url https://github.com/johndoe/authentication -``` - -This example will download the .zip file of the `authentication` service from GitHub, -create a new directory with the name `authentication` in the current working directory -and unzips the files in this directory. diff --git a/docs/03-cli-reference/08-slstats.md b/docs/03-cli-reference/08-slstats.md deleted file mode 100644 index 0395a00d3..000000000 --- a/docs/03-cli-reference/08-slstats.md +++ /dev/null @@ -1,31 +0,0 @@ - - -# SlStats - -This plugin implements a way to toggle [framework statistics](../framework-statistics.md). - -``` -serverless slstats --enable -``` - -## Options -- `--enable` or `-e`. -- `--disable` or `-d` - -## Provided lifecycle events -- `slstats:slstats` - -## Examples - -### Disabling it - -``` -serverless slstats --disable -``` - -This example will disable framework statistics. diff --git a/docs/03-cli-reference/README.md b/docs/03-cli-reference/README.md deleted file mode 100644 index 7946f4146..000000000 --- a/docs/03-cli-reference/README.md +++ /dev/null @@ -1,18 +0,0 @@ - - -# Serverless CLI Reference - -Here you can read through the docs of all commands that come with Serverless. - -* [create](./01-create.md) -* [install](./02-install.md) -* [deploy](./03-deploy.md) -* [invoke](./04-invoke.md) -* [logs](./05-logs.md) -* [info](./06-info.md) -* [remove](./07-remove.md) -* [slstats](./08-slstats.md) diff --git a/docs/04-extending-serverless/01-creating-plugins.md b/docs/04-extending-serverless/01-creating-plugins.md deleted file mode 100644 index e5f9f4fd4..000000000 --- a/docs/04-extending-serverless/01-creating-plugins.md +++ /dev/null @@ -1,498 +0,0 @@ - - -# Building Serverless plugins - -The Serverless plugin System is at the core of the Serverless framework. - -The main goals of the plugin system are: - -- Separation of CLI configuration and plugin logic - - We want any plugin author to be able to easily create new commands within the Serverless framework and extend existing commands. To achieve this we've created a strong separation between CLI and plugins that has clear interfaces between each other. -- Separation between logic of different plugins - - Different plugins need to have an easy way to run independently and after each other without defining dependencies between each other. -- Greater Extensibility - - Plugins need to be able to easily integrate into the lifecycle of a command independent of other Plugins that are running and can extend the functionality of Serverless easily. - -## Concepts - -### Plugin - -A plugin encapsulates commands (and corresponding lifecycle events) and hooks in a shareable way. A plugin is not forced to provide both, they can only consist of a list of commands and lifecycle events or only of hooks. - -### Command - -A command represents a CLI command that can be called by a user, e.g. `serverless deploy` would be the `deploy` command. - -A command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the lifecycle events for this particular command. Every command defines its own lifecycle events, so different commands can have completely different lifecycles. - -The commands that come with Serverless (e.g. `deploy`, `remove`, …) are implemented in the exact same way as commands built by other users. This means that lifecycle events we define for our commands do not have any special meaning in Serverless or for other plugins. Every command is free to have its own lifecycle events, none of them are more special than others. - -```javascript -'use strict'; - -class MyPlugin { - constructor() { - this.commands = { - deploy: { - lifecycleEvents: [ - 'resources', - 'functions' - ] - }, - }; - } -} - -module.exports = MyPlugin; -``` - -We automatically put the name of the command in front of lifecycle events when they are used for hooks. -So in a hook the following syntax needs to be used. - -***CommandName:LifecycleEventName*** - -Which would be **deploy:resources**, and **deploy:functions** in a hook definition (which we will show in more detail below). - -In addition to the lifecycle events defined here we will create 2 additional events for each: - -1. `before:CommandName:LifecycleEventName` -2. `after:CommandName:LifecycleEventName` - -Following the above example we’ll have these lifecycle events for our `myPlugin` plugin: - -For the **deploy:resources** lifecycleEvent: - -- `before:deploy:resources` -- `deploy:resources` -- `after:deploy:resources` - -For the **deploy:functions** lifecycleEvent: - -- `before:deploy:functions` -- `deploy:functions` -- `after:deploy:functions` - -These names will be used as hooks to include plugin logic. This allows to set up lifecycle events with generic names, but still make sure they are only executed for specific commands. - -You can also nest commands, e.g. if you want to provide a command `serverless deploy single` you can simply nest commands as defined in the following example. Those nested commands have their own lifecycle events and do not inherit them from their parents. - -```javascript -'use strict'; - -class MyPlugin { - constructor() { - this.commands = { - deploy: { - lifecycleEvents: [ - 'resources', - 'functions' - ], - commands: { - single: { - lifecycleEvents: [ - 'resources', - 'functions' - ], - }, - }, - }, - } - } -} - -module.exports = MyPlugin; -``` - -### Hook - -Hooks allow to connect specific lifecycle events to functions in a plugin. In the constructor of your class you define a `hooks` variable that the Plugin System will use once a specific command is running. Any hook can bind to any lifecycle event from any command, not just from commands that the same plugin provides. - -This allows to extend any command with additional functionality. - -```javascript -'use strict'; - -class Deploy { - constructor() { - this.commands = { - deploy: { - lifecycleEvents: [ - 'resources', - 'functions' - ] - }, - }; - - this.hooks = { - 'before:deploy:resources': this.beforeDeployResources, - 'deploy:resources': this.deployResources, - 'after:deploy:functions': this.afterDeployFunctions - }; - } - - beforeDeployResources() { - console.log('Before Deploy Resources'); - } - - deployResources() { - console.log('Deploy Resources'); - } - - afterDeployFunctions() { - console.log('After Deploy Functions'); - } -} - -module.exports = Deploy; -``` - -### Serverless instance - -The `serverless` instance which enables access to the whole Serverless setup during runtime is passed in as the first parameter to the plugin constructor. - -```javascript -'use strict'; - -class MyPlugin { - constructor(serverless, options) { - this.serverless = serverless; - this.options = options; - - this.commands = { - log: { - lifecycleEvents: [ - 'serverless' - ], - }, - }; - - this.hooks = { - 'log:serverless': this.logServerless.bind(this) - } - } - - logServerless() { - console.log('Serverless instance: ', this.serverless); - } -} - -module.exports = MyPlugin; -``` - -### Options and shortcuts - -Each (sub)command can have multiple options (and corresponding shortcuts if available). - -Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`. - -Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName` - -The `options` object will be passed in as the second parameter to the constructor of your plugin. - -```javascript -'use strict'; - -class Deploy { - constructor(serverless, options) { - this.serverless = serverless; - this.options = options; - - this.commands = { - deploy: { - lifecycleEvents: [ - 'functions' - ], - options: { - function: { - usage: 'Specify the function you want to deploy (e.g. "--function myFunction")' - } - } - }, - }; - - this.hooks = { - 'deploy:functions': this.deployFunction.bind(this) - } - } - - deployFunction() { - console.log('Deploying function: ', this.options.function); - } -} - -module.exports = Deploy; -``` - -#### Mark options as required - -Options can be marked as required. This way the plugin manager will automatically raise an error if a required option -is not passed in via the CLI. You can mark options as required with the help of `required: true` inside the options -definition. - -```javascript -'use strict'; - -class Deploy { - constructor(serverless, options) { - this.options = options; - - this.commands = { - deploy: { - lifecycleEvents: [ - 'functions' - ], - options: { - function: { - usage: 'Specify the function you want to deploy (e.g. "--function myFunction")', - required: true - } - } - }, - }; - - this.hooks = { - 'deploy:functions': this.deployFunction.bind(this) - } - } - - deployFunction() { - console.log('Deploying function: ', this.options.function); - } -} - -module.exports = Deploy; -``` - -#### Define shortcuts for options - -Options can also provide shortcuts. Shortcuts make it more convenient to enter long commands. Serverless will -translate shortcuts into options under the hood which means that the option the shortcut belongs to will be replaced with the value of the shortcut (if the shortcut is given). - -You can define shortcuts by setting the `shortcut` property in the options definition. - -**Note:** A shortcut should be unique inside of a plugin. - -```javascript -'use strict'; - -class Deploy { - constructor(serverless, options) { - this.options = options; - - this.commands = { - deploy: { - lifecycleEvents: [ - 'functions' - ], - options: { - function: { - usage: 'Specify the function you want to deploy (e.g. "--function myFunction" or "-f myFunction")', - required: true, - shortcut: 'f' - } - } - }, - }; - - this.hooks = { - 'deploy:functions': this.deployFunction.bind(this) - } - } - - deployFunction() { - console.log('Deploying function: ', this.options.function); - } -} - -module.exports = Deploy; -``` - -#### Custom validations for options - -You can provide a custom validation rule in form of a regular expression for your option. Serverless will raise an error -you can specify if the input for the option does not match the regular expression. - -In the following example we'll validate the `retries` option against a regular expression that checks if the value is a number. - -```javascript -'use strict'; - -class Deploy { - constructor(serverless, options) { - this.serverless = serverless; - this.options = options; - - this.commands = { - deploy: { - lifecycleEvents: [ - 'functions' - ], - options: { - retries: { - usage: 'Number of retries which should be performed', - customValidation: { - regularExpression: /^[0-9]+$/, - errorMessage: 'Retries should be a number', - }, - } - } - }, - }; - - this.hooks = { - 'deploy:functions': this.deployFunction.bind(this) - } - } - - deployFunction() { - console.log(`Deploying function… Will retry ${this.options.retries} times`); - } -} - -module.exports = Deploy; -``` - -## Provider specific plugins - -Plugins can be provider specific which means that they are bound to a provider. - -**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`. - -The provider definition should be added inside the plugins constructor and can be the name of the provider (as a string) or the provider plugin instance. - -### String representation - -The string representation simply tells Serverless that this plugin should only be loaded if the provider defined in the service matches the one of the plugin. - -```javascript -'use strict'; - -class ProviderDeploy { - constructor(serverless, options) { - this.serverless = serverless; - this.options = options; - - // set the providers name here - this.provider = 'providerName'; - - this.commands = { - deploy: { - lifecycleEvents: [ - 'functions' - ], - options: { - function: { - usage: 'Specify the function you want to deploy (e.g. "--function myFunction")', - required: true - } - } - }, - }; - - this.hooks = { - 'deploy:functions': this.deployFunction.bind(this) - } - } - - deployFunction() { - console.log('Deploying function: ', this.options.function); - } -} - -module.exports = ProviderDeploy; -``` - -### The provider plugin instance - -If you want to get access to provider specific utilities such as the SDK you can get the provider plugin instance with the help of the -`this.serverless.getProvider('providerName')` function and set it to the plugins `provider` property. -You can access the wrapped methods via `this.provider.`. - -The usage of the plugins `provider` property will load the plugin only if the `provider` matches the one defined in the service. - -```javascript -'use strict'; - -class ProviderInvoke { - constructor(serverless, options) { - this.serverless = serverless; - this.options = options; - - // get access to the provider plugin instance here - this.provider = this.serverless.getProvider('providerName'); - - this.commands = { - invoke: { - lifecycleEvents: [ - 'function' - ], - options: { - function: { - usage: 'Specify the function you want to invoke (e.g. "--function myFunction")', - required: true - } - } - }, - }; - - this.hooks = { - 'invoke:function': this.invokeFunction.bind(this) - } - } - - invokeFunction() { - // use the "request" method from the provider plugin - return this.provider.request('function', 'invoke', this.options.function); - } -} - -module.exports = ProviderInvoke; -``` - -## Plugin registration process - -A user has to define the plugins they want to use in the root level of the -`serverless.yml` file: - -```yml -plugins: - - custom-plugin-1 - - custom-plugin-2 -``` - -We do not auto-detect plugins from installed dependencies so users do not run into any surprises and we cut down on the startup time of the tool. Through JSON-REF users can share configuration for used plugins between -`serverless.yml` files in one repository. - -After the `serverless.yml` configuration file is loaded the plugin system will load all the commands and plugins and initialize the plugin system. - -## Plugin options - -Sometimes your plugin needs to setup some custom options. The `serverless.yml` -file provides the `custom` section where you can add options your plugin can use. - -```yml -plugins: - - my-greet-plugin - -custom: - greeting: hello -``` - -## Plugin Order - -Plugins are registered in the order they are defined through our system and the -`serverless.yml` file. By default we will load the -[core plugins](https://github.com/serverless/serverless/tree/master/lib/plugins) first, then we will load all plugins according to the order given in the -`serverless.yml` file. - -This means the Serverless core plugins will always be executed first for every lifecycle event before 3rd party plugins. -If external plugins should be running before our plugins they should generally be able to hook into an earlier lifecycle -event. - -## Command naming - -Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. Commands need to be unique in the current service context they are executed. So if you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins. diff --git a/docs/04-extending-serverless/02-creating-provider-plugins.md b/docs/04-extending-serverless/02-creating-provider-plugins.md deleted file mode 100644 index ca11ca0f4..000000000 --- a/docs/04-extending-serverless/02-creating-provider-plugins.md +++ /dev/null @@ -1,125 +0,0 @@ - - -# Building provider integrations - -Integrating different infrastructure providers happens through the standard plugin system. -Take a look at the ["building plugins"](./01-creating-plugins.md) documentation to understand how the plugin system works. - -## Provider plugins - -We'd recommend that you encapsulate provider related utilities into an own plugin and call it `Provider`. -You can register this provider plugin in Serverless with the help of the `serverless.setProvider(, )` function. -Furthermore your provider plugin needs to provide a static method which returns the providers name. - -Here's a simple skeleton which shows this in detail and can be used as a boilerplate to get started: - -```javascript -class MyProvider { - static getProviderName() { - return 'providerName'; - } - - constructor(serverless) { - this.serverless = serverless; - this.sdk = TheProvidersSDK; - this.provider = this; // only load plugin in a "providerName" service context - this.serverless.setProvider('providerName', this); - } - - // this method can be easily re-used by other plugins - useSDK(command) { - return this.sdk(command); - } -} - -module.exports = MyProvider; -``` - -After doing this other plugins can simply call `this.serverless.getProvider('providerName')` and access all the methods you've defined in your provider plugin. - -## Provider specific plugins - -You can add the providers name inside the constructor of your plugin. This makes it possible to only execute your plugins logic when the Serverless service uses the provider you've specified in your plugin. - -## Deployment - -Infrastructure provider plugins should bind to specific lifecycle events of the `deploy` command to compile the function and their events to provider specific resources. - -### Deployment lifecycle - -Let's take a look at the [core `deploy` plugin](https://github.com/serverless/serverless/tree/master/lib/plugins/deploy) and the different lifecycle hooks it provides. - -The following lifecycle events are run in order once the user types `serverless deploy` and hits enter: - -- `deploy:initialize` -- `deploy:setupProviderConfiguration` -- `deploy:compileFunctions` -- `deploy:compileEvents` -- `deploy:createDeploymentArtifacts` -- `deploy:deploy` - -Plugin developers can hook into those lifecycle events to compile and deploy functions and events on your providers infrastructure. - -Let's take a closer look at each lifecycle event to understand what its purpose is and what it should be used for. - -#### `deploy:initialize` - -This lifecycle should be used to load the basic resources the provider needs into memory (e.g. parse a basic resource -template skeleton such as a CloudFormation template). - -#### `deploy:setupProviderConfiguration` - -The purpose of the `deploy:setupProviderConfiguration` lifecycle is to take the basic resource template which was created in the previous lifecycle and deploy the rough skeleton on the cloud providers infrastructure (without any functions or events) for the first time. - -#### `deploy:createDeploymentArtifacts` - -The whole service get's zipped up into one .zip file. - -Serverless will automatically exclude the following files / folders to reduce the size of the .zip file: - -- .git -- .gitignore -- .serverless -- serverless.yaml -- serverless.yml -- .DS_Store - -You can always include previously excluded files and folders if you want to. - -#### `deploy:compileFunctions` - -Next up the functions inside the `serverless.yml` file should be compiled to provider specific resources and stored into memory. - -#### `deploy:compileEvents` - -After that the events which are defined in the `serverless.yml` file on a per function basis should be compiled to provider specific resources and also stored into memory. - -#### `deploy:deploy` - -The final lifecycle is the `deploy:deploy` lifecycle which should be used to deploy the previously compiled function and event resources to the providers infrastructure. - -### Amazon Web Services provider integration - -Curious how this works for the Amazon Web Services (AWS) provider integration? - -Here are the steps the AWS plugins take to compile and deploy the service on the AWS infrastructure in detail. - -#### The steps in detail - -1. The `serverless.yml` file is loaded into memory -2. A default AWS CloudFormation template is loaded and deployed to AWS (A S3 bucket for the service gets created)(`deploy:setupProviderConfiguration`) -3. The functions of the `serverless.yml` -4. Each functions events are compiled into CloudFormation resources and stored into memory (`deploy:compileEvents`) -5. Old functions (if available) are removed from the S3 bucket (`deploy:deploy`) -6. The service gets zipped up and is uploaded to S3 (`deploy:createDeploymentArtifacts` and `deploy:deploy`) -7. The compiled functions, event resources and custom provider resources are attached to the core CloudFormation template and the updated CloudFormation template gets redeployed (`deploy:deploy`) - -#### The code - -You may also take a closer look at the corresponding plugin code to get a deeper knowledge about what's going on behind the scenes. - -The full AWS integration can be found in [`lib/plugins/aws`](https://github.com/serverless/serverless/tree/master/lib/plugins/aws). diff --git a/docs/04-extending-serverless/README.md b/docs/04-extending-serverless/README.md deleted file mode 100644 index 98dae8993..000000000 --- a/docs/04-extending-serverless/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Developing plugins - -Here you can read how to develop your own Serverless plugins. We'll get into details on how to write custom plugins to -extend the functionality of Serverless. Furthermore we'll look into the way how you can use your plugin knowledge -to integrate your own provider into the Serverless framework. - -## Table of contents - -- [Building plugins](./01-creating-plugins.md) -- [Building provider integrations](./02-creating-provider-plugins.md) diff --git a/docs/README.md b/docs/README.md index fa219d4b3..9af5e1541 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,63 +4,92 @@ menuText: Docs layout: Doc --> -# Serverless Documentation + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/) + -Welcome to the Serverless documentation. +# Documentation -- [Quick Start Guide](./01-guide/) -- [Core Concepts](#concepts) -- [CLI Reference](./03-cli-reference/) -- [Providers](#providers) -- [Extending Serverless](./04-extending-serverless/) -- [Contributing to Serverless](#contributing) +The Serverless Framework allows you to deploy auto-scaling, pay-per-execution, event-driven functions to any cloud. We currently support Amazon Web Service's Lambda, and are expanding to support other cloud providers. -## Providers -- [AWS Integration Docs](./02-providers/aws/) +
+
+
+ + Serverless Framework AWS Lambda Guide + +
+
+ +
+
-## Concepts +
+
+ + Serverless Framework AWS Lambda CLI Reference + +
+ +
-Before we begin, let's run through some of the main concepts behind serverless. +
+
+ + Serverless Framework AWS Lambda Events + +
+
+ +
+
-* [Functions](#functions) -* [Events](#events) -* [Resources](#resources) -* [Services](#services) -* [Plugins](#plugins) - -### Functions - -Functions are the essential part for any serverless infrastructure. Several functions together form a service. A service typically solves one particular problem in your infrastructure. - -### Events - -Serverless is used to build event driven architecture. Basically everything which can trigger a function is an event. - -Events could be HTTP requests, events fired from a cloud storage (like a S3 bucket), scheduled events, etc. - -- [AWS Events](./02-providers/aws/events/) - -### Resources - -Resources are the different pieces that comprise your infrastructure like databases, storage buckets, API Gateways or other resources your provider lets you configure. - -### Services - -A *Serverless service* is a group of one or multiple functions and any resources they require. By grouping related functions together, it's easier to share code and resources between those functions. Services are also designed to be completely independent, which helps teams develop more quickly without waiting for others. - -### Plugins - -Here you can read how to develop your own Serverless plugins. We'll get into details on how to write custom plugins to extend the functionality of Serverless. Furthermore we'll look into the way how you can use your plugin knowledge to integrate your own provider into the Serverless framework. - -- [Building plugins](./04-extending-serverless/) - -Connect with the community on [gitter](https://gitter.im/serverless/serverless) or in the [Forum](http://forum.serverless.com) - -## Contributing -We love our contributors! Please read our [Contributing Document](../CONTRIBUTING.md) to learn how you can start working on the Framework yourself. - -Check out our [help-wanted](https://github.com/serverless/serverless/labels/help-wanted) or [help-wanted-easy](https://github.com/serverless/serverless/labels/help-wanted-easy) labels to find issues we want to move forward on with your help. - -## Framework statistics - -[Framework statistics](./framework-statistics.md) +
+
+ + Serverless Framework AWS Lambdxxxxa Examples + +
+ +
+
diff --git a/docs/framework-statistics.md b/docs/framework-statistics.md deleted file mode 100644 index 2ecd652f8..000000000 --- a/docs/framework-statistics.md +++ /dev/null @@ -1,30 +0,0 @@ - - -# Framework statistics - -Serverless will automatically collect anonymous framework statistics. This is done so that we better understand the usage and needs -of our users to improve Serverless in future releases. However you can always [disable it](#how-to-disable-it). - -## What we collect - -Our main goal is anonymity. All the data is anonymized and won't reveal who you are or what the project you're working on is / looks like. - -Please take a look at the [`logStat()` method](https://github.com/serverless/serverless/blob/master/lib/classes/Utils.js) in the `Utils` class to see what (and how) we collect statistics. - -## How it's implemented - -We encourage you to look into the source to see more details about the actual implementation. - -The whole implementation consists of two parts: - -1. The [slstats plugin](https://github.com/serverless/serverless/tree/master/lib/plugins/slstats) -2. The `logStat()` method you can find in the [Utils class](https://github.com/serverless/serverless/blob/master/lib/classes/Utils.js) - -## How to disable it - -You can disable it by running the following command: `serverless slstats --disable`. -You can always run `serverless slstats --enable` to enable it again. diff --git a/docs/providers/README.md b/docs/providers/README.md new file mode 100644 index 000000000..3d7509d0b --- /dev/null +++ b/docs/providers/README.md @@ -0,0 +1,19 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/) + + +# Serverless Infrastructure Providers + +Providers are where your serverless functions run in the cloud. + +Under the hood, the serverless framework is deploying your code to a cloud provider like Amazon web services or Google Cloud functions. + +You specify your provider in your services `serverless.yml` file. + +* [Back to main documentation](../README.md) diff --git a/docs/providers/aws/README.md b/docs/providers/aws/README.md new file mode 100644 index 000000000..6a40cd2c9 --- /dev/null +++ b/docs/providers/aws/README.md @@ -0,0 +1,17 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/) + + +# Serverless AWS Provider Documentation + +Welcome to the Serverless Amazon Web Services documentation! Please select a section on the left to get started. + +**Note:** Before continuing [AWS system credentials](./guide/credentials/) are required for using the CLI. + +If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless) diff --git a/docs/providers/aws/cli-reference/README.md b/docs/providers/aws/cli-reference/README.md new file mode 100644 index 000000000..e601555a4 --- /dev/null +++ b/docs/providers/aws/cli-reference/README.md @@ -0,0 +1,17 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/) + + +# Serverless AWS Lambda CLI Reference + +Welcome to the Serverless AWS Lambda CLI Reference! Please select a section on the left to get started. + +**Note:** Before continuing [AWS system credentials](https://serverless.com/framework/docs/providers/aws/guide/credentials/) are required for using the CLI. + +If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless) diff --git a/docs/03-cli-reference/01-create.md b/docs/providers/aws/cli-reference/create.md similarity index 80% rename from docs/03-cli-reference/01-create.md rename to docs/providers/aws/cli-reference/create.md index 855fe543b..a3a0629bf 100644 --- a/docs/03-cli-reference/01-create.md +++ b/docs/providers/aws/cli-reference/create.md @@ -1,15 +1,20 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/create) + + # Create Creates a new service in the current working directory based on the provided template. -``` +```bash serverless create --template aws-nodejs ``` @@ -37,7 +42,7 @@ Most commonly used templates: ### Creating a new service -``` +```bash serverless create --template aws-nodejs --name my-special-service ``` @@ -49,7 +54,7 @@ The provider which is used for deployment later on is AWS (Amazon web services). ### Creating a named service in a (new) directory -``` +```bash serverless create --template aws-nodejs --path my-new-service ``` @@ -58,4 +63,4 @@ will be generated in the `my-new-service` directory. This directory will be crea will use the already present directory. Additionally Serverless will rename the service according to the path you provide. In this example the service will be -renamed to `my-new-service`. +renamed to `my-new-service`. \ No newline at end of file diff --git a/docs/03-cli-reference/03-deploy.md b/docs/providers/aws/cli-reference/deploy.md similarity index 80% rename from docs/03-cli-reference/03-deploy.md rename to docs/providers/aws/cli-reference/deploy.md index 75f2e560c..7c085b279 100644 --- a/docs/03-cli-reference/03-deploy.md +++ b/docs/providers/aws/cli-reference/deploy.md @@ -1,16 +1,21 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/deploy) + + # Deploy Deploys your service. You can access all created deployment artifacts in the `.serverless` folder. -``` -serverless deploy [function|list] +```bash +serverless deploy [function] ``` ## Options @@ -25,7 +30,7 @@ serverless deploy [function|list] ### Deployment without stage and region options -``` +```bash serverless deploy ``` @@ -34,22 +39,13 @@ provider in the default stage (`dev`) to the default region (`us-east-1`). ### Deployment with stage and region options -``` +```bash serverless deploy --stage production --region eu-central-1 ``` With this example we've defined that we want our service to be deployed to the `production` stage in the region `eu-central-1`. -## List existing deploys - -``` -serverless deploy list -``` - -Running this command will list your recent deployments available in your S3 deployment bucket. It will use -stage and region from the provider config. - ## Provided lifecycle events - `deploy:cleanup` - `deploy:initialize` @@ -58,5 +54,4 @@ stage and region from the provider config. - `deploy:compileFunctions` - `deploy:compileEvents` - `deploy:deploy` -- `deploy:function:deploy` -- `deploy:list:log` +- `deploy:function:deploy` \ No newline at end of file diff --git a/docs/03-cli-reference/06-info.md b/docs/providers/aws/cli-reference/info.md similarity index 83% rename from docs/03-cli-reference/06-info.md rename to docs/providers/aws/cli-reference/info.md index 324eb1c25..f066a2ac8 100644 --- a/docs/03-cli-reference/06-info.md +++ b/docs/providers/aws/cli-reference/info.md @@ -1,10 +1,15 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/info) + + # Info Displays information about the deployed service. @@ -30,7 +35,7 @@ See the example below for an example output. **Example:** -``` +```bash $ serverless info Service Information @@ -46,8 +51,10 @@ functions: ``` #### Verbose + When using the `--verbose` flag, the `info` command will also append all Stack Outputs to the output: -``` + +```bash $ serverless info --verbose Service Information @@ -69,4 +76,4 @@ CreateThumbnailsLambdaFunctionArn: arn:aws:lambda:us-east-1:377024778620:functio TakeScreenshotLambdaFunctionArn: arn:aws:lambda:us-east-1:377024778620:function:lambda-screenshots-dev-takeScreenshot ServiceEndpoint: https://12341jc801.execute-api.us-east-1.amazonaws.com/dev ServerlessDeploymentBucketName: lambda-screenshots-dev-serverlessdeploymentbucket-15b7pkc04f98a -``` +``` \ No newline at end of file diff --git a/docs/providers/aws/cli-reference/install.md b/docs/providers/aws/cli-reference/install.md new file mode 100644 index 000000000..aa2046c7b --- /dev/null +++ b/docs/providers/aws/cli-reference/install.md @@ -0,0 +1,35 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/install) + + +# Install + +Installs a service from a GitHub URL in the current working directory. + +```bash +serverless install --url https://github.com/some/service +``` + +## Options +- `--url` or `-u` The services GitHub URL. **Required**. + +## Provided lifecycle events +- `install:install` + +## Examples + +### Installing a service from a GitHub URL + +```bash +serverless install --url https://github.com/johndoe/authentication +``` + +This example will download the .zip file of the `authentication` service from GitHub, create a new directory with the name `authentication` in the current working directory and unzips the files in this directory. \ No newline at end of file diff --git a/docs/03-cli-reference/04-invoke.md b/docs/providers/aws/cli-reference/invoke.md similarity index 75% rename from docs/03-cli-reference/04-invoke.md rename to docs/providers/aws/cli-reference/invoke.md index 645ae7dc7..82e67b129 100644 --- a/docs/03-cli-reference/04-invoke.md +++ b/docs/providers/aws/cli-reference/invoke.md @@ -1,10 +1,15 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/invoke) + + # Invoke Invokes a previously deployed function. It allows to send event data to the function and read logs and display other important information of the function invoke. @@ -17,11 +22,11 @@ serverless invoke --function functionName - `--function` or `-f` The name of the function in your service that you want to invoke. **Required**. - `--stage` or `-s` The stage in your service you want to invoke your function in. - `--region` or `-r` The region in your stage that you want to invoke your function in. -- `--path` or `-p` The path to a json file holding input data to be passed to the invoked function. Either an absolute or - relative (to the root directory of your service) may be given. +- `--path` or `-p` The path to a json file holding input data to be passed to the invoked function. This path is relative to the +root directory of the service. - `--type` or `-t` The type of invocation. Either `RequestResponse`, `Event` or `DryRun`. Default is `RequestResponse`. - `--log` or `-l` If set to `true` and invocation type is `RequestResponse`, it will output logging data of the invocation. - Default is `false`. +Default is `false`. ## Provided lifecycle events - `invoke:invoke` @@ -30,7 +35,7 @@ serverless invoke --function functionName ### AWS -``` +```bash serverless invoke --function functionName --stage dev --region us-east-1 ``` @@ -39,7 +44,7 @@ output the result of the invocation in your terminal. #### Function invocation with logging -``` +```bash serverless invoke --function functionName --stage dev --region us-east-1 --log ``` @@ -47,15 +52,9 @@ Just like the first example, but will also outputs logging information about you #### Function invocation with data passing -``` +```bash serverless invoke --function functionName --stage dev --region us-east-1 --path lib/data.json ``` This example will pass the json data in the `lib/data.json` file (relative to the root of the service) while invoking -the specified/deployed function. - -``` -serverless invoke --function functionName --stage dev --region us-east-1 --path /tmp/data.json -``` - -This example will pass the json data in the `/tmp/data.json` file while invoking the specified/deployed function. +the specified/deployed function. \ No newline at end of file diff --git a/docs/03-cli-reference/05-logs.md b/docs/providers/aws/cli-reference/logs.md similarity index 85% rename from docs/03-cli-reference/05-logs.md rename to docs/providers/aws/cli-reference/logs.md index 85d9f1200..7782aa54b 100644 --- a/docs/03-cli-reference/05-logs.md +++ b/docs/providers/aws/cli-reference/logs.md @@ -1,10 +1,15 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/logs) + + # Logs Lets you watch the logs of a specific function. @@ -18,9 +23,9 @@ serverless logs -f hello - `--function` or `-f` The function you want to fetch the logs for. **Required** - `--stage` or `-s` The stage you want to view the function logs for. If not provided, the plugin will use the default stage listed in `serverless.yml`. If that doesn't exist either it'll just fetch the logs from the `dev` stage. - `--region` or `-r` The region you want to view the function logs for. If not provided, the plugin will use the default region listed in `serverless.yml`. If that doesn't exist either it'll just fetch the logs from the `us-east-1` region. -- `--startTime` A specific unit in time to start fetching logs from (ie: `2010-10-20` or `1469705761`). All absolute dates/datetimes .e.g `2010-10-20` are parsed as UTC. Here's a list of the supported string formats: +- `--startTime` A specific unit in time to start fetching logs from (ie: `2010-10-20` or `1469705761`). Here's a list of the supported string formats: -``` +```bash 30m # since 30 minutes ago 2h # since 2 hours ago 3d # since 3 days ago @@ -71,4 +76,4 @@ Serverless will tail the CloudWatch log output and print new log messages coming ```bash serverless logs -f hello --filter serverless ``` -This will fetch only the logs that contain the string `serverless` +This will fetch only the logs that contain the string `serverless` \ No newline at end of file diff --git a/docs/03-cli-reference/07-remove.md b/docs/providers/aws/cli-reference/remove.md similarity index 61% rename from docs/03-cli-reference/07-remove.md rename to docs/providers/aws/cli-reference/remove.md index 63fbc2d34..dd097cf70 100644 --- a/docs/03-cli-reference/07-remove.md +++ b/docs/providers/aws/cli-reference/remove.md @@ -1,15 +1,20 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/remove) + + # Remove Removes the deployed service which is defined in your current working directory. -``` +```bash serverless remove ``` @@ -25,8 +30,8 @@ serverless remove ### Removal of service in specific stage and region -``` +```bash serverless remove --stage dev --region us-east-1 ``` -This example will remove the deployed service of your current working directory with the stage `dev` and the region `us-east-1`. +This example will remove the deployed service of your current working directory with the stage `dev` and the region `us-east-1`. \ No newline at end of file diff --git a/docs/providers/aws/cli-reference/slstats.md b/docs/providers/aws/cli-reference/slstats.md new file mode 100644 index 000000000..0665f014d --- /dev/null +++ b/docs/providers/aws/cli-reference/slstats.md @@ -0,0 +1,36 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/slstats) + + +# Serverless Statistics + +This plugin implements a way to toggle framework statistics. + +```bash +serverless slstats --enable +``` + +## Options +- `--enable` or `-e`. +- `--disable` or `-d` + +## Provided lifecycle events +- `slstats:slstats` + +## Examples + +### Disabling it + +```bash +serverless slstats --disable +``` + +This example will disable framework statistics. diff --git a/docs/providers/aws/events/README.md b/docs/providers/aws/events/README.md new file mode 100644 index 000000000..87d4d6601 --- /dev/null +++ b/docs/providers/aws/events/README.md @@ -0,0 +1,17 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/) + + +# Serverless AWS Lambda Events + +Welcome to the Serverless AWS Lambda Events Glossary! Please select a section on the left to get started. + +**Note:** Before continuing [AWS system credentials](https://serverless.com/framework/docs/providers/aws/guide/credentials/) are required for using the CLI. + +If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless) diff --git a/docs/02-providers/aws/events/01-apigateway.md b/docs/providers/aws/events/apigateway.md similarity index 80% rename from docs/02-providers/aws/events/01-apigateway.md rename to docs/providers/aws/events/apigateway.md index 501cb4329..bc68b833c 100644 --- a/docs/02-providers/aws/events/01-apigateway.md +++ b/docs/providers/aws/events/apigateway.md @@ -1,16 +1,36 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/apigateway) + + # API Gateway -## Simple http setup +To create HTTP endpoints as Event sources for your AWS Lambda Functions, use the Serverless Framework's easy AWS API Gateway Events syntax. + +There are two ways you can configure your HTTP endpoints to integrate with your AWS Lambda Functions: +* lambda-proxy (Recommended) +* lambda + +The difference between these is `lambda-proxy` automatically passes the content of the HTTP request into your AWS Lambda function (headers, body, etc.) and allows you to configure your response (headers, status code, body) in the code of your AWS Lambda Function. Whereas, the `lambda` method makes you explicitly define headers, status codes, and more in the configuration of each API Gateway Endpoint (not in code). We highly recommend using the `lambda-proxy` method if it supports your use-case, since the `lambda` method is highly tedious. + +By default, the Framework uses the `lambda-proxy` method (i.e., everything is passed into your Lambda), and nothing is required by you to enable it. + +## Lambda Proxy Integration + +### Simple HTTP Endpoint This setup specifies that the `index` function should be run when someone accesses the API gateway at `users/index` via a `GET` request. +Here's an example: + ```yml # serverless.yml functions: @@ -20,7 +40,33 @@ functions: - http: GET users/index ``` -## Http setup with extended event options +```javascript +// users.js + +'use strict'; + +exports.handler = function(event, context, callback) { + + console.log(event); // Contains incoming request data (e.g., query params, headers and more) + + const response = { + statusCode: 200, + headers: { + "x-custom-header" : "My Header Value" + }, + body: JSON.stringify({ "message": "Hello World!" }) + }; + + callback(null, response); +}; +``` + +**Note:** When the body is a JSON-Document, you must parse it yourself: +``` +JSON.parse(event.body); +``` + +### HTTP Endpoint with Extended Options Here we've defined an POST endpoint for the path `posts/create`. @@ -35,9 +81,155 @@ functions: method: post ``` -## Request parameters +### Enabling CORS +To set CORS configurations for your HTTP endpoints, simply modify your event configurations as follows: -You can pass optional and required parameters to your functions, so you can use them in for example Api Gateway tests and SDK generation. Marking them as `true` will make them required, `false` will make them optional. +```yml +functions: + hello: + handler: handler.hello + events: + - http: + path: user/create + method: get + cors: true +``` + +If you want to use CORS with the lambda-proxy integration, remember to include `Access-Control-Allow-Origin` in your returned headers object, like this: + +```javascript +// users.js + +'use strict'; + +exports.handler = function(event, context, callback) { + + const response = { + statusCode: 200, + headers: { + "Access-Control-Allow-Origin" : "*" // Required for CORS support to work + }, + body: JSON.stringify({ "message": "Hello World!" }) + }; + + callback(null, response); +}; +``` + +### HTTP Endpoints with Custom Authorizers + +Custom Authorizers allow you to run an AWS Lambda Function before your targeted AWS Lambda Function. This is useful for Microservice Architectures or when you simply want to do some Authorization before running your business logic. + +You can enable Custom Authorizers for your HTTP endpoint by setting the Authorizer in your `http` event to another function +in the same service, as shown in the following example: + +```yml +# serverless.yml +functions: + create: + handler: posts.create + events: + - http: + path: posts/create + method: post + authorizer: authorizerFunc + authorizerFunc: + handler: handlers.authorizerFunc +``` +Or, if you want to configure the Authorizer with more options, you can turn the `authorizer` property into an object as +shown in the following example: + +```yml +# serverless.yml +functions: + create: + handler: posts.create + events: + - http: + path: posts/create + method: post + authorizer: + name: authorizerFunc + resultTtlInSeconds: 0 + identitySource: method.request.header.Authorization + identityValidationExpression: someRegex + authorizerFunc: + handler: handlers.authorizerFunc +``` + +If the Authorizer function does not exist in your service but exists in AWS, you can provide the ARN of the Lambda +function instead of the function name, as shown in the following example: + +```yml +# serverless.yml +functions: + create: + handler: posts.create + events: + - http: + path: posts/create + method: post + authorizer: xxx:xxx:Lambda-Name +``` + +Or, if you want to configure the Authorizer with more options, you can turn the `authorizer` property into an object as +shown in the following example: + +```yml +# serverless.yml +functions: + create: + handler: posts.create + events: + - http: + path: posts/create + method: post + authorizer: + arn: xxx:xxx:Lambda-Name + resultTtlInSeconds: 0 + identitySource: method.request.header.Authorization + identityValidationExpression: someRegex +``` + +### Catching Exceptions In Your Lambda Function + +In case an exception is thrown in your lambda function AWS will send an error message with `Process exited before completing request`. This will be caught by the regular expression for the 500 HTTP status and the 500 status will be returned. + +### Setting API keys for your Rest API +You can specify a list of API keys to be used by your service Rest API by adding an `apiKeys` array property to the +`provider` object in `serverless.yml`. You'll also need to explicitly specify which endpoints are `private` and require +one of the api keys to be included in the request by adding a `private` boolean property to the `http` event object you +want to set as private. + +Here's an example configuration for setting API keys for your service Rest API: + +```yml +service: my-service +provider: + name: aws + apiKeys: + - myFirstKey + - ${env:MY_API_KEY} # you can hide it in a serverless variable +functions: + hello: + events: + - http: + path: user/create + method: get + private: true +``` + +Please note that those are the API keys names, not the actual values. Once you deploy your service, the value of those API keys will be auto generated by AWS and printed on the screen for you to use. + +Clients connecting to this Rest API will then need to set any of these API keys values in the `x-api-key` header of their request. This is only necessary for functions where the `private` property is set to true. + +## Lambda Integration + +This method is more complicated and involves a lot more configuration of the `http` event syntax. + +### Request Parameters + +To pass optional and required parameters to your functions, so you can use them in API Gateway tests and SDK generation, marking them as `true` will make them required, `false` will make them optional. ```yml # serverless.yml @@ -60,7 +252,7 @@ functions: bar: false ``` -In order for path variables to work, ApiGateway also needs them in the method path itself, like so: +In order for path variables to work, API Gateway also needs them in the method path itself, like so: ```yml # serverless.yml @@ -78,78 +270,9 @@ functions: id: true ``` -## Integration types +### Request templates -Serverless supports the following integration types: - -- `lambda` -- `lambda-proxy` - -Here's a simple example which demonstrates how you can set the `integration` type for your `http` event: - -```yml -# serverless.yml -functions: - get: - handler: users.get - events: - - http: - path: users - method: get - integration: lambda -``` - -### `lambda-proxy` - -**Important:** Serverless defaults to this integration type if you don't setup another one. -Furthermore any `request` or `response` configuration will be ignored if this `integration` type is used. - -`lambda-proxy` simply passes the whole request as is (regardless of the content type, the headers, etc.) directly to the -Lambda function. This means that you don't have to setup custom request / response configuration (such as templates, the -passthrough behavior, etc.). - -Your function needs to return corresponding response information. - -Here's an example for a JavaScript / Node.js function which shows how this might look like: - -```javascript -'use strict'; - -exports.handler = function(event, context, callback) { - const responseBody = { - message: "Hello World!", - input: event - }; - - const response = { - statusCode: 200, - headers: { - "x-custom-header" : "My Header Value" - }, - body: JSON.stringify(responseBody) - }; - - callback(null, response); -}; -``` - -**Note:** If you want to use CORS with the lambda-proxy integration, remember to include `Access-Control-Allow-Origin` in your returned headers object. - -Take a look at the [AWS documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-create-api-as-simple-proxy-for-lambda.html) -for more information about this. - -### `lambda` - -The `lambda` integration type should be used if you want more control over the `request` and `response` configurations. - -Serverless ships with defaults for the request / response configuration (such as request templates, error code mappings, -default passthrough behaviour) but you can always configure those accordingly when you set the `integration` type to `lambda`. - -## Request templates - -**Note:** The request configuration can only be used when the integration type is set to `lambda`. - -### Default request templates +#### Default Request Templates Serverless ships with the following default request templates you can use out of the box: @@ -168,7 +291,7 @@ Both templates give you access to the following properties you can access with t - identity - stageVariables -### Using custom request templates +#### Custom Request Templates However you can define and use your own request templates as follows (you can even overwrite the default request templates by defining a new request template for an existing content type): @@ -210,8 +333,7 @@ functions: You can then access the query string `https://example.com/dev/whatever?bar=123` by `event.foo` in the lambda function. If you want to spread a string into multiple lines, you can use the `>` or `|` syntax, but the following strings have to be all indented with the same amount, [read more about `>` syntax](http://stackoverflow.com/questions/3790454/in-yaml-how-do-i-break-a-string-over-multiple-lines). - -### Pass Through Behavior +#### Pass Through Behavior API Gateway provides multiple ways to handle requests where the Content-Type header does not match any of the specified mapping templates. When this happens, the request payload will either be passed through the integration request *without transformation* or rejected with a `415 - Unsupported Media Type`, depending on the configuration. You can define this behavior as follows (if not specified, a value of **NEVER** will be used): @@ -243,13 +365,11 @@ See the [api gateway documentation](https://docs.aws.amazon.com/apigateway/lates - A missing/empty request Content-Type is considered to be the API Gateway default (`application/json`) - API Gateway docs refer to "WHEN_NO_TEMPLATE" (singular), but this will fail during creation as the actual value should be "WHEN_NO_TEMPLATES" (plural) -## Responses - -**Note:** The response configuration can only be used when the integration type is set to `lambda`. +### Responses Serverless lets you setup custom headers and a response template for your `http` event. -### Using custom response headers +#### Custom Response Headers Here's an example which shows you how you can setup a custom response header: @@ -271,7 +391,7 @@ functions: for your header values. Headers are passed to API Gateway exactly like you define them. Passing the `Cache-Control` header as `"'max-age=120'"` means API Gateway will receive the value as `'max-age=120'` (enclosed with single quotes). -### Using a custom response template +### Custom Response Templates Sometimes you'll want to define a custom response template API Gateway should use to transform your lambdas output. Here's an example which will transform the return value of your lambda so that the browser renders it as HTML: @@ -298,7 +418,7 @@ the `${file(templatefile)}` syntax. Serverless ships with default status codes you can use to e.g. signal that a resource could not be found (404) or that the user is not authorized to perform the action (401). Those status codes are regex definitions that will be added to your API Gateway configuration. -#### Overview of available status codes +#### Available Status Codes | Status Code | Meaning | | --- | --- | @@ -311,7 +431,7 @@ the user is not authorized to perform the action (401). Those status codes are r | 502 | Bad Gateway | | 504 | Gateway Timeout | -#### Using status codes +#### Using Status Codes To return a given status code you simply need to add square brackets with the status code of your choice to your returned message like this: `[401] You are not authorized to access this resource!`. @@ -324,7 +444,7 @@ module.exports.hello = (event, context, cb) => { } ``` -#### Custom status codes +#### Custom Status Codes You can override the defaults status codes supplied by Serverless. You can use this to change the default status code, add/remove status codes, or change the templates and headers used for each status code. Use the pattern key to change the selection process that dictates what code is returned. @@ -380,114 +500,7 @@ functions: Content-Type: "'application/json+hal'" ``` -### Catching exceptions in your Lambda function - -In case an exception is thrown in your lambda function AWS will send an error message with `Process exited before completing request`. This will be caught by the regular expression for the 500 HTTP status and the 500 status will be returned. - -### Http setup with custom authorizer - -You can enable custom authorizers for your HTTP endpoint by setting the authorizer in your http event to another function -in the same service, as shown in the following example - -```yml -# serverless.yml -functions: - create: - handler: posts.create - events: - - http: - path: posts/create - method: post - authorizer: authorizerFunc - authorizerFunc: - handler: handlers.authorizerFunc -``` -Or, if you want to configure the authorizer with more options, you can turn the `authorizer` property into an object as -shown in the following example: - -```yml -# serverless.yml -functions: - create: - handler: posts.create - events: - - http: - path: posts/create - method: post - authorizer: - name: authorizerFunc - resultTtlInSeconds: 0 - identitySource: method.request.header.Authorization - identityValidationExpression: someRegex - authorizerFunc: - handler: handlers.authorizerFunc -``` - -### Http setup with custom authorizer (via ARN) -If the authorizer function does not exist in your service but exists in AWS, you can provide the ARN of the Lambda -function instead of the function name, as shown in the following example: - -```yml -# serverless.yml -functions: - create: - handler: posts.create - events: - - http: - path: posts/create - method: post - authorizer: xxx:xxx:Lambda-Name -``` - -Or, if you want to configure the authorizer with more options, you can turn the `authorizer` property into an object as -shown in the following example: - -```yml -# serverless.yml -functions: - create: - handler: posts.create - events: - - http: - path: posts/create - method: post - authorizer: - arn: xxx:xxx:Lambda-Name - resultTtlInSeconds: 0 - identitySource: method.request.header.Authorization - identityValidationExpression: someRegex -``` - -## Setting API keys for your Rest API -You can specify a list of API keys to be used by your service Rest API by adding an `apiKeys` array property to the -`provider` object in `serverless.yml`. You'll also need to explicitly specify which endpoints are `private` and require -one of the api keys to be included in the request by adding a `private` boolean property to the `http` event object you -want to set as private. - -Here's an example configuration for setting API keys for your service Rest API: - -```yml -service: my-service -provider: - name: aws - apiKeys: - - myFirstKey - - ${env:MY_API_KEY} # you can hide it in a serverless variable -functions: - hello: - events: - - http: - path: user/create - method: get - private: true -``` - -Please note that those are the API keys names, not the actual values. Once you deploy your service, the value of those API keys will be auto generated by AWS and printed on the screen for you to use. - -Clients connecting to this Rest API will then need to set any of these API keys values in the `x-api-key` header of their request. This is only necessary for functions where the `private` property is set to true. - -## Enabling CORS for your endpoints -To set CORS configurations for your HTTP endpoints, simply modify your event configurations as follows: +## Enabling CORS with the Lambda Integration Method ```yml functions: @@ -537,7 +550,7 @@ module.exports.hello = (event, context, cb) => { } ``` -## Setting an HTTP proxy on API Gateway +## Setting an HTTP Proxy on API Gateway To set up an HTTP proxy, you'll need two CloudFormation templates, one for the endpoint (known as resource in CF), and one for method. These two templates will work together to construct your proxy. So if you want to set `your-app.com/serverless` as a proxy for `serverless.com`, you'll need the following two templates in your `serverless.yml`: diff --git a/docs/02-providers/aws/events/02-s3.md b/docs/providers/aws/events/s3.md similarity index 84% rename from docs/02-providers/aws/events/02-s3.md rename to docs/providers/aws/events/s3.md index 45b54e8f4..7b0eb3770 100644 --- a/docs/02-providers/aws/events/02-s3.md +++ b/docs/providers/aws/events/s3.md @@ -1,16 +1,22 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/s3) + + # S3 ## Simple event definition This will create a `photos` bucket which fires the `resize` function when an object is added or modified inside the bucket. A hardcoded bucket name can lead to issues as a bucket name can only be used once in S3. For that you can use the [Serverless Variable syntax](../../../01-guide/08-serverless-variables.md) and add dynamic elements to the bucket name. -```yml +```yaml functions: resize: handler: resize.handler @@ -22,7 +28,7 @@ functions: This will create a bucket `photos`. The `users` function is called whenever an object is removed from the bucket. Check out the [AWS documentation](http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html#notification-how-to-event-types-and-destinations) to learn more about all the different event types that can be configured. -```yml +```yaml functions: users: handler: users.handler @@ -36,11 +42,11 @@ functions: This will create a bucket `photos`. The `users` function is called whenever an image with `.jpg` extension is uploaded to folder `uploads` in the bucket. Check out the [AWS documentation](http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html#notification-how-to-filtering) to learn more about all the different filter types that can be configured. -```yml +```yaml functions: users: handler: users.handler - rules: + events: - s3: bucket: photos event: s3:ObjectCreated:* diff --git a/docs/02-providers/aws/events/03-schedule.md b/docs/providers/aws/events/schedule.md similarity index 63% rename from docs/02-providers/aws/events/03-schedule.md rename to docs/providers/aws/events/schedule.md index beff32313..6c7a1704c 100644 --- a/docs/02-providers/aws/events/03-schedule.md +++ b/docs/providers/aws/events/schedule.md @@ -1,14 +1,20 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/schedule) + + # Schedule The following config will attach a schedule event and causes the function `crawl` to be called every 2 hours. The configuration allows you to attach multiple schedules to the same function. You can either use the `rate` or `cron` syntax. Take a look at the [AWS schedule syntax documentation](http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html) for more details. -```yml +```yaml functions: crawl: handler: crawl @@ -22,7 +28,7 @@ functions: This will create and attach a schedule event for the `aggregate` function which is disabled. If enabled it will call the `aggregate` function every 10 minutes. -```yml +```yaml functions: aggregate: handler: statistics.handler @@ -30,4 +36,7 @@ functions: - schedule: rate: rate(10 minutes) enabled: false + - schedule: + rate: cron(0 12 * * ? *) + enabled: false ``` diff --git a/docs/02-providers/aws/events/04-sns.md b/docs/providers/aws/events/sns.md similarity index 82% rename from docs/02-providers/aws/events/04-sns.md rename to docs/providers/aws/events/sns.md index 49b1c6f72..fa0efbffc 100644 --- a/docs/02-providers/aws/events/04-sns.md +++ b/docs/providers/aws/events/sns.md @@ -1,9 +1,15 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/sns) + + # SNS In the following example we create a new SNS topic with the name `dispatch` which is bound to the `dispatcher` function. The function will be called every time a message is sent to the `dispatch` topic. diff --git a/docs/02-providers/aws/events/05-streams.md b/docs/providers/aws/events/streams.md similarity index 72% rename from docs/02-providers/aws/events/05-streams.md rename to docs/providers/aws/events/streams.md index 66dd0af7e..803ec6fa5 100644 --- a/docs/02-providers/aws/events/05-streams.md +++ b/docs/providers/aws/events/streams.md @@ -1,9 +1,15 @@ + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/streams) + + # DynamoDB / Kinesis Streams This setup specifies that the `compute` function should be triggered whenever the corresponding DynamoDB table is modified (e.g. a new entry is added). diff --git a/docs/providers/aws/examples/README.md b/docs/providers/aws/examples/README.md new file mode 100644 index 000000000..f4cebe05c --- /dev/null +++ b/docs/providers/aws/examples/README.md @@ -0,0 +1,20 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/) + + +# Serverless AWS Lambda Examples + +Welcome to the Serverless Amazon Web Services Examples! Please select an example below: + +* [Hello World](./hello-world) +* [Using External Libraries](./using-external-libraries) +* [Cron](./cron) +* [Serving HTML page](./web-serving-html) + +If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless) diff --git a/docs/providers/aws/examples/cron/README.md b/docs/providers/aws/examples/cron/README.md new file mode 100644 index 000000000..75a70f9f6 --- /dev/null +++ b/docs/providers/aws/examples/cron/README.md @@ -0,0 +1,20 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/cron/) + + +# Cron Example + +Create a scheduled task with AWS Lambda and automate all the things! Examples: + +* [JavaScript](./node) + +For more information on running cron with Serverless check out the [Tutorial: Serverless Scheduled Tasks](https://parall.ax/blog/view/3202/tutorial-serverless-scheduled-tasks) by parallax. + +For more information on `schedule` event check out [our docs](../../events/schedule.md). diff --git a/docs/providers/aws/examples/cron/node/README.md b/docs/providers/aws/examples/cron/node/README.md new file mode 100644 index 000000000..87de2000f --- /dev/null +++ b/docs/providers/aws/examples/cron/node/README.md @@ -0,0 +1,20 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/cron/node) + + +# JavaScript Cron Example + +This is an example of creating a function that runs as a cron job. + +To see your job running tail your logs with: + +```bash +serverless logs -function cron -tail +``` diff --git a/docs/02-providers/aws/examples/cron/node/handler.js b/docs/providers/aws/examples/cron/node/handler.js similarity index 50% rename from docs/02-providers/aws/examples/cron/node/handler.js rename to docs/providers/aws/examples/cron/node/handler.js index 5fb485788..980b35d28 100644 --- a/docs/02-providers/aws/examples/cron/node/handler.js +++ b/docs/providers/aws/examples/cron/node/handler.js @@ -2,5 +2,5 @@ module.exports.run = () => { const time = new Date(); - console.log(`Your cron ran ${time}`); + console.log(`Your cron ran ${time}`); // eslint-disable-line no-console }; diff --git a/docs/02-providers/aws/examples/cron/node/serverless.yml b/docs/providers/aws/examples/cron/node/serverless.yml similarity index 78% rename from docs/02-providers/aws/examples/cron/node/serverless.yml rename to docs/providers/aws/examples/cron/node/serverless.yml index c24b21466..85e06c872 100644 --- a/docs/02-providers/aws/examples/cron/node/serverless.yml +++ b/docs/providers/aws/examples/cron/node/serverless.yml @@ -8,4 +8,4 @@ functions: cron: handler: handler.run events: - - schedule: rate(1 minute) \ No newline at end of file + - schedule: rate(1 minute) diff --git a/docs/providers/aws/examples/hello-world/README.md b/docs/providers/aws/examples/hello-world/README.md new file mode 100644 index 000000000..7a87e5e4f --- /dev/null +++ b/docs/providers/aws/examples/hello-world/README.md @@ -0,0 +1,19 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/hello-world/) + + +# Hello World Example + +Welcome to the Hello World example. + +We are excited for you to start your Serverless journey! + +* [JavaScript](./node) +* [Python](./python) diff --git a/docs/providers/aws/examples/hello-world/node/README.md b/docs/providers/aws/examples/hello-world/node/README.md new file mode 100644 index 000000000..3ecc656ec --- /dev/null +++ b/docs/providers/aws/examples/hello-world/node/README.md @@ -0,0 +1,35 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/hello-world/node/) + + +# Hello World Node.js Example + +Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md). + +## 1. Deploy + +`serverless deploy` or `sls deploy`. `sls` is shorthand for the Serverless CLI command + +## 2. Invoke deployed function + +`serverless invoke --function helloWorld` or `serverless invoke -f helloWorld` + +`-f` is shorthand for `--function` + +In your terminal window you should see the response from AWS Lambda + +```bash +{ + "message": "Hello World", + "event": {} +} +``` + +Congrats you have just deployed and ran your Hello World function! diff --git a/docs/02-providers/aws/examples/hello-world/node/handler.js b/docs/providers/aws/examples/hello-world/node/handler.js similarity index 95% rename from docs/02-providers/aws/examples/hello-world/node/handler.js rename to docs/providers/aws/examples/hello-world/node/handler.js index 630518208..12a311f42 100644 --- a/docs/02-providers/aws/examples/hello-world/node/handler.js +++ b/docs/providers/aws/examples/hello-world/node/handler.js @@ -4,6 +4,7 @@ module.exports.helloWorldHandler = function (event, context, callback) { const message = { message: 'Hello World', + event, }; // callback will send message object back callback(null, message); diff --git a/docs/02-providers/aws/examples/hello-world/node/serverless.yml b/docs/providers/aws/examples/hello-world/node/serverless.yml similarity index 100% rename from docs/02-providers/aws/examples/hello-world/node/serverless.yml rename to docs/providers/aws/examples/hello-world/node/serverless.yml diff --git a/docs/providers/aws/examples/hello-world/python/README.md b/docs/providers/aws/examples/hello-world/python/README.md new file mode 100644 index 000000000..011ee4d61 --- /dev/null +++ b/docs/providers/aws/examples/hello-world/python/README.md @@ -0,0 +1,34 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/hello-world/python/) + + +# Hello World Python Example + +Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md). + +## 1. Deploy + +`serverless deploy` or `sls deploy`. `sls` is shorthand for the serverless CLI command + +## 2. Invoke deployed function + +`serverless invoke --function helloWorld` or `serverless invoke -f helloWorld` + +`-f` is shorthand for `--function` + +In your terminal window you should see the response from AWS Lambda + +```bash +{ + "message": "Hello World" +} +``` + +Congrats you have just deployed and ran your Hello World function! diff --git a/docs/02-providers/aws/examples/hello-world/python/handler.py b/docs/providers/aws/examples/hello-world/python/handler.py similarity index 83% rename from docs/02-providers/aws/examples/hello-world/python/handler.py rename to docs/providers/aws/examples/hello-world/python/handler.py index 690e2d012..7ba5ed97f 100644 --- a/docs/02-providers/aws/examples/hello-world/python/handler.py +++ b/docs/providers/aws/examples/hello-world/python/handler.py @@ -3,4 +3,4 @@ def helloWorldHandler(event, context): 'message': 'Hello World' } - return message \ No newline at end of file + return message diff --git a/docs/02-providers/aws/examples/hello-world/python/serverless.yml b/docs/providers/aws/examples/hello-world/python/serverless.yml similarity index 100% rename from docs/02-providers/aws/examples/hello-world/python/serverless.yml rename to docs/providers/aws/examples/hello-world/python/serverless.yml diff --git a/docs/providers/aws/examples/using-external-libraries/README.md b/docs/providers/aws/examples/using-external-libraries/README.md new file mode 100644 index 000000000..ff00f2e30 --- /dev/null +++ b/docs/providers/aws/examples/using-external-libraries/README.md @@ -0,0 +1,20 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/using-external-libraries/) + + +# Using External Libraries Examples + +When creating Serverless services you are able to use third party packages from your respective ecosystems package manager. Examples: + +* [JavaScript](./node) + +For Node.js you can leverage the vast ecosystem of NPM and `require` in modules into your project. + +For Python you can use the `pip` package manager. diff --git a/docs/providers/aws/examples/using-external-libraries/node/README.md b/docs/providers/aws/examples/using-external-libraries/node/README.md new file mode 100644 index 000000000..df5eddd8b --- /dev/null +++ b/docs/providers/aws/examples/using-external-libraries/node/README.md @@ -0,0 +1,36 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/using-external-libraries/node/) + + +# Using External libraries in Node.js Example + +Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md). + +## 1. Install dependencies + +For this example we are going to install the `faker` module from npm. + +`npm install faker --save` + +## 2. Install the faker module in your `handler.js` file + +Inside of `handler.js` require your module: + +`const faker = require('faker');` + +## 3. Deploy + +Run `serverless deploy`. + +Alternatively, you can run `npm run deploy` and deploy via NPM script defined in the `package.json` file + +## 4. Invoke + +`serverless invoke --function helloRandomName` diff --git a/docs/providers/aws/examples/using-external-libraries/node/event.json b/docs/providers/aws/examples/using-external-libraries/node/event.json new file mode 100644 index 000000000..2ac50a459 --- /dev/null +++ b/docs/providers/aws/examples/using-external-libraries/node/event.json @@ -0,0 +1,5 @@ +{ + "key3": "value3", + "key2": "value2", + "key1": "value1" +} diff --git a/docs/providers/aws/examples/using-external-libraries/node/handler.js b/docs/providers/aws/examples/using-external-libraries/node/handler.js new file mode 100644 index 000000000..7d1309b25 --- /dev/null +++ b/docs/providers/aws/examples/using-external-libraries/node/handler.js @@ -0,0 +1,13 @@ +// 'use strict'; +// // Import faker module from node_modules +// const faker = require('faker'); +// +// // Your function handler +// module.exports.helloRandomNameHandler = function (event, context, callback) { +// const randomName = faker.name.firstName(); +// const message = { +// message: 'Hello ' + randomName, +// event: event +// }; +// callback(null, message); +// }; diff --git a/docs/02-providers/aws/examples/using-external-libraries/node/package.json b/docs/providers/aws/examples/using-external-libraries/node/package.json similarity index 59% rename from docs/02-providers/aws/examples/using-external-libraries/node/package.json rename to docs/providers/aws/examples/using-external-libraries/node/package.json index a7cd0f3af..89667c7c2 100644 --- a/docs/02-providers/aws/examples/using-external-libraries/node/package.json +++ b/docs/providers/aws/examples/using-external-libraries/node/package.json @@ -1,7 +1,10 @@ { - "name": "external-library", - "description": "Serverless using external libraries example with Node.js", + "name": "hello-world", + "description": "Serverless using external libraries example with node", "private": true, + "scripts": { + "deploy": "serverless deploy" + }, "dependencies": { "faker": "^3.1.0" } diff --git a/docs/02-providers/aws/examples/using-external-libraries/node/serverless.yml b/docs/providers/aws/examples/using-external-libraries/node/serverless.yml similarity index 56% rename from docs/02-providers/aws/examples/using-external-libraries/node/serverless.yml rename to docs/providers/aws/examples/using-external-libraries/node/serverless.yml index 4bbb504b2..ae8c48d3e 100644 --- a/docs/02-providers/aws/examples/using-external-libraries/node/serverless.yml +++ b/docs/providers/aws/examples/using-external-libraries/node/serverless.yml @@ -1,5 +1,5 @@ # Hello Random Name for AWS Lambda -service: external-lib # Service Name +service: hello-random-name # Service Name provider: name: aws @@ -7,4 +7,4 @@ provider: functions: helloRandomName: - handler: handler.helloRandomName + handler: handler.helloRandomNameHandler diff --git a/docs/providers/aws/examples/web-serving-html/README.md b/docs/providers/aws/examples/web-serving-html/README.md new file mode 100644 index 000000000..4a59d8511 --- /dev/null +++ b/docs/providers/aws/examples/web-serving-html/README.md @@ -0,0 +1,18 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/web-serving-html/) + + +# Serving HTML through API Gateway Example + +These examples illustrate how to hookup an API Gateway endpoint to a Lambda function to render HTML on a `GET` request. So instead of returning the default `json` from requests to an endpoint, you can display custom HTML. + +This is useful for dynamic webpages and landing pages for marketing activities. + +* [JavaScript](./node) diff --git a/docs/providers/aws/examples/web-serving-html/node/README.md b/docs/providers/aws/examples/web-serving-html/node/README.md new file mode 100644 index 000000000..b423e4000 --- /dev/null +++ b/docs/providers/aws/examples/web-serving-html/node/README.md @@ -0,0 +1,13 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/examples/web-serving-html/node/) + + +# Serving HTML in Node.js through API Gateway Example + +[This is an example](https://github.com/serverless/serverless/tree/master/docs/providers/aws/examples/web-serving-html/node) of serving vanilla HTML/CSS/JS through API Gateway. diff --git a/docs/02-providers/aws/examples/web-serving-html/node/handler.js b/docs/providers/aws/examples/web-serving-html/node/handler.js similarity index 91% rename from docs/02-providers/aws/examples/web-serving-html/node/handler.js rename to docs/providers/aws/examples/web-serving-html/node/handler.js index 914016966..c6566a607 100644 --- a/docs/02-providers/aws/examples/web-serving-html/node/handler.js +++ b/docs/providers/aws/examples/web-serving-html/node/handler.js @@ -1,7 +1,7 @@ 'use strict'; // Your function handler -module.exports.staticHtml = function (event, context, callback) { +module.exports.html = function (event, context, callback) { let dynamicHtml; /* check for GET params and use if available */ if (event.queryStringParameters && event.queryStringParameters.name) { diff --git a/docs/02-providers/aws/examples/web-serving-html/node/serverless.yml b/docs/providers/aws/examples/web-serving-html/node/serverless.yml similarity index 86% rename from docs/02-providers/aws/examples/web-serving-html/node/serverless.yml rename to docs/providers/aws/examples/web-serving-html/node/serverless.yml index 097ced5e3..26bf00615 100644 --- a/docs/02-providers/aws/examples/web-serving-html/node/serverless.yml +++ b/docs/providers/aws/examples/web-serving-html/node/serverless.yml @@ -1,5 +1,4 @@ # Serving HTML through API Gateway for AWS Lambda - service: serve-html provider: @@ -8,7 +7,7 @@ provider: functions: staticHtml: - handler: handler.staticHtml + handler: handler.html events: - http: method: get diff --git a/docs/providers/aws/guide/README.md b/docs/providers/aws/guide/README.md new file mode 100644 index 000000000..81f9992c6 --- /dev/null +++ b/docs/providers/aws/guide/README.md @@ -0,0 +1,17 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/) + + +# Serverless AWS Lambda Guide + +Welcome to the Serverless AWS Lambda Guide! Please select a section on the left to get started. + +**Note:** Before continuing [AWS system credentials](https://serverless.com/framework/docs/providers/aws/guide/credentials/) are required for using the CLI. + +If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless) diff --git a/docs/providers/aws/guide/credentials.md b/docs/providers/aws/guide/credentials.md new file mode 100644 index 000000000..06e68cf28 --- /dev/null +++ b/docs/providers/aws/guide/credentials.md @@ -0,0 +1,112 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/credentials) + + +# Credentials + +The Serverless Framework needs access to your cloud providers account so that it can create and manage resources on your behalf. + +Here we'll provide setup instructions for different cloud provider accounts. Just pick the one for your provider and follow the steps to get everything in place for Serverless. + +At this time, the Serverless Framework supports only Amazon Web Services, but support for other providers is in the works. + +## Amazon Web Services + +**[Video Guide Available Here](https://www.youtube.com/watch?v=bFHmgqbAh4M)** + +Here's how to set up the Serverless Framework with your Amazon Web Services account. + +If you're new to Amazon Web Services, make sure you put in a credit card. If you don't have a credit card set up, you may not be able to deploy your resources and you may run into this error: + +```bash +AWS Access Key Id needs a subscription for the service +``` + +Don't worry, you won't be charged for signing up. New AWS users get access to the [AWS Free Tier](https://aws.amazon.com/free/), which let's you use many AWS resources for free for 1 year, like [AWS Lambda](https://aws.amazon.com/lambda/pricing/). + +While in the AWS Free Tier, you can build an entire application on AWS Lambda, AWS API Gateway, and more, without getting charged for 1 year... As long as you don't exceed the resources in the Free Tier. + +### Creating AWS Access Keys + +To let the Serverless Framework access your AWS account, we're going to create an IAM User with Admin access, which can configure the services in your AWS account. This IAM User will have its own set of AWS Access Keys. + +**Note:** In a production environment, we recommend reducing the permissions to the IAM User which the Framework uses. Unfortunately, the Framework's functionality is growing so fast, we can't yet offer you a finite set of permissions it needs (we're working on this). Consider using a separate AWS account in the interim, if you cannot get permission to your organization's primary AWS accounts. + +1. Create or login to your Amazon Web Services Account and go to the Identity & Access Management (IAM) page. + +2. Click on **Users** and then **Create New Users**. Enter a name in the first field to remind you this User is the Framework, like `serverless-admin`. Then click **Create**. Later, you can create different IAM Users for different apps and different stages of those apps. That is, if you don't use separate AWS accounts for stages/apps, which is most common. + +3. View and copy the **API Key** & **Secret** to a temporary place. You'll need it in the next step. + +4. In the User record in the AWS IAM Dashboard, look for **Managed Policies** on the **Permissions** tab and click **Attach Policy**. + +5. In the next screen, search for and select **AdministratorAccess** then click **Attach**. + +### Using AWS Access Keys + +You can configure the Serverless Framework to use your AWS **API Key** & **Secret** two ways: + +#### Quick Setup + +As a quick setup to get started you can export them as environment variables so they would be accessible to Serverless and the AWS SDK in your shell: + +```bash +export AWS_ACCESS_KEY_ID= +export AWS_SECRET_ACCESS_KEY= +serverless deploy +``` + +#### Using AWS Profiles + +For a more permanent solution you can also set up credentials through AWS profiles using the `aws-cli`, or by configuring the credentials file directly. + +To set them up through the `aws-cli` [install it first](http://docs.aws.amazon.com/cli/latest/userguide/installing.html) then run `aws configure` [to configure the aws-cli and credentials](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html): + +```bash +$ aws configure +AWS Access Key ID [None]: AKIAIOSFODNN7EXAMPLE +AWS Secret Access Key [None]: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY +Default region name [None]: us-west-2 +Default output format [None]: ENTER +``` + +Credentials are stored in INI format in `~/.aws/credentials`, which you can edit directly if needed. Read more about that file in the [AWS documentation](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-config-files) + +You can even set up different profiles for different accounts, which can be used by Serverless as well. To specify a default profile to use, you can add a `profile` setting to your `provider` configuration in `serverless.yml`: + +```yml +service: new-service +provider: + name: aws + runtime: nodejs4.3 + stage: dev + profile: devProfile +``` + +##### Per Stage Profiles + +As an advanced use-case, you can deploy different stages to different accounts by using different profiles per stage. In order to use different profiles per stage, you must leverage [variables](https://serverless.com/framework/docs/providers/aws/guide/variables) and the provider profile setting. + +This example `serverless.yml` snippet will load the profile depending upon the stage specified in the command line options (or default to 'dev' if unspecified); + +```yml +service: new-service +provider: + name: aws + runtime: nodejs4.3 + stage: ${opt:stage, self:custom.defaultStage} + profile: ${self:custom.profiles.${self:provider.stage}} +custom: + defaultStage: dev + profiles: + dev: devProfile + prod: prodProfile +``` diff --git a/docs/providers/aws/guide/deploying.md b/docs/providers/aws/guide/deploying.md new file mode 100644 index 000000000..0f454838d --- /dev/null +++ b/docs/providers/aws/guide/deploying.md @@ -0,0 +1,83 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/deploying) + + +# Deploying + +The Serverless Framework was designed to provision your AWS Lambda Functions, Events and infrastructure Resources safely and quickly. It does this via a couple of methods designed for different types of deployments. + +## Deploy All + +This is the main method for doing deployments with the Serverless Framework: + +```bash +serverless deploy +``` + +Use this method when you have updated your Function, Event or Resource configuration in `serverless.yml` and you want to deploy that change (or multiple changes at the same time) to Amazon Web Services. + +### How It Works + +The Serverless Framework translates all syntax in `serverless.yml` to a single AWS CloudFormation template. By depending on CloudFormation for deployments, users of the Serverless Framework get the safety and reliability of CloudFormation. + +* An AWS CloudFormation template is created from your `serverless.yml`. +* If a Stack has not yet been created, then it is created with no resources except for an S3 Bucket, which will store zip files of your Function code. +* The code of your Functions is then packaged into zip files. +* Zip files of your Functions' code are uploaded to your Code S3 Bucket. +* Any IAM Roles, Functions, Events and Resources are added to the AWS CloudFormation template. +* The CloudFormation Stack is updated with the new CloudFormation template. + +### Tips + +* Use this in your CI/CD systems, as it is the safest method of deployment. +* You can print the progress during the deployment if you use `verbose` mode, like this: + ``` + serverless deploy --verbose + ``` +* This method uses the AWS CloudFormation Stack Update method. CloudFormation is slow, so this method is slower. If you want to develop more quickly, use the `serverless deploy function` command (described below) + +* This method defaults to `dev` stage and `us-east-1` region. You can change the default stage and region in your `serverless.yml` file by setting the `stage` and `region` properties inside a `provider` object as the following example shows: + ```yml + # serverless.yml + + service: service-name + provider: + name: aws + stage: beta + region: us-west-2 + ``` + +* You can also deploy to different stages and regions by passing in flags to the command: + ``` + serverless deploy --stage production --region eu-central-1 + ``` + +Check out the [deploy command docs](../cli-reference/deploy) for all details and options. + +## Deploy Function + +This deployment method does not touch your AWS CloudFormation Stack. Instead, it simply overwrites the zip file of the current function on AWS. This method is much faster, since it does not rely on CloudFormation. + +```bash +serverless deploy function --function myFunction +``` + +### How It Works + +* The Framework packages up the targeted AWS Lambda Function into a zip file. +* That zip file is uplaoded to your S3 bucket using the same name as the previous function, which the CloudFormation stack is pointing to. + +### Tips + +* Use this when you are developing and want to test on AWS because it's much faster. +* During development, people will often run this command several times, as opposed to `serverless deploy` which is only run when larger infrastructure provisioning is required. + +Check out the [deploy command docs](../cli-reference/deploy.md) for all details and options. diff --git a/docs/providers/aws/guide/events.md b/docs/providers/aws/guide/events.md new file mode 100644 index 000000000..7d87da050 --- /dev/null +++ b/docs/providers/aws/guide/events.md @@ -0,0 +1,59 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/events) + + +# Events + +If you are using AWS as a provider for your Service, all *Events* are anything in AWS that can trigger an AWS Lambda function, like an S3 bucket upload, an SNS topic, and HTTP endpoints created via API Gateway. + +Upon deployment, the Serverless Framework will deploy any infrastructure required for an event (e.g., an API Gateway endpoint) and configure your Function to listen to it. + +## Configuration + +Events belong to each Function and can be found in the `events` property, which is an array: + +```yml +functions: + createUser: # A function + handler: handler.createUser + events: # All events are here + - http: + path: users/create + method: post +``` + +Events are objects, which can contain event-specific information. + +You can set multiple Events per Function, as long as that is supported by AWS. + +```yml +functions: + createUser: # A function + handler: handler.users + events: # All events are here + - http: + path: users/create + method: post + - http: + path: users/update + method: put + - http: + path: users/delete + method: delete +``` + +## Types + +The Serverless Framework supports all of the AWS Lambda events and more. Instead of listing them here, we've put them in a separate section, since they have a lot of configurations and functionality. [Check out the events section for more information.](../events) + +## Deploying + +To deploy or update your Functions, Events and Infrastructure, run `serverless deploy`. diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md new file mode 100644 index 000000000..61b5a88d6 --- /dev/null +++ b/docs/providers/aws/guide/functions.md @@ -0,0 +1,248 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/functions) + + +# Functions + +If you are using AWS as a provider for your *Service*, all *Functions* are AWS Lambda functions. + +## Configuration + +All of the AWS Lambda functions in your serverless service can be found in `serverless.yml` under the `functions` property. + +```yml +# serverless.yml + +service: myService + +provider: + name: aws + runtime: nodejs4.3 + +functions: + functionOne: + handler: handler.functionOne +``` + +The `handler` property points to the file and module containing the code you want to run in your function. + +```javascript +// handler.js + +module.exports.functionOne = function(event, context, callback) {} +``` + +You can add as many functions as you want within this property. + +```yml +# serverless.yml + +service: myService + +provider: + name: aws + runtime: nodejs4.3 + +functions: + functionOne: + handler: handler.functionOne + description: optional description for your Lambda + functionTwo: + handler: handler.functionTwo + functionThree: + handler: handler.functionThree +``` + +Your functions can either inherit their settings from the `provider` property. + +```yml +# serverless.yml + +service: myService + +provider: + name: aws + runtime: nodejs4.3 + memorySize: 512 # inherited value + +functions: + functionOne: + handler: handler.functionOne +``` + +Or you can specify properties at the function level. + +```yml +# serverless.yml + +service: myService + +provider: + name: aws + runtime: nodejs4.3 + +functions: + functionOne: + handler: handler.functionOne + memorySize: 512 # function specific +``` + +## Permissions + +Every AWS Lambda function needs permission to interact with other AWS infrastructure resources within your account. These permissions are set via an AWS IAM Role. You can set permission policy statements within this role via the `provider.iamRoleStatements` property. + +```yml +# serverless.yml + +service: myService + +provider: + name: aws + runtime: nodejs4.3 + iamRoleStatements: # permissions for all of your functions can be set here + - Effect: Allow + Action: # Gives permission to DynamoDB tables in a specific region + - dynamodb:DescribeTable + - dynamodb:Query + - dynamodb:Scan + - dynamodb:GetItem + - dynamodb:PutItem + - dynamodb:UpdateItem + - dynamodb:DeleteItem + Resource: "arn:aws:dynamodb:us-east-1:*:*" + +functions: + functionOne: + handler: handler.functionOne + memorySize: 512 +``` + +Another example: + +```yml +# serverless.yml + +service: myService +provider: + name: aws + iamRoleStatements: + - Effect: "Allow" + Action: + - "s3:ListBucket" + Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket"} ] ] } # You can put CloudFormation syntax in here. No one will judge you. Remember, this all gets translated to CloudFormation. + - Effect: "Allow" + Action: + - "s3:PutObject" + Resource: + Fn::Join: + - "" + - - "arn:aws:s3:::" + - "Ref" : "ServerlessDeploymentBucket" + +functions: + functionOne: + handler: handler.functionOne + memorySize: 512 +``` + +You can also use an existing IAM role by adding your IAM Role ARN in the `iamRoleARN` property. For example: + +```yml +# serverless.yml + +service: new-service +provider: + name: aws + iamRoleARN: arn:aws:iam::YourAccountNumber:role/YourIamRole +``` + +Support for separate IAM Roles per function is coming soon. + +## VPC Configuration + +You can add VPC configuration to a specific function in `serverless.yml` by adding a `vpc` object property in the function configuration. This object should contain the `securityGroupIds` and `subnetIds` array properties needed to construct VPC for this function. Here's an example configuration: + +```yml +# serverless.yml +service: service-name +provider: aws + +functions: + hello: + handler: handler.hello + vpc: + securityGroupIds: + - securityGroupId1 + - securityGroupId2 + subnetIds: + - subnetId1 + - subnetId2 +``` + +Or if you want to apply VPC configuration to all functions in your service, you can add the configuration to the higher level `provider` object, and overwrite these service level config at the function level. For example: + +```yml +# serverless.yml +service: service-name +provider: + name: aws + vpc: + securityGroupIds: + - securityGroupId1 + - securityGroupId2 + subnetIds: + - subnetId1 + - subnetId2 + +functions: + hello: # this function will overwrite the service level vpc config above + handler: handler.hello + vpc: + securityGroupIds: + - securityGroupId1 + - securityGroupId2 + subnetIds: + - subnetId1 + - subnetId2 + users: # this function will inherit the service level vpc config above + handler: handler.users +``` + +Then, when you run `serverless deploy`, VPC configuration will be deployed along with your lambda function. + +## Environment Variables + +We're working on great Environment Variable support. Until then, you'll be able to use the following tools for different languages to set environment variables and make them available to your code. + +## Javascript + +You can use [dotenv](https://www.npmjs.com/package/dotenv) to load files with environment variables. Those variables can be set during your CI process or locally and then packaged and deployed together with your function code. + +## Python + +You can use [python-dotenv](https://github.com/theskumar/python-dotenv) to load files with environment variables. Those variables can be set during your CI process or locally and then packaged and deployed together with your function code. + +## Java + +For Java the easiest way to set up environment like configuration is through [property files](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html). While those will not be available as environment variables they are very commonly used configuration mechanisms throughout Java. + +## Log Group Resources + +By default, the framework does not create LogGroups for your Lambdas. However this behavior will be deprecated soon and we'll be adding CloudFormation LogGroups resources as part of the stack. This makes it easy to clean up your log groups in the case you remove your service, and make the lambda IAM permissions much more specific and secure. + +To opt in for this feature now to avoid breaking changes later, add the following to your provider config in serverless.yml: + +``` +provider: + cfLogs: true +``` + +If you get a CloudFormation error saying that log group already exists, you have to remove it first from AWS console, then deploy, otherwise for new services this should work out of the box. diff --git a/docs/providers/aws/guide/installation.md b/docs/providers/aws/guide/installation.md new file mode 100644 index 000000000..0e7b5834c --- /dev/null +++ b/docs/providers/aws/guide/installation.md @@ -0,0 +1,35 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/installation) + + +# Installation + +### Installing Node.js + +Serverless is a [Node.js](https://nodejs.org) CLI tool so the first thing you need to do is to install Node.js on your machine. + +Go to the official [Node.js website](https://nodejs.org), download and follow the [installation instructions](https://nodejs.org/en/download/) to install Node.js on your local machine. + +**Note:** Serverless runs on Node v4 or higher. So make sure that you pick a recent Node version. + +You can verify that Node.js is installed successfully by runnning `node --version` in your terminal. You should see the corresponding Node version number printed out. + +### Installing the Serverless Framework + +Next, install the Serverless Framework via [npm](https://npmjs.org) which was already installed when you installed Node.js. + +Open up a terminal and type `npm install -g serverless` to install Serverless. + +Once the installation process is done you can verify that Serverless is installed successfully by running `serverless`. + +### Installing AWS + +AWS ships with the core of the Serverless Framework, so no additional installation is required. \ No newline at end of file diff --git a/docs/providers/aws/guide/intro.md b/docs/providers/aws/guide/intro.md new file mode 100644 index 000000000..076582319 --- /dev/null +++ b/docs/providers/aws/guide/intro.md @@ -0,0 +1,90 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/intro) + + +# Introduction + +The Serverless Framework helps you develop and deploy your AWS Lambda functions, along with the AWS infrastructure resources they require. It's a CLI that offers structure, automation and best practices out-of-the-box, allowing you to focus on building sophisticated, event-driven, serverless architectures, comprised of Functions and Events. + +A few things the Serverless Framework does differently than a normal application Framework are: +* It manages your code as well as your infrastructure +* It supports multiple languages (Node.js, Python, Java, and more) + +Here are the Framework's main concepts and how they pertain to AWS and Lambda... + +## Concepts + +### Functions + +A Function is an AWS Lambda function. It's an independent unit of deployment, like a microservice. It's merely code, deployed in the cloud, that is most often written to perform a single job such as: + +* *Saving a user to the database* +* *Processing a file in a database* +* *Performing a scheduled task* + +You can perform multiple jobs in your code, but we don't recommend doing that without good reason. Separation of concerns is best and the Framework is designed to help you easily develop and deploy Functions, as well as manage lots of them. + +### Events + +Anything that triggers an AWS Lambda Function to execute is regarded by the Framework as an **Event**. Events are infrastructure events on AWS such as: + +* *An AWS API Gateway HTTP endpoint (e.g., for a REST API)* +* *An AWS S3 bucket upload (e.g., for an image)* +* *A CloudWatch timer (e.g., run every 5 minutes)* +* *An AWS SNS topic (e.g., a message)* +* *A CloudWatch Alert (e.g., something happened)* +* *And more...* + +When you define an event for your AWS Lambda functions in the Serverless Framework, the Framework will automatically create any infrastructure necessary for that event (e.g., an API Gateway endpoint) and configure your AWS Lambda Functions to listen to it. + +### Resources + +**Resources** are AWS infrastructure components which your Functions use such as: + +* *An AWS DynamoDB Table (e.g., for saving Users/Posts/Comments data)* +* *An AWS S3 Bucket (e.g., for saving images or files)* +* *An AWS SNS Topic (e.g., for sending messages asynchronously)* +* *Anything that can be defined in CloudFormation is supported by the Serverless Framework* + +The Serverless Framework not only deploys your Functions and the Events that trigger them, but it also deploys the AWS infrastructure components your Functions depend upon. + +### Services + +A **Service** is the Framework's unit of organization. You can think of it as a project file, though you can have multiple services for a single application. It's where you define your Functions, the Events that trigger them, and the Resources your Functions use, all in one file entitled `serverless.yml`. It looks like this: + +```yml +// serverless.yml + +service: users + +functions: // Your "Functions" + usersCreate: + events: // The "Events" that trigger this function + - http: post users/create + usersCreate: + events: + - http: delete users/delete + +resources: // The "Resources" your "Functions" use. Raw AWS CloudFormation goes in here. +``` +When you deploy with the Framework by running `serverless deploy`, everything in `serverless.yml` is deployed at once. + +### Plugins + +You can overwrite or extend the functionality of the Framework using **Plugins**. Every `serverless.yml` can contain a `plugins:` property, which features multiple plugins. + +```yml +# serverless.yml + +plugins: + - serverless-offline + - serverless-secrets +``` diff --git a/docs/providers/aws/guide/packaging.md b/docs/providers/aws/guide/packaging.md new file mode 100644 index 000000000..17e4f839f --- /dev/null +++ b/docs/providers/aws/guide/packaging.md @@ -0,0 +1,82 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/packaging) + + +# Packaging + +Sometimes you might like to have more control over your function artifacts and how they are packaged. + +You can use the `package` and `exclude` configuration for more control over the packaging process. + +## Exclude / include + +Exclude allows you to define globs that will be excluded from the resulting artifact. If you wish to +include files you can use a glob pattern prefixed with `!` such as `!re-include-me/**`. Serverless will run the glob patterns in order. + +## Example + +Exclude all node_modules but then re-include a specific modules (in this case node-fetch) + +``` yaml +package: + exclude: + - node_modules/** + - "!node_modules/node-fetch/**" +``` + +``` +exclude: + - tmp/** + - .git +``` + +## Artifact +For complete control over the packaging process you can specify your own zip file for your service. Serverless won't zip your service if this is configured so `include` and `exclude` will be ignored. + +## Example + +```yaml +service: my-service +package: + include: + - lib + - functions + exclude: + - tmp + - .git + artifact: path/to/my-artifact.zip +``` + +## Packaging functions separately + +If you want even more controls over your functions for deployment you can configure them to be packaged independently. This allows you more control for optimizing your deployment. To enable individual packaging set `individually` to true in the service wide packaging settings. + +Then for every function you can use the same `include/exclude/artifact` config options as you can service wide. The `include/exclude` options will be merged with the service wide options to create one `include/exclude` config per function during packaging. + +```yaml +service: my-service +package: + individually: true + exclude: + - excluded-by-default.json +functions: + hello: + handler: handler.hello + package: + include: + # We're including this file so it will be in the final package of this function only + - excluded-by-default.json + world: + handler: handler.hello + package: + exclude: + - event.json +``` diff --git a/docs/providers/aws/guide/plugins.md b/docs/providers/aws/guide/plugins.md new file mode 100644 index 000000000..c3fd9080c --- /dev/null +++ b/docs/providers/aws/guide/plugins.md @@ -0,0 +1,314 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/plugins) + + +# Plugins + +A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins. + +If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins. + +## Installing Plugins + +External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM: + +``` +npm install --save custom-serverless-plugin +``` + +We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file. + +```yml +# serverless.yml file + +plugins: + - custom-serverless-plugin +``` + +Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary +configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there): + +```yml +plugins: + - custom-serverless-plugin + +custom: + customkey: customvalue +``` + +### Load Order + +Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them. + +```yml +# serverless.yml + +plugins: + - plugin1 + - plugin2 +``` + +In this case `plugin1` is loaded before `plugin2`. + +## Writing Plugins + +### Concepts + +#### Plugin + +Code which defines *Commands*, any *Events* within a *Command*, and any *Hooks* assigned to an *Lifecycle Event*. + +* Command // CLI configuration, commands, subcommands, options + * LifecycleEvent(s) // Events that happen sequentially when the command is run + * Hook(s) // Code that runs when a Lifecycle Event happens during a Command + +#### Command + +A CLI *Command* that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the *Lifecycle Events* for the command. Every command defines its own lifecycle events. + +```javascript +'use strict'; + +class MyPlugin { + constructor() { + this.commands = { + deploy: { + lifecycleEvents: [ + 'resources', + 'functions' + ] + }, + }; + } +} + +module.exports = MyPlugin; +``` + +#### Lifecycle Events + +Events that fire sequentially during a Command. The above example list two Events. However, for each Event, and additional `before` and `after` event is created. Therefore, six Events exist in the above example: + +- `before:deploy:resources` +- `deploy:resources` +- `after:deploy:resources` +- `before:deploy:functions` +- `deploy:functions` +- `after:deploy:functions` + +The name of the command in front of lifecycle events when they are used for Hooks. + +#### Hooks + +A Hook binds code to any lifecycle event from any command. + +```javascript +'use strict'; + +class Deploy { + constructor() { + this.commands = { + deploy: { + lifecycleEvents: [ + 'resources', + 'functions' + ] + }, + }; + + this.hooks = { + 'before:deploy:resources': this.beforeDeployResources, + 'deploy:resources': this.deployResources, + 'after:deploy:functions': this.afterDeployFunctions + }; + } + + beforeDeployResources() { + console.log('Before Deploy Resources'); + } + + deployResources() { + console.log('Deploy Resources'); + } + + afterDeployFunctions() { + console.log('After Deploy Functions'); + } +} + +module.exports = Deploy; +``` + +### Nesting Commands + +You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not inherit them from their parents. + +```javascript +'use strict'; + +class MyPlugin { + constructor() { + this.commands = { + deploy: { + lifecycleEvents: [ + 'resources', + 'functions' + ], + commands: { + function: { + lifecycleEvents: [ + 'package', + 'deploy' + ], + }, + }, + }, + } + } +} + +module.exports = MyPlugin; +``` + +### Defining Options + +Each (sub)command can have multiple Options. + +Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`. + +Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`. + +The `options` object will be passed in as the second parameter to the constructor of your plugin. + +In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included. + +**Note:** At this time, the Serverless Framework does not use parameters. + +```javascript +'use strict'; + +class Deploy { + constructor(serverless, options) { + this.serverless = serverless; + this.options = options; + + this.commands = { + deploy: { + lifecycleEvents: [ + 'functions' + ], + options: { + function: { + usage: 'Specify the function you want to deploy (e.g. "--function myFunction")', + shortcut: 'f', + required: true + } + } + }, + }; + + this.hooks = { + 'deploy:functions': this.deployFunction.bind(this) + } + } + + deployFunction() { + console.log('Deploying function: ', this.options.function); + } +} + +module.exports = Deploy; +``` + +### Provider Specific Plugins + +Plugins can be provider specific which means that they are bound to a provider. + +**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`. + +The provider definition should be added inside the plugins constructor: + +```javascript +'use strict'; + +class ProviderDeploy { + constructor(serverless, options) { + this.serverless = serverless; + this.options = options; + + // set the providers name here + this.provider = 'providerName'; + + this.commands = { + deploy: { + lifecycleEvents: [ + 'functions' + ], + options: { + function: { + usage: 'Specify the function you want to deploy (e.g. "--function myFunction")', + required: true + } + } + }, + }; + + this.hooks = { + 'deploy:functions': this.deployFunction.bind(this) + } + } + + deployFunction() { + console.log('Deploying function: ', this.options.function); + } +} + +module.exports = ProviderDeploy; +``` + +The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor. + +### Serverless Instance + +The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor. + +```javascript +'use strict'; + +class MyPlugin { + constructor(serverless, options) { + this.serverless = serverless; + this.options = options; + + this.commands = { + log: { + lifecycleEvents: [ + 'serverless' + ], + }, + }; + + this.hooks = { + 'log:serverless': this.logServerless.bind(this) + } + } + + logServerless() { + console.log('Serverless instance: ', this.serverless); + } +} + +module.exports = MyPlugin; +``` + +### Command Naming + +Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins. \ No newline at end of file diff --git a/docs/providers/aws/guide/resources.md b/docs/providers/aws/guide/resources.md new file mode 100644 index 000000000..a64dbe64f --- /dev/null +++ b/docs/providers/aws/guide/resources.md @@ -0,0 +1,81 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/resources) + + +# Resources + +If you are using AWS as a provider for your Service, all *Resources* are other AWS infrastructure resources which the AWS Lambda functions in your *Service* depend on, like AWS DynamoDB or AWS S3. + +Using the Serverless Framework, you can define the infrastructure resources you need in `serverless.yml`, and easily deploy them. + +## Configuration + +Every `serverless.yml` using the `aws` provider is a single AWS CloudFormation stack. This is where your AWS Lambda functions and their event configurations are defined and it's how they are deployed. When you add `resources` those resources are added into your CloudFormation stack upon `serverless deploy`. + +Define your AWS resources in a property titled `resources`. What goes in this property is raw CloudFormation template syntax, in YAML, like this: + +```yml +# serverless.yml + +service: usersCrud +provider: aws +functions: + +resources: // CloudFormation template syntax + Resources: + usersTable: + Type: AWS::DynamoDB::Table + Properties: + TableName: usersTable + AttributeDefinitions: + - AttributeName: email + AttributeType: S + KeySchema: + - AttributeName: email + KeyType: HASH + ProvisionedThroughput: + ReadCapacityUnits: 1 + WriteCapacityUnits: 1 +``` + +You can overwrite/attach any kind of resource to your CloudFormation stack. You can add `Resources`, `Outputs` or even overwrite the `Description`. You can also use [Serverless Variables](./variables.md) for sensitive data or reusable configuration in your resources templates. Please be cautious as overwriting existing parts of your CloudFormation stack might introduce unexpected behavior. + +## AWS CloudFormation Resource Reference + +To have consistent naming in the Cloudformation Templates that get deployed we use a standard pattern: + +`{Function Name}{Cloud Formation Resource Type}{ResourceName}{SequentialID or Random String}` + +* `Function Name` - This is optional for Resources that should be recreated when the function name gets changed. Those resources are also called *function bound* +* `Cloud Formation Resource Type` - E.g., S3Bucket +* `Resource Name` - An identifier for the specific resource, e.g. for an S3 Bucket the configured bucket name. +* `SequentialID or Random String` - For a few resources we need to add an optional sequential id or random string to identify them + +All resource names that are deployed by Serverless have to follow this naming scheme. The only exception (for backwards compatibility reasons) is the S3 Bucket that is used to upload artifacts so they can be deployed to your function. + +We're also using the term `normalizedName` or similar terms in this guide. This means dropping any characters that aren't allowed in resources names, e.g. special characters. + +| AWS Resource | Name Template | Example | +|--- |--- | --- | +| S3::Bucket | S3Bucket{normalizedBucketName} | S3BucketMybucket | +|IAM::Role | IamRoleLambdaExecution | IamRoleLambdaExecution | +|IAM::Policy | IamPolicyLambdaExecution | IamPolicyLambdaExecution | +|Lambda::Function | {normalizedFunctionName}LambdaFunction | HelloLambdaFunction | +|Lambda::Permission |
  • **Schedule**: {normalizedFunctionName}LambdaPermissionEventsRuleSchedule{index}
  • **S3**: {normalizedFunctionName}LambdaPermissionS3
  • **APIG**: {normalizedFunctionName}LambdaPermissionApiGateway
  • **SNS**: {normalizedFunctionName}LambdaPermission{normalizedTopicName}
    • |
    • **Schedule**: HelloLambdaPermissionEventsRuleSchedule1
    • **S3**: HelloLambdaPermissionS3
    • **APIG**: HelloLambdaPermissionApiGateway
    • **SNS**: HelloLambdaPermissionSometopic
      • | +|Events::Rule | {normalizedFuntionName}EventsRuleSchedule{SequentialID} | HelloEventsRuleSchedule1 | +|ApiGateway::RestApi | ApiGatewayRestApi | ApiGatewayRestApi | +|ApiGateway::Resource | ApiGatewayResource{normalizedPath} | ApiGatewayResourceUsers | +|ApiGateway::Method | ApiGatewayResource{normalizedPath}{normalizedMethod} | ApiGatewayResourceUsersGet | +|ApiGateway::Authorizer | {normalizedFunctionName}ApiGatewayAuthorizer | HelloApiGatewayAuthorizer | +|ApiGateway::Deployment | ApiGatewayDeployment{randomNumber} | ApiGatewayDeployment12356789 | +|ApiGateway::ApiKey | ApiGatewayApiKey{SequentialID} | ApiGatewayApiKey1 | +|SNS::Topic | SNSTopic{normalizedTopicName} | SNSTopicSometopic | +|AWS::Lambda::EventSourceMapping |
      • **DynamoDB:** {normalizedFunctionName}EventSourceMappingDynamodb{tableName}
      • **Kinesis:** {normalizedFunctionName}EventSourceMappingKinesis{streamName}
      |
      • **DynamoDB:** HelloLambdaEventSourceMappingDynamodbUsers
      • **Kinesis:** HelloLambdaEventSourceMappingKinesisMystream
      | diff --git a/docs/providers/aws/guide/services.md b/docs/providers/aws/guide/services.md new file mode 100644 index 000000000..61887af6a --- /dev/null +++ b/docs/providers/aws/guide/services.md @@ -0,0 +1,154 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/services) + + +# Services + +A *Service* is like a Project. It's where you define your AWS Lambda Functions, the Events that trigger them and any AWS infrastructure Resources they require, all in a file called `serverless.yml`. + +To get started building your first Serverless Framework project, create a *Service*. + +## Organization + +In the beginning of an application, many people use a single Service to define all of the Functions, Events and Resources for that project. This is what we recommend in the beginning. + +```bash +myApp/ + serverless.yml # Contains all functions and infrastructure resources +``` + +However, as your application grows, you can break it out into multiple services. A lot of people organize their services by workflows or data models, and group the functions related to those workflows and data models together in the service. + +```bash +users/ + serverless.yml # Contains 4 functions that do Users CRUD operations and the Users database +posts/ + serverless.yml # Contains 4 functions that do Posts CRUD operations and the Posts database +comments/ + serverless.yml # Contains 4 functions that do Comments CRUD operations and the Comments database +``` +This makes sense since related functions usually use common infrastructure resources, and you want to keep those functions and resources together as a single unit of deployment, for better organization and separation of concerns. + +**Note:** Currently, every service will create a separate REST API on AWS API Gateway. Due to a limitation with AWS API Gateway, you can only have a custom domain per one REST API. If you plan on making a large REST API, please make note of this limitation. Also, a fix is in the works and is a top priority. + +## Creation + +To create a service, use the `create` command. You must also pass in a runtime (e.g., node.js, python etc.) you would like to write the service in. You can also pass in a path to create a directory and auto-name your service: + +```bash +serverless create --template aws-nodejs --path myService +``` + +Here are the available runtimes for AWS Lambda: + +* aws-nodejs +* aws-python +* aws-java-gradle +* aws-java-maven +* aws-scala-sbt + +Check out the [create command docs](../cli-reference/create) for all the details and options. + +## Contents + +You'll see the following files in your working directory: +- `serverless.yml` +- `handler.js` +- `event.json` + +### serverless.yml + +Each *Serverless service* configuration is managed in the `serverless.yml` file. The main responsibilities of this file are: + + - Declare a Serverless service + - Define one or multiple functions in the service + - Define the provider the service will be deployed to (and the runtime if provided) + - Define custom plugins to be used + - Define events that trigger each function to execute (e.g. HTTP requests) + - Define a set of resources (e.g. 1 AWS CloudFormation stack) required by the functions in this service + - Allow events listed in the `events` section to automatically create the resources required for the event upon deployment + - Allow flexible configuration using Serverless Variables + +You can see the name of the service, the provider configuration and the first function inside the `functions` definition which points to the `handler.js` file. Any further service configuration will be done in this file. + +```yml +# serverless.yml + +service: users + +provider: + name: aws + runtime: nodejs4.3 + memorySize: 512 + +functions: + usersCreate: # A Function + events: # The Events that trigger this Function + - http: post users/create + usersDelete: # A Function + events: # The Events that trigger this Function + - http: delete users/delete + +# The "Resources" your "Functions" use. Raw AWS CloudFormation goes in here. +resources: + Resources: + usersTable: + Type: AWS::DynamoDB::Table + Properties: + TableName: usersTable + AttributeDefinitions: + - AttributeName: email + AttributeType: S + KeySchema: + - AttributeName: email + KeyType: HASH + ProvisionedThroughput: + ReadCapacityUnits: 1 + WriteCapacityUnits: 1 +``` + +Every `serverless.yml` translates to a single AWS CloudFormation template and a CloudFormation stack is created from that resulting CloudFormation template. + +### handler.js + +The `handler.js` file contains your function code. The function definition in `serverless.yml` will point to this `handler.js` file and the function exported here. + +### event.json + +This file contains event data you can use to invoke your function with via `serverless invoke -p event.json` + +## Deployment + +When you deploy a Service, all of the Functions, Events and Resources in your `serverless.yml` are translated to an AWS CloudFormation template and deployed as a single CloudFormation stack. + +To deploy a service, use the `deploy` command: + +```bash +serverless deploy +``` + +Deployment defaults to `dev` stage and `us-east-1` region on AWS, unless you specified these elsewhere, or add them in as options: + +```bash +serverless deploy --stage prod --region us-east-1 +``` + +Check out the [deployment guide](https://serverless.com/framework/docs/providers/aws/guide/deploying/) to learn more about deployments and how they work. Or, check out the [deploy command docs](../cli-reference/deploy) for all the details and options. + +## Removal + +To easily remove your Service from your AWS account, you can use the `remove` command. + +Run `serverless remove -v` to trigger the removal process. As in the deploy step we're also running in the `verbose` mode so you can see all details of the remove process. + +Serverless will start the removal and informs you about it's process on the console. A success message is printed once the whole service is removed. + +The removal process will only remove the service on your provider's infrastructure. The service directory will still remain on your local machine so you can still modify and (re)deploy it to another stage, region or provider later on. diff --git a/docs/providers/aws/guide/testing.md b/docs/providers/aws/guide/testing.md new file mode 100644 index 000000000..89aabb63a --- /dev/null +++ b/docs/providers/aws/guide/testing.md @@ -0,0 +1,98 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/testing) + + +# Testing + +Serverless introduces a lot of simplifications when it comes to serving business logic. We only need to provide handler function that almost entirely implements business logic. The only thing that we need to apply to are handler function arguments that are passed by FaaS provider. E.g. AWS Lambda passes 3 arguments `event`, `context` and `callback` to Node.js functions. Of course list of arguments differs between languages and, what is more important, between FaaS providers. + +Another important factor is a cloud environment. Basically, it's impossible to emulate AWS locally. Of course projects like [dynamodb-local](http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBLocal.html) or [kinesalite](https://github.com/mhart/kinesalite) may help but AWS (and other providers) provide much more services. We shouldn't rely on local implementations if we want to be 100% sure that our service won't fail after deploying to production environment. + +Because of those issues (and having [test pyramid](http://martinfowler.com/bliki/TestPyramid.html) in mind) we suggest following testing strategy: + +- business logic should be independent from FaaS provider, +- unit testing should be used as a main tool for verifying business logic, +- integration tests should be used for verifying integration with other services. + +Let's take simple Node.js function as an example. The responsibility of this function is to save user into DB and send welcome email: + +```javascript +const db = require('db').connect(); +const mailer = require('mailer'); + +module.exports.saveUser = (event, context, callback) => { + const user = { + email: event.email, + created_at: Date.now() + } + + db.saveUser(user, function (err) { + if (err) { + callback(err); + } else { + mailer.sendWelcomeEmail(event.email); + callback(); + } + }); +}; +``` + +There are two main problems with this functions: + +- code is bounded to how AWS Lambda passes incoming data (`event` object), +- testing this function require running DB instance and mail server. + +## Unit testing + +Business logic should be implemented in a way that allows using it in a different environment, no matter if it's AWS Lambda, Google Cloud Functions or HTTP server. Instead of writing complicated handler functions we should extract what is the core of our business. Let's extract it from above example + +```javascript +class Users { + constructor(db, mailer) { + this.db = db; + this.mailer = mailer; + } + + save(email, callback) { + const user = { + email: email, + created_at: Date.now() + } + + this.db.saveUser(user, function (err) { + if (err) { + callback(err); + } else { + this.mailer.sendWelcomeEmail(email); + callback(); + } + }); + } +} +``` + +This class is testable and doesn't require running any of the external services. Instead of real `db` and `mailer` objects we can pass mocks and assert if `saveUser` and `sendWelcomeEmail` has been called with proper arguments. We should have as much unit-test as possible and run them every code change. Of course passing unit-tests doesn't mean that our function is working as expected. That's why we also need integration test. + +## Integration tests + +After extracting business logic to separate module handler function looks like this: + +```javascript +const db = require('db').connect(); +const mailer = require('mailer'); +const users = require('users')(db, mailer); + +module.exports.saveUser = (event, context, callback) => { + users.save(event.email, callback); +}; +``` + +It's responsible for setting up dependencies, injecting them and calling business logic functions. This code will be changed less often. To make sure that function is working as expected integration tests should be ran against deployed function. They should invoke function (`serverless invoke`) with fixture email address, check if user is actually saved to DB and check if email was received. diff --git a/docs/v0-v1-comparison.md b/docs/providers/aws/guide/v0_to_v1.md similarity index 66% rename from docs/v0-v1-comparison.md rename to docs/providers/aws/guide/v0_to_v1.md index c5a9c4acb..6e34a3b3b 100644 --- a/docs/v0-v1-comparison.md +++ b/docs/providers/aws/guide/v0_to_v1.md @@ -1,12 +1,19 @@ -# Comparison between 0.x and 1.x of Serverless + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/v0_to_v1) + + +# Comparison Of Serverless Framework V.1 & V.0 After the 0.5.6 release of Serverless we sat down with many contributors and users of the Framework to discuss the next steps to improve Serverless. + Those discussions lead to our decision to completely rewrite Serverless. The configuration is in no way backwards compatible and can basically be seen as a completely new tool. We've decided to make this step so in the future we have a stronger base to work from and make sure we don't have to do major breaking changes like this anymore. @@ -19,7 +26,7 @@ As 1.x is a complete reimplementation without backwards compatibility pretty muc ### Central configuration file -In the past configuration was spread out over several configuration files. It was hard for users to have a good overview over all the different configuration values set for different functions. This was now moved into a central [serverless.yml file](./01-guide/12-serverless-yml-reference.md) that stores all configuration for one service. This also means there is no specific folder setup that you have to follow any more. By default Serverless simply zips up the folder your serverless.yml is in and deploys it to any functions defined in that config file (although you can [change the packaging behavior](./01-guide/10-packaging.md)). +In the past configuration was spread out over several configuration files. It was hard for users to have a good overview over all the different configuration values set for different functions. This was now moved into a central serverless.yml file that stores all configuration for one service. This also means there is no specific folder setup that you have to follow any more. By default Serverless simply zips up the folder your serverless.yml is in and deploys it to any functions defined in that config file (although you can [change the packaging behavior](https://serverless.com/framework/docs/providers/aws/guide/packaging/)). ### Services are the main unit of deployment @@ -27,16 +34,16 @@ In the past Serverless didn't create a strong connection between functions that ### Built on CloudFormation -With the move to a more service oriented style came the decision to move all configuration into CloudFormation. Every resource we create gets created through a central CloudFormation template. Each service gets its own CloudFormation stack, we even deploy new CF stacks if you create a service in a different stage. A very important feature that came with this move to CF was that you can now easily create any other kind of resource in AWS and connect it with your functions. You can read more about custom resources in [our guide](./01-guide/06-custom-provider-resources.md) +With the move to a more service oriented style came the decision to move all configuration into CloudFormation. Every resource we create gets created through a central CloudFormation template. Each service gets its own CloudFormation stack, we even deploy new CF stacks if you create a service in a different stage. A very important feature that came with this move to CF was that you can now easily create any other kind of resource in AWS and connect it with your functions. You can read more about resources in [our guide](https://serverless.com/framework/docs/providers/aws/guide/resources/) ### New plugin system -While our old plugin system allowed for a powerful setup we felt we could push it a lot further and went back to the drawing board. We came up with a completely new way to build plugins for Serverless through hooks and lifecycle events. This is a breaking change for any existing plugin. You can read more about our Plugin system in our [extending serverless docs](./04-extending-serverless). +While our old plugin system allowed for a powerful setup we felt we could push it a lot further and went back to the drawing board. We came up with a completely new way to build plugins for Serverless through hooks and lifecycle events. This is a breaking change for any existing plugin. You can read more about our Plugin system in our [extending serverless docs](https://serverless.com/framework/docs/providers/aws/guide/plugins/). ### Endpoints are now events -In 0.x APIG was treated as a separate resource and you could deploy endpoints separately. In 1.x APIG is just another event source that can be configured to trigger Lambda functions. We create one APIG per CloudFormation stack, so if you deploy to different stages we're creating separate API Gateways. You can read all about our [APIG integration in our event docs](./02-providers/aws/events/01-apigateway.md). +In 0.x APIG was treated as a separate resource and you could deploy endpoints separately. In 1.x APIG is just another event source that can be configured to trigger Lambda functions. We create one APIG per CloudFormation stack, so if you deploy to different stages we're creating separate API Gateways. You can read all about our [APIG integration in our event docs](https://serverless.com/framework/docs/providers/aws/events/apigateway/). ## How to upgrade from 0.x to 1.x -As Serverless 1.x is a complete reimplementation and does not implement all the features that were in 0.x (but has a lot more features in general) there is no direct update path. Basically the best way for users to move from 0.x to 1.x is to go through [our guide](./01-guide) and the [AWS provider documentation](./02-providers/aws) that will teach you all the details of Serverless 1.x. This should make it pretty easy to understand how to set up a service for 1.x and move your code over. We've worked with different teams during the Beta phase of Serverless 1.x and they were able to move their services into the new release pretty quickly. +As Serverless 1.x is a complete reimplementation and does not implement all the features that were in 0.x (but has a lot more features in general) there is no direct update path. Basically the best way for users to move from 0.x to 1.x is to go through [our guide](https://serverless.com/framework/docs/providers/aws/guide/) and the [AWS provider documentation](https://serverless.com/framework/docs/providers/aws/) that will teach you all the details of Serverless 1.x. This should make it pretty easy to understand how to set up a service for 1.x and move your code over. We've worked with different teams during the Beta phase of Serverless 1.x and they were able to move their services into the new release pretty quickly. diff --git a/docs/01-guide/08-serverless-variables.md b/docs/providers/aws/guide/variables.md similarity index 59% rename from docs/01-guide/08-serverless-variables.md rename to docs/providers/aws/guide/variables.md index be342ff66..8cda633ac 100644 --- a/docs/01-guide/08-serverless-variables.md +++ b/docs/providers/aws/guide/variables.md @@ -1,13 +1,18 @@ -# Serverless Variables + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/variables) + -The Serverless framework provides a powerful variable system to give your `serverless.yml` configuration file extra flexibility. With Serverless Variables, you'll be able to do the following: +# Variables + +The Serverless framework provides a powerful variable system which allows you to add dynamic data into your `serverless.yml`. With Serverless Variables, you'll be able to do the following: - Reference & load variables from environment variables - Reference & load variables from CLI options @@ -16,44 +21,8 @@ The Serverless framework provides a powerful variable system to give your `serve - Recursively nest variable references within each other for ultimate flexibility - Combine multiple variable references to overwrite each other -## Referencing Environment Variables -To reference environment variables, you'll need to use the `${env:SOME_VAR}` syntax in your `serverless.yml` configuration file. Here's an example: - -```yml -service: new-service -provider: aws -functions: - hello: - name: ${env:FUNC_PREFIX}-hello - handler: handler.hello - world: - name: ${env:FUNC_PREFIX}-world - handler: handler.world - -``` - -In the previous example you're dynamically adding a prefix to the function names by referencing the `FUNC_PREFIX` env var. So you can easily change that prefix for all functions by changing the `FUNC_PREFIX` env var. - -## Referencing CLI Options -To reference CLI options that you passed, you'll need to use the `${opt:some_option}` syntax in your `serverless.yml` configuration file. Here's an example: - -```yml -service: new-service -provider: aws -functions: - hello: - name: ${opt:stage}-hello - handler: handler.hello - world: - name: ${opt:stage}-world - handler: handler.world - -``` - -In the previous example you're dynamically adding a prefix to the function names by referencing the `stage` option that you pass in the CLI when you run `serverless deploy --stage dev`. So when you deploy, the function name will always include the stage you're deploying to. - -## Recursively Self-Reference serverless.yml Properties -To self-reference properties in `serverless.yml`, you'll need to use the `${self:someProperty}` syntax in your `serverless.yml` configuration file. This functionality is recursive, so you can go as deep in the object tree as you want. Here's an example: +## Reference Properties In serverless.yml +To self-reference properties in `serverless.yml`, use the `${self:someProperty}` syntax in your `serverless.yml`. This functionality is recursive, so you can go as deep in the object tree as you want. ```yml service: new-service @@ -70,22 +39,51 @@ functions: handler: handler.world events: - schedule: ${self:custom.globalSchedule} - ``` -In the previous example you're setting a global schedule for all functions by referencing the `globalSchedule` property in the same `serverless.yml` file. This way, you can easily change the schedule for all functions whenever you like. +In the above example you're setting a global schedule for all functions by referencing the `globalSchedule` property in the same `serverless.yml` file. This way, you can easily change the schedule for all functions whenever you like. -## Recursively Reference Variables in Other Files -To reference variables in other YAML or JSON files, you'll need to use the `${file(./myFile.yml):someProperty}` syntax in your `serverless.yml` configuration file. This functionality is recursive, so you can go as deep in that file as you want. Here's an example: +## Referencing Environment Variables +To reference environment variables, use the `${env:SOME_VAR}` syntax in your `serverless.yml` configuration file. ```yml - -# myCustomFile.yml - -globalSchedule: rate(10 minutes) - +service: new-service +provider: aws +functions: + hello: + name: ${env:FUNC_PREFIX}-hello + handler: handler.hello + world: + name: ${env:FUNC_PREFIX}-world + handler: handler.world ``` +In the above example you're dynamically adding a prefix to the function names by referencing the `FUNC_PREFIX` env var. So you can easily change that prefix for all functions by changing the `FUNC_PREFIX` env var. + +## Referencing CLI Options +To reference CLI options that you passed, use the `${opt:some_option}` syntax in your `serverless.yml` configuration file. + +```yml +service: new-service +provider: aws +functions: + hello: + name: ${opt:stage}-hello + handler: handler.hello + world: + name: ${opt:stage}-world + handler: handler.world +``` + +In the above example, you're dynamically adding a prefix to the function names by referencing the `stage` option that you pass in the CLI when you run `serverless deploy --stage dev`. So when you deploy, the function name will always include the stage you're deploying to. + +## Reference Variables in Other Files +To reference variables in other YAML or JSON files, use the `${file(./myFile.yml):someProperty}` syntax in your `serverless.yml` configuration file. This functionality is recursive, so you can go as deep in that file as you want. Here's an example: + +```yml +# myCustomFile.yml +globalSchedule: rate(10 minutes) +``` ```yml # serverless.yml @@ -101,12 +99,11 @@ functions: handler: handler.world events: - schedule: ${self:custom.globalSchedule} # This would also work in this case - ``` -In the previous example you're referencing the entire `myCustomFile.yml` file in the `custom` property. You just need to pass the path relative to your service directory. You can also request specific properties in that file as shown in the `schedule` property. It's completely recursive and you can go as deep as you want. +In the above example, you're referencing the entire `myCustomFile.yml` file in the `custom` property. You need to pass the path relative to your service directory. You can also request specific properties in that file as shown in the `schedule` property. It's completely recursive and you can go as deep as you want. -### Referencing other +## Multiple Configuration Files Adding many custom resources to your `serverless.yml` file could bloat the whole file, so you can use the Serverless Variable syntax to split this up. @@ -115,8 +112,7 @@ resources: Resources: ${file(cloudformation-resources.json)} ``` -The corresponding resources which are defined inside the `cloudformation-resources.json` file will be resolved and loaded -into the `Resources` section. +The corresponding resources which are defined inside the `cloudformation-resources.json` file will be resolved and loaded into the `Resources` section. ## Nesting Variable References The Serverless variable system allows you to nest variable references within each other for ultimate flexibility. So you can reference certain variables based on other variables. Here's an example: @@ -130,17 +126,15 @@ custom: functions: hello: handler: handler.hello - ``` -In the previous example, if you pass `dev` as a stage option, the framework will look for the `dev_arn` environment variable. If you pass `production`, the framework will look for `production_arn`, and so on. This allows you to creatively use multiple variables by using a certain naming pattern without having to update the values of these variables constantly. You can go as deep as you want in your nesting, and can reference variables at any level of nesting from any source (env, opt, self or file). +In the above example, if you pass `dev` as a stage option, the framework will look for the `dev_arn` environment variable. If you pass `production`, the framework will look for `production_arn`, and so on. This allows you to creatively use multiple variables by using a certain naming pattern without having to update the values of these variables constantly. You can go as deep as you want in your nesting, and can reference variables at any level of nesting from any source (env, opt, self or file). ## Overwriting Variables The Serverless framework gives you an intuitive way to reference multiple variables as a fallback strategy in case one of the variables is missing. This way you'll be able to use a default value from a certain source, if the variable from another source is missing. For example, if you want to reference the stage you're deploying to, but you don't want to keep on providing the `stage` option in the CLI. What you can do in `serverless.yml` is: - ```yml service: new-service provider: @@ -156,21 +150,9 @@ functions: What this says is to use the `stage` CLI option if it exists, if not, use the default stage (which lives in `provider.stage`). So during development you can safely deploy with `serverless deploy`, but during production you can do `serverless deploy --stage production` and the stage will be picked up for you without having to make any changes to `serverless.yml`. -This overwrite functionality is super powerful. You can have as many variable references as you want, from any source you want, and each of them can be of different type and different name. +You can have as many variable references as you want, from any source you want, and each of them can be of different type and different name. -## Setting the variable syntax - -You can overwrite the variable syntax in case you want to use a text for a config parameter that would clash with the variable syntax. - -```yml -service: aws-nodejs # Name of the Service - -defaults: - variableSyntax: '\${{([\s\S]+?)}}' # Overwrite the default "${}" variable syntax to be "${{}}" instead. This can be helpful if you want to use "${}" as a string without using it as a variable. -``` - - -# Migrating serverless.env.yml +## Migrating serverless.env.yml Previously we used the `serverless.env.yml` file to track Serverless Variables. It was a completely different system with different concepts. To migrate your variables from `serverless.env.yml`, you'll need to decide where you want to store your variables. * Using a config file: You can still use `serverless.env.yml`, but the difference now is that you can structure the file however you want, and you'll need to reference each variable/property correctly in `serverless.yml`. For more info, you can check the file reference section above. @@ -178,4 +160,4 @@ Previously we used the `serverless.env.yml` file to track Serverless Variables. * Using environment variables: You can instead store your variables in environment variables and reference them with `env.someEnvVar`. For more info, you can check the environment variable reference section above. * Making your variables stage/region specific: `serverless.env.yml` allowed you to have different values for the same variable based on the stage/region you're deploying to. You can achieve the same result by using the nesting functionality of the new variable system. For example, if you have two different ARNs, one for `dev` stage and the other for `prod` stage, you can do the following: `${env:${opt:stage}_arn}`. This will make sure the correct env var is referenced based on the stage provided as an option. Of course you'll need to export both `dev_arn` and `prod_arn` env vars on your local system. -Now you don't need `serverless.env.yml` at all, but you can still use it if you want. It's just not required anymore. Migrating to the new variable system is easy and you just need to know how the new system works and make small adjustments to how you store & reference your variables. +Now you don't need `serverless.env.yml` at all, but you can still use it if you want. It's just not required anymore. Migrating to the new variable system is easy and you just need to know how the new system works and make small adjustments to how you store & reference your variables. \ No newline at end of file diff --git a/docs/providers/aws/guide/workflow.md b/docs/providers/aws/guide/workflow.md new file mode 100644 index 000000000..6410f02ca --- /dev/null +++ b/docs/providers/aws/guide/workflow.md @@ -0,0 +1,70 @@ + + + +### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/workflow) + + +# Workflow + +## Process +Quick recommendations and tips for various processes. +### Development +* Write your functions +* Use `serverless deploy` only when you've made changes to `serverless.yml` and in CI/CD systems. +* Use `serverless deploy function -f myFunction -l` to rapidly deploy changes when you are working on a specific AWS Lambda Function. +* Use `serverless invoke -f myFunction -l` to test your AWS Lambda Functions on AWS. +* Open up a separate tab in your console and stream logs in there via `serverless logs -f myFunction -t`. +* Write tests to run locally. +### Stages +* At the very least, use a `dev` and `production` stage. +* Use different AWS accounts for stages. +* In larger teams, each member should use a separate AWS account and their own stage for development. +### Larger Projects +* Break your application/project into multiple Serverless Services. +* Model your Serverless Services around Data Models or Workflows. +* Keep the Functions and Resources in your Serverless Services to a minimum. + +## Cheat Sheet +A handy list of commands to use when developing with the Serverless Framework. + +##### Create A Service: +Creates a new Service +``` +serverless create -p [SERVICE NAME] -t aws-nodejs +``` + +##### Install A Service +This is a convenience method to install a pre-made Serverless Service locally by downloading the Github repo and unzipping it. +``` +serverless install -u [GITHUB URL OF SERVICE] +``` + +##### Deploy All +Use this when you have made changes to your Functions, Events or Resources in `serverless.yml` or you simply want to deploy all changes within your Service at the same time. +``` +serverless deploy -s [STAGE NAME] -r [REGION NAME] -v +``` + +##### Deploy Function +Use this to quickly overwrite your AWS Lambda code on AWS, allowing you to develop faster. +``` +serverless deploy function -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME] +``` + +##### Invoke Function +Invokes an AWS Lambda Function on AWS and returns logs. +``` +serverless deploy function -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME] -l +``` + +##### Streaming Logs +Open up a separate tab in your console and stream all logs for a specific Function using this command. +``` +serverless logs -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME] +``` \ No newline at end of file diff --git a/lib/classes/Error.js b/lib/classes/Error.js index 6c47ef8af..cbfcaff9b 100644 --- a/lib/classes/Error.js +++ b/lib/classes/Error.js @@ -70,7 +70,7 @@ module.exports.logError = (e) => { } consoleLog(' '); - consoleLog(chalk.yellow(' Your Environment Infomation -----------------------------')); + consoleLog(chalk.yellow(' Your Environment Information -----------------------------')); consoleLog(chalk.yellow(` OS: ${process.platform}`)); consoleLog(chalk.yellow(` Node Version: ${process.version.replace(/^[v|V]/, '')}`)); consoleLog(chalk.yellow(` Serverless Version: ${version}`)); diff --git a/lib/classes/Service.js b/lib/classes/Service.js index 48600cf80..56bc2393f 100644 --- a/lib/classes/Service.js +++ b/lib/classes/Service.js @@ -65,9 +65,6 @@ class Service { if (!serverlessFile.provider) { throw new SError('"provider" property is missing in serverless.yml'); } - if (!serverlessFile.functions) { - throw new SError('"functions" property is missing in serverless.yml'); - } if (typeof serverlessFile.provider !== 'object') { const providerName = serverlessFile.provider; @@ -91,7 +88,7 @@ class Service { that.custom = serverlessFile.custom; that.plugins = serverlessFile.plugins; that.resources = serverlessFile.resources; - that.functions = serverlessFile.functions; + that.functions = serverlessFile.functions || {}; if (serverlessFile.package) { that.package.individually = serverlessFile.package.individually; diff --git a/lib/classes/Service.test.js b/lib/classes/Service.test.js index 0c3d9fc20..088aad7ef 100644 --- a/lib/classes/Service.test.js +++ b/lib/classes/Service.test.js @@ -334,7 +334,7 @@ describe('Service', () => { }); }); - it('should throw error if functions property is missing', () => { + it('should not throw error if functions property is missing', () => { const SUtils = new Utils(); const serverlessYml = { service: 'service-name', @@ -347,11 +347,7 @@ describe('Service', () => { serviceInstance = new Service(serverless); return serviceInstance.load().then(() => { - // if we reach this, then no error was thrown as expected - // so make assertion fail intentionally to let us know something is wrong - expect(1).to.equal(2); - }).catch(e => { - expect(e.name).to.be.equal('ServerlessError'); + expect(serverless.service.functions).to.deep.equal({}); }); }); diff --git a/lib/classes/Utils.js b/lib/classes/Utils.js index 537363ee3..6008f66c8 100644 --- a/lib/classes/Utils.js +++ b/lib/classes/Utils.js @@ -291,7 +291,7 @@ class Utils { general: { userId, timestamp: (new Date()).getTime(), - timezone: (new Date()).toString().match(/([A-Z]+[\+-][0-9]+)/)[1], + timezone: (new Date()).toString().match(/([A-Z]+[+-][0-9]+)/)[1], operatingSystem: process.platform, serverlessVersion: serverless.version, nodeJsVersion: process.version, diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js index 0ff2b4b82..deb7d0a55 100644 --- a/lib/classes/Variables.js +++ b/lib/classes/Variables.js @@ -12,7 +12,7 @@ class Variables { this.service = this.serverless.service; this.overwriteSyntax = RegExp(/,/g); - this.fileRefSyntax = RegExp(/^file\(([a-zA-Z0-9._\-\/]+?)\)/g); + this.fileRefSyntax = RegExp(/^file\(([a-zA-Z0-9._\-/]+?)\)/g); this.envRefSyntax = RegExp(/^env:./g); this.optRefSyntax = RegExp(/^opt:./g); this.selfRefSyntax = RegExp(/^self:./g); @@ -75,18 +75,22 @@ class Variables { populateVariable(propertyParam, matchedString, valueToPopulate) { let property = propertyParam; - if (typeof valueToPopulate === 'string') { property = replaceall(matchedString, valueToPopulate, property); } else { if (property !== matchedString) { - const errorMessage = [ - 'Trying to populate non string value into', - ` a string for variable ${matchedString}.`, - ' Please make sure the value of the property is a string.', - ].join(''); - throw new this.serverless.classes - .Error(errorMessage); + if (typeof valueToPopulate === 'number') { + property = replaceall(matchedString, String(valueToPopulate), property); + } else { + const errorMessage = [ + 'Trying to populate non string value into', + ` a string for variable ${matchedString}.`, + ' Please make sure the value of the property is a string.', + ].join(''); + throw new this.serverless.classes + .Error(errorMessage); + } + return property; } property = valueToPopulate; } @@ -98,7 +102,8 @@ class Variables { const variableStringsArray = variableStringsString.split(','); variableStringsArray.find(variableString => { finalValue = this.getValueFromSource(variableString); - return (typeof finalValue !== 'undefined' && finalValue !== null); + return (finalValue !== null && typeof finalValue !== 'undefined') && + !(typeof finalValue === 'object' && _.isEmpty(finalValue)); }); return finalValue; @@ -151,6 +156,10 @@ class Variables { const referencedFileFullPath = path.join(this.serverless.config.servicePath, referencedFileRelativePath); + if (!this.serverless.utils.fileExistsSync(referencedFileFullPath)) { + return undefined; + } + let valueToPopulate = this.serverless.utils.readFileSync(referencedFileFullPath); if (matchedFileRefString !== variableString) { let deepProperties = variableString diff --git a/lib/classes/Variables.test.js b/lib/classes/Variables.test.js index bfef5ecd2..2caec549a 100644 --- a/lib/classes/Variables.test.js +++ b/lib/classes/Variables.test.js @@ -155,6 +155,17 @@ describe('Variables', () => { expect(newProperty).to.equal('my stage is dev'); }); + it('should populate number variables as sub string', () => { + const serverless = new Serverless(); + const valueToPopulate = 5; + const matchedString = '${opt:number}'; + const property = 'your account number is ${opt:number}'; + + const newProperty = serverless.variables + .populateVariable(property, matchedString, valueToPopulate); + expect(newProperty).to.equal('your account number is 5'); + }); + it('should populate non string variables', () => { const serverless = new Serverless(); const valueToPopulate = 5; @@ -166,11 +177,11 @@ describe('Variables', () => { expect(newProperty).to.equal(5); }); - it('should throw error if populating non string variable as sub string', () => { + it('should throw error if populating non string or non number variable as sub string', () => { const serverless = new Serverless(); - const valueToPopulate = 5; - const matchedString = '${opt:number}'; - const property = 'hello ${opt:number}'; + const valueToPopulate = {}; + const matchedString = '${opt:object}'; + const property = 'your account number is ${opt:object}'; expect(() => serverless.variables .populateVariable(property, matchedString, valueToPopulate)) .to.throw(Error); @@ -194,6 +205,21 @@ describe('Variables', () => { serverless.variables.getValueFromSource.restore(); }); + it('should overwrite empty object values', () => { + const serverless = new Serverless(); + const getValueFromSourceStub = sinon + .stub(serverless.variables, 'getValueFromSource'); + + getValueFromSourceStub.onCall(0).returns({}); + getValueFromSourceStub.onCall(1).returns('variableValue'); + + const valueToPopulate = serverless.variables + .overwrite('opt:stage,env:stage'); + expect(valueToPopulate).to.equal('variableValue'); + expect(getValueFromSourceStub.callCount).to.equal(2); + serverless.variables.getValueFromSource.restore(); + }); + it('should not overwrite 0 values', () => { const serverless = new Serverless(); const getValueFromSourceStub = sinon @@ -359,6 +385,16 @@ describe('Variables', () => { expect(valueToPopulate).to.deep.equal(configYml); }); + it('should get undefined if non existing file and the second argument is true', () => { + const serverless = new Serverless(); + const tmpDirPath = testUtils.getTmpDirPath(); + + serverless.config.update({ servicePath: tmpDirPath }); + + const valueToPopulate = serverless.variables.getValueFromFile('file(./config.yml)'); + expect(valueToPopulate).to.be.equal(undefined); + }); + it('should populate non json/yml files', () => { const serverless = new Serverless(); const SUtils = new Utils(); diff --git a/lib/plugins/Plugins.json b/lib/plugins/Plugins.json index e31b265a2..0cc057f33 100644 --- a/lib/plugins/Plugins.json +++ b/lib/plugins/Plugins.json @@ -8,6 +8,7 @@ "./info/info.js", "./logs/logs.js", "./remove/remove.js", + "./rollback/index.js", "./slstats/slstats.js", "./aws/provider/awsProvider.js", "./aws/deploy/index.js", @@ -15,6 +16,7 @@ "./aws/info/index.js", "./aws/logs/index.js", "./aws/remove/index.js", + "./aws/rollback/index.js", "./aws/deploy/compile/functions/index.js", "./aws/deploy/compile/events/schedule/index.js", "./aws/deploy/compile/events/s3/index.js", diff --git a/lib/plugins/aws/deploy/compile/events/apiGateway/lib/apiKeys.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/apiKeys.js index 31dae6232..9ac6cf3a2 100644 --- a/lib/plugins/aws/deploy/compile/events/apiGateway/lib/apiKeys.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/apiKeys.js @@ -6,41 +6,33 @@ const BbPromise = require('bluebird'); module.exports = { compileApiKeys() { if (this.serverless.service.provider.apiKeys) { - if (this.serverless.service.provider.apiKeys.constructor !== Array) { + if (!Array.isArray(this.serverless.service.provider.apiKeys)) { throw new this.serverless.classes.Error('apiKeys property must be an array'); } - let apiKeyNumber = 0; - this.serverless.service.provider.apiKeys.forEach(apiKey => { - apiKeyNumber++; + _.forEach(this.serverless.service.provider.apiKeys, (apiKey, i) => { + const apiKeyNumber = i + 1; + if (typeof apiKey !== 'string') { throw new this.serverless.classes.Error('API Keys must be strings'); } - const apiKeysTemplate = ` - { - "Type" : "AWS::ApiGateway::ApiKey", - "Properties" : { - "Enabled" : true, - "Name" : "${apiKey}", - "StageKeys" : [{ - "RestApiId": { "Ref": "ApiGatewayRestApi" }, - "StageName": "${this.options.stage}" - }] + _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, { + [`ApiGatewayApiKey${apiKeyNumber}`]: { + Type: 'AWS::ApiGateway::ApiKey', + Properties: { + Enabled: true, + Name: apiKey, + StageKeys: [{ + RestApiId: { Ref: this.apiGatewayRestApiLogicalId }, + StageName: this.options.stage, + }], + }, + DependsOn: this.apiGatewayDeploymentLogicalId, }, - "DependsOn": "${this.apiGateWayDeploymentLogicalId}" - } - `; - - const newApiKeyObject = { - [`ApiGatewayApiKey${apiKeyNumber}`]: JSON.parse(apiKeysTemplate), - }; - - _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, - newApiKeyObject); + }); }); } - return BbPromise.resolve(); }, }; diff --git a/lib/plugins/aws/deploy/compile/events/apiGateway/lib/deployment.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/deployment.js index 43d39a653..1eb6c692a 100644 --- a/lib/plugins/aws/deploy/compile/events/apiGateway/lib/deployment.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/deployment.js @@ -5,42 +5,34 @@ const BbPromise = require('bluebird'); module.exports = { compileDeployment() { - const deploymentTemplate = ` - { - "Type" : "AWS::ApiGateway::Deployment", - "Properties" : { - "RestApiId" : { "Ref": "ApiGatewayRestApi" }, - "StageName" : "${this.options.stage}" - } - } - `; + this.apiGatewayDeploymentLogicalId = `ApiGatewayDeployment${(new Date()).getTime().toString()}`; - this.apiGateWayDeploymentLogicalId = `ApiGatewayDeployment${(new Date()).getTime().toString()}`; - const deploymentTemplateJson = JSON.parse(deploymentTemplate); - deploymentTemplateJson.DependsOn = this.methodDependencies; - - const newDeploymentObject = { - [this.apiGateWayDeploymentLogicalId]: deploymentTemplateJson, - }; - - _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, - newDeploymentObject); + _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, { + [this.apiGatewayDeploymentLogicalId]: { + Type: 'AWS::ApiGateway::Deployment', + Properties: { + RestApiId: { Ref: this.apiGatewayRestApiLogicalId }, + StageName: this.options.stage, + }, + DependsOn: this.methodDependencies, + }, + }); // create CLF Output for endpoint - const outputServiceEndpointTemplate = ` - { - "Description": "URL of the service endpoint", - "Value": { "Fn::Join" : [ "", [ "https://", { "Ref": "ApiGatewayRestApi" }, - ".execute-api.${this.options.region}.amazonaws.com/${this.options.stage}"] ] } - }`; - - const newOutputEndpointObject = { - ServiceEndpoint: JSON.parse(outputServiceEndpointTemplate), - }; - - _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Outputs, - newOutputEndpointObject); - + _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Outputs, { + ServiceEndpoint: { + Description: 'URL of the service endpoint', + Value: { + 'Fn::Join': ['', + [ + 'https://', + { Ref: this.apiGatewayRestApiLogicalId }, + `.execute-api.${this.options.region}.amazonaws.com/${this.options.stage}`, + ], + ], + }, + }, + }); return BbPromise.resolve(); }, }; diff --git a/lib/plugins/aws/deploy/compile/events/apiGateway/lib/restApi.js b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/restApi.js index 6c883818d..f051894e5 100644 --- a/lib/plugins/aws/deploy/compile/events/apiGateway/lib/restApi.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/lib/restApi.js @@ -5,21 +5,16 @@ const BbPromise = require('bluebird'); module.exports = { compileRestApi() { - const restApiTemplate = ` - { - "Type" : "AWS::ApiGateway::RestApi", - "Properties" : { - "Name" : "${this.options.stage}-${this.serverless.service.service}" - } - } - `; + this.apiGatewayRestApiLogicalId = 'ApiGatewayRestApi'; - const newRestApiObject = { - ApiGatewayRestApi: JSON.parse(restApiTemplate), - }; - - _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, - newRestApiObject); + _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, { + [this.apiGatewayRestApiLogicalId]: { + Type: 'AWS::ApiGateway::RestApi', + Properties: { + Name: `${this.options.stage}-${this.serverless.service.service}`, + }, + }, + }); return BbPromise.resolve(); }, diff --git a/lib/plugins/aws/deploy/compile/events/apiGateway/tests/apiKeys.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/apiKeys.js index 94e7ce305..a3eb38556 100644 --- a/lib/plugins/aws/deploy/compile/events/apiGateway/tests/apiKeys.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/apiKeys.js @@ -19,42 +19,17 @@ describe('#compileApiKeys()', () => { Resources: {}, Outputs: {}, }; - serverless.service.environment = { - stages: { - dev: { - regions: { - 'us-east-1': { - vars: { - IamRoleLambdaExecution: - 'arn:aws:iam::12345678:role/service-dev-IamRoleLambdaExecution-FOO12345678', - }, - }, - }, - }, - }, - }; const options = { stage: 'dev', region: 'us-east-1', }; awsCompileApigEvents = new AwsCompileApigEvents(serverless, options); - awsCompileApigEvents.serverless.service.functions = { - first: { - events: [ - { - http: { - path: 'users/create', - method: 'POST', - private: true, - }, - }, - ], - }, - }; + awsCompileApigEvents.apiGatewayRestApiLogicalId = 'ApiGatewayRestApi'; + awsCompileApigEvents.apiGatewayDeploymentLogicalId = 'ApiGatewayDeploymentTest'; }); - it('should compile api key resource', () => awsCompileApigEvents - .compileApiKeys().then(() => { + it('should compile api key resource', () => + awsCompileApigEvents.compileApiKeys().then(() => { expect( awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate .Resources.ApiGatewayApiKey1.Type @@ -79,6 +54,11 @@ describe('#compileApiKeys()', () => { awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate .Resources.ApiGatewayApiKey1.Properties.StageKeys[0].StageName ).to.equal('dev'); + + expect( + awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate + .Resources.ApiGatewayApiKey1.DependsOn + ).to.equal('ApiGatewayDeploymentTest'); }) ); diff --git a/lib/plugins/aws/deploy/compile/events/apiGateway/tests/deployment.js b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/deployment.js index 1de943a7f..65ee42959 100644 --- a/lib/plugins/aws/deploy/compile/events/apiGateway/tests/deployment.js +++ b/lib/plugins/aws/deploy/compile/events/apiGateway/tests/deployment.js @@ -8,34 +8,6 @@ describe('#compileDeployment()', () => { let serverless; let awsCompileApigEvents; - const serviceResourcesAwsResourcesObjectMock = { - Resources: { - DeploymentApigEvent: { - Type: 'AWS::ApiGateway::Deployment', - DependsOn: ['method-dependency1', 'method-dependency2'], - Properties: { - RestApiId: { Ref: 'ApiGatewayRestApi' }, - StageName: 'dev', - }, - }, - }, - Outputs: { - ServiceEndpoint: { - Description: 'URL of the service endpoint', - Value: { - 'Fn::Join': [ - '', - [ - 'https://', - { Ref: 'ApiGatewayRestApi' }, - '.execute-api.us-east-1.amazonaws.com/dev', - ], - ], - }, - }, - }, - }; - beforeEach(() => { serverless = new Serverless(); serverless.service.provider.compiledCloudFormationTemplate = { @@ -47,32 +19,48 @@ describe('#compileDeployment()', () => { region: 'us-east-1', }; awsCompileApigEvents = new AwsCompileApigEvents(serverless, options); + awsCompileApigEvents.apiGatewayRestApiLogicalId = 'ApiGatewayRestApi'; awsCompileApigEvents.methodDependencies = ['method-dependency1', 'method-dependency2']; }); it('should create a deployment resource', () => awsCompileApigEvents .compileDeployment().then(() => { - const deploymentLogicalId = Object + const apiGatewayDeploymentLogicalId = Object .keys(awsCompileApigEvents.serverless.service.provider .compiledCloudFormationTemplate.Resources)[0]; expect( awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate - .Resources[deploymentLogicalId] - ).to.deep.equal( - serviceResourcesAwsResourcesObjectMock.Resources.DeploymentApigEvent - ); + .Resources[apiGatewayDeploymentLogicalId] + ).to.deep.equal({ + Type: 'AWS::ApiGateway::Deployment', + DependsOn: ['method-dependency1', 'method-dependency2'], + Properties: { + RestApiId: { Ref: awsCompileApigEvents.apiGatewayRestApiLogicalId }, + StageName: 'dev', + }, + }); }) ); - it('should add service endpoint output', () => awsCompileApigEvents - .compileDeployment().then(() => { + it('should add service endpoint output', () => + awsCompileApigEvents.compileDeployment().then(() => { expect( awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate .Outputs.ServiceEndpoint - ).to.deep.equal( - serviceResourcesAwsResourcesObjectMock.Outputs.ServiceEndpoint - ); + ).to.deep.equal({ + Description: 'URL of the service endpoint', + Value: { + 'Fn::Join': [ + '', + [ + 'https://', + { Ref: awsCompileApigEvents.apiGatewayRestApiLogicalId }, + '.execute-api.us-east-1.amazonaws.com/dev', + ], + ], + }, + }); }) ); }); diff --git a/lib/plugins/aws/deploy/compile/events/stream/index.js b/lib/plugins/aws/deploy/compile/events/stream/index.js index 7f4378a0f..07284e90f 100644 --- a/lib/plugins/aws/deploy/compile/events/stream/index.js +++ b/lib/plugins/aws/deploy/compile/events/stream/index.js @@ -85,7 +85,7 @@ class AwsCompileStreamEvents { // get the name of the stream (and remove any non-alphanumerics in it) const streamName = EventSourceArn.split('/')[1]; const normalizedStreamName = streamName[0].toUpperCase() - + streamName.substr(1).replace(/\W/g, ''); + + streamName.substr(1).replace(/[^A-Za-z0-9]/g, ''); // create type specific PolicyDocument statements let streamStatement = {}; diff --git a/lib/plugins/aws/deploy/compile/functions/index.js b/lib/plugins/aws/deploy/compile/functions/index.js index 51299ca2e..c88cdfb2a 100644 --- a/lib/plugins/aws/deploy/compile/functions/index.js +++ b/lib/plugins/aws/deploy/compile/functions/index.js @@ -26,7 +26,7 @@ class AwsCompileFunctions { this.serverless.service.package.artifact; if (!artifactFilePath) { - throw new Error(`No artifact path is set for function: ${functionName}`); + throw new Error(`No artifact path is set for function: "${functionName}"`); } if (this.serverless.service.package.deploymentBucket) { @@ -39,7 +39,7 @@ class AwsCompileFunctions { if (!functionObject.handler) { const errorMessage = [ - `Missing "handler" property in function ${functionName}`, + `Missing "handler" property in function ""${functionName}".`, ' Please make sure you point to the correct lambda handler.', ' For example: handler.hello.', ' Please check the docs for more info', diff --git a/lib/plugins/aws/deploy/compile/functions/tests/index.js b/lib/plugins/aws/deploy/compile/functions/tests/index.js index 2f5b4c921..36f989729 100644 --- a/lib/plugins/aws/deploy/compile/functions/tests/index.js +++ b/lib/plugins/aws/deploy/compile/functions/tests/index.js @@ -13,11 +13,11 @@ describe('AwsCompileFunctions', () => { const compiledFunctionName = 'TestLambdaFunction'; beforeEach(() => { - serverless = new Serverless(); const options = { stage: 'dev', region: 'us-east-1', }; + serverless = new Serverless(options); serverless.setProvider('aws', new AwsProvider(serverless)); awsCompileFunctions = new AwsCompileFunctions(serverless, options); awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate = { diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js index 7eb42f8b8..f8d50bba7 100644 --- a/lib/plugins/aws/deploy/index.js +++ b/lib/plugins/aws/deploy/index.js @@ -9,7 +9,7 @@ const generateArtifactDirectoryName = require('./lib/generateArtifactDirectoryNa const setBucketName = require('../lib/setBucketName'); const cleanupS3Bucket = require('./lib/cleanupS3Bucket'); const uploadArtifacts = require('./lib/uploadArtifacts'); -const updateStack = require('./lib/updateStack'); +const updateStack = require('../lib/updateStack'); const configureStack = require('./lib/configureStack'); const mergeIamTemplates = require('./lib/mergeIamTemplates'); @@ -51,9 +51,9 @@ class AwsDeploy { 'deploy:deploy': () => BbPromise.bind(this) .then(this.mergeCustomProviderResources) .then(this.setBucketName) - .then(this.cleanupS3Bucket) .then(this.uploadArtifacts) .then(this.updateStack) + .then(this.cleanupS3Bucket) .then(() => { if (this.options.noDeploy) this.serverless.cli.log('Did not deploy due to --noDeploy'); }), diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js index 00f7a6541..14a279bb6 100644 --- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js +++ b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js @@ -7,8 +7,7 @@ const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks'); module.exports = { getObjectsToRemove() { - // 4 old ones + the one which will be uploaded after the cleanup = 5 - const stacksToKeepCount = 4; + const stacksToKeepCount = 5; const service = this.serverless.service.service; const stage = this.options.stage; diff --git a/lib/plugins/aws/deploy/lib/configureStack.js b/lib/plugins/aws/deploy/lib/configureStack.js index 92edb8b53..48d024c0f 100644 --- a/lib/plugins/aws/deploy/lib/configureStack.js +++ b/lib/plugins/aws/deploy/lib/configureStack.js @@ -14,6 +14,7 @@ module.exports = { 'lib', 'core-cloudformation-template.json') ); + const bucketName = this.serverless.service.provider.deploymentBucket; if (bucketName) { diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js index 5ba5b12d0..6ef503e94 100644 --- a/lib/plugins/aws/deploy/lib/createStack.js +++ b/lib/plugins/aws/deploy/lib/createStack.js @@ -38,7 +38,7 @@ module.exports = { createStack() { const stackName = `${this.serverless.service.service}-${this.options.stage}`; - if (/^[^a-zA-Z].+|.*[^a-zA-Z0-9\-].*/.test(stackName) || stackName.length > 128) { + if (/^[^a-zA-Z].+|.*[^a-zA-Z0-9-].*/.test(stackName) || stackName.length > 128) { const errorMessage = [ `The stack service name "${stackName}" is not valid. `, 'A service name should only contain alphanumeric', diff --git a/lib/plugins/aws/deploy/lib/iam-policy-lambda-execution-template.json b/lib/plugins/aws/deploy/lib/iam-policy-lambda-execution-template.json index 49c566267..e59725e91 100644 --- a/lib/plugins/aws/deploy/lib/iam-policy-lambda-execution-template.json +++ b/lib/plugins/aws/deploy/lib/iam-policy-lambda-execution-template.json @@ -10,10 +10,16 @@ "Effect": "Allow", "Action": [ "logs:CreateLogGroup", - "logs:CreateLogStream", + "logs:CreateLogStream" + ], + "Resource": [] + }, + { + "Effect": "Allow", + "Action": [ "logs:PutLogEvents" ], - "Resource": "" + "Resource": [] } ] }, diff --git a/lib/plugins/aws/deploy/lib/mergeIamTemplates.js b/lib/plugins/aws/deploy/lib/mergeIamTemplates.js index e14067a31..cb2886370 100644 --- a/lib/plugins/aws/deploy/lib/mergeIamTemplates.js +++ b/lib/plugins/aws/deploy/lib/mergeIamTemplates.js @@ -6,6 +6,10 @@ const path = require('path'); module.exports = { mergeIamTemplates() { + if (!this.serverless.service.getAllFunctions().length) { + return BbPromise.resolve(); + } + if (typeof this.serverless.service.provider.iamRoleARN !== 'string') { // merge in the iamRoleLambdaTemplate const iamRoleLambdaExecutionTemplate = this.serverless.utils.readFileSync( @@ -36,16 +40,76 @@ module.exports = { .Properties .PolicyName = `${this.options.stage}-${this.serverless.service.service}-lambda`; - iamPolicyLambdaExecutionTemplate - .IamPolicyLambdaExecution - .Properties - .PolicyDocument - .Statement[0] - .Resource = `arn:aws:logs:${this.options.region}:*:*`; - _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, iamPolicyLambdaExecutionTemplate); + if (!this.serverless.service.provider.cfLogs) { + this.serverless.service.provider.compiledCloudFormationTemplate.Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[0] + .Resource = `arn:aws:logs:${this.options.region}:*:*`; + + this.serverless.service.provider.compiledCloudFormationTemplate.Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[1] + .Resource = `arn:aws:logs:${this.options.region}:*:*`; + + const warningMessage = [ + 'Deprecation Notice: Starting with the next update, ', + 'we will drop support for Lambda to implicitly create LogGroups. ', + 'Please remove your log groups and set "provider.cfLogs: true", ' + + 'for CloudFormation to explicitly create them for you.', + ].join(''); + this.serverless.cli.log(warningMessage); + } else { + this.serverless.service.getAllFunctions().forEach((functionName) => { + const functionObject = this.serverless.service.getFunction(functionName); + const normalizedFunctionName = functionName[0].toUpperCase() + functionName.substr(1); + const logGroupTemplate = ` + { + "${normalizedFunctionName}LogGroup": { + "Type" : "AWS::Logs::LogGroup", + "Properties" : { + "LogGroupName" : "/aws/lambda/${functionObject.name}" + } + } + } + `; + const newLogGroup = JSON.parse(logGroupTemplate); + _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, + newLogGroup); + + this.serverless.service.provider.compiledCloudFormationTemplate + .Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[0] + .Resource + .push({ 'Fn::GetAtt': [`${normalizedFunctionName}LogGroup`, 'Arn'] }); + + this.serverless.service.provider.compiledCloudFormationTemplate + .Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[1] + .Resource + .push({ + 'Fn::Join': [ + ':', + [ + { 'Fn::GetAtt': [`${normalizedFunctionName}LogGroup`, 'Arn'] }, + '*', + ], + ], + }); + }); + } // add custom iam role statements if (this.serverless.service.provider.iamRoleStatements && diff --git a/lib/plugins/aws/deploy/tests/all.js b/lib/plugins/aws/deploy/tests/all.js index b70b61a53..636d51c80 100644 --- a/lib/plugins/aws/deploy/tests/all.js +++ b/lib/plugins/aws/deploy/tests/all.js @@ -5,7 +5,6 @@ require('./generateArtifactDirectoryName'); require('./mergeCustomProviderResources'); require('./cleanupS3Bucket'); require('./uploadArtifacts'); -require('./updateStack'); require('./index'); require('./configureStack'); require('./mergeIamTemplates'); diff --git a/lib/plugins/aws/deploy/tests/configureStack.js b/lib/plugins/aws/deploy/tests/configureStack.js index 2d5efc668..be7b5e2fc 100644 --- a/lib/plugins/aws/deploy/tests/configureStack.js +++ b/lib/plugins/aws/deploy/tests/configureStack.js @@ -12,6 +12,7 @@ const configureStack = require('../lib/configureStack'); describe('#configureStack', () => { let serverless; const awsPlugin = {}; + const functionName = 'test'; beforeEach(() => { serverless = new Serverless(); @@ -21,7 +22,23 @@ describe('#configureStack', () => { stage: 'dev', region: 'us-east-1', }; + Object.assign(awsPlugin, configureStack, validate); + + awsPlugin.serverless.cli = new serverless.classes.CLI(); + + awsPlugin.serverless.service.provider.compiledCloudFormationTemplate = { + Resources: {}, + Outputs: {}, + }; + awsPlugin.serverless.service.service = 'new-service'; + awsPlugin.serverless.service.functions = { + [functionName]: { + name: 'test', + artifact: 'test.zip', + handler: 'handler.hello', + }, + }; }); it('should validate the region for the given S3 bucket', () => { diff --git a/lib/plugins/aws/deploy/tests/generateArtifactDirectoryName.js b/lib/plugins/aws/deploy/tests/generateArtifactDirectoryName.js index 9f7a096f5..f33facc00 100644 --- a/lib/plugins/aws/deploy/tests/generateArtifactDirectoryName.js +++ b/lib/plugins/aws/deploy/tests/generateArtifactDirectoryName.js @@ -20,7 +20,7 @@ describe('#generateArtifactDirectoryName()', () => { it('should generate a name for the artifact directory based on the current time', () => awsDeploy .generateArtifactDirectoryName().then(() => { - expect(awsDeploy.serverless.service.package.artifactDirectoryName).to.match(/[0-9]+\-.+/); + expect(awsDeploy.serverless.service.package.artifactDirectoryName).to.match(/[0-9]+-.+/); }) ); }); diff --git a/lib/plugins/aws/deploy/tests/index.js b/lib/plugins/aws/deploy/tests/index.js index ccae5ffdf..813e0e497 100644 --- a/lib/plugins/aws/deploy/tests/index.js +++ b/lib/plugins/aws/deploy/tests/index.js @@ -83,12 +83,12 @@ describe('AwsDeploy', () => { .to.be.equal(true); expect(setBucketNameStub.calledAfter(mergeCustomProviderResourcesStub)) .to.be.equal(true); - expect(cleanupS3BucketStub.calledAfter(setBucketNameStub)) - .to.be.equal(true); - expect(uploadArtifactsStub.calledAfter(cleanupS3BucketStub)) + expect(uploadArtifactsStub.calledAfter(setBucketNameStub)) .to.be.equal(true); expect(updateStackStub.calledAfter(uploadArtifactsStub)) .to.be.equal(true); + expect(cleanupS3BucketStub.calledAfter(updateStackStub)) + .to.be.equal(true); }); }); diff --git a/lib/plugins/aws/deploy/tests/mergeIamTemplates.js b/lib/plugins/aws/deploy/tests/mergeIamTemplates.js index 821114dc6..76b86c2d0 100644 --- a/lib/plugins/aws/deploy/tests/mergeIamTemplates.js +++ b/lib/plugins/aws/deploy/tests/mergeIamTemplates.js @@ -9,6 +9,7 @@ const AwsDeploy = require('../'); describe('#mergeIamTemplates()', () => { let awsDeploy; let serverless; + const functionName = 'test'; beforeEach(() => { serverless = new Serverless(); @@ -21,8 +22,28 @@ describe('#mergeIamTemplates()', () => { awsDeploy.serverless.service.provider.compiledCloudFormationTemplate = { Resources: {}, }; + awsDeploy.serverless.service.service = 'new-service'; + awsDeploy.serverless.service.functions = { + [functionName]: { + name: 'test', + artifact: 'test.zip', + handler: 'handler.hello', + }, + }; }); + it('should not merge there are no functions', () => { + awsDeploy.serverless.service.functions = {}; + + return awsDeploy.mergeIamTemplates() + .then(() => { + const resources = awsDeploy.serverless.service.provider + .compiledCloudFormationTemplate.Resources; + + expect(resources.IamRoleLambdaExecution).to.equal(undefined); + expect(resources.IamPolicyLambdaExecution).to.equal(undefined); + }); + }); it('should merge the IamRoleLambdaExecution template into the CloudFormation template', () => { const IamRoleLambdaExecutionTemplate = awsDeploy.serverless.utils.readFileSync( @@ -42,8 +63,8 @@ describe('#mergeIamTemplates()', () => { }); }); - it('should merge IamPolicyLambdaExecution template into the CloudFormation template', () => - awsDeploy.mergeIamTemplates() + it('should merge IamPolicyLambdaExecution template into the CloudFormation template', + () => awsDeploy.mergeIamTemplates() .then(() => { // we check for the type here because a deep equality check will error out due to // the updates which are made after the merge (they are tested in a separate test) @@ -53,8 +74,8 @@ describe('#mergeIamTemplates()', () => { }) ); - it('should update the necessary variables for the IamPolicyLambdaExecution', () => - awsDeploy.mergeIamTemplates() + it('should update the necessary variables for the IamPolicyLambdaExecution', + () => awsDeploy.mergeIamTemplates() .then(() => { expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate .Resources @@ -68,15 +89,6 @@ describe('#mergeIamTemplates()', () => { awsDeploy.serverless.service.service }-lambda` ); - - expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate - .Resources - .IamPolicyLambdaExecution - .Properties - .PolicyDocument - .Statement[0] - .Resource - ).to.equal(`arn:aws:logs:${awsDeploy.options.region}:*:*`); }) ); @@ -96,7 +108,7 @@ describe('#mergeIamTemplates()', () => { return awsDeploy.mergeIamTemplates() .then(() => { expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate - .Resources.IamPolicyLambdaExecution.Properties.PolicyDocument.Statement[1] + .Resources.IamPolicyLambdaExecution.Properties.PolicyDocument.Statement[2] ).to.deep.equal(awsDeploy.serverless.service.provider.iamRoleStatements[0]); }); }); @@ -121,4 +133,132 @@ describe('#mergeIamTemplates()', () => { .Resources.IamRoleLambdaExecution ).to.not.exist); }); + + it('should add a CloudWatch LogGroup resource', () => { + awsDeploy.serverless.service.provider.cfLogs = true; + const normalizedName = `${functionName[0].toUpperCase()}${functionName.substr(1)}LogGroup`; + return awsDeploy.mergeIamTemplates().then(() => { + expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate + .Resources[normalizedName] + ).to.deep.equal( + { + Type: 'AWS::Logs::LogGroup', + Properties: { + LogGroupName: `/aws/lambda/${functionName}`, + }, + } + ); + }); + }); + + it('should update IamPolicyLambdaExecution with a logging resource for the function', () => { + awsDeploy.serverless.service.provider.cfLogs = true; + awsDeploy.serverless.service.functions = { + func0: { + handler: 'func.function.handler', + name: 'func0', + }, + func1: { + handler: 'func.function.handler', + name: 'func1', + }, + }; + const f = awsDeploy.serverless.service.functions; + const normalizedNames = [ + `${f.func0.name[0].toUpperCase()}${f.func0.name.substr(1)}LogGroup`, + `${f.func1.name[0].toUpperCase()}${f.func1.name.substr(1)}LogGroup`, + ]; + return awsDeploy.mergeIamTemplates().then(() => { + expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate + .Resources[normalizedNames[0]] + ).to.deep.equal( + { + Type: 'AWS::Logs::LogGroup', + Properties: { + LogGroupName: `/aws/lambda/${f.func0.name}`, + }, + } + ); + expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate + .Resources[normalizedNames[1]] + ).to.deep.equal( + { + Type: 'AWS::Logs::LogGroup', + Properties: { + LogGroupName: `/aws/lambda/${f.func1.name}`, + }, + } + ); + }); + }); + + it('should update IamPolicyLambdaExecution with a logging resource for the function', () => { + awsDeploy.serverless.service.provider.cfLogs = true; + const normalizedName = `${functionName[0].toUpperCase()}${functionName.substr(1)}LogGroup`; + return awsDeploy.mergeIamTemplates().then(() => { + expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate + .Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[0] + .Resource + ).to.deep.equal([{ 'Fn::GetAtt': [normalizedName, 'Arn'] }]); + expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate + .Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[1] + .Resource + ).to.deep.equal([{ 'Fn::Join': [':', [{ 'Fn::GetAtt': [normalizedName, 'Arn'] }, '*']] }]); + }); + }); + + it('should update IamPolicyLambdaExecution with each function\'s logging resources', () => { + awsDeploy.serverless.service.provider.cfLogs = true; + awsDeploy.serverless.service.functions = { + func0: { + handler: 'func.function.handler', + name: 'func0', + }, + func1: { + handler: 'func.function.handler', + name: 'func1', + }, + }; + const f = awsDeploy.serverless.service.functions; // avoid 100 char lines below + const normalizedNames = [ + `${f.func0.name[0].toUpperCase()}${f.func0.name.substr(1)}LogGroup`, + `${f.func1.name[0].toUpperCase()}${f.func1.name.substr(1)}LogGroup`, + ]; + return awsDeploy.mergeIamTemplates().then(() => { + expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate + .Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[0] + .Resource + ).to.deep.equal( + [ + { 'Fn::GetAtt': [normalizedNames[0], 'Arn'] }, + { 'Fn::GetAtt': [normalizedNames[1], 'Arn'] }, + ] + ); + expect(awsDeploy.serverless.service.provider.compiledCloudFormationTemplate + .Resources + .IamPolicyLambdaExecution + .Properties + .PolicyDocument + .Statement[1] + .Resource + ).to.deep.equal( + [ + { 'Fn::Join': [':', [{ 'Fn::GetAtt': [normalizedNames[0], 'Arn'] }, '*']] }, + { 'Fn::Join': [':', [{ 'Fn::GetAtt': [normalizedNames[1], 'Arn'] }, '*']] }, + ] + ); + }); + }); }); diff --git a/lib/plugins/aws/deployFunction/index.js b/lib/plugins/aws/deployFunction/index.js index cb2b855f7..ab5998969 100644 --- a/lib/plugins/aws/deployFunction/index.js +++ b/lib/plugins/aws/deployFunction/index.js @@ -3,6 +3,7 @@ const BbPromise = require('bluebird'); const fs = require('fs'); const validate = require('../lib/validate'); +const filesize = require('filesize'); // The Package plugin which is used to zip the service const Package = require('../../package'); @@ -75,13 +76,9 @@ class AwsDeployFunction { // Get function stats const stats = fs.statSync(this.options.functionObj.artifact); - const fileSizeInBytes = stats.size; - const fileSizeInMegabytes = fileSizeInBytes / 1000000.0; this.serverless.cli.log( - [ - `Uploading function: ${this.options.function} `, - `(${Math.round(fileSizeInMegabytes * 100) / 100}MB)...`, - ].join('')); + `Uploading function: ${this.options.function} (${filesize(stats.size)})...` + ); // Perform upload return this.provider.request( diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitorStack.js index 3c3e49e8c..5abe55646 100644 --- a/lib/plugins/aws/lib/monitorStack.js +++ b/lib/plugins/aws/lib/monitorStack.js @@ -45,23 +45,24 @@ module.exports = { data.StackEvents.reverse().forEach((event) => { const eventInRange = (monitoredSince < event.Timestamp); const eventNotLogged = (loggedEvents.indexOf(event.EventId) === -1); - let eventStatus = event.ResourceStatus; + let eventStatus = event.ResourceStatus || null; if (eventInRange && eventNotLogged) { // Keep track of stack status if (event.ResourceType === 'AWS::CloudFormation::Stack') { stackStatus = eventStatus; } // Keep track of first failed event - if (eventStatus.endsWith('FAILED') && stackLatestError === null) { + if (eventStatus + && eventStatus.endsWith('FAILED') && stackLatestError === null) { stackLatestError = event; } // Log stack events if (this.options.verbose) { - if (eventStatus.endsWith('FAILED')) { + if (eventStatus && eventStatus.endsWith('FAILED')) { eventStatus = chalk.red(eventStatus); - } else if (eventStatus.endsWith('PROGRESS')) { + } else if (eventStatus && eventStatus.endsWith('PROGRESS')) { eventStatus = chalk.yellow(eventStatus); - } else if (eventStatus.endsWith('COMPLETE')) { + } else if (eventStatus && eventStatus.endsWith('COMPLETE')) { eventStatus = chalk.green(eventStatus); } let eventLog = `CloudFormation - ${eventStatus} - `; @@ -77,7 +78,9 @@ module.exports = { }); // Handle stack create/update/delete failures if ((stackLatestError && !this.options.verbose) - || (stackStatus.endsWith('ROLLBACK_COMPLETE') && this.options.verbose)) { + || (stackStatus + && stackStatus.endsWith('ROLLBACK_COMPLETE') + && this.options.verbose)) { this.serverless.cli.log('Deployment failed!'); let errorMessage = 'An error occurred while provisioning your stack: '; errorMessage += `${stackLatestError.LogicalResourceId} - `; diff --git a/lib/plugins/aws/deploy/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js similarity index 100% rename from lib/plugins/aws/deploy/lib/updateStack.js rename to lib/plugins/aws/lib/updateStack.js diff --git a/lib/plugins/aws/provider/awsProvider.js b/lib/plugins/aws/provider/awsProvider.js index 6b71d53f4..34613358f 100644 --- a/lib/plugins/aws/provider/awsProvider.js +++ b/lib/plugins/aws/provider/awsProvider.js @@ -79,7 +79,7 @@ class AwsProvider { this.serverless = serverless; this.sdk = AWS; this.provider = this; // only load plugin in an AWS service context - this.serverless.setProvider('aws', this); + this.serverless.setProvider(this.constructor.getProviderName(), this); // Use HTTPS Proxy (Optional) const proxy = process.env.proxy diff --git a/lib/plugins/aws/rollback/index.js b/lib/plugins/aws/rollback/index.js new file mode 100644 index 000000000..9df1c17d0 --- /dev/null +++ b/lib/plugins/aws/rollback/index.js @@ -0,0 +1,79 @@ +'use strict'; + +const _ = require('lodash'); +const BbPromise = require('bluebird'); +const validate = require('../lib/validate'); +const setBucketName = require('../lib/setBucketName'); +const updateStack = require('../lib/updateStack'); +const monitorStack = require('../lib/monitorStack'); +const findAndGroupDeployments = require('../utils/findAndGroupDeployments'); + +class AwsRollback { + constructor(serverless, options) { + this.serverless = serverless; + this.options = options; + this.provider = this.serverless.getProvider('aws'); + + Object.assign( + this, + validate, + setBucketName, + updateStack, + monitorStack + ); + + this.hooks = { + 'before:rollback:initialize': () => BbPromise.bind(this) + .then(this.validate), + 'rollback:rollback': () => BbPromise.bind(this) + .then(this.setBucketName) + .then(this.setStackToUpdate) + .then(this.updateStack), + }; + } + + setStackToUpdate() { + const service = this.serverless.service; + const serviceName = this.serverless.service.service; + const stage = this.options.stage; + const prefix = `serverless/${serviceName}/${stage}`; + + return this.provider.request('S3', + 'listObjectsV2', + { + Bucket: this.bucketName, + Prefix: prefix, + }, + this.options.stage, + this.options.region) + .then((response) => { + const deployments = findAndGroupDeployments(response, serviceName, stage); + + if (deployments.length === 0) { + const msg = 'Couldn\'t find any existing deployments.'; + const hint = 'Please verify that stage and region are correct.'; + return BbPromise.reject(`${msg} ${hint}`); + } + + const date = new Date(this.options.timestamp); + const dateString = `${date.getTime().toString()}-${date.toISOString()}`; + const exists = _.some(deployments, (deployment) => ( + _.some(deployment, { + directory: dateString, + file: 'compiled-cloudformation-template.json', + }) + )); + + if (!exists) { + const msg = `Couldn't find a deployment for the timestamp: ${this.options.timestamp}.`; + const hint = 'Please verify that the timestamp, stage and region are correct.'; + return BbPromise.reject(`${msg} ${hint}`); + } + + service.package.artifactDirectoryName = `${prefix}/${dateString}`; + return BbPromise.resolve(); + }); + } +} + +module.exports = AwsRollback; diff --git a/lib/plugins/aws/rollback/tests/rollback.js b/lib/plugins/aws/rollback/tests/rollback.js new file mode 100644 index 000000000..3b0607bb4 --- /dev/null +++ b/lib/plugins/aws/rollback/tests/rollback.js @@ -0,0 +1,167 @@ +'use strict'; + +const AwsProvider = require('../../provider/awsProvider'); +const AwsRollback = require('../index'); +const Serverless = require('../../../../Serverless'); +const expect = require('chai').expect; +const assert = require('chai').assert; +const BbPromise = require('bluebird'); +const sinon = require('sinon'); + +describe('AwsRollback', () => { + let awsRollback; + let s3Key; + + beforeEach(() => { + const serverless = new Serverless(); + const options = { + stage: 'dev', + region: 'us-east-1', + timestamp: 1476779096930, + }; + serverless.setProvider('aws', new AwsProvider(serverless)); + serverless.service.service = 'rollback'; + awsRollback = new AwsRollback(serverless, options); + awsRollback.serverless.cli = new serverless.classes.CLI(); + s3Key = `serverless/${serverless.service.service}/${options.stage}`; + }); + + describe('#constructor()', () => { + it('should have hooks', () => expect(awsRollback.hooks).to.be.not.empty); + + it('should set the provider variable to an instance of AwsProvider', () => + expect(awsRollback.provider).to.be.instanceof(AwsProvider)); + }); + + describe('hooks', () => { + it('should run "before:rollback:initialize" hook promise chain in order', () => { + const validateStub = sinon.stub(awsRollback, 'validate').returns(BbPromise.resolve()); + + return awsRollback.hooks['before:rollback:initialize']().then(() => { + expect(validateStub.calledOnce).to.be.equal(true); + }); + }); + + it('should run "rollback:rollback" promise chain in order', () => { + const setBucketNameStub = sinon + .stub(awsRollback, 'setBucketName').returns(BbPromise.resolve()); + const setStackToUpdateStub = sinon + .stub(awsRollback, 'setStackToUpdate').returns(BbPromise.resolve()); + const updateStackStub = sinon + .stub(awsRollback, 'updateStack').returns(BbPromise.resolve()); + + return awsRollback.hooks['rollback:rollback']().then(() => { + expect(setBucketNameStub.calledOnce) + .to.be.equal(true); + expect(setStackToUpdateStub.calledAfter(setBucketNameStub)) + .to.be.equal(true); + expect(updateStackStub.calledAfter(setStackToUpdateStub)) + .to.be.equal(true); + }); + }); + }); + + describe('#setStackToUpdate()', () => { + it('should reject in case no deployments are available', () => { + const s3Response = { + Contents: [], + }; + const listObjectsStub = sinon.stub(awsRollback.provider, 'request') + .returns(BbPromise.resolve(s3Response)); + + return awsRollback.setStackToUpdate() + .then(() => { + assert.isNotOk(true, 'setStackToUpdate should not resolve'); + }) + .catch((errorMessage) => { + expect(errorMessage).to.include('Couldn\'t find any existing deployments'); + expect(listObjectsStub.calledOnce).to.be.equal(true); + expect(listObjectsStub.calledWithExactly( + 'S3', + 'listObjectsV2', + { + Bucket: awsRollback.bucketName, + Prefix: `${s3Key}`, + }, + awsRollback.options.stage, + awsRollback.options.region + )).to.be.equal(true); + awsRollback.provider.request.restore(); + }); + }); + + it('should reject in case this specific deployments is not available', () => { + const s3Objects = [ + { + // eslint-disable-next-line max-len + Key: 'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json', + }, + { + Key: 'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/test.zip', + }, + ]; + const s3Response = { + Contents: s3Objects, + }; + + const listObjectsStub = sinon.stub(awsRollback.provider, 'request') + .returns(BbPromise.resolve(s3Response)); + + return awsRollback.setStackToUpdate() + .then(() => { + assert.isNotOk(true, 'setStackToUpdate should not resolve'); + }) + .catch((errorMessage) => { + expect(errorMessage).to.include('Couldn\'t find a deployment for the timestamp'); + expect(listObjectsStub.calledOnce).to.be.equal(true); + expect(listObjectsStub.calledWithExactly( + 'S3', + 'listObjectsV2', + { + Bucket: awsRollback.bucketName, + Prefix: `${s3Key}`, + }, + awsRollback.options.stage, + awsRollback.options.region + )).to.be.equal(true); + awsRollback.provider.request.restore(); + }); + }); + + it('should resolve set the artifactDirectoryName and resolve', () => { + const s3Objects = [ + { + // eslint-disable-next-line max-len + Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json', + }, + { + Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip', + }, + ]; + const s3Response = { + Contents: s3Objects, + }; + + const listObjectsStub = sinon.stub(awsRollback.provider, 'request') + .returns(BbPromise.resolve(s3Response)); + + return awsRollback.setStackToUpdate() + .then(() => { + expect(awsRollback.serverless.service.package.artifactDirectoryName) + .to.be.equal('serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z'); + expect(listObjectsStub.calledOnce).to.be.equal(true); + expect(listObjectsStub.calledWithExactly( + 'S3', + 'listObjectsV2', + { + Bucket: awsRollback.bucketName, + Prefix: `${s3Key}`, + }, + awsRollback.options.stage, + awsRollback.options.region + )).to.be.equal(true); + awsRollback.provider.request.restore(); + }); + }); + }); +}); diff --git a/lib/plugins/aws/tests/monitorStack.js b/lib/plugins/aws/tests/monitorStack.js index c820f27a9..4e1ce49cd 100644 --- a/lib/plugins/aws/tests/monitorStack.js +++ b/lib/plugins/aws/tests/monitorStack.js @@ -302,6 +302,63 @@ describe('monitorStack', () => { }); }); + it('should keep monitoring when 1st ResourceType is not "AWS::CloudFormation::Stack"', () => { + const describeStackEventsStub = sinon.stub(awsPlugin.provider, 'request'); + const cfDataMock = { + StackId: 'new-service-dev', + }; + const firstNoStackResourceTypeEvent = { + StackEvents: [ + { + EventId: '1a2b3c4d', + LogicalResourceId: 'somebucket', + ResourceType: 'AWS::S3::Bucket', + Timestamp: new Date(), + }, + ], + }; + const updateStartEvent = { + StackEvents: [ + { + EventId: '1a2b3c4d', + LogicalResourceId: 'mocha', + ResourceType: 'AWS::CloudFormation::Stack', + Timestamp: new Date(), + ResourceStatus: 'UPDATE_IN_PROGRESS', + }, + ], + }; + const updateComplete = { + StackEvents: [ + { + EventId: '1m2n3o4p', + LogicalResourceId: 'mocha', + ResourceType: 'AWS::CloudFormation::Stack', + Timestamp: new Date(), + ResourceStatus: 'UPDATE_COMPLETE', + }, + ], + }; + describeStackEventsStub.onCall(0).returns(BbPromise.resolve(firstNoStackResourceTypeEvent)); + describeStackEventsStub.onCall(1).returns(BbPromise.resolve(updateStartEvent)); + describeStackEventsStub.onCall(2).returns(BbPromise.resolve(updateComplete)); + + return awsPlugin.monitorStack('update', cfDataMock, 10).then(() => { + expect(describeStackEventsStub.callCount).to.be.equal(3); + expect(describeStackEventsStub.calledWithExactly( + 'CloudFormation', + 'describeStackEvents', + { + StackName: cfDataMock.StackId, + }, + awsPlugin.options.stage, + awsPlugin.options.region + )).to.be.equal(true); + awsPlugin.provider.request.restore(); + }); + }); + + it('should catch describeStackEvents error if stack was not in deleting state', () => { const describeStackEventsStub = sinon.stub(awsPlugin.provider, 'request'); const cfDataMock = { diff --git a/lib/plugins/aws/deploy/tests/updateStack.js b/lib/plugins/aws/tests/updateStack.js similarity index 97% rename from lib/plugins/aws/deploy/tests/updateStack.js rename to lib/plugins/aws/tests/updateStack.js index 30af4b656..73ad2a871 100644 --- a/lib/plugins/aws/deploy/tests/updateStack.js +++ b/lib/plugins/aws/tests/updateStack.js @@ -4,10 +4,10 @@ const expect = require('chai').expect; const sinon = require('sinon'); const path = require('path'); const BbPromise = require('bluebird'); -const AwsProvider = require('../../provider/awsProvider'); -const AwsDeploy = require('../index'); -const Serverless = require('../../../../Serverless'); -const testUtils = require('../../../../../tests/utils'); +const AwsProvider = require('../provider/awsProvider'); +const AwsDeploy = require('../deploy'); +const Serverless = require('../../../Serverless'); +const testUtils = require('../../../../tests/utils'); describe('updateStack', () => { let serverless; diff --git a/lib/plugins/create/templates/aws-python/handler.py b/lib/plugins/create/templates/aws-python/handler.py index ea831b279..d542b9c82 100644 --- a/lib/plugins/create/templates/aws-python/handler.py +++ b/lib/plugins/create/templates/aws-python/handler.py @@ -9,7 +9,7 @@ def hello(event, context): response = { "statusCode": 200, "body": json.dumps(body) - }; + } return response diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js index 9829ecd95..94973dc9b 100644 --- a/lib/plugins/package/lib/packageService.js +++ b/lib/plugins/package/lib/packageService.js @@ -18,7 +18,7 @@ module.exports = { const packageExcludes = this.serverless.service.package.exclude || []; // add defaults for exclude - return _.union(exclude, packageExcludes, this.defaultExcludes); + return _.union(this.defaultExcludes, packageExcludes, exclude); }, getServiceArtifactName() { diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js index c2977174c..0371221e8 100644 --- a/lib/plugins/package/lib/zipService.js +++ b/lib/plugins/package/lib/zipService.js @@ -4,11 +4,20 @@ const archiver = require('archiver'); const BbPromise = require('bluebird'); const path = require('path'); const fs = require('fs'); -const glob = require('glob'); +const glob = require('glob-all'); module.exports = { zipDirectory(servicePath, exclude, zipFileName) { - exclude.push('.serverless/**'); + const patterns = ['**']; + exclude.forEach((pattern) => { + if (pattern.charAt(0) !== '!') { + patterns.push(`!${pattern}`); + } else { + patterns.push(pattern.substring(1)); + } + }); + + patterns.push('!.serverless/**'); const zip = archiver.create('zip'); @@ -25,11 +34,11 @@ module.exports = { output.on('open', () => { zip.pipe(output); - const files = glob.sync('**', { + const files = glob.sync(patterns, { cwd: servicePath, - ignore: exclude, dot: true, silent: true, + follow: true, }); files.forEach((filePath) => { diff --git a/lib/plugins/package/tests/packageService.js b/lib/plugins/package/tests/packageService.js index ce34a45f0..3ba424249 100644 --- a/lib/plugins/package/tests/packageService.js +++ b/lib/plugins/package/tests/packageService.js @@ -32,11 +32,10 @@ describe('#packageService()', () => { const exclude = packageService.getExcludedPaths(); expect(exclude).to.deep.equal([ - 'dir', 'file.js', '.git', '.gitignore', '.DS_Store', 'npm-debug.log', 'serverless.yaml', 'serverless.yml', - '.serverless', + '.serverless', 'dir', 'file.js', ]); }); @@ -52,12 +51,11 @@ describe('#packageService()', () => { const exclude = packageService.getExcludedPaths(funcExclude); expect(exclude).to.deep.equal([ - 'lib', 'other.js', - 'dir', 'file.js', '.git', '.gitignore', '.DS_Store', 'npm-debug.log', 'serverless.yaml', 'serverless.yml', - '.serverless', + '.serverless', 'dir', 'file.js', + 'lib', 'other.js', ]); }); }); diff --git a/lib/plugins/package/tests/zipService.js b/lib/plugins/package/tests/zipService.js index a9714fb1e..30d77eecb 100644 --- a/lib/plugins/package/tests/zipService.js +++ b/lib/plugins/package/tests/zipService.js @@ -177,8 +177,9 @@ describe('#zipService()', () => { it('should exclude globs', () => { const exclude = [ - 'exclude-me*/**', 'node_modules/exclude-me/**', + 'exclude-me/**', + 'exclude-me.js', ]; const zipFileName = getTestArtifactFileName('re-include'); @@ -216,4 +217,50 @@ describe('#zipService()', () => { .to.equal('node_modules/include-me/include-aswell'); }); }); + + it('should re-include files using ! glob pattern', () => { + const exclude = [ + 'node_modules/exclude-me/**', + 'exclude-me/**', + '!include-me.js', + ]; + + const zipFileName = getTestArtifactFileName('re-include'); + + return packageService.zipDirectory(servicePath, exclude, zipFileName) + .then((artifact) => { + const data = fs.readFileSync(artifact); + + return zip.loadAsync(data); + }).then(unzippedData => { + const unzippedFileData = unzippedData.files; + + expect(Object.keys(unzippedFileData) + .filter(file => !unzippedFileData[file].dir).length).to.equal(10); + + expect(unzippedFileData['handler.js'].name) + .to.equal('handler.js'); + + expect(unzippedFileData['lib/function.js'].name) + .to.equal('lib/function.js'); + + expect(unzippedFileData['include-me.js'].name) + .to.equal('include-me.js'); + + expect(unzippedFileData['include-me/some-file'].name) + .to.equal('include-me/some-file'); + + expect(unzippedFileData['a-serverless-plugin.js'].name) + .to.equal('a-serverless-plugin.js'); + + expect(unzippedFileData['node_modules/include-me/include'].name) + .to.equal('node_modules/include-me/include'); + + expect(unzippedFileData['node_modules/include-me/include-aswell'].name) + .to.equal('node_modules/include-me/include-aswell'); + + expect(unzippedFileData['include-me.js'].name) + .to.equal('include-me.js'); + }); + }); }); diff --git a/lib/plugins/rollback/index.js b/lib/plugins/rollback/index.js new file mode 100644 index 000000000..d388d331c --- /dev/null +++ b/lib/plugins/rollback/index.js @@ -0,0 +1,30 @@ +'use strict'; + +class Rollback { + constructor(serverless) { + this.serverless = serverless; + + this.commands = { + rollback: { + usage: 'Rollback the Serverless service to a specific deployment', + lifecycleEvents: [ + 'initialize', + 'rollback', + ], + options: { + timestamp: { + usage: 'Timestamp of the deployment (list deployments with `serverless deploy list`)', + shortcut: 't', + required: true, + }, + verbose: { + usage: 'Show all stack events during deployment', + shortcut: 'v', + }, + }, + }, + }; + } +} + +module.exports = Rollback; diff --git a/lib/plugins/rollback/tests/rollback.js b/lib/plugins/rollback/tests/rollback.js new file mode 100644 index 000000000..3b72e617c --- /dev/null +++ b/lib/plugins/rollback/tests/rollback.js @@ -0,0 +1,34 @@ +'use strict'; + +const expect = require('chai').expect; +const Rollback = require('../index'); +const Serverless = require('../../../Serverless'); + +describe('Rollback', () => { + let rollback; + let serverless; + + beforeEach(() => { + serverless = new Serverless(); + rollback = new Rollback(serverless); + }); + + describe('#constructor()', () => { + it('should have the command rollback', () => { + // eslint-disable-next-line no-unused-expressions + expect(rollback.commands.rollback).to.not.be.undefined; + }); + + it('should have a lifecycle events initialize and rollback', () => { + expect(rollback.commands.rollback.lifecycleEvents).to.deep.equal([ + 'initialize', + 'rollback', + ]); + }); + + it('should have a required option timestamp', () => { + // eslint-disable-next-line no-unused-expressions + expect(rollback.commands.rollback.options.timestamp.required).to.be.true; + }); + }); +}); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2ef082b1e..2cb023181 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2,11 +2,58 @@ "name": "serverless", "version": "1.0.3", "dependencies": { + "abbrev": { + "version": "1.0.9", + "from": "abbrev@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" + }, + "acorn": { + "version": "4.0.3", + "from": "acorn@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz" + }, + "acorn-jsx": { + "version": "3.0.1", + "from": "acorn-jsx@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "dependencies": { + "acorn": { + "version": "3.3.0", + "from": "acorn@>=3.0.4 <4.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz" + } + } + }, "agent-base": { "version": "2.0.1", "from": "agent-base@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz" }, + "ajv": { + "version": "4.8.2", + "from": "ajv@>=4.7.0 <5.0.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.8.2.tgz" + }, + "ajv-keywords": { + "version": "1.1.1", + "from": "ajv-keywords@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz" + }, + "align-text": { + "version": "0.1.4", + "from": "align-text@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz" + }, + "amdefine": { + "version": "1.0.0", + "from": "amdefine@>=0.0.4", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz" + }, + "ansi-escapes": { + "version": "1.4.0", + "from": "ansi-escapes@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz" + }, "ansi-regex": { "version": "2.0.0", "from": "ansi-regex@>=2.0.0 <3.0.0", @@ -23,9 +70,9 @@ "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.1.0.tgz", "dependencies": { "async": { - "version": "2.0.1", + "version": "2.1.1", "from": "async@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/async/-/async-2.1.1.tgz" } } }, @@ -35,31 +82,69 @@ "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz" }, "argparse": { - "version": "1.0.7", + "version": "1.0.9", "from": "argparse@>=1.0.7 <2.0.0", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz" + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz" + }, + "array-union": { + "version": "1.0.2", + "from": "array-union@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz" + }, + "array-uniq": { + "version": "1.0.3", + "from": "array-uniq@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz" + }, + "arrify": { + "version": "1.0.1", + "from": "arrify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz" + }, + "asn1": { + "version": "0.2.3", + "from": "asn1@>=0.2.3 <0.3.0", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz" + }, + "assert-plus": { + "version": "0.2.0", + "from": "assert-plus@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz" + }, + "assertion-error": { + "version": "1.0.2", + "from": "assertion-error@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz" }, "async": { "version": "1.5.2", "from": "async@>=1.5.2 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" }, + "asynckit": { + "version": "0.4.0", + "from": "asynckit@>=0.4.0 <0.5.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" + }, "aws-sdk": { - "version": "2.6.7", - "from": "aws-sdk@2.6.7", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.6.7.tgz", - "dependencies": { - "base64-js": { - "version": "1.2.0", - "from": "base64-js@>=1.0.2 <2.0.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz" - }, - "buffer": { - "version": "4.9.1", - "from": "buffer@4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz" - } - } + "version": "2.6.8", + "from": "aws-sdk@>=2.3.17 <3.0.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.6.8.tgz" + }, + "aws-sign2": { + "version": "0.6.0", + "from": "aws-sign2@>=0.6.0 <0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz" + }, + "aws4": { + "version": "1.5.0", + "from": "aws4@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz" + }, + "babel-code-frame": { + "version": "6.16.0", + "from": "babel-code-frame@>=6.16.0 <7.0.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz" }, "balanced-match": { "version": "0.4.2", @@ -67,13 +152,18 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz" }, "base64-js": { - "version": "0.0.8", - "from": "base64-js@0.0.8", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" + "version": "1.2.0", + "from": "base64-js@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz" + }, + "bcrypt-pbkdf": { + "version": "1.0.0", + "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz" }, "bl": { "version": "1.1.2", - "from": "bl@>=1.1.2 <1.2.0", + "from": "bl@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", "dependencies": { "readable-stream": { @@ -85,18 +175,28 @@ }, "bluebird": { "version": "3.4.6", - "from": "bluebird@3.4.6", + "from": "bluebird@>=3.4.0 <4.0.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz" }, + "boom": { + "version": "2.10.1", + "from": "boom@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz" + }, "brace-expansion": { "version": "1.1.6", "from": "brace-expansion@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz" }, + "browser-stdout": { + "version": "1.3.0", + "from": "browser-stdout@1.3.0", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz" + }, "buffer": { - "version": "3.6.0", - "from": "buffer@>=3.0.1 <4.0.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz" + "version": "4.9.1", + "from": "buffer@4.9.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz" }, "buffer-crc32": { "version": "0.2.5", @@ -108,30 +208,102 @@ "from": "buffer-shims@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" }, + "builtin-modules": { + "version": "1.1.1", + "from": "builtin-modules@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz" + }, + "caller-id": { + "version": "0.1.0", + "from": "caller-id@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz" + }, + "caller-path": { + "version": "0.1.0", + "from": "caller-path@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz" + }, + "callsites": { + "version": "0.2.0", + "from": "callsites@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz" + }, + "camelcase": { + "version": "1.2.1", + "from": "camelcase@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" + }, "capture-stack-trace": { "version": "1.0.0", "from": "capture-stack-trace@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz" }, + "caseless": { + "version": "0.11.0", + "from": "caseless@>=0.11.0 <0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz" + }, "caw": { "version": "2.0.0", "from": "caw@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.0.tgz" }, + "center-align": { + "version": "0.1.3", + "from": "center-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz" + }, "chalk": { "version": "1.1.3", - "from": "chalk@>=1.1.0 <2.0.0", + "from": "chalk@>=1.1.1 <2.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" }, + "circular-json": { + "version": "0.3.1", + "from": "circular-json@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz" + }, + "cli-cursor": { + "version": "1.0.2", + "from": "cli-cursor@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz" + }, + "cli-width": { + "version": "2.1.0", + "from": "cli-width@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz" + }, + "cliui": { + "version": "2.1.0", + "from": "cliui@>=2.1.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz" + } + } + }, + "co": { + "version": "4.6.0", + "from": "co@>=4.6.0 <5.0.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz" + }, + "code-point-at": { + "version": "1.0.1", + "from": "code-point-at@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz" + }, "combined-stream": { "version": "1.0.5", "from": "combined-stream@>=1.0.5 <2.0.0", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz" }, "commander": { - "version": "2.9.0", - "from": "commander@>=2.9.0 <3.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz" + "version": "2.8.1", + "from": "commander@>=2.8.1 <2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz" }, "component-emitter": { "version": "1.2.1", @@ -148,11 +320,33 @@ "from": "concat-map@0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" }, + "concat-stream": { + "version": "1.5.2", + "from": "concat-stream@>=1.4.6 <2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz", + "dependencies": { + "readable-stream": { + "version": "2.0.6", + "from": "readable-stream@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz" + } + } + }, + "contains-path": { + "version": "0.1.0", + "from": "contains-path@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz" + }, "cookiejar": { "version": "2.0.6", "from": "cookiejar@2.0.6", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz" }, + "core-js": { + "version": "2.3.0", + "from": "core-js@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz" + }, "core-util-is": { "version": "1.0.2", "from": "core-util-is@>=1.0.0 <1.1.0", @@ -168,16 +362,48 @@ "from": "create-error-class@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz" }, + "cryptiles": { + "version": "2.0.5", + "from": "cryptiles@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz" + }, "crypto-browserify": { "version": "1.0.9", "from": "crypto-browserify@1.0.9", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz" }, + "d": { + "version": "0.1.1", + "from": "d@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz" + }, + "damerau-levenshtein": { + "version": "1.0.3", + "from": "damerau-levenshtein@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.3.tgz" + }, + "dashdash": { + "version": "1.14.0", + "from": "dashdash@>=1.12.0 <2.0.0", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, "debug": { "version": "2.2.0", - "from": "debug@>=2.2.0 <3.0.0", + "from": "debug@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" }, + "decamelize": { + "version": "1.2.0", + "from": "decamelize@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" + }, "decompress": { "version": "4.0.0", "from": "decompress@>=4.0.0 <5.0.0", @@ -203,16 +429,48 @@ "from": "decompress-unzip@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz" }, + "deep-eql": { + "version": "0.1.3", + "from": "deep-eql@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", + "dependencies": { + "type-detect": { + "version": "0.1.1", + "from": "type-detect@0.1.1", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz" + } + } + }, "deep-extend": { "version": "0.4.1", "from": "deep-extend@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz" }, + "deep-is": { + "version": "0.1.3", + "from": "deep-is@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz" + }, + "del": { + "version": "2.2.2", + "from": "del@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz" + }, "delayed-stream": { "version": "1.0.0", "from": "delayed-stream@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" }, + "diff": { + "version": "1.4.0", + "from": "diff@1.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz" + }, + "doctrine": { + "version": "1.5.0", + "from": "doctrine@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz" + }, "download": { "version": "5.0.2", "from": "download@>=5.0.2 <6.0.0", @@ -223,6 +481,11 @@ "from": "duplexer3@>=0.1.4 <0.2.0", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz" }, + "ecc-jsbn": { + "version": "0.1.1", + "from": "ecc-jsbn@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz" + }, "encoding": { "version": "0.1.12", "from": "encoding@>=0.1.11 <0.2.0", @@ -231,28 +494,149 @@ "end-of-stream": { "version": "1.1.0", "from": "end-of-stream@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz" + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz", + "dependencies": { + "once": { + "version": "1.3.3", + "from": "once@>=1.3.0 <1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" + } + } + }, + "es5-ext": { + "version": "0.10.12", + "from": "es5-ext@>=0.10.11 <0.11.0", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz" + }, + "es6-iterator": { + "version": "2.0.0", + "from": "es6-iterator@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz" + }, + "es6-map": { + "version": "0.1.4", + "from": "es6-map@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz" + }, + "es6-promise": { + "version": "3.0.2", + "from": "es6-promise@>=3.0.2 <3.1.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz" + }, + "es6-set": { + "version": "0.1.4", + "from": "es6-set@>=0.1.3 <0.2.0", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz" + }, + "es6-symbol": { + "version": "3.1.0", + "from": "es6-symbol@>=3.1.0 <3.2.0", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz" + }, + "es6-weak-map": { + "version": "2.0.1", + "from": "es6-weak-map@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz" }, "escape-string-regexp": { "version": "1.0.5", "from": "escape-string-regexp@>=1.0.2 <2.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" }, + "escodegen": { + "version": "1.8.1", + "from": "escodegen@>=1.8.0 <1.9.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "dependencies": { + "estraverse": { + "version": "1.9.3", + "from": "estraverse@>=1.9.1 <2.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz" + } + } + }, + "escope": { + "version": "3.6.0", + "from": "escope@>=3.6.0 <4.0.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz" + }, + "eslint-import-resolver-node": { + "version": "0.2.3", + "from": "eslint-import-resolver-node@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz" + }, + "espree": { + "version": "3.3.2", + "from": "espree@>=3.3.1 <4.0.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz" + }, "esprima": { "version": "2.7.3", "from": "esprima@>=2.6.0 <3.0.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz" }, + "esrecurse": { + "version": "4.1.0", + "from": "esrecurse@>=4.1.0 <5.0.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz", + "dependencies": { + "estraverse": { + "version": "4.1.1", + "from": "estraverse@>=4.1.0 <4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz" + } + } + }, + "estraverse": { + "version": "4.2.0", + "from": "estraverse@>=4.2.0 <5.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz" + }, + "esutils": { + "version": "2.0.2", + "from": "esutils@>=2.0.2 <3.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz" + }, + "event-emitter": { + "version": "0.3.4", + "from": "event-emitter@>=0.3.4 <0.4.0", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz" + }, + "exit-hook": { + "version": "1.1.1", + "from": "exit-hook@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz" + }, "extend": { "version": "3.0.0", "from": "extend@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz" }, + "extsprintf": { + "version": "1.0.2", + "from": "extsprintf@1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz" + }, + "fast-levenshtein": { + "version": "2.0.5", + "from": "fast-levenshtein@>=2.0.4 <2.1.0", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz" + }, "fd-slicer": { "version": "1.0.1", "from": "fd-slicer@>=1.0.1 <1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz" }, + "figures": { + "version": "1.7.0", + "from": "figures@>=1.3.5 <2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz" + }, + "file-entry-cache": { + "version": "2.0.0", + "from": "file-entry-cache@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz" + }, "file-type": { "version": "3.8.0", "from": "file-type@>=3.8.0 <4.0.0", @@ -268,11 +652,41 @@ "from": "filenamify@>=1.2.1 <2.0.0", "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz" }, + "filesize": { + "version": "3.3.0", + "from": "filesize@latest", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.3.0.tgz" + }, + "fill-keys": { + "version": "1.0.2", + "from": "fill-keys@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz" + }, + "find-up": { + "version": "1.1.2", + "from": "find-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz" + }, + "flat-cache": { + "version": "1.2.1", + "from": "flat-cache@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.1.tgz" + }, + "forever-agent": { + "version": "0.6.1", + "from": "forever-agent@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz" + }, "form-data": { "version": "1.0.0-rc3", "from": "form-data@1.0.0-rc3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz" }, + "formatio": { + "version": "1.1.1", + "from": "formatio@1.1.1", + "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz" + }, "formidable": { "version": "1.0.17", "from": "formidable@>=1.0.14 <1.1.0", @@ -280,7 +694,7 @@ }, "fs-extra": { "version": "0.26.7", - "from": "fs-extra@>=0.26.4 <0.27.0", + "from": "fs-extra@>=0.26.7 <0.27.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz" }, "fs.realpath": { @@ -288,6 +702,21 @@ "from": "fs.realpath@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" }, + "function-bind": { + "version": "1.1.0", + "from": "function-bind@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz" + }, + "generate-function": { + "version": "2.0.0", + "from": "generate-function@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz" + }, + "generate-object-property": { + "version": "1.2.0", + "from": "generate-object-property@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz" + }, "get-proxy": { "version": "1.1.0", "from": "get-proxy@>=1.0.1 <2.0.0", @@ -303,10 +732,37 @@ "from": "get-stream@>=2.2.0 <3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz" }, + "getpass": { + "version": "0.1.6", + "from": "getpass@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, "glob": { - "version": "7.1.0", - "from": "glob@7.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz" + "version": "7.1.1", + "from": "glob@>=7.0.0 <8.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz" + }, + "glob-all": { + "version": "3.1.0", + "from": "glob-all@>=3.1.0 <4.0.0", + "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.1.0.tgz" + }, + "globals": { + "version": "9.12.0", + "from": "globals@>=9.2.0 <10.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz" + }, + "globby": { + "version": "5.0.0", + "from": "globby@>=5.0.0 <6.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz" }, "got": { "version": "6.5.0", @@ -314,20 +770,67 @@ "resolved": "https://registry.npmjs.org/got/-/got-6.5.0.tgz" }, "graceful-fs": { - "version": "4.1.6", + "version": "4.1.9", "from": "graceful-fs@>=4.1.0 <5.0.0", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz" + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz" }, "graceful-readlink": { "version": "1.0.1", "from": "graceful-readlink@>=1.0.0", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz" }, + "growl": { + "version": "1.9.2", + "from": "growl@1.9.2", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz" + }, + "handlebars": { + "version": "4.0.5", + "from": "handlebars@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz", + "dependencies": { + "source-map": { + "version": "0.4.4", + "from": "source-map@>=0.4.4 <0.5.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz" + } + } + }, + "har-validator": { + "version": "2.0.6", + "from": "har-validator@>=2.0.2 <2.1.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz" + }, + "has": { + "version": "1.0.1", + "from": "has@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz" + }, "has-ansi": { "version": "2.0.0", "from": "has-ansi@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" }, + "has-flag": { + "version": "1.0.0", + "from": "has-flag@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz" + }, + "hawk": { + "version": "3.1.3", + "from": "hawk@>=3.1.0 <3.2.0", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz" + }, + "hoek": { + "version": "2.16.3", + "from": "hoek@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" + }, + "http-signature": { + "version": "1.1.1", + "from": "http-signature@>=1.1.0 <1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz" + }, "https-proxy-agent": { "version": "1.0.0", "from": "https-proxy-agent@>=1.0.0 <2.0.0", @@ -339,35 +842,100 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" }, "ieee754": { - "version": "1.1.6", + "version": "1.1.8", "from": "ieee754@>=1.1.4 <2.0.0", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz" + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz" + }, + "ignore": { + "version": "3.2.0", + "from": "ignore@>=3.1.5 <4.0.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz" + }, + "immediate": { + "version": "3.0.6", + "from": "immediate@>=3.0.5 <3.1.0", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz" + }, + "imurmurhash": { + "version": "0.1.4", + "from": "imurmurhash@>=0.1.4 <0.2.0", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" }, "inflight": { - "version": "1.0.5", + "version": "1.0.6", "from": "inflight@>=1.0.4 <2.0.0", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz" + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" }, "inherits": { - "version": "2.0.1", + "version": "2.0.3", "from": "inherits@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" }, "ini": { "version": "1.3.4", "from": "ini@>=1.3.0 <1.4.0", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz" }, + "inquirer": { + "version": "0.12.0", + "from": "inquirer@>=0.12.0 <0.13.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz" + }, + "interpret": { + "version": "1.0.1", + "from": "interpret@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz" + }, "is-absolute": { "version": "0.1.7", "from": "is-absolute@>=0.1.5 <0.2.0", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz" }, + "is-buffer": { + "version": "1.1.4", + "from": "is-buffer@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" + }, + "is-my-json-valid": { + "version": "2.15.0", + "from": "is-my-json-valid@>=2.12.4 <3.0.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz" + }, "is-natural-number": { "version": "2.1.1", "from": "is-natural-number@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz" }, + "is-object": { + "version": "1.0.1", + "from": "is-object@>=1.0.1 <1.1.0", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz" + }, + "is-path-cwd": { + "version": "1.0.0", + "from": "is-path-cwd@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz" + }, + "is-path-in-cwd": { + "version": "1.0.0", + "from": "is-path-in-cwd@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz" + }, + "is-path-inside": { + "version": "1.0.0", + "from": "is-path-inside@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz" + }, + "is-property": { + "version": "1.0.2", + "from": "is-property@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz" + }, "is-redirect": { "version": "1.0.0", "from": "is-redirect@>=1.0.0 <2.0.0", @@ -378,6 +946,11 @@ "from": "is-relative@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz" }, + "is-resolvable": { + "version": "1.0.0", + "from": "is-resolvable@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz" + }, "is-retry-allowed": { "version": "1.1.0", "from": "is-retry-allowed@>=1.0.0 <2.0.0", @@ -385,54 +958,241 @@ }, "is-stream": { "version": "1.1.0", - "from": "is-stream@>=1.0.1 <2.0.0", + "from": "is-stream@>=1.1.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" }, + "is-typedarray": { + "version": "1.0.0", + "from": "is-typedarray@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz" + }, "isarray": { "version": "1.0.0", "from": "isarray@>=1.0.0 <1.1.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, + "isexe": { + "version": "1.1.2", + "from": "isexe@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz" + }, + "isstream": { + "version": "0.1.2", + "from": "isstream@>=0.1.2 <0.2.0", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" + }, "jmespath": { "version": "0.15.0", "from": "jmespath@0.15.0", "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz" }, + "jodid25519": { + "version": "1.0.2", + "from": "jodid25519@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz" + }, + "js-tokens": { + "version": "2.0.0", + "from": "js-tokens@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + }, "js-yaml": { "version": "3.6.1", - "from": "js-yaml@>=3.5.5 <4.0.0", + "from": "js-yaml@>=3.6.1 <4.0.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz" }, + "jsbn": { + "version": "0.1.0", + "from": "jsbn@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz" + }, "json-refs": { "version": "2.1.6", "from": "json-refs@>=2.1.5 <3.0.0", - "resolved": "https://registry.npmjs.org/json-refs/-/json-refs-2.1.6.tgz" + "resolved": "https://registry.npmjs.org/json-refs/-/json-refs-2.1.6.tgz", + "dependencies": { + "commander": { + "version": "2.9.0", + "from": "commander@>=2.9.0 <3.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz" + } + } + }, + "json-schema": { + "version": "0.2.3", + "from": "json-schema@0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz" + }, + "json-stable-stringify": { + "version": "1.0.1", + "from": "json-stable-stringify@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz" + }, + "json-stringify-safe": { + "version": "5.0.1", + "from": "json-stringify-safe@>=5.0.1 <5.1.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" + }, + "json3": { + "version": "3.3.2", + "from": "json3@3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz" }, "jsonfile": { - "version": "2.3.1", + "version": "2.4.0", "from": "jsonfile@>=2.1.0 <3.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz" + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz" + }, + "jsonify": { + "version": "0.0.0", + "from": "jsonify@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz" + }, + "jsonpointer": { + "version": "4.0.0", + "from": "jsonpointer@>=4.0.0 <5.0.0", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz" + }, + "jsprim": { + "version": "1.3.1", + "from": "jsprim@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz" + }, + "jsx-ast-utils": { + "version": "1.3.3", + "from": "jsx-ast-utils@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.3.3.tgz" + }, + "kind-of": { + "version": "3.0.4", + "from": "kind-of@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz" }, "klaw": { "version": "1.3.0", "from": "klaw@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.0.tgz" }, + "lazy-cache": { + "version": "1.0.4", + "from": "lazy-cache@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz" + }, "lazystream": { "version": "1.0.0", "from": "lazystream@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz" }, + "lcov-parse": { + "version": "0.0.10", + "from": "lcov-parse@0.0.10", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz" + }, + "levn": { + "version": "0.3.0", + "from": "levn@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz" + }, + "lie": { + "version": "3.1.0", + "from": "lie@>=3.1.0 <3.2.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.0.tgz" + }, "lodash": { "version": "4.16.4", - "from": "lodash@4.16.4", + "from": "lodash@>=4.13.1 <5.0.0", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz" }, + "lodash._baseassign": { + "version": "3.2.0", + "from": "lodash._baseassign@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz" + }, + "lodash._basecopy": { + "version": "3.0.1", + "from": "lodash._basecopy@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz" + }, + "lodash._basecreate": { + "version": "3.0.3", + "from": "lodash._basecreate@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz" + }, + "lodash._getnative": { + "version": "3.9.1", + "from": "lodash._getnative@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz" + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "from": "lodash._isiterateecall@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz" + }, + "lodash.cond": { + "version": "4.5.2", + "from": "lodash.cond@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz" + }, + "lodash.create": { + "version": "3.1.1", + "from": "lodash.create@3.1.1", + "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz" + }, + "lodash.endswith": { + "version": "4.2.1", + "from": "lodash.endswith@>=4.0.1 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz" + }, + "lodash.find": { + "version": "4.6.0", + "from": "lodash.find@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz" + }, + "lodash.findindex": { + "version": "4.6.0", + "from": "lodash.findindex@>=4.3.0 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash.findindex/-/lodash.findindex-4.6.0.tgz" + }, + "lodash.isarguments": { + "version": "3.1.0", + "from": "lodash.isarguments@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz" + }, + "lodash.isarray": { + "version": "3.0.4", + "from": "lodash.isarray@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz" + }, + "lodash.keys": { + "version": "3.1.2", + "from": "lodash.keys@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz" + }, + "log-driver": { + "version": "1.2.5", + "from": "log-driver@1.2.5", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz" + }, + "lolex": { + "version": "1.3.2", + "from": "lolex@1.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz" + }, + "longest": { + "version": "1.0.1", + "from": "longest@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz" + }, "lowercase-keys": { "version": "1.0.0", "from": "lowercase-keys@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz" }, + "merge-descriptors": { + "version": "1.0.1", + "from": "merge-descriptors@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz" + }, "methods": { "version": "1.1.2", "from": "methods@>=1.1.1 <1.2.0", @@ -444,14 +1204,14 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" }, "mime-db": { - "version": "1.23.0", - "from": "mime-db@>=1.23.0 <1.24.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz" + "version": "1.24.0", + "from": "mime-db@>=1.24.0 <1.25.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz" }, "mime-types": { - "version": "2.1.11", + "version": "2.1.12", "from": "mime-types@>=2.1.3 <3.0.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz" + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz" }, "minimatch": { "version": "3.0.3", @@ -465,7 +1225,7 @@ }, "mkdirp": { "version": "0.5.1", - "from": "mkdirp@>=0.5.0 <0.6.0", + "from": "mkdirp@>=0.5.1 <0.6.0", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "dependencies": { "minimist": { @@ -475,9 +1235,14 @@ } } }, + "module-not-found-error": { + "version": "1.0.1", + "from": "module-not-found-error@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz" + }, "moment": { "version": "2.15.1", - "from": "moment@2.15.1", + "from": "moment@>=2.13.0 <3.0.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.15.1.tgz" }, "ms": { @@ -485,40 +1250,117 @@ "from": "ms@0.7.1", "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" }, + "mute-stream": { + "version": "0.0.5", + "from": "mute-stream@0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz" + }, "native-promise-only": { "version": "0.8.1", "from": "native-promise-only@>=0.8.1 <0.9.0", "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz" }, + "natural-compare": { + "version": "1.4.0", + "from": "natural-compare@>=1.4.0 <2.0.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" + }, "node-fetch": { "version": "1.6.3", - "from": "node-fetch@1.6.3", + "from": "node-fetch@>=1.5.3 <2.0.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz" }, "node-status-codes": { - "version": "2.0.0", + "version": "2.0.1", "from": "node-status-codes@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz" + }, + "node-uuid": { + "version": "1.4.7", + "from": "node-uuid@>=1.4.2 <2.0.0", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" + }, + "nopt": { + "version": "3.0.6", + "from": "nopt@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz" }, "normalize-path": { "version": "2.0.1", "from": "normalize-path@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz" }, + "number-is-nan": { + "version": "1.0.1", + "from": "number-is-nan@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" + }, + "oauth-sign": { + "version": "0.8.2", + "from": "oauth-sign@>=0.8.0 <0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz" + }, "object-assign": { "version": "4.1.0", "from": "object-assign@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" }, "once": { - "version": "1.3.3", + "version": "1.4.0", "from": "once@>=1.3.0 <2.0.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz" + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz" + }, + "onetime": { + "version": "1.1.0", + "from": "onetime@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz" + }, + "optimist": { + "version": "0.6.1", + "from": "optimist@>=0.6.1 <0.7.0", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "dependencies": { + "minimist": { + "version": "0.0.10", + "from": "minimist@>=0.0.1 <0.1.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" + }, + "wordwrap": { + "version": "0.0.3", + "from": "wordwrap@>=0.0.2 <0.1.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz" + } + } + }, + "optionator": { + "version": "0.8.2", + "from": "optionator@>=0.8.2 <0.9.0", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz" + }, + "os-homedir": { + "version": "1.0.2", + "from": "os-homedir@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz" + }, + "pako": { + "version": "1.0.3", + "from": "pako@>=1.0.2 <1.1.0", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.3.tgz" + }, + "path-exists": { + "version": "2.1.0", + "from": "path-exists@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz" }, "path-is-absolute": { - "version": "1.0.0", + "version": "1.0.1", "from": "path-is-absolute@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" + }, + "path-is-inside": { + "version": "1.0.2", + "from": "path-is-inside@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz" }, "path-loader": { "version": "1.0.1", @@ -532,7 +1374,7 @@ }, "pify": { "version": "2.3.0", - "from": "pify@>=2.0.0 <3.0.0", + "from": "pify@>=2.3.0 <3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" }, "pinkie": { @@ -545,6 +1387,26 @@ "from": "pinkie-promise@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz" }, + "pkg-dir": { + "version": "1.0.0", + "from": "pkg-dir@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz" + }, + "pkg-up": { + "version": "1.0.0", + "from": "pkg-up@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz" + }, + "pluralize": { + "version": "1.2.1", + "from": "pluralize@>=1.2.1 <2.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz" + }, + "prelude-ls": { + "version": "1.1.2", + "from": "prelude-ls@>=1.1.2 <1.2.0", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz" + }, "prepend-http": { "version": "1.0.4", "from": "prepend-http@>=1.0.1 <2.0.0", @@ -555,6 +1417,11 @@ "from": "process-nextick-args@>=1.0.6 <1.1.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz" }, + "progress": { + "version": "1.1.8", + "from": "progress@>=1.1.8 <2.0.0", + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz" + }, "punycode": { "version": "1.3.2", "from": "punycode@1.3.2", @@ -580,21 +1447,93 @@ "from": "readable-stream@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz" }, + "readline2": { + "version": "1.0.1", + "from": "readline2@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz" + }, + "rechoir": { + "version": "0.6.2", + "from": "rechoir@>=0.6.2 <0.7.0", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz" + }, "reduce-component": { "version": "1.0.1", "from": "reduce-component@1.0.1", "resolved": "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz" }, + "repeat-string": { + "version": "1.6.1", + "from": "repeat-string@>=1.5.2 <2.0.0", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" + }, "replaceall": { "version": "0.1.6", "from": "replaceall@>=0.1.6 <0.2.0", "resolved": "https://registry.npmjs.org/replaceall/-/replaceall-0.1.6.tgz" }, + "request": { + "version": "2.75.0", + "from": "request@2.75.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz", + "dependencies": { + "form-data": { + "version": "2.0.0", + "from": "form-data@>=2.0.0 <2.1.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz" + }, + "qs": { + "version": "6.2.1", + "from": "qs@>=6.2.0 <6.3.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz" + } + } + }, + "require-uncached": { + "version": "1.0.2", + "from": "require-uncached@>=1.0.2 <2.0.0", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz" + }, + "resolve": { + "version": "1.1.7", + "from": "resolve@>=1.1.6 <2.0.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz" + }, + "resolve-from": { + "version": "1.0.1", + "from": "resolve-from@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz" + }, + "restore-cursor": { + "version": "1.0.1", + "from": "restore-cursor@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz" + }, + "right-align": { + "version": "0.1.3", + "from": "right-align@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz" + }, "rimraf": { "version": "2.5.4", "from": "rimraf@>=2.2.8 <3.0.0", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz" }, + "run-async": { + "version": "0.1.0", + "from": "run-async@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz" + }, + "rx-lite": { + "version": "3.1.2", + "from": "rx-lite@>=3.1.2 <4.0.0", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz" + }, + "samsam": { + "version": "1.1.2", + "from": "samsam@1.1.2", + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz" + }, "sax": { "version": "1.1.5", "from": "sax@1.1.5", @@ -603,14 +1542,7 @@ "seek-bzip": { "version": "1.0.5", "from": "seek-bzip@>=1.0.5 <2.0.0", - "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", - "dependencies": { - "commander": { - "version": "2.8.1", - "from": "commander@>=2.8.1 <2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz" - } - } + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz" }, "semver": { "version": "5.0.3", @@ -619,7 +1551,7 @@ }, "semver-regex": { "version": "1.0.0", - "from": "semver-regex@latest", + "from": "semver-regex@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz" }, "shelljs": { @@ -632,21 +1564,68 @@ "from": "slash@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz" }, + "slice-ansi": { + "version": "0.0.4", + "from": "slice-ansi@0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz" + }, + "sntp": { + "version": "1.0.9", + "from": "sntp@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz" + }, + "source-map": { + "version": "0.2.0", + "from": "source-map@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz" + }, "sprintf-js": { "version": "1.0.3", "from": "sprintf-js@>=1.0.2 <1.1.0", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" }, + "sshpk": { + "version": "1.10.1", + "from": "sshpk@>=1.7.0 <2.0.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz", + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "from": "assert-plus@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz" + } + } + }, + "stack-trace": { + "version": "0.0.9", + "from": "stack-trace@>=0.0.0 <0.1.0", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz" + }, + "string-width": { + "version": "1.0.2", + "from": "string-width@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz" + }, "string_decoder": { "version": "0.10.31", "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, + "stringstream": { + "version": "0.0.5", + "from": "stringstream@>=0.0.4 <0.1.0", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" + }, "strip-ansi": { "version": "3.0.1", "from": "strip-ansi@>=3.0.0 <4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" }, + "strip-bom": { + "version": "3.0.0", + "from": "strip-bom@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" + }, "strip-dirs": { "version": "1.1.1", "from": "strip-dirs@>=1.1.1 <2.0.0", @@ -654,7 +1633,7 @@ }, "strip-json-comments": { "version": "1.0.4", - "from": "strip-json-comments@>=1.0.1 <1.1.0", + "from": "strip-json-comments@>=1.0.4 <1.1.0", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" }, "strip-outer": { @@ -672,15 +1651,15 @@ "from": "superagent@>=1.6.1 <2.0.0", "resolved": "https://registry.npmjs.org/superagent/-/superagent-1.8.4.tgz", "dependencies": { - "isarray": { - "version": "0.0.1", - "from": "isarray@0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, "readable-stream": { "version": "1.0.27-1", "from": "readable-stream@1.0.27-1", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz" + }, + "isarray": { + "version": "0.0.1", + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" } } }, @@ -689,11 +1668,33 @@ "from": "supports-color@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" }, + "table": { + "version": "3.8.3", + "from": "table@>=3.7.8 <4.0.0", + "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", + "dependencies": { + "string-width": { + "version": "2.0.0", + "from": "string-width@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "from": "is-fullwidth-code-point@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz" + } + } + }, "tar-stream": { "version": "1.5.2", "from": "tar-stream@>=1.5.0 <2.0.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz" }, + "text-table": { + "version": "0.2.0", + "from": "text-table@>=0.2.0 <0.3.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" + }, "through": { "version": "2.3.8", "from": "through@>=2.3.6 <3.0.0", @@ -704,6 +1705,18 @@ "from": "timed-out@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz" }, + "tough-cookie": { + "version": "2.3.2", + "from": "tough-cookie@>=2.3.0 <2.4.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "dependencies": { + "punycode": { + "version": "1.4.1", + "from": "punycode@>=1.4.1 <2.0.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz" + } + } + }, "traverse": { "version": "0.6.6", "from": "traverse@>=0.6.6 <0.7.0", @@ -714,15 +1727,74 @@ "from": "trim-repeated@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz" }, + "tryit": { + "version": "1.0.3", + "from": "tryit@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz" + }, "tunnel-agent": { "version": "0.4.3", - "from": "tunnel-agent@>=0.4.1 <0.5.0", + "from": "tunnel-agent@>=0.4.0 <0.5.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz" }, + "tweetnacl": { + "version": "0.14.3", + "from": "tweetnacl@>=0.14.0 <0.15.0", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz" + }, + "type-check": { + "version": "0.3.2", + "from": "type-check@>=0.3.2 <0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz" + }, + "type-detect": { + "version": "1.0.0", + "from": "type-detect@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz" + }, + "typedarray": { + "version": "0.0.6", + "from": "typedarray@>=0.0.5 <0.1.0", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" + }, + "uglify-js": { + "version": "2.7.4", + "from": "uglify-js@>=2.6.0 <3.0.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz", + "dependencies": { + "async": { + "version": "0.2.10", + "from": "async@>=0.2.6 <0.3.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz" + }, + "source-map": { + "version": "0.5.6", + "from": "source-map@>=0.5.1 <0.6.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "from": "uglify-to-browserify@>=1.0.0 <1.1.0", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz" + }, "unbzip2-stream": { "version": "1.0.10", "from": "unbzip2-stream@>=1.0.9 <2.0.0", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.0.10.tgz" + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.0.10.tgz", + "dependencies": { + "base64-js": { + "version": "0.0.8", + "from": "base64-js@0.0.8", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" + }, + "buffer": { + "version": "3.6.0", + "from": "buffer@>=3.0.1 <4.0.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz" + } + } }, "unzip-response": { "version": "2.0.1", @@ -744,6 +1816,16 @@ "from": "url-parse-lax@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz" }, + "user-home": { + "version": "2.0.0", + "from": "user-home@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz" + }, + "util": { + "version": "0.10.3", + "from": "util@>=0.10.3 <1.0.0", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz" + }, "util-deprecate": { "version": "1.0.2", "from": "util-deprecate@>=1.0.1 <1.1.0", @@ -751,14 +1833,39 @@ }, "uuid": { "version": "2.0.3", - "from": "uuid@2.0.3", + "from": "uuid@>=2.0.2 <3.0.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz" }, + "verror": { + "version": "1.3.6", + "from": "verror@1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz" + }, + "which": { + "version": "1.2.11", + "from": "which@>=1.1.1 <2.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.11.tgz" + }, + "window-size": { + "version": "0.1.0", + "from": "window-size@0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz" + }, + "wordwrap": { + "version": "1.0.0", + "from": "wordwrap@>=0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz" + }, "wrappy": { "version": "1.0.2", "from": "wrappy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" }, + "write": { + "version": "0.2.1", + "from": "write@>=0.2.1 <0.3.0", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz" + }, "xml2js": { "version": "0.4.15", "from": "xml2js@0.4.15", @@ -781,6 +1888,18 @@ "from": "xtend@>=4.0.0 <5.0.0", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" }, + "yargs": { + "version": "1.2.6", + "from": "yargs@>=1.2.6 <1.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz", + "dependencies": { + "minimist": { + "version": "0.1.0", + "from": "minimist@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz" + } + } + }, "yauzl": { "version": "2.6.0", "from": "yauzl@>=2.4.2 <3.0.0", diff --git a/package.json b/package.json index e38998145..6da540bea 100644 --- a/package.json +++ b/package.json @@ -76,8 +76,9 @@ "bluebird": "^3.4.0", "chalk": "^1.1.1", "download": "^5.0.2", + "filesize": "^3.3.0", "fs-extra": "^0.26.7", - "glob": "^7.0.6", + "glob-all": "^3.1.0", "https-proxy-agent": "^1.0.0", "js-yaml": "^3.6.1", "json-refs": "^2.1.5", diff --git a/tests/all.js b/tests/all.js index 4475bb911..c08d4ac8c 100644 --- a/tests/all.js +++ b/tests/all.js @@ -20,6 +20,7 @@ require('../lib/plugins/logs/tests/logs'); require('../lib/plugins/remove/tests/remove'); require('../lib/plugins/package/tests/all'); require('../lib/plugins/slstats/tests/slstats'); +require('../lib/plugins/rollback/tests/rollback'); // AWS Plugins Tests require('../lib/plugins/aws/provider/awsProvider.test'); @@ -28,6 +29,7 @@ require('../lib/plugins/aws/tests/monitorStack'); require('../lib/plugins/aws/tests/setBucketName'); require('../lib/plugins/aws/tests/findAndGroupDeployments'); require('../lib/plugins/aws/tests/getS3ObjectsFromStacks'); +require('../lib/plugins/aws/tests/updateStack'); require('../lib/plugins/aws/info/tests'); require('../lib/plugins/aws/invoke/tests'); require('../lib/plugins/aws/logs/tests'); @@ -41,6 +43,7 @@ require('../lib/plugins/aws/deploy/compile/events/sns/tests'); require('../lib/plugins/aws/deploy/compile/events/stream/tests'); require('../lib/plugins/aws/deployFunction/tests/index'); require('../lib/plugins/aws/deployList/tests/index'); +require('../lib/plugins/aws/rollback/tests/rollback'); // Other Tests require('./utils/tests'); diff --git a/tests/integration/aws/api-gateway/integration-lambda-proxy/api-keys/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda-proxy/api-keys/service/serverless.yml index 1b0e532a2..a15923777 100644 --- a/tests/integration/aws/api-gateway/integration-lambda-proxy/api-keys/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda-proxy/api-keys/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true apiKeys: - WillBeReplacedBeforeDeployment diff --git a/tests/integration/aws/api-gateway/integration-lambda-proxy/cors/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda-proxy/cors/service/serverless.yml index 785bb7ea3..e75121f83 100644 --- a/tests/integration/aws/api-gateway/integration-lambda-proxy/cors/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda-proxy/cors/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/api-gateway/integration-lambda-proxy/custom-authorizers/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda-proxy/custom-authorizers/service/serverless.yml index 2661daecc..e86a63e94 100644 --- a/tests/integration/aws/api-gateway/integration-lambda-proxy/custom-authorizers/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda-proxy/custom-authorizers/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/api-gateway/integration-lambda-proxy/simple-api/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda-proxy/simple-api/service/serverless.yml index 314fea363..537d95042 100644 --- a/tests/integration/aws/api-gateway/integration-lambda-proxy/simple-api/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda-proxy/simple-api/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/api-gateway/integration-lambda/api-keys/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda/api-keys/service/serverless.yml index 2f352a084..ab715a465 100644 --- a/tests/integration/aws/api-gateway/integration-lambda/api-keys/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda/api-keys/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true apiKeys: - WillBeReplacedBeforeDeployment diff --git a/tests/integration/aws/api-gateway/integration-lambda/cors/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda/cors/service/serverless.yml index 5da843870..fa8ae5885 100644 --- a/tests/integration/aws/api-gateway/integration-lambda/cors/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda/cors/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/api-gateway/integration-lambda/custom-authorizers/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda/custom-authorizers/service/serverless.yml index 97acce3a7..8f5cc37c8 100644 --- a/tests/integration/aws/api-gateway/integration-lambda/custom-authorizers/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda/custom-authorizers/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/api-gateway/integration-lambda/simple-api/service/serverless.yml b/tests/integration/aws/api-gateway/integration-lambda/simple-api/service/serverless.yml index 8cb26f5a3..8c6ec9d2e 100644 --- a/tests/integration/aws/api-gateway/integration-lambda/simple-api/service/serverless.yml +++ b/tests/integration/aws/api-gateway/integration-lambda/simple-api/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/general/custom-resources/service/serverless.yml b/tests/integration/aws/general/custom-resources/service/serverless.yml index cfcb89531..71dda7280 100644 --- a/tests/integration/aws/general/custom-resources/service/serverless.yml +++ b/tests/integration/aws/general/custom-resources/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/general/nested-handlers/service/serverless.yml b/tests/integration/aws/general/nested-handlers/service/serverless.yml index 63c4a41fd..13f0116de 100644 --- a/tests/integration/aws/general/nested-handlers/service/serverless.yml +++ b/tests/integration/aws/general/nested-handlers/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/general/overwrite-resources/service/serverless.yml b/tests/integration/aws/general/overwrite-resources/service/serverless.yml index c677ea764..fab5698b1 100644 --- a/tests/integration/aws/general/overwrite-resources/service/serverless.yml +++ b/tests/integration/aws/general/overwrite-resources/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/schedule/multiple-schedules-multiple-functions/service/serverless.yml b/tests/integration/aws/schedule/multiple-schedules-multiple-functions/service/serverless.yml index 688218977..3f823a902 100644 --- a/tests/integration/aws/schedule/multiple-schedules-multiple-functions/service/serverless.yml +++ b/tests/integration/aws/schedule/multiple-schedules-multiple-functions/service/serverless.yml @@ -1,6 +1,9 @@ service: aws-nodejs -provider: aws +provider: + name: aws + runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/sns/multiple-topics-multiple-functions/service/serverless.yml b/tests/integration/aws/sns/multiple-topics-multiple-functions/service/serverless.yml index 3e7d72911..10321748e 100644 --- a/tests/integration/aws/sns/multiple-topics-multiple-functions/service/serverless.yml +++ b/tests/integration/aws/sns/multiple-topics-multiple-functions/service/serverless.yml @@ -1,6 +1,9 @@ service: aws-nodejs -provider: aws +provider: + name: aws + runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/sns/multiple-topics-single-function/service/serverless.yml b/tests/integration/aws/sns/multiple-topics-single-function/service/serverless.yml index 70c85427a..ab8726e46 100644 --- a/tests/integration/aws/sns/multiple-topics-single-function/service/serverless.yml +++ b/tests/integration/aws/sns/multiple-topics-single-function/service/serverless.yml @@ -1,6 +1,9 @@ service: aws-nodejs -provider: aws +provider: + name: aws + runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/sns/single-topic-multiple-functions/service/serverless.yml b/tests/integration/aws/sns/single-topic-multiple-functions/service/serverless.yml index 840d5b2b6..9f3cfaf2d 100644 --- a/tests/integration/aws/sns/single-topic-multiple-functions/service/serverless.yml +++ b/tests/integration/aws/sns/single-topic-multiple-functions/service/serverless.yml @@ -1,6 +1,9 @@ service: aws-nodejs -provider: aws +provider: + name: aws + runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/aws/sns/single-topic-single-function/service/serverless.yml b/tests/integration/aws/sns/single-topic-single-function/service/serverless.yml index c3215d0a2..c14fa9acd 100644 --- a/tests/integration/aws/sns/single-topic-single-function/service/serverless.yml +++ b/tests/integration/aws/sns/single-topic-single-function/service/serverless.yml @@ -1,6 +1,9 @@ service: aws-nodejs -provider: aws +provider: + name: aws + runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/general/custom-plugins/service/serverless.yml b/tests/integration/general/custom-plugins/service/serverless.yml index 4f73fd976..9a9fc1187 100644 --- a/tests/integration/general/custom-plugins/service/serverless.yml +++ b/tests/integration/general/custom-plugins/service/serverless.yml @@ -3,6 +3,7 @@ service: aws-nodejs # NOTE: update this with your service name provider: name: aws runtime: nodejs4.3 + cfLogs: true functions: hello: diff --git a/tests/integration/simple-integration-test.js b/tests/integration/simple-integration-test.js index 35e57e95a..fdc28d95b 100644 --- a/tests/integration/simple-integration-test.js +++ b/tests/integration/simple-integration-test.js @@ -74,6 +74,27 @@ describe('Service Lifecyle Integration Test', () => { expect(result.message).to.be.equal('Service Update Succeeded'); }); + it('should list existing deployments and roll back to first deployment', function () { + this.timeout(0); + let timestamp; + const listDeploys = execSync(`${serverlessExec} deploy list`); + const output = listDeploys.toString(); + const match = output.match(new RegExp('Timestamp: (.+)')); + if (match) { + timestamp = match[1]; + } + // eslint-disable-next-line no-unused-expressions + expect(timestamp).to.not.undefined; + + execSync(`${serverlessExec} rollback -t ${timestamp}`); + + const invoked = execSync(`${serverlessExec} invoke --function hello --noGreeting true`); + const result = JSON.parse(new Buffer(invoked, 'base64').toString()); + // parse it once again because the body is stringified to be LAMBDA-PROXY ready + const message = JSON.parse(result.body).message; + expect(message).to.be.equal('Go Serverless v1.0! Your function executed successfully!'); + }); + it('should remove service from aws', function () { this.timeout(0); execSync(`${serverlessExec} remove`, { stdio: 'inherit' });