Merge branch 'master' into hhh

CONTRIBUTING.md

@@ -1,17 +1,17 @@
 # Contributing Guidelines
 
-Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional 
+Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
 documentation, we greatly value feedback and contributions from our community.
 
-Please read through this document before submitting any issues or pull requests to ensure we have all the necessary 
+Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
 information to effectively respond to your bug report or contribution.
 
 
 ## Reporting Bugs/Feature Requests
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/aws-samples/aws-reinvent-2018-trivia-game/issues), or [recently closed](https://github.com/aws-samples/aws-reinvent-2018-trivia-game/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+When filing an issue, please check [existing open](https://github.com/aws-samples/aws-reinvent-2019-trivia-game/issues), or [recently closed](https://github.com/aws-samples/aws-reinvent-2019-trivia-game/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -36,17 +36,17 @@ To send us a pull request, please:
 5. Send us a pull request, answering any default questions in the pull request interface.
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and 
+GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws-samples/aws-reinvent-2018-trivia-game/labels/help%20wanted) issues is a great place to start. 
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws-samples/aws-reinvent-2019-trivia-game/labels/help%20wanted) issues is a great place to start.
 
 
 ## Code of Conduct
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
 [email protected] with any additional questions or comments.
 
 
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/aws-samples/aws-reinvent-2018-trivia-game/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws-samples/aws-reinvent-2019-trivia-game/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

README.md

@@ -1,4 +1,4 @@
-## AWS re:Invent 2018 Trivia Game
+## AWS re:Invent 2019 Trivia Game
 
 Sample trivia game built with AWS Fargate, AWS Lambda, and Amazon Lex.  See [reinvent-trivia.com](https://www.reinvent-trivia.com) for a running example.
 

chat-bot/hook/test-events/one.expected.json

@@ -29,7 +29,7 @@
     "slotToElicit": "two",
     "message": {
       "contentType": "PlainText",
-      "content": "That is correct! The answer is \"2012\". New score is 100 points! For 200 points: What Amazon-favorite sport was introduced in re:Invent attendees in 2016?"
+      "content": "That is correct! The answer is \"2012\". New score is 100 points! For 200 points: What Amazon-favorite sport was introduced to re:Invent attendees in 2016?"
     }
   }
 }

pipelines/README.md

@@ -6,12 +6,10 @@ In src/ directory:
 * pipeline.ts: Generic pipeline class that defines an infrastructure-as-code pipeline
 * api-base-image-pipeline.ts: Builds and publishes the base Docker image for the backend API service
 * api-service-pipeline.ts: Builds and deploys the backend API service to Fargate
+* api-service-codedeploy-pipeline.ts: Builds and deploys the backend API service to Fargate with CodeDeploy
 * static-site-pipeline.ts: Provisions infrastructure for the static site, like a CloudFront distribution and an S3 bucket, plus bundles and uploads the static site pages to the site's S3 bucket
 * chat-bot-pipeline.ts: Builds and deploys the chat bot Lambda function and Lex model
 
-In templates/ directory:
-* trivia-backend-codedeploy-blue-green.template.yaml: Template for deploying the backend API service using CodeDeploy, instead of using CloudFormation for deployments.  This is an alternative to api-service-pipeline.ts listed above.
-
 ## Prep
 
 Create a GitHub [personal access token](https://github.com/settings/tokens) with access to your fork of the repo, including "admin:repo_hook" and "repo" permissions.  Then store the token in Secrets Manager:
@@ -38,14 +36,10 @@ cdk deploy --app 'node src/static-site-pipeline.js'
 cdk deploy --app 'node src/api-base-image-pipeline.js'
 
 cdk deploy --app 'node src/api-service-pipeline.js'
+OR
+cdk deploy --app 'node src/api-service-codedeploy-pipeline.js'
 
 cdk deploy --app 'node src/chat-bot-pipeline.js'
 ```
 
-To use CodeDeploy blue-green deployments instead of CloudFormation deployments for the API backend service, use the following instead of using the api-service-pipeline template listed above:
-
-```
-aws cloudformation deploy --region us-east-1 --template-file templates/trivia-backend-codedeploy-blue-green.template.yaml --stack-name TriviaGameBackendPipeline --capabilities CAPABILITY_IAM
-```
-
 See the pipelines in the CodePipeline console.