Merge branch 'master' of github.com:aws-samples/aws-serverless-workshops

Author: Pirtle

Auth/images/wildrydes-complete-architecture.png

@@ -38,7 +38,7 @@ <h4 id="create-an-amazon-s3-bucket">1. Create an Amazon S3 bucket</h4>
 <li><p>Provide a globally unique name for your bucket such as <code>wildrydes-data-yourname</code>.</p></li>
 <li><p>Select the region you’ve been using for your bucket.</p>
 <p><img src="images/data-lake-create-bucket.png" /></kbd></p></li>
-<li><p>Click <strong>Next</strong> twice, and then click <strong>Create bucket</strong>.</p></li>
+<li><p>Click <strong>Next</strong> three times, and then click <strong>Create bucket</strong>.</p></li>
 </ol>
 <h4 id="create-an-amazon-kinesis-data-firehose-delivery-stream">2. Create an Amazon Kinesis Data Firehose delivery stream</h4>
 <p>Create an Amazon Kinesis Data Firehose delivery stream named <strong>wildrydes</strong> that is configured to source data from the <strong>wildrydes</strong> stream and deliver its contents in batches to the S3 bucket created in the previous section.</p>
@@ -88,7 +88,7 @@ <h4 id="create-an-amazon-athena-table">3. Create an Amazon Athena table</h4>
 <button class="btn btn-outline-primary copy">
 Copy to Clipboard
 </button></li>
-<li><p>Click <strong>Run Query</strong>.</p></li>
+<li><p>Click <strong>Run Query</strong>. You might have to run the query twice.</p></li>
 <li><p>Verify the table <strong>wildrydes</strong> was created by ensuring it has been added to the list of tables in the left navigation.</p></li>
 </ol>
 <h4 id="explore-the-batched-data-files">4. Explore the batched data files</h4>

Auth/images/wildrydes-module1-architecture.png

@@ -80,7 +80,7 @@ <h4 id="create-a-lambda-function-to-process-the-stream">3. Create a Lambda funct
 <p><img src="./images/stream-processing-lambda-basic-information.png" /></p></li>
 <li><p>Click <strong>Create function</strong>.</p></li>
 <li><p>Scroll down to the <strong>Function code</strong> section.</p></li>
-<li><p>Select <strong>Node.js 6.10</strong> from <strong>Runtime</strong>.</p></li>
+<li><p>Select <strong>Node.js 8.10</strong> from <strong>Runtime</strong>.</p></li>
 <li><p>Copy and paste the JavaScript code below into the code editor.</p>
 <div class="sourceCode" id="cb1"><pre class="sourceCode javascript"><code class="sourceCode javascript"><a class="sourceLine" id="cb1-1" data-line-number="1"><span class="st">&#39;use strict&#39;</span><span class="op">;</span></a>
 <a class="sourceLine" id="cb1-2" data-line-number="2"></a>
@@ -171,7 +171,7 @@ <h4 id="monitor-the-lambda-function">4. Monitor the Lambda function</h4>
 <ol type="1">
 <li><p>Run the producer to start emiting sensor data to the stream with a unique unicorn name.</p>
 <pre class="console"><code>./producer -name Rocinante</code></pre></li>
-<li><p>Click on the <strong>Monitoring</strong> tab and explore the metrics available to monitor the function. Click on <strong>Jump to Logs</strong> to explore the function’s log output.</p></li>
+<li><p>Click on the <strong>Monitoring</strong> tab and explore the metrics available to monitor the function. Click on <strong>View logs in CloudWatch</strong> to explore the function’s log output.</p></li>
 </ol>
 <button class="btn btn-outline-primary copy">
 Copy to Clipboard

Auth/images/wildrydes-module2-architecture.png

@@ -25,7 +25,7 @@ Below is a code snippet from the SAM template to list Unicorns:
     Type: 'AWS::Serverless::Function'
     Properties:
       FunctionName: 'uni-api-list'
-      Runtime: nodejs6.10
+      Runtime: nodejs8.10
       CodeUri: app
       Handler: list.lambda_handler
       Description: List Unicorns
@@ -47,7 +47,7 @@ The **FunctionName** property defines a custom name for the Lambda function.  If
 
 #### Runtime
 
