From a119e1e50d783bb9c14293d747cc7152a0484cc5 Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 11:02:53 -0500
Subject: [PATCH 1/9] Update CreateZombieWorkshop.json
changing nodejs from 4.3 to 8.10 in CreateZombieWorkshop.json
---
CloudFormation/CreateZombieWorkshop.json | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/CloudFormation/CreateZombieWorkshop.json b/CloudFormation/CreateZombieWorkshop.json
index 57528b1..b68b9ce 100644
--- a/CloudFormation/CreateZombieWorkshop.json
+++ b/CloudFormation/CreateZombieWorkshop.json
@@ -377,7 +377,7 @@
"S3Bucket": { "Fn::FindInMap" : [ "AllowedRegions", { "Ref" : "AWS::Region" }, "S3ContentsBucket"]},
"S3Key": "S3GetFilesFunction.zip"
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "120"
},
"DependsOn": [
@@ -395,7 +395,7 @@
"S3Bucket": { "Ref" : "S3BucketForWebsiteContent" },
"S3Key": "cognitoTriggerBuild.zip"
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "120"
},
"DependsOn": [
@@ -456,7 +456,7 @@
"S3Bucket": { "Ref": "S3BucketForWebsiteContent" },
"S3Key": "WK305_Gateway.zip"
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "300",
"MemorySize": "1536"
},
@@ -477,7 +477,7 @@
"S3Bucket": { "Ref": "S3BucketForWebsiteContent" },
"S3Key": "cognito.zip"
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "300",
"MemorySize": "1536"
},
@@ -520,7 +520,7 @@
"S3Bucket": { "Ref" : "S3BucketForWebsiteContent" },
"S3Key": "ZombiePostMessage.zip"
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "60"
},
"DependsOn": [
@@ -540,7 +540,7 @@
"S3Bucket": { "Ref" : "S3BucketForWebsiteContent" },
"S3Key": "ZombieGetMessages.zip"
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "60"
},
"DependsOn" : [
@@ -596,7 +596,7 @@
"};\n"
]]}
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "10"
},
"DependsOn" : ["TalkersDynamoDBTable","ZombieLabLambdaRole"]
@@ -656,7 +656,7 @@
"};\n"
]]}
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "10"
},
"DependsOn" : ["TalkersDynamoDBTable", "ZombieLabLambdaRole"]
@@ -686,7 +686,7 @@
"S3Bucket": { "Ref" : "S3BucketForWebsiteContent" },
"S3Key": "IamUsers.zip"
},
- "Runtime": "nodejs4.3",
+ "Runtime": "nodejs8.10",
"Timeout": "60"
},
"DependsOn": [
From aa66dcb335b4ed1d6ab93368ab8ab16b7e8951b4 Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 11:04:29 -0500
Subject: [PATCH 2/9] Update index.js
change nodejs 4.3 to 8.10 in CognitoTriggerBuild
---
CloudFormation/CustomResources/cognitoTriggerBuild/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CloudFormation/CustomResources/cognitoTriggerBuild/index.js b/CloudFormation/CustomResources/cognitoTriggerBuild/index.js
index 0e2ec02..5bddc98 100644
--- a/CloudFormation/CustomResources/cognitoTriggerBuild/index.js
+++ b/CloudFormation/CustomResources/cognitoTriggerBuild/index.js
@@ -33,7 +33,7 @@ exports.handler = function(event, context, callback) {
FunctionName: stackName + '-CognitoLambdaTrigger' + '-' + region,
Handler: 'index.handler',
Role: iamRole,
- Runtime: 'nodejs4.3',
+ Runtime: 'nodejs8.10',
Timeout: '120'
};
lambda.createFunction(params, function(err, data) {
From d73a76ec1257f24a00ffdd4b05ff9110071d03b6 Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 11:47:32 -0500
Subject: [PATCH 3/9] Update README.md
---
README.md | 148 ++----------------------------------------------------
1 file changed, 4 insertions(+), 144 deletions(-)
diff --git a/README.md b/README.md
index 6969181..9311199 100644
--- a/README.md
+++ b/README.md
@@ -29,9 +29,6 @@ Each of the labs in this workshop is an independent section and you may choose t
This exercise integrates the popular messaging app, [Slack](http://slack.com), into the chat application so that survivors can send messages to the survivor chat from within the Slack app.
-* **Lab 5: Intel Edison Zombie Motion Sensor** (IoT device required)
-
- This exercise integrates motion sensor detection of zombies to the chat system using an Intel Edison board and a Grove PIR Motion Sensor. You will configure a Lambda function to consume motion detection events and push them into the survivor chat!
### Workshop Cleanup
@@ -42,25 +39,15 @@ This section provides instructions to tear down your environment when you're don
### Let's Begin! Launch the CloudFormation Stack
*Prior to launching a stack, be aware that a few of the resources launched need to be manually deleted when the workshop is over. When finished working, please review the "Workshop Cleanup" section to learn what manual teardown is required by you.*
-1\. To begin this workshop, **click one of the 'Deploy to AWS' buttons below for the region you'd like to use**. This is the AWS region where you will launch resources for the duration of this workshop. This will open the CloudFormation template in the AWS Management Console for the region you select.
+1\. To begin this workshop, **click the 'Launch Stack' button below to dpely to US-East-1**. This is the AWS region where you will launch resources for the duration of this workshop. This will open the CloudFormation template in the AWS Management Console for the region you select.
Region | Launch Template
------------ | -------------
-**N. Virginia** (us-east-1) | [](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=zombiestack&templateURL=https://s3.amazonaws.com/aws-zombie-workshop-us-east-1/CreateZombieWorkshop.json)
-**Ohio** (us-east-2) | [](https://console.aws.amazon.com/cloudformation/home?region=us-east-2#/stacks/new?stackName=zombiestack&templateURL=https://s3-us-east-2.amazonaws.com/aws-zombie-workshop-us-east-2/CreateZombieWorkshop.json)
-**Oregon** (us-west-2) | [](https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=zombiestack&templateURL=https://s3-us-west-2.amazonaws.com/aws-zombie-workshop-us-west-2/CreateZombieWorkshop.json)
-**Ireland** (eu-west-1) | [](https://console.aws.amazon.com/cloudformation/home?region=eu-west-1#/stacks/new?stackName=zombiestack&templateURL=https://s3-eu-west-1.amazonaws.com/aws-zombie-workshop-eu-west-1/CreateZombieWorkshop.json)
-**Frankfurt** (eu-central-1) | [](https://console.aws.amazon.com/cloudformation/home?region=eu-central-1#/stacks/new?stackName=zombiestack&templateURL=https://s3-eu-central-1.amazonaws.com/aws-zombie-workshop-eu-central-1/CreateZombieWorkshop.json)
-**Tokyo** (ap-northeast-1) | [](https://console.aws.amazon.com/cloudformation/home?region=ap-northeast-1#/stacks/new?stackName=zombiestack&templateURL=https://s3-ap-northeast-1.amazonaws.com/aws-zombie-workshop-ap-northeast-1/CreateZombieWorkshop.json)
-**Seoul** (ap-northeast-2) | [](https://console.aws.amazon.com/cloudformation/home?region=ap-northeast-2#/stacks/new?stackName=zombiestack&templateURL=https://s3-ap-northeast-2.amazonaws.com/aws-zombie-workshop-ap-northeast-2/CreateZombieWorkshop.json)
-**Singapore** (ap-southeast-1) | [](https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-1#/stacks/new?stackName=zombiestack&templateURL=https://s3-ap-southeast-1.amazonaws.com/aws-zombie-workshop-ap-southeast-1/CreateZombieWorkshop.json)
-**Sydney** (ap-southeast-2) | [](https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-2#/stacks/new?stackName=zombiestack&templateURL=https://s3-ap-southeast-2.amazonaws.com/aws-zombie-workshop-ap-southeast-2/CreateZombieWorkshop.json)
-
-*If you have CloudFormation launch FAILED issues, please try launching in us-east-1 (Virginia)*
+**N. Virginia** (us-east-1) | [](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=zombiechat&templateURL=https://s3.amazonaws.com/-tcsn-zombielab/CreateZombieWorkshop.json)
-2\. Once you have chosen a region and are inside the AWS CloudFormation Console, you should be on a screen titled "Select Template". We are providing CloudFormation with a template on your behalf, so click the blue **Next** button to proceed.
+2\. Once you are inside the AWS CloudFormation Console in US-EAST-1, you should be on a screen titled "Select Template". We are providing CloudFormation with a template on your behalf, so click the blue **Next** button to proceed.
-3\. On the following screen, "Specify Details", your Stack is pre-populated with the name "zombiestack". You can customize that to a name of your choice **less than 15 characters in length** or leave as is. For the parameters section, if you want to develop with a team and would like to create IAM Users in your account to grant your teammates access, then specify how many teammates/users you want to be created in the **NumberOfTeammates** text box. Otherwise, leave it defaulted to 0 and no additional users will be created. The user launching the stack (you) already have the necessary permissions. Click **Next**.
+3\. On the following screen, "Specify Details", your Stack is pre-populated with the name "zombiechat". You can customize that to a name of your choice **less than 15 characters in length** or leave as is. For the parameters section, if you want to develop with a team and would like to create IAM Users in your account to grant your teammates access, then specify how many teammates/users you want to be created in the **NumberOfTeammates** text box. Otherwise, leave it defaulted to 0 and no additional users will be created. The user launching the stack (you) already have the necessary permissions. Click **Next**.
*If you create IAM users, an IAM group will also be created and those users will be added to that group. On deletion of the stack, those resources will be deleted for you.*
@@ -612,133 +599,6 @@ You've configured Slack to forward messages to your zombie survivor chat app. Bu
* * *
-## Lab 5 - Motion Sensor Integration with Intel Edison and Grove
-
-In this section, you'll help protect suvivors from zombies. Zombie motion sensor devices allow communities to determine if zombies (or intruders) are nearby. You'll setup a Lambda function to consume motion sensor events from an IoT device and push the messages into your chat application.
-
-**IoT Integration Architecture**
-
-
-If you wish to utilize the Zombie Sensor as a part of the workshop, this guide will walk you through the following:
-
-* Items required to create the physical Zombie sensor (Ignore this step if a zombie sensor is provided as a part of an AWS workshop)
-* How to create the AWS backend (Simple Notification Service Topic) for the Zombie Sensor
-* How to install the Node.js device code provided in this workshop onto the device
-
-**Please note that this section requires an IoT device that can emit messages to SNS. If you are setting this up on your own device outside of the workshop, please proceed through the sections below to do that, otherwise skip the device setup instructions as the device has been setup by AWS for you by the workshop instructor.**
-
-**Items Required**
-
-1\. One Intel® Edison and Grove IoT Starter Kit Powered by AWS. This can be purchased [here](http://www.amazon.com/gp/product/B0168KU5FK?*Version*=1&*entries*=0).
-2\. Within this starter kit you will be using the following components for this exercise:
-
-* Intel® Edison for Arduino
-* Base Shield
-* USB Cable; 480mm-Black x1
-* USB Wall Power Supply x1
-* Grove - PIR Motion Sensor: The application code is a very simple app that publishes a message to an Amazon Simple Notification Service (SNS) topic when motion is detected on the Grove PIR Motion Sensor. For the purpose of a workshop, this should be done only once in a central account by the workshop organizer - the SNS topic will be made public so that participants can subscribe to this topic and make use of it during the workshop.
-
-An example output message from the Intel Edison:
-
-``` {"message":"A Zombie has been detected in London!", "value":"1", "city":"London", "longtitude":"-0.127758", "lattitude":"51.507351"} ```
-
-A simple workflow of this architecture is:
-
-Intel Edison -> SNS topic -> Your AWS Lambda functions subscribed to the topic.
-
-####Creating the AWS Backend
-
-**If you are following this guide during a workshop presented by AWS, please ignore the steps below, 1-3\. An SNS topic should already be configured for the workshop participants to consume messages from. That SNS topic ARN will be provided to you.**
-
-1\. Create the SNS Topic. Navigate to the SNS product page within the AWS Management Console and click **Topics** in the left hand menu. Then click on 'Create New Topic'. You will be presented with the following window. Fill in the fields with your desired values and click create topic.
-
-
-2\. You will now need to edit the topic policy to permit any AWS account to subscribe lambda functions to your SNS topic. Select the check box next to your new topic, and then click **Actions -> Edit topic policy**. You need to configure these settings presented as shown the below screenshot. Then click **Update Policy**. This part is what allows others (perhaps teammates working on this lab with you, to consume notifications from your SNS topic.
-
-
-3\. You now have your central SNS topic configured and ready to use. Ensure that you make a note of the Topic ARN and region where you have created the topic, you will need it in some of the following steps.
-
-####Installing the application on the Intel Edison
-**If you are following this guide during a workshop presented by AWS, please ignore this section. An Intel Edison board should already be configured for the workshop particants to consume messages from.**
-
-1\. First, you will need to get your Edison board set up. You can find a getting started guide for this on the Intel site [here](https://software.intel.com/en-us/articles/assemble-intel-edison-on-the-arduino-board). Note that for the purpose of this tutorial, we will be writing our client code for the Edison in Node.js and will therefore be using the Intel® XDK for IoT (referred to as 'XDK' from here on, and which you will need to install) as our IDE.
-
-2\. You will need to physically connect the Grove PIR Motion Sensor to pin D6 on the breakout board.
-
-3\. Download all of the code from the 'zombieIntelEdisonCode' folder in the GitHub repository and store it in a folder locally on your machine. This simply consists of a main.js file (our application) and our package.json (our app dependencies).
-
-4\. Navigate to the homepage in the XDK and start a new project.
-
-5\. Choose to import an existing Node.js project and select the folder where you stored the code from this repository in the previous step.
-
-6\. Give your project a name. We called ours **zombieSensor**.
-
-7\. You now need to edit the code in main.js to include your AWS credentials and the SNS topic that you have created. Firstly, we'll need some AWS credentials.
-
-8\. You will need to create an IAM User with Access and Secret Access Keys for your Edison to publish messages to your SNS topic. There is a guide on how to create IAM Users [here](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_create.html). Your IAM policy for the user should look like the following:
-
-```
-{
- "Version": "2012-10-17",
- "Statement": [{
- "Action": [ "sns:Publish" ],
- "Effect": "Allow",
- "Resource": "ENTER YOUR SNS TOPIC ARN HERE"
- }]
-}
-```
-
-9\. Now let's add your credentials to the client side code. Edit the following line in main.js to include your user access keys and the region where you have set up your SNS topic.
-
-``` AWS.config.update({accessKeyId: 'ENTER ACCESSKEY HERE', secretAccessKey: 'ENTER SECRET ACCESS KEY HERE', region: 'ENTER REGION HERE'}); ```
-
-10\. Edit the following line in main.js to reflect the region in which you created the SNS topic.
-
-``` var sns = new AWS.SNS({region: 'ENTER REGION HERE'}); ```
-
-11\. Edit the following line in main.js to reflect the Amazon Resource Name (ARN) of the SNS topic that you created earlier.
-
-``` TopicArn: "ENTER YOUR SNS TOPIC ARN HERE" ```
-
-12\. You now need to connect the XDK to your Intel Edison device. There is a guide on the Intel site on how to do this [here](https://software.intel.com/en-us/getting-started-with-the-intel-xdk-iot-edition) under the 'Connect to your Intel® IoT Platform' section.
-
-13\. You now need to build the app and push it to your device. First, hit the build/install icon, this looks like a hammer in the XDK. It may take a couple of minutes to install the required packages etc.
-
-14\. Once the app has been built succesfully, you can run the app by pressing the run icon, this looks like a circuit board with a green 'play' sign.
-
-15\. Your app should now be running on the Edison device and your messages being published to the SNS topic. You can consume these messages using AWS Lambda. There is some documentation to get you started [here](http://docs.aws.amazon.com/sns/latest/dg/sns-lambda.html). Continue below to learn how to integrate the SNS notifications into the chat application.
-
-####Consuming the SNS Topic Messages with AWS Lambda
-
-Using the things learned in this workshop, can you develop a Lambda function that alerts survivors in the chat application when zombies are detected from the zombie sensor? In this section you will configure a Lambda function that triggers when messages are sent from the Edison device to the zombie sensor SNS topic. This function will push the messages to the chat application to notify survivors of zombies!
-
-1\. Open up the Lambda console and click **Create a Lambda function**.
-
-2\. On the blueprints screen, click **Skip** as we won't use one.
-
-3\. On the next page (**Configure Triggers**), click the empty field next to the AWS Lambda logo and select SNS as an event source.
-
-
-
-* For the SNS topic selection, either select the SNS topic from the dropdown you created earlier (if you're working on this outside of an AWS workshop) or if you are working in an AWS workshop, insert the shared SNS topic ARN provided to you by the organizer. Make sure the trigger checkbox option is set to enabled so that your Lambda function will immediately begin processing messages. Click **Next**.
-
-* The SNS Topic ARN provided by AWS (if in a workshop) is not in your AWS account and will not display in your dropdown of choices. It is an ARN provided by AWS in a separate account and needs to be typed in.
-
-4\. On the "Configure Function" screen, name your function "[Your CloudFormation Stack Name]-sensor". Now open the **exampleSNSFunction.js** file from the workshop GitHub repository. It is located [here](/zombieSensor/lambda/exampleSNSFunction.js). Copy the entire contents of this JS file into the empty Lambda code editor.
-
-When you've copied the code into the Lambda browser editor, locate the variable **API**. Replace the variable **API.endpoint** with your /zombie/message/post endpoint. It should look like **https://xxxxxxxx.execute-api.us-west-2.amazonaws.com**. This is the "Invoke URL" which you can grab from the Stages page in the API Gateway console. Remember, don't insert anything after the ".com" portion, the function fills in the rest of the resource path for you. You also should insert the region for your API in the **API.region** variable.
-
-5\. For the **Role**, leave the option as **Choose an existing role**. Then in the "Existing Role" dropdown, select the ZombieLabLambdaRole that was created for you by CloudFormation. It should look like "[Your CloudFormation stack name]-ZombieLabLambdaRole".
-
-6\. Set the **Timeout** to **30** seconds. Leave all other options as default on the Lambda creation page and click **Next**.
-
-7\. On the Review page, click **Create function**.
-
-8\. That's it! When your function is created, head on over to your survivor chat application. If your session has expired you may need to login again.
-
-* Almost immediately you should begin seeing zombie sensor messages showing up in the chat application which means your messages are successfully sending from the Intel Edison device to the Zombie Sensor SNS Topic. Any survivors with Lambda functions subscribed to this topic will get notifications in their team's survivor chat service.
-
-* This Lambda Function takes the zombie sensor message from SNS, parses it, and makes an AWS SigV4 signed HTTPS POST request to your API Gateway message endpoint. That endpoint inserts the record into DynamoDB as a message making it available to the application on subsequent poll requests.
## Workshop Cleanup
From 1ddb9f73feafecd12d99edb7e278182cbfb17e1c Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 11:49:33 -0500
Subject: [PATCH 4/9] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 9311199..06e2a9f 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ This section provides instructions to tear down your environment when you're don
Region | Launch Template
------------ | -------------
-**N. Virginia** (us-east-1) | [](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=zombiechat&templateURL=https://s3.amazonaws.com/-tcsn-zombielab/CreateZombieWorkshop.json)
+**N. Virginia** (us-east-1) | [](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/new?stackName=zombiechat&templateURL=https://s3.amazonaws.com/tcsn-zombielab/CreateZombieWorkshop.json)
2\. Once you are inside the AWS CloudFormation Console in US-EAST-1, you should be on a screen titled "Select Template". We are providing CloudFormation with a template on your behalf, so click the blue **Next** button to proceed.
From 797d432458b2f6d7fe3ec1899d1fd71f6b5efc86 Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 15:37:34 -0500
Subject: [PATCH 5/9] Update TwilioProcessing.js
---
Twilio/TwilioProcessing.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Twilio/TwilioProcessing.js b/Twilio/TwilioProcessing.js
index 5b1d115..02c5aba 100644
--- a/Twilio/TwilioProcessing.js
+++ b/Twilio/TwilioProcessing.js
@@ -7,7 +7,7 @@ var path = require('path');
/* == Globals == */
var API = {
- region: 'INSERT YOUR REGION CODE HERE', //i.e 'us-east-1'
+ region: 'us-east-1',
endpoint: 'INSERT YOUR API GATEWAY URL HERE INCLUDING THE HTTPS://' // ie: 'https://xxxxxxx.execute-api.us-east-1.amazonaws.com'
};
@@ -126,4 +126,4 @@ function postToChatService(post_data, context) {
console.log('Error: ' + err);
context.fail('Lambda failed with error ' + err);
});
-}
\ No newline at end of file
+}
From f6d59a00b40218ccbaf812f1012e73368855725f Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 15:38:24 -0500
Subject: [PATCH 6/9] Update ZombieWorkshopSearchIndexing.js
---
ElasticSearchLambda/ZombieWorkshopSearchIndexing.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js b/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js
index 9bf7442..ca6ed0b 100644
--- a/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js
+++ b/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js
@@ -3,7 +3,7 @@ var path = require('path');
/* == Globals == */
var esDomain = {
- region: 'us-west-2',
+ region: 'us-west-1',
endpoint: 'https://ENDPOINT_HERE',
index: 'messages',
doctype: 'message'
From 992d4c227afdc961f1b10e9c8b8ab894792ab61f Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 16:08:37 -0500
Subject: [PATCH 7/9] Update ZombieWorkshopSearchIndexing.js
---
ElasticSearchLambda/ZombieWorkshopSearchIndexing.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js b/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js
index ca6ed0b..d10f26f 100644
--- a/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js
+++ b/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js
@@ -3,8 +3,8 @@ var path = require('path');
/* == Globals == */
var esDomain = {
- region: 'us-west-1',
- endpoint: 'https://ENDPOINT_HERE',
+ region: 'us-east-1',
+ endpoint: 'https://YOUR_ENDPOINT_HERE',
index: 'messages',
doctype: 'message'
};
@@ -48,6 +48,7 @@ function postToES(doc, context) {
req.region = esDomain.region;
req.headers['presigned-expires'] = false;
req.headers['Host'] = endpoint.host;
+ req.headers['Content-Type'] = 'application/json';
req.body = doc;
console.log('Creating the Signer for the post request');
From f29016c9962d950691de4a2e818346813b795011 Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 16:44:25 -0500
Subject: [PATCH 8/9] Update SlackService.js
---
Slack/SlackService.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Slack/SlackService.js b/Slack/SlackService.js
index 312d36e..a31f2c9 100644
--- a/Slack/SlackService.js
+++ b/Slack/SlackService.js
@@ -5,7 +5,7 @@ var https = require('https');
/* == Globals == */
var API = {
- region: 'INSERT YOUR REGION HERE', // the region code where you launched the stack
+ region: 'us-east-1', // the region code where you launched the stack
endpoint: 'INSERT YOUR API GATEWAY FQDN HERE INCLUDING THE HTTPS://' //i.e.: Something like ... https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com
};
@@ -132,4 +132,4 @@ function postToChatService(post_data, context) {
context.fail('Lambda failed with error ' + err);
});
}
-
\ No newline at end of file
+
From d2fc14dc90a990a6026b0e0c066ff90bf0c08863 Mon Sep 17 00:00:00 2001
From: whhorn <whhorn@gmail.com>
Date: Mon, 21 Jan 2019 17:53:53 -0500
Subject: [PATCH 9/9] Update README.md
---
README.md | 115 +++++++++++++++++++++++++++++-------------------------
1 file changed, 62 insertions(+), 53 deletions(-)
diff --git a/README.md b/README.md
index 06e2a9f..54b3bb9 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Each of the labs in this workshop is an independent section and you may choose t
* **Lab 3: Search Integration with Elasticsearch**
- This exercise adds an Elasticsearch cluster to the application which is used to index chat messages streamed from the DynamoDB table containing chat messages.
+ This exercise adds an Elasticsearch cluster to the application which is used to index chat messages streamed from the DynamoDB table containing chat messages. You may also practice searching and visualization with Kibana.
* **Lab 4: Slack Integration**
@@ -58,6 +58,9 @@ Region | Launch Template
6\. Your stack will take about 3 minutes to launch and you can track its progress in the "Events" tab. When it is done creating, the status will change to "CREATE_COMPLETE".
7\. Click the "Outputs" tab in CloudFormation and click the link for "MyChatRoomURL". This should open your chat application in a new tab. Leave this tab open as you'll come back to it later.
+ Note - It will be helpful to leave open the CloudFormation Outputs tab as this information will be referenced
+
+
Please continue to the next section for the required Cognito User Pools authentication setup.
@@ -79,7 +82,7 @@ You will now setup the Cognito User Pool as the user directory of your chat app
-Cognito User Pools is not available in all AWS regions. Please review the list [here](https://docs.aws.amazon.com/general/latest/gr/rande.html#cognito_identity_region) for the regions that Cognito is available in. Therefore if you launched your CloudFormation stack in any region other than one of those listed on the above website, then please use the top navigation bar in the management console to switch AWS regions and navigate to **us-east-1 (Virginia)** to configure Cognito. Your application will stay hosted in the region you launched the CloudFormation template, but the authentication with Cognito will reside in us-east-1 (Virginia). If you launched the Cloudformation stack in one of those regions where Cognito exists, then please simply navigate to the Cognito service in the AWS Management Console as the service is available in that region already and you will configure it within that region.
+Cognito User Pools is not available in all AWS regions. Please review the list [here](https://docs.aws.amazon.com/general/latest/gr/rande.html#cognito_identity_region) for the regions that Cognito is available in. Therefore if you launched your CloudFormation stack in any region other than one of those listed on the above website, then please use the top navigation bar in the management console to switch AWS regions and navigate to **us-east-1 (Virginia)** to configure Cognito. Your application will stay hosted in the region you launched the CloudFormation template, but the authentication with Cognito will reside in us-east-1 (Virginia).
When inside the Cognito service console, click the blue button **Manage your User Pools**. You will setup the user directory that your chat application users will authenticate to when they use your app.
@@ -193,9 +196,9 @@ Download the **S3/assets/js.constants.js** file to your local machine and open i
* **Select your Camp**: Specify the geography where you live! Currently this attribute is not used in the application and is available for those that want to tackle an extra credit opportunity!. When you're done with the workshop, try and tackle the Channel Challenge in the Appendix.
-* **Slack Username**: Type the Slack Username you will use during the Slack lab of this workshop. This associates your Slack username with your Survivor app user account and is required if you want to do the Slack lab.
+* **Slack Username**: Type the Slack Username - your display name in Slack - you will use during the Slack lab of this workshop. This associates your Slack username with your Survivor app user account and is required if you want to do the Slack lab.
-* **Slack Team Domain Name**: Slack users can be members of many teams. Type the Slack team domain name that you want to integrate with this survivor chat app. The combination of a Slack team domain and Slack Username will unique identity a user to associate with your new Survivor chat app account.
+* **Slack Team Domain Name**: Slack users can be members of many teams. Type the Slack team domain name - tcsn-serverless - that you want to integrate with this survivor chat app. The combination of a Slack team domain and Slack Username will unique identity a user to associate with your new Survivor chat app account.
When done, click **Sign Up**.
@@ -220,6 +223,7 @@ After confirming your account, sign in with your credentials and begin chatting!
**The baseline chat application is now configured and working! There is still important functionality missing and the Lambda Signal Corps needs you to build it out...so get started below!**
+
*This workshop does not utilize API Gateway Cache. Please KEEP THIS FEATURE TURNED OFF as it is not covered under the AWS Free Tier and will incur additional charges. It is not a requirement for the workshop.*
## Lab 1 - Typing Indicator
@@ -312,7 +316,7 @@ The application uses [CORS](http://docs.aws.amazon.com/AmazonS3/latest/dev/cors.
**LAB 1 COMPLETE**
-Head back to the survivor chat app and **Refresh the page** type messages. POST requests are being made to the Talkers API resource which is updating a DynamoDB table continuously with timestamps along with who is typing. Simultaneously, the application is performing a continuous polling (GET Requests) against /zombie/talkers to show which survivors are typing. This displays
+Head back to the survivor chat app and **Refresh the page or logout/login** type messages. POST requests are being made to the Talkers API resource which is updating a DynamoDB table continuously with timestamps along with who is typing. Simultaneously, the application is performing a continuous polling (GET Requests) against /zombie/talkers to show which survivors are typing. This displays
@@ -332,13 +336,13 @@ In this section, you’ll create a free-trial Twilio SMS phone number. You will
2\. Once you have created your account, login to the Twilio console and navigate to the Home icon on the left navigation pane. On the Home screen/console dashboard, scroll down to the **Phone Numbers** section and click "Phone Numbers".
-3\. On the Phone Numbers screen, click **Get Started** to assign a phone number to your account. Then click the red **Get your first Twilio phone number** button. We’re going to generate a 10-digit phone number in this lab, but a short-code would also work if preferred. This number should be enabled for voice and messaging by default. A popup will appear with your new phone number, click **Choose this number**. If the proposed phone number does not support messaging, click "Search for a different number", select your country and select the checkbox "SMS", then click "Search". Twilio propose a list of phone number, select "Choose number" for one of them. Then, type your address, click "Save and continue" and "Done".
+3\. On the Phone Numbers screen, click **Get Started** to assign a phone number to your account. Then click the red **Get a trial number** button. We’re going to generate a 10-digit phone number in this lab, but a short-code would also work if preferred. This number should be enabled for voice and messaging by default. A popup will appear with your new phone number, click **Choose this number**. If the proposed phone number does not support messaging, click "Search for a different number", select your country and select the checkbox "SMS", then click "Search". Twilio propose a list of phone number, select "Choose number" for one of them. Then, type your address, click "Save and continue" and "Done".
* **International Users** - These are US phone numbers that you are provisioning in Twilio. You can also choose to configure an internationl number in Twilio, however there may be charges that apply. Currently this workshop only supports US phone numbers in the front end JS application due to the necessary formatting logic that has yet to be introduced into the code!
If you have an international mobile device, you can still do this lab. When registering for a user account in the zombie chat, just use a dummy placeholder 10 digit phone number for now. Later steps in this lab will illustrate a workaround that allows you to send SMS using your international phne number*
-4\. Once you’ve received a phone number, click the **Manage Numbers** button on the left navigation pane. Click on your phone number, which will take you to the properties page for that number.
+4\. Once you’ve received a phone number, click the **ellipses button->Super Network->Phone Numbers** button on the left navigation pane. Click on your phone number, which will take you to the properties page for that number.
5\. Scroll to the bottom of the properties page, to the **Messaging** section. In the **Configure With** dropdown, select the **Webhooks/TwiML** option. Leave this page open for now and proceed to the next step.
@@ -362,23 +366,25 @@ If you have an international mobile device, you can still do this lab. When regi
* As you'll see throughout this workshop, we will leverage separate Lambda functions to pre-process data before sending standardized/formatted requests to the /zombie/message resource. This allows us to-reuse the existing DynamoDB logic sitting behind the /zombie/message resource rather than writing multiple separate functions that all interact with DynamoDB individually. As messages come in to your Twilio number, the Twilio webhook forwards them with HTTP POST requests to your /zombie/twilio resource, which will be integrated with a backend pre-processing Lambda function. This pre-processing function will strip apart the Twilio payload and format it before making a signed SigV4 HTTPS POST to your /zombie/message service which requires IAM authorization in order to be invoked.
-12\. Click **Create a Lambda function** and select the blueprint titled **Blank Function** as we will be creating a brand new function. Click **Next** to skip through the Configure Triggers screen.
+12\. Click **Create a Lambda function** and select the blueprint titled **Blank Function** as we will be creating a brand new function.
+
+* Select the US-East-1 Region for your new function
+* Assign the existing **[Your stack name]-ZombieLabLambdaRole...** Execution Role - For simplicity we are reusing the same Lambda role for our functions.
+* Click **Next** to move to the Lambda Configuration screen.
-13\. Create a name for the function, such as **"[Your CloudFormation stack name]-TwilioProcessing"**. Set the "Runtime" as **Node.js 4.3**. In the source code found on Github, open the **TwilioProcessing.js** file found inside the **/Twilio** folder. Delete the sample code in the Lambda console editor and replace it with the entire contents from your TwilioProcessing.js file. Once you have copied the code into Lambda, scroll down to [line 8](/Twilio/TwilioProcessing.js#L8) in the code where the **API** variable is declared. **API.endpoint** should show a value of "INSERT YOUR API GATEWAY URL HERE INCLUDING THE HTTPS://". Please replace this string with the fully qualified domain name (FQDN) of the URL for your **/zombie/message** POST method found in API Gateway. For example, it should look something like "https://xxxxxxxx.execute-api.us-west-2.amazonaws.com".
+13\. Create a name for the function, such as **"[Your CloudFormation stack name]-TwilioProcessing"**. Set the "Runtime" as **Node.js 8.10**. In the source code found on Github, open the **TwilioProcessing.js** file found inside the **/Twilio** folder. Delete the sample code in the Lambda console editor and replace it with the entire contents from your TwilioProcessing.js file. Once you have copied the code into Lambda, scroll down to [line 8](/Twilio/TwilioProcessing.js#L8) in the code where the **API** variable is declared. **API.endpoint** should show a value of "INSERT YOUR API GATEWAY URL HERE INCLUDING THE HTTPS://". Please replace this string with the fully qualified domain name (FQDN) of the URL for your **/zombie/message** POST method found in API Gateway. For example, it should look something like "https://xxxxxxxx.execute-api.us-west-2.amazonaws.com".
-You should also fill in the region code in the variable **API.region**. This should be the region where you launched CloudFormation.
Next, you will also copy in the name of your DynamoDB **Users** table that was created for you. This should be named as **[Your CloudFormation Stack Name]-users"**. You should copy this table name into the **table** variable in your Lambda code. You will also need to copy in the name of your "phoneindex" (this is an index that was created on the DynamoDB table to assist with querying). These attributes can be found in the Outputs section in CloudFormation. You should be copying the values for **DynamoDBUsersTableName** and **DynamoDBUsersPhoneIndex** from CloudFormation.
-* Some of the functions in this workshop were originally authored for Nodejs 0.10 but are still capable of running in the Node4.3 runtimes +. The workshop will soon be upgraded to use the latest Nodejs runtime that is supported by Lambda.
-14\. After you have copied the code into the Lambda inline code console and modified the variables, scroll down to the **Lambda function handler and role** section. **Choose an existing role** should be selected from the dropdown. Then for the existing **role**, select the role that looks like **[Your stack name]-ZombieLabLambdaRole...**. For simplicity we are reusing the same Lambda role for our functions.
+Under "Advanced settings", set the **Timeout** field to 30 seconds and keep all the rest of the defaults set.
-15\. Under "Advancted settings", set the **Timeout** field to 30 seconds and keep all the rest of the defaults set. Then click **Next** and then **Create function** on the Review page to create your Lambda function.
+Then click **Save** on the upper right of the page to create your Lambda function.
* You have just created a Lambda function that is integrated as the backend for your /zombie/twilio resource POST method. The function converts the parameters to the correct format for our Chat Service including a conversion to JSON format, and makes an HTTPS POST request to the /zombie/message Chat Service resource. That endpoint will take care of inserting the data into the DynamoDB messages table.
-16\. Now that you have created the TwilioProcessing function, you need to connect it to the **POST** method for your /zombie/twilio endpoint. Navigate back to the API Gateway console and select the **POST** method for your **/zombie/twilio** resource.
+15\. Now that you have created the TwilioProcessing function, you need to connect it to the **POST** method for your /zombie/twilio endpoint. Navigate back to the API Gateway console and select the **POST** method for your **/zombie/twilio** resource.
17\. On the **Method Execution** screen for the "POST" method, the "Integration Request" box should show a type of **MOCK** for your /twilio resource.
@@ -388,7 +394,7 @@ Next, you will also copy in the name of your DynamoDB **Users** table that was c
20\. Twilio sends data from their API with a content-type of "application/x-www-form-urlencoded", but Lambda requires the content-type to be "application/json" for any payload parameters sent to it. You will configure a Mapping Template so that API Gateway converts the content type of incoming messages into JSON before executing your backend Lambda TwilioProcessing function with the parameters.
-21\. On the Integration Request screen for your /zombie/twilio POST method, expand the **Body Mapping Templates** section and click **Add mapping template**. In the textbox for "Content-Type", input **application/x-www-form-urlencoded** and click the little checkmark button to continue. Once you have clicked the little checkbox, a popup window will appear asking if you want to only allow requests that match the Content-Type you specified. Click **Yes, secure this integration**. A new section will appear below with a dropdown for **Generate Template**. Click that dropdown and select **Method Request Passthrough**.
+21\. On the Integration Request screen for your /zombie/twilio POST method, expand the **Mapping Templates** section and click **Add mapping template**. In the textbox for "Content-Type", input **application/x-www-form-urlencoded** and click the little checkmark button to continue. Once you have clicked the little checkbox, a popup window will appear asking if you want to only allow requests that match the Content-Type you specified. Click **Yes, secure this integration**. A new section will appear below with a dropdown for **Generate Template**. Click that dropdown and select **Method Request Passthrough**.
22\. A "Template" text editor window will appear. In this section you will input a piece of VTL transformation logic to convert the incoming Twilio data to JSON format. In this text editor, **delete all of the pre-filled content** and copy the following code into the editor.
@@ -399,7 +405,7 @@ After copying the code into the editor, click the **Save** button. You have now
23\. Now that you have configured the Integration Request to transform incoming messages into JSON, we need to configure the Integration Response to transform outgoing responses back to Twilio into XML format since the Twilio API requires XML as a response Content-Type. This step is required so that when you send SMS messages to the survivor Chat Service, it can respond back to your Twilio Phone Number with a confirmation message that your message was received successfully.
-24\. Head back to the Method Execution screen for the twilio POST method. On the "Method Execution" screen for your /zombie/twilio POST method, click **Integration Response**. On the "Integration Response" screen, click the black arrow to expand the method response section. Expand the **Body Mapping Templates** section. You should see a Content-Type of "application/json". We need a Content-Type of XML, not JSON, so **delete this Content-Type by clicking the little black minus icon** and click **Delete** on the pop-up window.
+24\. Head back to the Method Execution screen for the twilio POST method. On the "Method Execution" screen for your /zombie/twilio POST method, click **Integration Response**. On the "Integration Response" screen, click the black arrow to expand the method response section. Expand the **Mapping Templates** section. You should see a Content-Type of "application/json". We need a Content-Type of XML, not JSON, so **delete this Content-Type by clicking the little black minus icon** and click **Delete** on the pop-up window.
25\. Click **Add mapping template** similar to the way you did this in the earlier steps for the Integration Request section.
@@ -454,7 +460,9 @@ In this lab you'll launch an Elasticsearch Service cluster and setup DynamoDB St
3\. On the **Configure Cluster** page, leave the default cluster settings and click **Next**.
-4\. For the access policy, select the **Allow or deny access to one or more AWS accounts or IAM users** option in the dropdown and fill in your account ID. Your AWS Account ID is actually provided to you in the examples section so just copy and paste it into the text box. Make sure **Allow** is selected for the "Effect" dropdown option. Click **OK**.
+4\. For the network policy, select the **Public Access** option.
+
+For the access policy, select the **Allow or deny access to one or more AWS accounts or IAM users** option in the dropdown and fill in your account ID. Your AWS Account ID is actually provided to you in the examples section so just copy and paste it into the text box. Make sure **Allow** is selected for the "Effect" dropdown option. Click **OK**.
5\. Select **Next** to go to the domain review page.
@@ -469,34 +477,36 @@ In this lab you'll launch an Elasticsearch Service cluster and setup DynamoDB St
9\. Go into the Lambda service page by clicking on Lambda in the Management Console.
-10\. Select **Create a Lambda Function**.
-
-11\. On the Blueprints screen select **Blank Function** to create a Lambda function from scratch.
-
-12\. In Configure Triggers section, select the DynamoDB event source type and then select the **messages** DynamoDB table. It should appear as **"[Your CloudFormation stack name]-messages"**. Then set the **Batch size** to **5**, the **Starting position** to **Latest** and select the checkbox **Enable trigger**. Then click on Next button.
+10\. Click **Create a Lambda function** and select the blueprint titled **Blank Function** as we will be creating a brand new function.
+* Give your function a name, such as **"[Your CloudFormation stack name]-ESsearch"**. Keep the runtime at the default. You can set a description for the function if you'd like.
+* Select the US-East-1 Region for your new function
+* Assign the existing **[Your stack name]-ZombieLabLambdaRole...** Execution Role - For simplicity we are reusing the same Lambda role for our functions.
+* Click **Next** to move to the Lambda Configuration screen.
-13\. Give your function a name, such as **"[Your CloudFormation stack name]-ESsearch"**. Keep the runtime at the default. You can set a description for the function if you'd like.
+11\. In Configure Triggers section, select the DynamoDB event source type and then select the **messages** DynamoDB table. It should appear as **"[Your CloudFormation stack name]-messages"**. Then set the **Batch size** to **5**, the **Starting position** to **Latest** and select the checkbox **Enable trigger**. Then click on Next button..
-14\. Paste in the code from the ZombieWorkshopSearchIndexing.js file provided to you. This is found in the Github repo in the "ElasticsearchLambda" folder.
+12\. Paste in the code from the ZombieWorkshopSearchIndexing.js file provided to you. This is found in the Github repo in the "ElasticsearchLambda" folder.
-15\. On [line 6](/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js#L6) in the code provided, replace the **region** variable with the code for the region you are working in (the region you launched your stack, created your Lambda function etc). If you're working in Oregon region, then leave the code us-west-2 as is.
+13\. On [line 6](/ElasticSearchLambda/ZombieWorkshopSearchIndexing.js#L6) in the code provided, check the **region** variable with the code for the region you are working in which should be us-east-1, edit as necessary.
Then on line 7, replace the **endpoint** variable that has a value of **ENDPOINT_HERE** with the Elasticsearch endpoint created in step 8\. **Make sure the endpoint you paste starts with https://**.
* This step requires that your cluster is finished creating and in "Active" state before you'll have access to see the endpoint of your cluster.
-16\. Now you'll add an execution role to your Lambda function which gives permissions for your Lambda function to access AWS resources. For the Role, select **Choose an existing role**, and for the Existing Role, select **"[Your CloudFormation stack name]-ZombieLabLambdaRole"** which is the role that was created for you for this workshop. It has permissions to the Elasticsearch service.
+Under "Advanced settings", set the **Timeout** field to 60 seconds and keep all the rest of the defaults set.
-17\. Expand the "Advanced settings" section and find the "Timeout" field for your Lambda function. In the timeout field, change the function timeout to **1** minute. This ensures Lambda can process the batch of messages before Lambda times out. Keep all the other defaults on the page set as is. Select **Next** and then on the Review page, select **Create function** to create your Lambda function.
+Then click **Save** on the upper right of the page to create your Lambda function.
-18\. In the above step, we configured [DynamoDB Streams](http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Streams.html) to capture incoming messages on the table and trigger a Lambda function to push them to our Elasticsearch cluster. Your messages posted in the chat from this point forward will be indexed to Elasticsearch. Post a few messages in the chat, at least 5 as configured in the DynamoDB Streams event source (batch size). You should be able to see that messages are being indexed in the "Indices" section for your cluster in the Elasticsearch Service console.
+
+
+14\. In the above step, we configured [DynamoDB Streams](http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Streams.html) to capture incoming messages on the table and trigger a Lambda function to push them to our Elasticsearch cluster. Your messages posted in the chat from this point forward will be indexed to Elasticsearch. Post a few messages in the chat, at least 5 as configured in the DynamoDB Streams event source (batch size). You should be able to see that messages are being indexed in the "Indices" section for your cluster in the Elasticsearch Service console.
**LAB 3 COMPLETE**
If you would like to explore and search over the messages in the Kibana web UI that is provided with your cluster, you will need to navigate to the Elasticsearch domain you created and change the permissions. Currently you've configured the permissions so that only your AWS account has access. This allows your Lambda function to index messages into the cluster.
-To use the web UI to build charts and search over the index, you will need to implement an IP based policy to whitelist your computer/laptop/network or for simplicity, choose to allow everyone access. For instructions on how to modify the access policy of an ES cluster, visit [this documentation](http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg-configure-access.html). If you choose to open access to anyone be aware that anyone can see your messages, so please be sure to restrict access back to your AWS account when you're done exploring Kibana, or simply delete your ES cluster.
+To use the web UI to build charts and search over the index, you will need to implement an IP based policy to whitelist your computer/laptop/network or for simplicity, **choose to temporarily allow everyone access using the provided access policy template**. For instructions on how to modify the access policy of an ES cluster, visit [this documentation](http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-gsg-configure-access.html). If you choose to open access to anyone be aware that anyone can see your messages, so please be sure to restrict access back to your AWS account when you're done exploring Kibana, or simply delete your ES cluster.
* * *
@@ -511,7 +521,7 @@ If you aren't familiar with Slack, they offer a free chat communications service
**Slack Integration Architecture**
-1\. Go to [http://www.slack.com](http://www.slack.com) and create a username, as well as a team. If you want to use your existing Slack username and existing team, then proceed with that profile instead of creating a new one.
+1\. Go to [http://www.slack.com](http://www.slack.com) and join the provided slack channel and team. If you want to use your existing Slack username and join the workshop team, then proceed with that profile instead of creating a new one.
2\. Once logged into your Slack team, navigate to [https://slack.com/apps](https://slack.com/apps) which should direct you to the app directory for your team. In the search bar in the middle of the App Directory page, type **slash commands** and select it from the options. This will take you to the Slash Commands portal.
@@ -519,52 +529,51 @@ If you aren't familiar with Slack, they offer a free chat communications service
Slash commands allow you to define a command that you can use within Slack to trigger Slack to perform actions in an event driven manner. In this case we are going to configure a slash command to forward messages to an external source with a webhook. You'll configure your Slash Command to make a POST request to a /zombie/slack API resource you will soon be creating in API Gateway.
-4\. On the Slash Commands configuration page, define a command in the **Commands** text box. Insert **/survivors** as your Slash Command. Then select "Add Slash Command Integration" to save it.
+4\. On the Slash Commands configuration page, define a command in the **Commands** text box. Insert **/"initials"survivors** as your Slash Command. Then select "Add Slash Command Integration" to save it.
5\. On the Integration Settings page, scroll down to the **Method** configuration andmake sure the **Method** section has "POST" selected from the dropdown options. Then scroll to the **Token** section and copy the Token (or generate a new one) to a text file as you'll need it in the following steps.
-6\. Keep the Slack browser tab open and in another tab navigate to the AWS Lambda management console in the AWS Management Console.
-
-7\. Click **Create a Lambda function**. You'll create a Lambda function to parse incoming Slack messages and send them to the Chat Service.
+*Feel free to add an autocompelte setting using your slash app name to make it easy to locate when testing
-8\. On the Blueprints page select **Blank Function** to create a function from scratch. Also skip past the triggers page by selecting **Next**.
+6\. Keep the Slack browser tab open and in another tab navigate to the AWS Lambda management console in the AWS Management Console.
-9\. Give your function a name such as **"[Your CloudFormation Stack name]-SlackService"**. For the Nodejs version, you can keep the default Nodejs version selected. Now navigate to the GitHub repo for this workshop, or the location where you downloaded the GitHub files to your local machine.
+7\. Click **Create a Lambda function** and select the blueprint titled **Blank Function** as we will be creating a brand new function.
+* Give your function a name, such as **"[Your CloudFormation Stack name]-SlackService"**. Keep the runtime at the default. You can set a description for the function if you'd like.
+* Select the US-East-1 Region for your new function
+* Assign the existing **[Your stack name]-ZombieLabLambdaRole...** Execution Role - For simplicity we are reusing the same Lambda role for our functions.
+* Click **Next** to move to the Lambda Configuration screen.
-10\. Open the **SlackService.js** file from the GitHub repo, found in the slack folder. Copy the entire contents of this js file into the Lambda inline edit window.
+8\. Open the **SlackService.js** file from the GitHub repo, found in the slack folder. Copy the entire contents of this js file into the Lambda inline edit window.
* This SlackService function will serve as the backend for a new /zombie/slack API resource you will create later. This function accepts incoming messages forwarded from Slack when you use the slash command, it then reformats the parameters and proxies the Slack messages to the zombie survivor chat service (/zombi/message) . This Lambda function verifies that the incoming message has the predefined Slack Token, and it also does a DynamoDB query against the Users table to validate that the user who submitted the message in Slack is a preconfigured survivor in our backend (Remember when you signed up for the chat, you provided your Slack username and team domain as part of the sign-up process). In this workshop, we're using this is as the way to authorize requests against the /zombie/slack resource.
-11\. You should have saved the Slack Token string from earlier. Copy the Token string from Slack into the "token" variable on [line 15](/Slack/SlackService.js#L15) in the Lambda function, replacing the string **INSERT YOUR TOKEN FROM SLACK HERE** with your own token.
+9\. You should have saved the Slack Token string from earlier. Copy the Token string from Slack into the "token" variable on [line 15](/Slack/SlackService.js#L15) in the Lambda function, replacing the string **INSERT YOUR TOKEN FROM SLACK HERE** with your own token.
* Slack provides a unique token associated with your integration. You are copying this token into your Lambda function as a form of validation. When incoming requests from Slack are sent to your API endpoint, and your Lambda function is invoked with the Slack payload, your Lambda function will check to verify that the incoming Token in the request matches the Token you provided in the code. If the token does not match, Lambda returns an error and doesn't process the request.
-12\. There are 4 variables you need to insert in the code to communicate with the backend.
+10\. There are 4 variables you need to check/insert in the code to communicate with the backend.
a) In the "API" variable, you will insert the fully qualified domain name (FQDN) for your API. The **API.endpoint** variable should show a value of "INSERT YOUR API GATEWAY FQDN HERE INCLUDING THE HTTPS://" on [line 9](/Slack/SlackService.js#L9). Your final FQDN inserted into the code should look something like "https://xxxxxxxx.execute-api.us-west-2.amazonaws.com". This allows the SlackService function to communicate with your API.
-b) You should also fill in the region code in the variable **API.region**. This should be the region where you launched CloudFormation.
+b) You should verify the region code in the variable **API.region**. This should be us-east-1
c) Finally you will also copy in the name of your DynamoDB Users table that was created for you. This should be placed in the **table** variable. You will also need to copy in the name of your "slackindex" (this is an index that was created on the DynamoDB table to assist with querying). These attributes can be found in the Outputs section in CloudFormation. You should be copying the values for **DynamoDBUsersTableName** and **DynamoDBUsersSlackIndex** from CloudFormation.
-13\. After you have copied the code into the Lambda inline code console and modified the variables, scroll down to the **Lambda function handler and role** section. For the role, select **Choose an existing role** from the dropdown and then select the role that looks like **[Your stack name]-ZombieLabLambdaRole...**. For simplicity we are reusing the same Lambda role for our functions.
-
-14\. In the Advanced Settings, set the **Timeout** to **30** seconds. Then click **Next**.
+* Under "Advanced settings", set the **Timeout** field to 60 seconds and keep all the rest of the defaults set.
-15\. On the review page, make sure that everything looks correct.
+* Then click **Save** on the upper right of the page to create your Lambda function.
-16\. Click **Create function**. Your Lambda function will be created.
-17\. When the function is created, navigate to the API Gateway service in the AWS Management Console. Click into your "Zombie Workshop API Gateway" API. On the left Resources pane, click/highlight the "/zombie" resource so that it is selected. Then select the **Actions** button and choose "Create Resource". For Resource Name, insert **slack** and for Resource Path, insert **slack**. Click "Create Resource" to create your slack API resource. The final resource for your Slack API should be as shown below.
+10\. When the function is created, navigate to the API Gateway service in the AWS Management Console. Click into your "Zombie Workshop API Gateway" API. On the left Resources pane, click/highlight the "/zombie" resource so that it is selected. Then select the **Actions** button and choose "Create Resource". For Resource Name, insert **slack** and for Resource Path, insert **slack**. Click "Create Resource" to create your slack API resource. The final resource for your Slack API should be as shown below.
* In this step, you are creating a new API resource that the Slack slash command webhook can forward requests to. In the next steps, you'll create a POST method associated with this resource that triggers your Lambda function. When you type messages in Slack with the correct slash command, Slack will send requests to this resource, which will invoke your SlackService Lambda function to pre-process the payload and make a call to your /zombie/message endpoint to insert the data into DynamoDB.
-18\. For your newly created "/slack" resource, highlight it, then click **Actions** and select **Create Method** to create the **POST** method for the /zombie/slack resource. In the dropdown, select **POST**. Click the checkmark to create the POST method. On the Setup page, choose an Integration Type of **Lambda Function**, and select the region that you are working in for the region dropdown. For the Lambda Function field, type "SlackService" for the name of the Lambda Function. It should autofill your function name. Click **Save** and then **OK** to confirm.
+11\. For your newly created "/slack" resource, highlight it, then click **Actions** and select **Create Method** to create the **POST** method for the /zombie/slack resource. In the dropdown, select **POST**. Click the checkmark to create the POST method. On the Setup page, choose an Integration Type of **Lambda Function**, and select the region that you are working in for the region dropdown. For the Lambda Function field, type "SlackService" for the name of the Lambda Function. It should autofill your function name. Click **Save** and then **OK** to confirm.
-19\. Click **Integration Request** for the /slack POST method. We'll create a Mapping Template to convert the incoming query string parameters from Slack into JSON which is the format Lambda requires for parameters. This mapping template is required so that the incoming Slack message can be converted to the right format.
+12\. Click **Integration Request** for the /slack POST method. We'll create a Mapping Template to convert the incoming query string parameters from Slack into JSON which is the format Lambda requires for parameters. This mapping template is required so that the incoming Slack message can be converted to the right format.
-20\. Expand the **Body Mapping Templates** arrow and click **Add mapping template**. In the Content-Type box, enter **application/x-www-form-urlencoded** and click the little checkmark to continue. If a popup appears asking if you would like to secure the integration, click **Yes, secure this integration**. This ensures that only requests with the defined content-types will be allowed.
+12\. Expand the **Mapping Templates** arrow and click **Add mapping template**. In the Content-Type box, enter **application/x-www-form-urlencoded** and click the little checkmark to continue. If a popup appears asking if you would like to secure the integration, click **Yes, secure this integration**. This ensures that only requests with the defined content-types will be allowed.
As you did in the Twilio lab, we're going to copy VTL mapping logic to convert the request to JSON. A new section will appear on the right side of the screen with a dropdown for **Generate Template**. Click that dropdown and select **Method Request Passthrough**.
@@ -578,14 +587,14 @@ Click the grey **Save** button to continue. The result should look like the scre
-21\. Click the **Actions** button on the left side of the API Gateway console and select **Deploy API** to deploy your API. In the Deploy API window, select **ZombieWorkshopStage** from the dropdown and click **Deploy**.
+14\. Click the **Actions** button on the left side of the API Gateway console and select **Deploy API** to deploy your API. In the Deploy API window, select **ZombieWorkshopStage** from the dropdown and click **Deploy**.
-22\. On the left pane navigation tree, expand the ZombieWorkshopStage tree. Click the **POST** method for the **/zombie/slack** resource. You should see an Invoke URL appear for that resource as shown below.
+15\. On the left pane navigation tree, expand the ZombieWorkshopStage tree. Click the **POST** method for the **/zombie/slack** resource. You should see an Invoke URL appear for that resource as shown below.
-23\. Copy the entire Invoke URL. Navigate back to the Slack.com website to the Slash Command setup page and insert the Slack API Gateway Invoke URL you just copied into the "URL" textbox. Make sure to copy the entire url including "HTTPS://". Scroll to the bottom of the Slash Command screen and click **Save Integration**.
+16\. Copy the entire Invoke URL. Navigate back to the Slack.com website to the Slash Command setup page and insert the Slack API Gateway Invoke URL you just copied into the "URL" textbox. Make sure to copy the entire url including "HTTPS://". Scroll to the bottom of the Slash Command screen and click **Save Integration**.
-24\. You're ready to test out the Slash Command integration. In the team chat channel for your Slack account, type the Slash Command "/survivors" followed by a message. For example, type "/survivors Please help me I am stuck and zombies are trying to get me!". After sending it, you should get a confirmation response message from Slack Bot like the one below:
+17\. You're ready to test out the Slash Command integration. In the team chat channel for your Slack account, type the Slash Command "/survivors" followed by a message. For example, type "/survivors Please help me I am stuck and zombies are trying to get me!". After sending it, you should get a confirmation response message from Slack Bot like the one below:
**LAB 4 COMPLETE**