Aman diffs - bringing repos in sync (#128)

* Pulling in aman's changes

* moving images

* Pulling upstream

* Adding sync script

* Adding additional information in public repo about private instructions

Author: switch180

content/rdbms-migration/migration-chapter00.en.md

@@ -6,17 +6,17 @@ weight: 10
 ---
 In this module, you will create an environment to host the MySQL database on Amazon EC2. This instance will be used to host source database and simulate on-premise side of migration architecture.
 All the resources to configure source infrastructure are deployed via [Amazon CloudFormation](https://aws.amazon.com/cloudformation/) template.
-There are two CloudFormation templates used in this exercise which will deploy following resources.
+There are two CloudFormation templates used in this exercise which deploy the following resources.
 
-CloudFormation MySQL Template Resources:
-  - OnPrem VPC: Source VPC will represent an on-premise source environment in the N. Virginia region. This VPC will host source MySQL database on Amazon EC2
-  - Amazon EC2 MySQL Database: Amazon EC2 Amazon Linux 2 AMI with MySQL installed and running
-  - Load IMDb dataset: The template will create IMDb database on MySQL and load IMDb public dataset files into database. You can learn more about IMDb dataset inside [Explore Source Model](/hands-on-labs/rdbms-migration/migration-chapter03)
+CloudFormation MySQL Template Resources (**Already deployed**):
+  - **OnPrem VPC**: Source VPC will represent an on-premise source environment in the workshop region. This VPC will host source MySQL database on Amazon EC2
+  - **Amazon EC2 MySQL Database**: Amazon EC2 Amazon Linux 2 AMI with MySQL installed and running
+  - **Load IMDb dataset**: The template will create IMDb database on MySQL and load IMDb public dataset files into database. You can learn more about IMDb dataset inside [Explore Source Model](/hands-on-labs/rdbms-migration/migration-chapter03)
 
 
 
-CloudFormation DMS Instance Resources:
-  - DMS VPC:  Migration VPC on in the N. Virginia region. This VPC will host DMS replication instance.
-  - Replication Instance: DMS Replication instance that will facilitate database migration from source MySQL server on EC2 to Amazon DynamoDB
+CloudFormation DMS Instance Resources (**Needs deploying**):
+  - **DMS VPC**:  Migration VPC in the workshop region. This VPC will host DMS replication instance.
+  - **Replication Instance**: DMS Replication instance that will facilitate database migration from source MySQL server on EC2 to Amazon DynamoDB
 
 ![Final Deployment Architecture](/static/images/migration-environment.png)

content/rdbms-migration/migration-chapter02-1.en.md

@@ -5,23 +5,23 @@ date: 2021-04-25T07:33:04-05:00
 weight: 25
 ---
 
-Let's create the DMS resources for the workshop.
+Let's create the DMS resources for the workshop. First, we ensure if a DMS service role `dms-vpc-role` is already available. Then we need to deploy the DMS resources.
 
-1.  Go to IAM console > Roles > Create Role
-2.  Under “Select trusted entity” select “AWS service” then under “Use case” select “DMS” from the pulldown list and click the “DMS” radio button. Then click “Next”
-3.  Under “Add permissions” use the search box to find the “AmazonDMSVPCManagementRole” policy and select it, then click “Next”
-5.  Under “Name, review, and create” add the role name as exactly `dms-vpc-role` and click Create role
+1.  Go to IAM console > Roles > Search for `dms-vpc-role`. If you see a role, skip to the CloudFormation stack deployment. Else, select **Create role** and follow next steps.
+2.  Under **Select trusted entity** select **AWS service** then under **Use case** select **DMS** from the drop-down and click the **DMS** radio button. Then click **Next**
+3.  Under **Add permissions** use the search box to find the `AmazonDMSVPCManagementRole` policy and select it, then click **Next**
+5.  Under **Name, review, and create** add the role name as exactly `dms-vpc-role` and click **Create role**
 
 ::alert[_Do not continue unless you have made the IAM role._]
 
-1. Launch the CloudFormation template in US West 2 to deploy the resources in your account: [![CloudFormation](/static/images/cloudformation-launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=dynamodbmigration&templateURL=:param{key="lhol_migration_dms_setup_yaml"})  
+1. Launch the CloudFormation template in the workshop region to deploy the resources in your account: [![CloudFormation](/static/images/cloudformation-launch-stack.png)](https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=dynamodbmigration&templateURL=:param{key="lhol_migration_dms_setup_yaml"})  
     1. *Optionally, download [the YAML template](:param{key="lhol_migration_dms_setup_yaml"}) and launch it your own way*
-9.  Click Next
-10. Confirm the Stack Name *dynamodbmigration* and keep the default parameters (modify if necessary)
+9.  Click **Next**
+10. Confirm the Stack name `dynamodbmigration` and keep the default parameters (modify if necessary)
     ![Final Deployment Architecture](/static/images/migration18.jpg)
-11. Click “Next” twice
-12. Check “I acknowledge that AWS CloudFormation might create IAM resources with custom names.”
-1.  Click Submit. The CloudFormation template will take about 15 minutes to build a replication environment. You should continue the lab while the stack creates in the background.
+11. Click **Next** twice
+12. Check ***I acknowledge that AWS CloudFormation might create IAM resources with custom names***.
+1.  Click **Submit**. The CloudFormation template will take about 15 minutes to build a replication environment. You should continue the lab while the stack creates in the background.
     ![Final Deployment Architecture](/static/images/migration19.jpg)
 
 ::alert[_Do not wait for the stack to complete creation._ **Please continue the lab and allow it to create in the background.**]

content/rdbms-migration/migration-chapter02.en.md

@@ -5,18 +5,21 @@ date: 2021-04-25T07:33:04-05:00
 weight: 20
 ---
 This chapter will create source environment on AWS as discussed during Exercise Overview.
+
+::alert[MySQL Environment with data has already been deployed in your workshop account. No action is required on this page. The following steps are for you to learn. Head over to next page to deploy DMS resources.]
+
 The CloudFormation template used below will create Source VPC, EC2 hosting MySQL server, IMDb database and load IMDb public dataset into 6 tables.
 
-1. Launch the CloudFormation template in US West 2 to deploy the resources in your account: [![CloudFormation](/static/images/cloudformation-launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=rdbmsmigration&templateURL=:param{key="lhol_migration_setup_yaml"})  
+1. Launch the CloudFormation template in workshop region to deploy the resources in your account: [![CloudFormation](/static/images/cloudformation-launch-stack.png)](https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=rdbmsmigration&templateURL=:param{key="lhol_migration_setup_yaml"})  
     1. *Optionally, download [the YAML template](:param{key="lhol_migration_setup_yaml"}) and launch it your own way*
- 4. Click Next
- 5. Confirm the Stack Name *rdbmsmigration* and update parameters if necessary (leave the default options if at all possible)
+ 4. Click **Next**
+ 5. Confirm the Stack name `rdbmsmigration` and update parameters if necessary (leave the default options if at all possible)
    ![Final Deployment Architecture](/static/images/migration6.jpg)
- 6. Click “Next” twice then check “I acknowledge that AWS CloudFormation might create IAM resources with custom names.”
- 7. Click "Submit"
+ 6. Click **Next** twice then check ***I acknowledge that AWS CloudFormation might create IAM resources with custom names***.
+ 7. Click **Submit**
  8. The CloudFormation stack will take about 5 minutes to build the environment
   ![Final Deployment Architecture](/static/images/migration7.jpg)
- 9. Go to [EC2 Dashboard](https://console.aws.amazon.com/ec2/v2/home?region=us-west-2#Instances:)  and ensure the Status check column is 2/2 checks passed before moving to the next step.
+ 9. Go to [EC2 Dashboard](https://console.aws.amazon.com/ec2/v2/home#Instances:)  and ensure the **Status check** column is 2/2 checks passed before moving to the next step.
  ![Final Deployment Architecture](/static/images/migration8.jpg)
 
 

content/rdbms-migration/migration-chapter03.en.md

@@ -13,10 +13,10 @@ It created a MySQL database called `imdb`, added 6 new tables (one for each IMDb
 The CloudFormation template also configured a remote MySQL user based on input parameters for the template. 
 To explore the dataset, follow the instructions below to log in to the EC2 server.
 
- 1. Go to [EC2 console](https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#Instances:instanceState=running).
- 2. Select the MySQL Instance and click Connect.
+ 1. Go to [EC2 console](https://console.aws.amazon.com/ec2/v2/home#Instances:instanceState=running).
+ 2. Select the MySQL Instance and click **Connect**.
     ![Final Deployment Architecture](/static/images/migration9.jpg)
- 3. Make sure "ec2-user" is in the Username field. Click Connect.
+ 3. Make sure `ec2-user` is in the **User name** field. Click **Connect**.
     ![Final Deployment Architecture](/static/images/migration10.jpg)
  4. Elevate your privileges using the `sudo` command.
     ```bash
@@ -31,7 +31,7 @@ To explore the dataset, follow the instructions below to log in to the EC2 serve
  6. You can see all the 6 files copied from the IMDB dataset to the local EC2 directory.
     ![Final Deployment Architecture](/static/images/migration12.jpg)
  7. Feel free to explore the files.
- 8. Go to AWS CloudFormation [Stacks](https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks?filteringStatus=active&filteringText=&viewNested=true&hideStacks=false) and click on the stack you created earlier. Go to the Parameters tab and copy the username and password listed next to "DbMasterUsername" and "DbMasterPassword".
+ 8. Go to [AWS CloudFormation Console](https://console.aws.amazon.com/cloudformation/home#/stacks?filteringStatus=active&filteringText=&viewNested=true&hideStacks=false) and click on the stack you created earlier. Go to the **Parameters** tab and copy the username and password listed next to **DbMasterUsername** and **DbMasterPassword**.
    ![Final Deployment Architecture](/static/images/migration13.jpg)
  9. Go back to EC2 Instance console and login to mysql.
   ```bash

content/rdbms-migration/migration-chapter04.en.md

@@ -10,6 +10,7 @@ You can often query the data from multiple tables and assemble at the presentati
 To support high-traffic queries with ultra-low latency, designing a schema to take advantage of a NoSQL system generally makes technical and economic sense.
 
 To start designing a target data model in Amazon DynamoDB that will scale efficiently, you must identify the common access patterns. For the IMDb use case we have identified a set of access patterns as described below:
+
 ![Final Deployment Architecture](/static/images/migration32.png)
 
 A common approach to DynamoDB schema design is to identify application layer entities and use denormalization and composite key aggregation to reduce query complexity.