Updated README and screenshots

Author: kawsark

lab01-gettingstarted/README.md

@@ -13,8 +13,8 @@ This lab demonstrates how to connect Terraform Enterprise to a source code manag
 - Task 1: Connect GitHub to TFE and Fork a GitHub Repo
 - Task 2: Configure Variables
 - Task 3: Queue a Plan
-- Task 4: Edit Code on GitHub to Use Variables instead of file
-- Task 5: Confirm and Apply the Plan
+- Task 4: Confirm and Apply the Plan
+- Task 5: Destroy provisioned infrastructure
 
 ### Terraform Enterprise
 
@@ -36,18 +36,12 @@ Connecting Terraform Enterprise to GitHub will give us a continuous integration
 
 Visit this GitHub repository and fork it so you have a copy in your own GitHub account:
 
-    https://github.com/hashicorp/demo-terraform-101
+    https://github.com/kawsark/aws-terraform-workshop.git
 
 Optionally, clone the repository to your local machine (if you prefer to edit code locally instead of in the browser).
 
 ```bash
-$ git clone https://github.com/$USER/demo-terraform-101.git
-```
-
-We will work with the `after-tfe` branch. If you choose to work locally, check out this branch:
-
-```bash
-$ git checkout -t origin/after-tfe
+$ git clone https://github.com/$USER/aws-terraform-workshop.git
 ```
 
 #### Step 1.2: Connect GitHub to TFE
@@ -104,17 +98,21 @@ Back at Terraform Enterprise, you’ll see that it’s connected.
 
 Finally, we’re ready to fully create a Terraform Enterprise workspace. Go to https://app.terraform.io and click the "New Workspace" button at the top right.
 
-Give it a name such as "training-demo".
+Give it a name such as "training-lab01".
 
-GitHub is our only VCS connection. Click the "Repository" field and you’ll see a list of available repositories in an auto-complete menu. Find the `demo-terraform-101` repo. If yours isn’t here, refresh the page.
+- Choose GitHub as VCS connection.
+- Click the "Repository" field and you’ll see a list of available repositories in an auto-complete menu. Find the `aws-terraform-workshop` repo. If yours isn’t here, refresh the page.
 
-![TFE](images/tfe-basics/06.png "TFE")
+![TFE](images/tfe-basics/lab01-06.png "TFE")
 
-Terraform Enterprise can deploy from any branch. We'll use the `after-tfe` branch which has been minimally modified to work with Terraform Enterprise.
+- Click the "More Options" link
+  - **TERRAFORM WORKING DIRECTORY:** By default Terraform will use repository root directory. In this case we will specify `lab01-gettingstarted`.
 
-![TFE](images/tfe-basics/07.png "TFE")
+  - **VCS BRANCH:** Terraform Enterprise can deploy from any branch. We'll use the default branch; alternatively you can specify `master`.
 
-Click the "More Options" link and scroll down to "VCS Branch." Type `after-tfe` to use that branch.
+![TFE](images/tfe-basics/lab01-07.png "TFE")
+
+- Click the **Create Workspace** button.
 
 You’ll see a screen showing that a Terraform Enterprise workspace is connected to your GitHub repository. But we still need to provide Terraform with our secret key, access key, and other variables defined in the Terraform code as variables.
 
@@ -125,9 +123,11 @@ Go to the "Variables" tab.  On the variables page, you'll see there are two kind
 - Terraform variables: these are fed into Terraform, similar to `terraform.tfvars`
 - Environment variables: these are populated in the runtime environment where Terraform executes
 
-In the top "Terraform Variables" section, click "Edit" and add keys and values for all the variables in the project's `variables.tf` file. The only one you'll need initially is `identity` which is your unique animal name.
+### Step 2.2: Enter Terraform Variables
+
+In the top "Terraform Variables" section, click "Edit" and add keys and values for all the variables in the project's `variables.tf` file. The only one you'll need initially is `identity` which is a your username.
 
