refactored root documentation

README.md

@@ -7,88 +7,36 @@ If you are dealing with protecting data on your AWS architecture using methods s
 Data encryption provides a strong layer of security to protect data that you store within AWS services. AWS services can help you achieve ubiquitous encryption 
 for data in transit as well as data at rest.
 
-<a><img src="images/ubiquitous-encryption.png" width="700" height="500"></a>
+<a><img src="images/ubiquitous-encryption.png" width="989" height="557"></a>
 
 # Prerequisites
 
 ### AWS Account
 
-In order to complete these workshops you'll need a valid active AWS Account with Admin permissions.  The code and instructions in these workshops assume only one student is using a given AWS account at a time. If you try sharing an account with another student, you'll run into naming conflicts for certain resources. 
+If you are participating in this workshop as part of an AWS event, pre-provisioned temporary accounts that are specifically initialized for this workshop might be provided by the organizers. To access your temporary account you will receive a **12-digit hash code** that can be used at the [AWS Event Engine Site](https://dashboard.eventengine.run). You will not need a username and password.
 
-Use a **personal account** or create a new AWS account to ensure you have the neccessary access. This should not be an AWS account from the company you work for.
-
-If the resources that you use for this workshop are left undeleted you will incur charges on your AWS account.
+If you wish to participate in this workshop without a pre-provisioned temporary account, please see the [AWS Initialization and tear down](#aws-initialization-tear-down) section below.
 
 ### Browser
 
-These workshops assume that you are using a Cloud IDE environment. We recommend you use the latest version of Chrome or Firefox to complete this workshop.
+These workshops assume that you are using the [Cloud9 IDE environment](https://aws.amazon.com/cloud9/). We recommend you use the latest version of Chrome or Firefox to complete this workshop. 
 
 ### Knowledge Of Python Programming Language
 
 Basic python knowledge is sufficient to consume these workshops.
 
-### Region Support
-
-Since these workshops use the Cloud9 IDE, you can use run these workshops only in the following regions where the  AWS Cloud9 
-service is available : **N.Virginia, Ohio, Oregon, Ireland and Singapore.**
-
-### Cloudformation templates for initial environment setup
-
-Please run these cloudformation stacks in your AWS account as this is required for all the workshops in this repository. When you launch
-the Cloudformation stack keep clicking next until you get to the point where it says 
-
-**"I acknowledge that AWS CloudFormation might create IAM resources with custom names."**
-
-Acknowledge the above statement by clicking on the check box and then click on the **Create** button
-
-### Step 1 : (Launch CF Stack)
-
-**Please run this step only if you are consuming this workshop in your own AWS account. If AWS provides an account as part of an event you can skip this step.**
-
-[![Deploy workshops environment creation stack](images/cloudformation-launch-stack.png)](https://console.aws.amazon.com/cloudformation/home?#/stacks/new?stackName=template-workshops-setup&templateURL=https://s3.amazonaws.com/crypto-workshop-dont-delete/template-workshops-setup.yaml)
-
-The above stack creates an Cloud9 IDE environment called **workshop-environment** . In addition a VPC with two subnets and
-an internet gateway is also created. It takes about 5 minutes for the stack creation to complete. After
-about 5 minutes you should see the following cloudformation stacks with the status **CREATE_COMPLETE" as
-shown in the picture below 
-
-<a><img src="images/data-protection-env-setup-complete.png" width="700" height="300"></a>
-
-### Step 2 : (Cloud9 IDE Environment Setup)
+# Cloud9 Initialization
 
 * Navigate to the Cloud9 service within your AWS console
-* Open the Cloud9 IDE environment called **workshop-environment** .It takes about 30 seconds for the
-  environment to start up.
+* Open the Cloud9 IDE environment called **workshop-environment** . It takes about 30 seconds for the environment to start up.
 * In the Cloud9 IDE environment you will find a folder called **data-protection** in the folder pane on the left side of the screen
 * Open the file named **environment-setup.py**  in the IDE
-* Run the python module **environment-setup.py** by clicking the play button <a><img src="images/cloud9-ide-play-button.png" width="50" height="30"></a>
-  on the top pane 
-* This module would take about a minute to complete
+* Run the python module **environment-setup.py** by clicking the play button <a><img src="images/cloud9-ide-play-button.png" width="109" height="49"></a>on the top pane 
+* This module takes about a minute to complete
 * In the runner window below you should see **Workshop environment setup was successful** printed
 
-### Step 3 : (Initiating CF stacks creation)
-
-* Within the Cloud9 environment, open the file named **cf-setup.py** in the IDE
-* Run the python module **cf-setup.py** by clicking the play button <a><img src="images/cloud9-ide-play-button.png" width="50" height="30"></a>
-  on the top pane 
-* In the runner window below you should see **All cloudformation stack creation for the workshops has been initiated** printed
-* At this point you can move onto Step 4
-* It takes about 5 minutes for all cloudformation stacks creation to complete. Once complete you should see the
-  following stacks successfully completed as shown in the picture below :
-
-<a><img src="images/cf-template-complete-pic.png" width="700" height="300"></a>
-
-### Step 4 : (Change directory)
-
-* Open a bash terminal within the Cloud9 environment and change directory to **data-protection**. See Images below
-* At this point the cloud9 environment is ready for the workshops
-
-<a><img src="images/bash-terminal-environment.png" width="700" height="300"></a>
-
 # Workshops
 
-**Please review and complete all the above prerequisites before attempting the workshops below. The images below are clickable links**
-
 These workshops demonstrates server side encryption, client side encryption and certfificate management concepts within AWS. For example :
 
 * How do I put an object on S3 with server side encryption ?
@@ -97,37 +45,51 @@ These workshops demonstrates server side encryption, client side encryption and
 * How can I generate X.509 certificates with AWS Certificate Manager to enable TLS on my load balancer ?
 * How do I use AWS Certificate Manager to generate a private certificate authority ?
 
-Title | Description | Learning Time | Teaching Time With Discussion
-| :--- | :--- | :--- | :--- |
-[Server Side Encryption](https://github.com/aws-samples/data-protection/tree/kms-sse-usecase-1)  | This workshop demonstrates server side encryption on S3 | 15 min | 30 min
-[Client Side Encryption](https://github.com/aws-samples/data-protection/tree/kms-cse-usecase-3)  | This workshop demonstrates client side encryption | 15 min | 30 min
-[Client Side Encryption With Data Key Caching](https://github.com/aws-samples/data-protection/tree/kms-cse-usecase-4)  | This workshop demonstrates client side encryption with data key caching | 15 min | 30 min
-[Creating Private Certs ACM Private Certificate Authority - Mode-1 ](https://github.com/aws-samples/data-protection/tree/acm-pca-usecase-5)  | This workshop demonstrates how you create a AWS Certificate Manager private certificate authority(PCA) and use ACM PCA to sign a CSR to create a private certificate | 40 mins | 1 hour
-[Creating Private Certs ACM Private Certificate Authority - Mode-2 ](https://github.com/aws-samples/data-protection/tree/acm-pca-usecase-6)  | This workshop demonstrates how you create a AWS Certificate Manager private certificate authority and use this CA to create private X.509 certififcates for a private domain | 40 mins | 1 hour
+| Title | Description | Learning Time | Teaching Time With Discussion | 
+| :--- | :-------- | :-- | :-- |
+| [Server Side Encryption](usecase-1/)  | This workshop demonstrates server side encryption on S3 | 15 min | 30 min |
+| [Client Side Encryption](usecase-2/)  | This workshop demonstrates client side encryption | 15 min | 30 min |
+| [Client Side Encryption With Data Key Caching](usecase-3/)  | This workshop demonstrates client side encryption with data key caching | 15 min | 30 min |
+| [Creating Private Certs ACM Private Certificate Authority - Mode-1 ](usecase-4/)  | This workshop demonstrates how you create a AWS Certificate Manager private certificate authority(PCA) and use ACM PCA to sign a CSR to create a private certificate | 40 mins | 1 hour |
+| [Creating Private Certs ACM Private Certificate Authority - Mode-2 ](usecase-5/)  | This workshop demonstrates how you create a AWS Certificate Manager private certificate authority and use this CA to create private X.509 certififcates for a private domain | 40 mins | 1 hour |
+
+<hr/>
 
-# Final Cleanup
+# AWS Initialization & tear down
 
-Once you you have finished working on the workshops within this github repository ,the final step is to clean up the resources by deleting
-the cloudformation stacks that setup the workshop environment. If you don't follow the final cleanup process
-charges from resources created for these workshops will continue to accrue. Therefore please
-make sure that you follow the steps below to completion.
+**IMPORTANT!** 
+* This section is only relevant if you are **not** using a pre-provisioned account. 
+* The resources used in this workshop **will incur charges** in the AWS account used if not torn down according to the procedure outlined below
 
-For cleanup follow the steps below :
+You can use a **personal account** or create a **new AWS account** to ensure you have the neccessary access. This should not be an AWS account from the company you work for. Please note that creating an AWS account takes time (credit card validation, etc.) and is not recommended when participating in the workshop during a time constrained event.
+
+### Region Support
+
+Since these workshops use the Cloud9 IDE, you can use run these workshops in the following regions where the AWS Cloud9 
+service is available : 
+* **N.Virginia** (us-east-1)
+* **Ohio** (us-east-2)
+* **Oregon** (us-west-2)
+* **Ireland** (eu-west-1)
+* **Singapore** (ap-southeast-1)
+
+### Cloudformation templates for initial environment setup
+
+Please download the [Data Protection Workshop cloudformation stack](cf-templates/template-workshops-setup.yaml) and launch it in your AWS account as this is required for all the workshops in this repository. To launch the stack you must go to the AWS Console and navigate to the CloudFormation service where you can choose **Create Stack** and upload the Cloudformation stack for the workshop. You provide a name for the stack and keep clicking **next** until you get to the point where it says:
+
+**"I acknowledge that AWS CloudFormation might create IAM resources with custom names."**
+
+Acknowledge the above statement by clicking on the check box and then click on the **Create** button
 
-### Step 1 :
+The above stack creates an Cloud9 IDE environment called **workshop-environment**. 
+In addition a VPC with two subnets andan internet gateway is also created.
 
-Within the Cloud9 IDE **workshop environment** that you used for this workshop checkout the final clean up branch
-by using the following command :
 
-**git checkout final-cleanup**
+### Tear down Cloudformation stack
 
-### Step 2 :
+After you have completed the workshop, you need to tear down the stack by navigating to the CloudFormation service in the AWS console and selecting the stack name you chose when launching the stack. 
 
-* In the Cloud9 IDE you will find a python module called ***final-cleanup.py***
-* Run the **final-cleanup.py** python module 
-* At this point, cleanup of the cloudformation stacks is initiated.
-* It takes about 10 minutes for all the cloudformation stacks to be deleted. 
-* The Cloud9 IDE **workshop environment** session shall will be terminated at this point
+Choose the **delete** action and wait for the process to complete. Note that it can take a few minutes for the stack to clean up its resources.
 
 ## License Summary