Merge branch 'master' into dotnetcore2.0

# Conflicts:
#	.gitignore
#	tests/templates/test_all_templates

Author: Yunspace

.gitignore

@@ -54,5 +54,5 @@ jest
 *.swp
 
 # DotNet
-bin/
-obj/
+[Bb]in/
+[Oo]bj/

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.26.0 (29.01.2018)
+- [AWS Go support](https://github.com/serverless/serverless/pull/4669)
+- [Support for using an existing ApiGateway and Resources](https://github.com/serverless/serverless/pull/4247)
+- [Add logRetentionInDays config](https://github.com/serverless/serverless/pull/4591)
+- [Add support of `serverless.js` configuration file](https://github.com/serverless/serverless/pull/4590)
+- [Add "did you mean..." CLI suggestions](https://github.com/serverless/serverless/pull/4586)
+- [Add `--template-path` option to `serverless create`](https://github.com/serverless/serverless/pull/4576)
+- [Add support POJO input support for Java invoke local](https://github.com/serverless/serverless/pull/4596)
+
+## Meta
+- [Comparison since last release](https://github.com/serverless/serverless/compare/v1.25.0...v1.26.0)
+
+
 # 1.25.0 (20.12.2017)
 - [Improve Stage and Region Usage](https://github.com/serverless/serverless/pull/4560)
 - [Add API Gateway endpoint configuration](https://github.com/serverless/serverless/pull/4531)

README.md

@@ -132,7 +132,7 @@ The following are services you can instantly install and use by running `serverl
 
 ## <a name="features"></a>Features
 
-* Supports Node.js, Python, Java, Scala, C#, F#, Groovy, Kotlin, PHP & Swift.
+* Supports Node.js, Python, Java, Scala, C#, F#, Go, Groovy, Kotlin, PHP & Swift.
 * Manages the lifecycle of your serverless architecture (build, deploy, update, delete).
 * Safely deploy functions, events and their required resources together via provider resource managers (e.g., AWS CloudFormation).
 * Functions can be grouped ("serverless services") for easy management of code, resources & processes, across large projects & teams.
@@ -158,7 +158,7 @@ This table is generated from https://github.com/serverless/plugins/blob/master/p
 | **[Raml Serverless](https://github.com/andrewcurioso/raml-serverless)** <br/> Serverless plugin to work with RAML API spec documents | [andrewcurioso](http://github.com/andrewcurioso) |
 | **[Serverless Alexa Plugin](https://github.com/rajington/serverless-alexa-plugin)** <br/> Serverless plugin to support Alexa Lambda events | [rajington](http://github.com/rajington) |
 | **[Serverless Api Stage](https://github.com/leftclickben/serverless-api-stage)** <br/> Serverless API Stage plugin, enables stage variables and logging for AWS API Gateway. | [leftclickben](http://github.com/leftclickben) |
-| **[Serverless Apig S3](https://github.com/sdd/serverless-apig-s3)** <br/> Serve static front-end content from S3 via the API Gatewy and deploy client bundle to S3. | [sdd](http://github.com/sdd) |
+| **[Serverless Apig S3](https://github.com/sdd/serverless-apig-s3)** <br/> Serve static front-end content from S3 via the API Gateway and deploy client bundle to S3. | [sdd](http://github.com/sdd) |
 | **[Serverless Apigateway Plugin](https://github.com/GFG/serverless-apigateway-plugin)** <br/> Configure the AWS api gateway: Binary support, Headers and Body template mappings | [GFG](http://github.com/GFG) |
 | **[Serverless Apigw Binary](https://github.com/maciejtreder/serverless-apigw-binary)** <br/> Plugin to enable binary support in AWS API Gateway. | [maciejtreder](http://github.com/maciejtreder) |
 | **[Serverless Apigwy Binary](https://github.com/ryanmurakami/serverless-apigwy-binary)** <br/> Serverless plugin for configuring API Gateway to return binary responses | [ryanmurakami](http://github.com/ryanmurakami) |
@@ -263,6 +263,7 @@ This table is generated from https://github.com/serverless/examples/blob/master/
 -->
 | Project Name | Author |
 |:-------------|:------:|
+| **[Serverless Architecture Boilerplate](https://github.com/msfidelis/serverless-architecture-boilerplate)** <br/> Boilerplate to organize and deploy big projects using Serverless and CloudFormation on AWS | [msfidelis](http://github.com/msfidelis) |
 | **[Jwtauthorizr](https://github.com/serverlessbuch/jwtAuthorizr)** <br/> Custom JWT Authorizer Lambda function for Amazon API Gateway with Bearer JWT | [serverlessbuch](http://github.com/serverlessbuch) |
 | **[Serverless Graphql Api](https://github.com/boazdejong/serverless-graphql-api)** <br/> Serverless GraphQL API using Lambda and DynamoDB | [boazdejong](http://github.com/boazdejong) |
 | **[Serverless Screenshot](https://github.com/svdgraaf/serverless-screenshot)** <br/> Serverless Screenshot Service using PhantomJS | [svdgraaf](http://github.com/svdgraaf) |

docker-compose.yml

@@ -60,9 +60,19 @@ services:
     volumes:
       - ./tmp/serverless-integration-test-aws-csharp:/app
   aws-fsharp:
-    image: microsoft/dotnet:1.0.4-sdk
+    image: microsoft/dotnet:2.0-sdk
     volumes:
       - ./tmp/serverless-integration-test-aws-fsharp:/app
+  aws-go:
+    image: golang:1.9
+    volumes:
+      - ./tmp/serverless-integration-test-aws-go:/app
+      - ./tmp/serverless-integration-test-aws-go:/go/src/app
+  aws-go-dep:
+    image: yunspace/golang:1.9
+    volumes:
+      - ./tmp/serverless-integration-test-aws-go-dep:/app
+      - ./tmp/serverless-integration-test-aws-go-dep:/go/src/app
   aws-nodejs-typescript:
     image: node:6.10.3
     volumes:

docs/providers/aws/events/alexa-skill.md

@@ -14,14 +14,41 @@ layout: Doc
 
 ## Event definition
 
-This will enable your Lambda function to be called by an Alexa skill kit.
+This will enable your Lambda function to be called by an Alexa Skill kit.
+`amzn1.ask.skill.xx-xx-xx-xx-xx` is a skill ID for Alexa Skills kit. You receive a skill ID once you register and create a skill in [Amazon Developer Console](https://developer.amazon.com/).
+After deploying, add your deployed Lambda function ARN to which this event is attached to the Service Endpoint under Configuration on Amazon Developer Console.
 
 ```yml
 functions:
   mySkill:
     handler: mySkill.handler
     events:
-      - alexaSkill
+      - alexaSkill: amzn1.ask.skill.xx-xx-xx-xx-xx
 ```
 
 You can find detailed guides on how to create an Alexa Skill with Serverless using NodeJS [here](https://github.com/serverless/examples/tree/master/aws-node-alexa-skill) as well as in combination with Python [here](https://github.com/serverless/examples/tree/master/aws-python-alexa-skill).
+
+## Enabling / Disabling
+
+**Note:** `alexaSkill` events are enabled by default.
+
+This will create and attach a alexaSkill event for the `mySkill` function which is disabled. If enabled it will call
+the `mySkill` function by an Alexa Skill.
+
+```yaml
+functions:
+  mySkill:
+    handler: mySkill.handler
+    events:
+      - alexaSkill:
+          appId: amzn1.ask.skill.xx-xx-xx-xx
+          enabled: false
+```
+
+## Backwards compatibility
+
+Previous syntax of this event didn't require a skill ID as parameter, but according to [Amazon's documentation](https://developer.amazon.com/docs/custom-skills/host-a-custom-skill-as-an-aws-lambda-function.html#configuring-the-alexa-skills-kit-trigger) you should restrict your lambda function to be executed only by your skill.
+
+Omitting the skill id will make your Lambda function available for the public, allowing any other skill developer to invoke it.
+
+(This is important, as [opposing to custom HTTPS endpoints](https://developer.amazon.com/docs/custom-skills/handle-requests-sent-by-alexa.html#request-verify), there's no way to validate the request was sent by your skill.)

docs/providers/aws/events/apigateway.md

@@ -872,7 +872,7 @@ functions:
 
 ```
 
-In case the application has many chilren and grandchildren paths, you also want to break them out into smaller services. 
+In case the application has many children and grandchildren paths, you also want to break them out into smaller services. 
 
 ```yml
 service: service-a

docs/providers/aws/events/cloudwatch-log.md

@@ -14,7 +14,7 @@ layout: Doc
 
 ## Simple event definition
 
-This will enable your Lambda function to be called by an Log Stream.
+This will enable your Lambda function to be called by a Log Stream.
 
 ```yml
 functions:

docs/providers/aws/examples/hello-world/README.md

@@ -17,6 +17,8 @@ Pick your language of choice:
 
 * [JavaScript](./node)
 * [Python](./python)
-* [csharp](./csharp)
+* [C#](./csharp)
+* [F#](./fsharp)
+* [Go](./go)
 
 [View all examples](https://www.serverless.com/framework/docs/providers/aws/examples/)

docs/providers/aws/examples/hello-world/csharp/README.md

@@ -13,13 +13,32 @@ layout: Doc
 
 Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
 
+Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
+
+```
+$ sls
+
+Commands
+* You can run commands with "serverless" or the shortcut "sls"
+* Pass "--verbose" to this command to get in-depth plugin info
+* Pass "--no-color" to disable CLI colors
+* Pass "--help" after any <command> for contextual help
+```
+
 ## 1. Create a service
-`serverless create --template aws-csharp --path myService` or `sls create --template aws-csharp --path myService`, where 'myService' is a new folder to be created with template service files.  Change directories into this new folder.
+
+```
+sls create --template aws-csharp --path myService
+```
+
+Using the `create` command we can specify one of the available [templates](https://serverless.com/framework/docs/providers/aws/cli-reference/create#available-templates). For this example use aws-csharp with the `--template` or shorthand `-t` flag.
+
+The `--path` or shorthand `-p` is the location to be created with the template service files. Change directories into this new folder.
 
 ## 2. Build using .NET CLI tools and create zip package
 
 ```
-# Linux or OSX
+# Linux or Mac OS
 ./build.sh
 ```
 
@@ -29,14 +48,23 @@ Make sure `serverless` is installed. [See installation guide](../../../guide/ins
 ```
 
 ## 3. Deploy
-`serverless deploy` or `sls deploy`. `sls` is shorthand for the Serverless CLI command
+
+```
+sls deploy
+```
+
+This will deploy your function to AWS Lambda based on the settings in `serverless.yml`.
+
 
 ## 4. Invoke deployed function
-`serverless invoke --function hello` or `serverless invoke -f hello`
 
-`-f` is shorthand for `--function`
+```
+sls invoke -f hello
+```
+
+Invoke deployed function with command `invoke` and `--function` or shorthand `-f`.
 
-In your terminal window you should see the response from AWS Lambda
+In your terminal window you should see the response from AWS Lambda.
 
 ```bash
 {
@@ -49,4 +77,4 @@ In your terminal window you should see the response from AWS Lambda
 }
 ```
 
-Congrats you have just deployed and run your Hello World function!
+Congrats you have deployed and ran your Hello World function!

docs/providers/aws/examples/hello-world/fsharp/Handler.fs

@@ -7,31 +7,69 @@ layout: Doc
 
 # Hello World F# Example
 
-## Prerequisites
+Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
 
-* Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
-* [.Net Core 1.0.1 SDK](https://www.microsoft.com/net/download/core)
-    * 1.1 isn't currently supported by AWS Lambda 
-* [NodeJS v4 or higher](https://nodejs.org/en/)
-* An AWS Account
+Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
-## Build and Package 
+```
+$ sls
+
+Commands
+* You can run commands with "serverless" or the shortcut "sls"
+* Pass "--verbose" to this command to get in-depth plugin info
+* Pass "--no-color" to disable CLI colors
+* Pass "--help" after any <command> for contextual help
+```
 
-From the root of this directory, run `build.cmd`, or `build.sh` if on Linux / Mac.
+## 1. Create a service
 
-This will produce your deployment package at `bin/release/netcoreapp1.0/deploy-package.zip`.
+```
+sls create --template aws-fsharp --path myService
+```
 
-## Deployment and Invocation
+Using the `create` command we can specify one of the available [templates](https://serverless.com/framework/docs/providers/aws/cli-reference/create#available-templates). For this example use aws-fsharp with the `--template` or shorthand `-t` flag.
 
-Once packaged, you can follow [these instructions](https://github.com/serverless/serverless#quick-start) to deploy and remotely invoke the function on AWS Lambda.
+The `--path` or shorthand `-p` is the location to be created with the template service files. Change directories into this new folder.
 
-In short the commands you will need to run are (from the root of this directory):
+## 2. Build using .NET Core 2.X CLI tools and create zip package
 
 ```
-serverless config credentials --provider aws --key {YourAwsAccessKey} --secret {YourAwsSecret}
-serverless deploy -v
-serverless invoke -f hello -l
-serverless remove
+# Linux or Mac OS
+./build.sh
+```
+
+```
+# Windows PowerShell
+./build.cmd
+```
+
+## 3. Deploy
+
+```
+sls deploy
+```
+
+This will deploy your function to AWS Lambda based on the settings in `serverless.yml`.
+
+## 4. Invoke deployed function
+
+```
+sls invoke -f hello
+```
+
+Invoke deployed function with command `invoke` and `--function` or shorthand `-f`.
+
+In your terminal window you should see the response from AWS Lambda.
+
+```bash
+{
+    "Message": "Go Serverless v1.0! Your function executed successfully!",
+    "Request": {
+        "Key1": null,
+        "Key2": null,
+        "Key3": null
+    }
+}
 ```
 
-By default this template deploys to us-east-1, you can change that in "serverless.yml" under the `region: us-east-1` key.
+Congrats you have deployed and ran your Hello World function!