-The example API shown above is implemented in **Node.js 6.10**.  Additional runtimes are available for AWS Lambda.  Please refer to the [Lambda Execution Environment and Available Libraries](http://docs.aws.amazon.com/lambda/latest/dg/current-supported-versions.html) for the complete list.
+The example API shown above is implemented in **Node.js 8.10**.  Additional runtimes are available for AWS Lambda.  Please refer to the [Lambda Execution Environment and Available Libraries](http://docs.aws.amazon.com/lambda/latest/dg/current-supported-versions.html) for the complete list.
 
 #### CodeUri
 
@@ -73,19 +73,43 @@ Each of the following sections provide an implementation overview and detailed,
 
 If you're using the latest version of the Chrome, Firefox, or Safari web browsers the step-by-step instructions won't be visible until you expand the section.
 
+### 1. Update CodeStarWorker-uni-api-CloudFormation IAM Role
 
-### 1. Seed the `uni-api` CodeCommit Git repository
+1. In the AWS Management Console, click Services then select IAM under Security, Identity, & Compliance.
+
+1. Click the **Search IAM** search box.
+
+    ![Search IAM](images/cloudformation-role-1.png)
+
+1. Type `CodeStarWorker-uni-api-CloudFormation` in the search box and select **CodeStarWorker-uni-api-CloudFormation** in the left navigation.
+
+    ![Search CodeStarWorker-uni-api-CloudFormation](images/cloudformation-role-2.png)
+
+1. In the IAM Role Summary page, click the **Attach policies** button.
+
+    ![Attach policies](images/cloudformation-role-3.png)
+
+1. Type `AWSLambdaFullAccess` in the filter text box, select the checkbox to the left of the **AWSLambdaFullAccess** IAM Role, and click **Attach policy**.
+
+    ![Add AWSLambdaFullAccess policy](images/cloudformation-role-4.png)
+
+1. Upon returning to the IAM Role Summary page, note that the **AWSLambdaFullAccess** policy has been added to the Role.
+
+    ![Confirm policy addition](images/cloudformation-role-5.png)
+
+
+### 2. Seed the `uni-api` CodeCommit Git repository
 
 1. Each module has corresponding source code used to seed the CodeCommit Git repository for the CodeStar project.  To seed the CodeCommit Git repository, click on the **Launch Stack** button for your region below:
 
     Region| Launch
     ------|-----
-    US East (N. Virginia) | [![Launch Module 1 in us-east-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-us-east-1/codecommit-template.yml&param_sourceUrl=https://s3.amazonaws.com/fsd-aws-wildrydes-us-east-1/uni-api-1-v3.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=us-east-1)
-    US West (N. California) | [![Launch Module 1 in us-west-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-us-west-1/codecommit-template.yml&param_sourceUrl=https://s3-us-west-1.amazonaws.com/fsd-aws-wildrydes-us-west-1/uni-api-1-v3.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=us-west-1)
-    US West (Oregon) | [![Launch Module 1 in us-west-2](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-us-west-2/codecommit-template.yml&param_sourceUrl=https://s3-us-west-2.amazonaws.com/fsd-aws-wildrydes-us-west-2/uni-api-1-v3.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=us-west-2)
-    EU (Ireland) | [![Launch Module 1 in eu-west-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=eu-west-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-eu-west-1/codecommit-template.yml&param_sourceUrl=https://s3-eu-west-1.amazonaws.com/fsd-aws-wildrydes-eu-west-1/uni-api-1-v3.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=eu-west-1)
-    EU (Frankfurt) | [![Launch Module 1 in eu-central-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=eu-central-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-eu-central-1/codecommit-template.yml&param_sourceUrl=https://s3-eu-central-1.amazonaws.com/fsd-aws-wildrydes-eu-central-1/uni-api-1-v3.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=eu-central-1)
-    Asia Pacific (Sydney) | [![Launch Module 1 in ap-southeast-2](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-2#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-ap-southeast-2/codecommit-template.yml&param_sourceUrl=https://s3-ap-southeast-2.amazonaws.com/fsd-aws-wildrydes-ap-southeast-2/uni-api-1-v3.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=ap-southeast-2)
+    US East (N. Virginia) | [![Launch Module 1 in us-east-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-us-east-1/codecommit-template.yml&param_sourceUrl=https://s3.amazonaws.com/fsd-aws-wildrydes-us-east-1/uni-api-1-v4.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=us-east-1)
+    US West (N. California) | [![Launch Module 1 in us-west-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-us-west-1/codecommit-template.yml&param_sourceUrl=https://s3-us-west-1.amazonaws.com/fsd-aws-wildrydes-us-west-1/uni-api-1-v4.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=us-west-1)
+    US West (Oregon) | [![Launch Module 1 in us-west-2](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-us-west-2/codecommit-template.yml&param_sourceUrl=https://s3-us-west-2.amazonaws.com/fsd-aws-wildrydes-us-west-2/uni-api-1-v4.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=us-west-2)
+    EU (Ireland) | [![Launch Module 1 in eu-west-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=eu-west-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-eu-west-1/codecommit-template.yml&param_sourceUrl=https://s3-eu-west-1.amazonaws.com/fsd-aws-wildrydes-eu-west-1/uni-api-1-v4.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=eu-west-1)
+    EU (Frankfurt) | [![Launch Module 1 in eu-central-1](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=eu-central-1#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-eu-central-1/codecommit-template.yml&param_sourceUrl=https://s3-eu-central-1.amazonaws.com/fsd-aws-wildrydes-eu-central-1/uni-api-1-v4.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=eu-central-1)
+    Asia Pacific (Sydney) | [![Launch Module 1 in ap-southeast-2](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/images/cloudformation-launch-stack-button.png)](https://console.aws.amazon.com/cloudformation/home?region=ap-southeast-2#/stacks/create/review?stackName=Seed-1-ServerlessApplicationModel&templateURL=https://s3.amazonaws.com/fsd-aws-wildrydes-ap-southeast-2/codecommit-template.yml&param_sourceUrl=https://s3-ap-southeast-2.amazonaws.com/fsd-aws-wildrydes-ap-southeast-2/uni-api-1-v4.zip&param_targetRepositoryName=uni-api&param_targetRepositoryRegion=ap-southeast-2)
 
 
 1. The CloudFormation template has been prepopulated with the necessary fields for this module.  No changes are necessary
@@ -171,7 +195,7 @@ If you're unable to install SAM CLI on your workstation, you may find it easier
 
 
 1. Once the CloudFormation stack creation has completed, find the EC2 instance public DNS name by selecting the checkbox to the left of the **DeveloperInstance** Stack, and clicking the **Outputs** tab below the list of Stacks.  Find the output key labeled `PublicDnsName` and use the corresponding value in order to access the EC2 instance.
- 
+
 1. Use SSH client to connect to the instance.  If you are using Windows, use a client such as Putty or Bitvise (you can find instructions for connecting from Windows using Putty here: [Connecting to Your Linux Instance from Windows Using PuTTY](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/putty.html))
 
 1. The Git repository has been cloned to the home directory on launch, `/home/ec2-user/uni-api`.