Merge branch 'master' into patch-1

DavidWells · web-flow · commit 146efc6b9028 · 2018-04-16T11:24:40.000-07:00
diff --git a/README.md b/README.md
@@ -119,6 +119,7 @@ serverless install -u https://github.com/author/project -n my-project
 | **[Sqs Worker With Aws Lambda And Cloudwatch Alarms](https://github.com/sbstjn/sqs-worker-serverless)** <br/> Process messages stored in SQS with an [auto-scaled AWS Lambda worker](https://sbstjn.com/serverless-sqs-worker-with-aws-lambda.html) function. | [sbstjn](http://github.com/sbstjn) |
 | **[Serverless + Lambda + Vpc + Nat + Redis](https://github.com/ittus/aws-lambda-vpc-nat-examples)** <br/> Demo using API Gateway and Lambda with VPC and NAT to access Internet and AWS Resource | [ittus](http://github.com/ittus) |
 | **[Serverless Analytics](https://github.com/sbstjn/serverless-analytics)** <br/> Write your own Google Analytics clone and track website visitors serverless with API Gateway, Kinesis, Lambda, and DynamoDB. | [sbstjn](http://github.com/sbstjn) |
+| **[Serverless Dashboard For Atom Editor](https://github.com/horike37/serverless-dashboard-for-atom)** <br/> Atom editor package which allows you to deploy and visualize your serverless services with Serverless Framework on your editor. | [horike37](http://github.com/horike37) |
 | **[Serverless Es6/7 Crud Api](https://github.com/AnomalyInnovations/serverless-stack-demo-api)** <br/> [Serverless Stack](http://serverless-stack.com) examples of backend CRUD APIs (DynamoDB + Lambda + API Gateway + Cognito User Pool authorizer) for [React.js single-page app](http://demo.serverless-stack.com) | [AnomalyInnovations](http://github.com/AnomalyInnovations) |
 | **[Serverless Gitlab Ci](https://github.com/bvincent1/serverless-gitlab-ci)** <br/> Simple Gitlab CI template for automatic testing and deployments | [bvincent1](http://github.com/bvincent1) |
 | **[Serverless Reactjs Universal Rendering Boilerplate](https://github.com/TylorShin/react-universal-in-serverless)** <br/> ReactJS web app Starter kit does universal (isomorphic) rendering with Serverless | [TylorShin](http://github.com/TylorShin) |
@@ -127,7 +128,7 @@ serverless install -u https://github.com/author/project -n my-project
 | **[Stack Overflow Monitor](https://github.com/picsoung/stackoverflowmonitor)** <br/> Monitor Stack Overflow questions and post them in a Slack channel | [picsoung](http://github.com/picsoung) |
 | **[Adoptable Pet Bot](https://github.com/lynnaloo/adoptable-pet-bot)** <br/> Tweets adoptable pets using Serverless (Node.js) and AWS Lambda | [lynnaloo](http://github.com/lynnaloo) |
 | **[Aws Ses Serverless Example](https://github.com/lakshmantgld/aws-ses-serverless-example)** <br/> AWS SES example in NodeJS using lambda | [lakshmantgld](http://github.com/lakshmantgld) |
-| **[Bablebot](https://github.com/abiglobalhealth/bablebot)** <br/> Lambda + API Gateway: Zero-to-chatbot in <10 lines of JS. Built-in integrations for Messenger, Telegram, Kik, Line, Twilio, Skype, and Wechat. Or roll your own! | [abiglobalhealth](http://github.com/abiglobalhealth) |
+| **[Babelbot](https://github.com/abiglobalhealth/babelbot)** <br/> Lambda + API Gateway: Zero-to-chatbot in <10 lines of JS. Built-in integrations for Messenger, Telegram, Kik, Line, Twilio, Skype, and Wechat. Or roll your own! | [abiglobalhealth](http://github.com/abiglobalhealth) |
 | **[Bittman](https://github.com/rhlsthrm/bittman)** <br/> A serverless project that follows a stock trading algorithm and uses scheduled functions to save data to DynamoDB and send emails through Mailgun. | [rhlsthrm](http://github.com/rhlsthrm) |
 | **[Cordis Serverless](https://github.com/marzeelabs/cordis-serverless)** <br/> A serverless API for EU Cordis data | [marzeelabs](http://github.com/marzeelabs) |
 | **[Faultline](https://github.com/faultline/faultline)** <br/> Error tracking tool on AWS managed services. | [faultline](http://github.com/faultline) |
diff --git a/aws-java-simple-http-endpoint/README.md b/aws-java-simple-http-endpoint/README.md
@@ -58,17 +58,17 @@ mvn package
 
 Note: you can install Maven with
 
-1. [sdkman](http://sdkman.io/) using "sdk install maven" (yes, use as default)
-2. sudo apt-get install mvn
-3. brew install maven
+1. [sdkman](http://sdkman.io/) using `sdk install maven` (yes, use as default)
+2. `sudo apt-get install mvn`
+3. `brew install maven`
 
 If you use Maven to build, then in `serverless.yml` you have to replace
 
 ```yaml
 package:
   artifact: build/distributions/aws-java-simple-http-endpoint.zip
 ```
-by
+with
 ```yaml
 package:
   artifact: target/aws-java-simple-http-endpoint.jar
diff --git a/aws-node-rest-api-with-dynamodb/serverless.yml b/aws-node-rest-api-with-dynamodb/serverless.yml
@@ -4,7 +4,7 @@ frameworkVersion: ">=1.1.0 <2.0.0"
 
 provider:
   name: aws
-  runtime: nodejs4.3
+  runtime: nodejs6.10
   environment:
     DYNAMODB_TABLE: ${self:service}-${opt:stage, self:provider.stage}
   iamRoleStatements:
diff --git a/community-examples.json b/community-examples.json
@@ -1,8 +1,8 @@
 [
  {
-    "name": "bablebot",
+    "name": "babelbot",
     "description": "Lambda + API Gateway: Zero-to-chatbot in <10 lines of JS. Built-in integrations for Messenger, Telegram, Kik, Line, Twilio, Skype, and Wechat. Or roll your own!",
-    "githubUrl": "https://github.com/abiglobalhealth/bablebot"
+    "githubUrl": "https://github.com/abiglobalhealth/babelbot"
  },
  {
     "name": "jwtAuthorizr",
@@ -313,6 +313,11 @@
     "description": "Demo using API Gateway and Lambda with Protocol Buffer",
     "githubUrl": "https://github.com/theburningmonk/lambda-protobuf-demo"
   },
+  {
+    "name": "Serverless Dashboard For Atom Editor",
+    "description": "Atom editor package which allows you to deploy and visualize your serverless services with Serverless Framework on your editor.",
+    "githubUrl": "https://github.com/horike37/serverless-dashboard-for-atom"
+  },
   {
     "name": "Serverless + lambda + vpc + nat + redis",
     "description": "Demo using API Gateway and Lambda with VPC and NAT to access Internet and AWS Resource",
@@ -342,5 +347,10 @@
     "name": "Serverless Kakao Bot",
     "description": "Easy development for Kakaotalk Bot with Serverless",
     "githubUrl": "https://github.com/JisuPark/serverless-kakao-bot"
+  },
+  {
+    "name": "Serverless Q&A Example",
+    "description": "Inspired by the AWS example forum. A multitenancy Q&A template for surveys, forums and more",
+    "githubUrl": "https://github.com/jacksoncharles/serverless-qa-template-api"
   }
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "name": "bablebot",`
	`3`	`+ "name": "babelbot",`
`4`	`4`	`"description": "Lambda + API Gateway: Zero-to-chatbot in <10 lines of JS. Built-in integrations for Messenger, Telegram, Kik, Line, Twilio, Skype, and Wechat. Or roll your own!",`
`5`		`- "githubUrl": "https://github.com/abiglobalhealth/bablebot"`
	`5`	`+ "githubUrl": "https://github.com/abiglobalhealth/babelbot"`
`6`	`6`	`},`
`7`	`7`	`{`
`8`	`8`	`"name": "jwtAuthorizr",`
`@@ -313,6 +313,11 @@`
`313`	`313`	`"description": "Demo using API Gateway and Lambda with Protocol Buffer",`
`314`	`314`	`"githubUrl": "https://github.com/theburningmonk/lambda-protobuf-demo"`
`315`	`315`	`},`
	`316`	`+ {`
	`317`	`+ "name": "Serverless Dashboard For Atom Editor",`
	`318`	`+ "description": "Atom editor package which allows you to deploy and visualize your serverless services with Serverless Framework on your editor.",`
	`319`	`+ "githubUrl": "https://github.com/horike37/serverless-dashboard-for-atom"`
	`320`	`+ },`
`316`	`321`	`{`
`317`	`322`	`"name": "Serverless + lambda + vpc + nat + redis",`
`318`	`323`	`"description": "Demo using API Gateway and Lambda with VPC and NAT to access Internet and AWS Resource",`
`@@ -342,5 +347,10 @@`
`342`	`347`	`"name": "Serverless Kakao Bot",`
`343`	`348`	`"description": "Easy development for Kakaotalk Bot with Serverless",`
`344`	`349`	`"githubUrl": "https://github.com/JisuPark/serverless-kakao-bot"`
	`350`	`+ },`
	`351`	`+ {`
	`352`	`+ "name": "Serverless Q&A Example",`
	`353`	`+ "description": "Inspired by the AWS example forum. A multitenancy Q&A template for surveys, forums and more",`
	`354`	`+ "githubUrl": "https://github.com/jacksoncharles/serverless-qa-template-api"`
`345`	`355`	`}`
`346`	`356`	`]`