-### Step 2.1: Enter AWS Credentials
+### Step 2.3: Enter AWS Credentials as Environment Variables
 
 There is also a section for environment variables. We'll use these to store AWS credentials.
 
@@ -136,10 +136,11 @@ Click "Edit" and add variables for your AWS credentials.
 ```bash
 AWS_ACCESS_KEY_ID="AAAA"
 AWS_SECRET_ACCESS_KEY="AAAA"
-AWS_DEFAULT_REGION="us-west-2"
 ```
 
-Click the "Save" button.
+Click the "Save Variable" button. Optionally you can mark these variables as Sensitive, which will make them write-only.
+
+![TFE](images/tfe-basics/lab01-tfe-variables.png "TFE")
 
 ## Task 3: Queue a Plan
 
@@ -153,52 +154,11 @@ Go to the "Runs" tab, or "Latest Run". Find the most recent one (there will prob
 
 Scroll down to where it shows the plan. Click the button to "View Plan." You’ll see the same kind of output that you are used to seeing on the command line.
 
-We'll make another change from GitHub before running this plan, so click "Discard Plan."
-
-## Task 4: Edit Code on GitHub to Upgrade the AWS Provider Version
-
-Edit code on GitHub to upgrade the AWS provider version to `>= 1.20.0`.
-
-You'll make a pull request with these changes and observe the status of the pull request on GitHub.
-
-### Step 4.1
-
-On GitHub, find the "Branch" pulldown and switch to the `after-tfe` branch.
-
-Navigate to `main.tf`. Find the pencil icon. Click to edit this file directly in the browser.
-
-![TFE](images/tfe-basics/09.png "TFE")
-
-Edit the code to match the lines below.
-
-```bash
-provider "aws" {
-  # MODIFY this line to look for 1.20.0 or greater
-  version = ">= 1.20.0"
-}
-```
-
-Scroll to the bottom and select the option to "Create a new branch and start a pull request."
-
-![TFE](images/tfe-basics/10.png "TFE")
-
-You’ll be taken to a screen to create a pull request. Click the green "Propose file change" button. The page will be pre-populated with your commit message. Click "Create pull request."
-
 After a few seconds, you'll see that Terraform Enterprise checked the plan and that it passed.
 
-![TFE](images/tfe-basics/12.png "TFE")
-
-To see what was checked, click "Show all checks" and click "Details" next to the line that says "Terraform plan has changes."
-
-Merge the pull request to the `after-tfe` branch with the big green "Merge pull request" button. Click the "Confirm merge" button.
-
-## Task 5: Confirm and Apply the Plan
-
-### Step 5.1: Confirm and `apply`
-
-Back at Terraform Enterprise, find the "Current Run" tab. Click it and you’ll see the merge commit has triggered a plan and it needs confirmation.
+## Task 4: Confirm and Apply the Plan
 
-![TFE](images/tfe-basics/13.png "TFE")
+### Step 4.1: Confirm and `apply`
 
 Scroll to the bottom of the run and confirm the `plan`. At the bottom of the page you’ll see a place to comment (optional) and click "Confirm & Apply."
 
@@ -210,11 +170,11 @@ Examine the output of `apply` and find the IP address of the new instance. The o
 
 ![TFE](images/tfe-basics/15.png "TFE")
 
-## Task 6: Destroy
+## Task 5: Destroy
 
 To clean up, destroy the infrastructure you've just created.
 
-### Step 6.1: Configure CONFIRM_DESTROY variable
+### Step 5.1: Configure CONFIRM_DESTROY variable
 
 Go to the "Settings" tab in Terraform Enterprise and scroll to the bottom. Note the instructions under "Workspace Delete." We want to destroy the infrastructure but not necessarily the workspace.
 
@@ -226,7 +186,7 @@ Go to the "Variables" tab and do that.
 
 Click "Add" and "Save".
 
-### Step 6.2: Queue destroy plan
+### Step 5.2: Queue destroy plan
 
 It's sometimes necessary to queue a normal plan and then queue the destroy plan.