Merge pull request #14 from karthiksambandam/master

Changes based on Code* new console
awslabs · Nov 19, 2018 · 2c65451 · 2c65451
2 parents de541d5 + 4bc06b7
commit 2c65451
Show file tree

Hide file tree

Showing 20 changed files with 111 additions and 145 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/1_Lab1.md b/1_Lab1.md
@@ -15,18 +15,13 @@ Take a moment now and setup your Cloud9 development environment.
 5. You may leave **Environment settings** at their defaults of launching a new **t2.micro** EC2 instance which will be paused after **30 minutes** of inactivity.
 6. Click **Next step**.
 7. Review the environment settings and click **Create environment**. It will take several minutes for your environment to be provisioned and prepared.
-8. Once ready, your IDE will open to a welcome screen. Below that, you should see a terminal prompt similar to: ![setup](./img/setup-cloud9-terminal.png) You can run AWS CLI commands in here just like you would on your local computer. Verify that your user is logged in by running `aws sts get-caller-identity`.
+8. Once ready, your IDE will open to a welcome screen. Below that, you should see a terminal prompt similar to: ![setup](./img/setup-cloud9-terminal.png) You can run AWS CLI commands in here just like you would on your local computer. Verify that your user is logged in by running the following command.
 
 ```console
 user:~/environment $ aws sts get-caller-identity
 ```
 
 You'll see output indicating your account and user information:
-
-```console
-user:~/environment $ aws sts get-caller-identity
-```
-
 ```console
 {
     "Account": "123456789012",
@@ -48,12 +43,11 @@ Keep an open scratch pad in Cloud9 or a text editor on your local computer for n
 **_To create the AWS CodeCommit repository (console)_**
 
 1. Open the AWS CodeCommit console at <https://console.aws.amazon.com/codecommit>.
-2. In the region selector, choose the region where you will create the repository. For more information, see [Regions and Git Connection Endpoints](http://docs.aws.amazon.com/codecommit/latest/userguide/regions.html).
-3. On the Welcome page, choose Get Started Now. (If a **_Dashboard_** page appears instead, choose **_Create repository_**.)
-4. On the **_Create repository_** page, in the **_Repository name_** box, type **_WebAppRepo_**.
-5. In the **_Description_** box, type **_My demonstration repository_**.
-6. Choose **_Create repository_** to create an empty AWS CodeCommit repository named **_WebAppRepo_**.
-7. On the **_Configure email notifications_** page, choose **_Skip_**.
+
+2. On the Welcome page, choose Get Started Now. (If a **_Dashboard_** page appears instead, choose **_Create repository_**.)
+3. On the **_Create repository_** page, in the **_Repository name_** box, type **_WebAppRepo_**.
+4. In the **_Description_** box, type **_My demonstration repository_**.
+5. Choose **_Create repository_** to create an empty AWS CodeCommit repository named **_WebAppRepo_**.
 
 **_Note_** The remaining steps in this tutorial assume you have named your AWS CodeCommit repository **_WebAppRepo_**. If you use a name other than **_WebAppRepo_**, be sure to use it throughout this tutorial. For more information about creating repositories, including how to create a repository from the terminal or command line, see [Create a Repository](http://docs.aws.amazon.com/codecommit/latest/userguide/how-to-create-repository.html).
 
@@ -121,7 +115,11 @@ user:~/environment/WebAppRepo/ $ git push -u origin master
 
 Provide your Git HTTPs credential when prompted. Credential helper will store it, hence you won't be asked again for subsequent push.
 
-**_💡 Tip_** After you have pushed files to your AWS CodeCommit repository, you can use the AWS CodeCommit console to view the contents. For more information, see [Browse the Contents of a Repository](http://docs.aws.amazon.com/codecommit/latest/userguide/how-to-browse.html).
+**_💡 Tip_** After you have pushed files to your AWS CodeCommit repository, you can use the [AWS CodeCommit console](https://console.aws.amazon.com/codecommit/home) to view the contents.
+
+![buildsuccess](./img/Lab1-CodeCommit-Success.png)
+
+For more information, see [Browse the Contents of a Repository](http://docs.aws.amazon.com/codecommit/latest/userguide/how-to-browse.html).
 
 ***
 
@@ -141,8 +139,10 @@ user:~/environment/WebAppRepo (master) $ aws cloudformation create-stack --stack
 2. Upon completion take a note on the service roles created. Check [describe-stacks](http://docs.aws.amazon.com/cli/latest/reference/cloudformation/describe-stacks.html) to find the output of the stack.
 
 3. For Console, refer to the CloudFormation [Outputs tab](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-console-view-stack-data-resources.html) to see output. A S3 Bucket is also created. Make a note of this bucket. This will be used to store the output from CodeBuild in the next step. **_Sample Output:_** ![](./img/cfn-output.png)
+
 4. Let us **create CodeBuild** project from **CLI**. To create the build project using AWS CLI, we need JSON-formatted input.
-    **_Create_** a json file named **_'create-project.json'_** under 'MyDevEnvironment'. ![](./img/create-json.png) Copy the content below to create-project.json. (Replace the placeholders marked with **_<<>>_** with your own values.) To know more about the codebuild project json [review the spec](http://docs.aws.amazon.com/codebuild/latest/userguide/create-project.html#create-project-cli).
+    **_Create_** a json file named **_'create-project.json'_** under 'MyDevEnvironment'. ![](./img/create-json.png) Copy the content below to create-project.json. (Replace the placeholders marked with **_<<>>_** with your own values.) 
+
 
 ```json
 {
@@ -165,6 +165,9 @@ user:~/environment/WebAppRepo (master) $ aws cloudformation create-stack --stack
   "serviceRole": "<<BuildRoleArn-Value-FROM-CLOUDFORMATION-OUTPUT>>"
 }
 ```
+
+  To know more about the codebuild project json [review the spec](http://docs.aws.amazon.com/codebuild/latest/userguide/create-project.html#create-project-cli).
+
 
 5. Switch to the directory that contains the file you just saved, and run the **_create-project_** command:
 
@@ -236,7 +239,7 @@ user:~/environment/WebAppRepo (master) $ aws codebuild create-project --cli-inpu
 ### Stage 5: Let's build the code on cloud
 
 1. A build spec is a collection of build commands and related settings in YAML format, that AWS CodeBuild uses to run a build.
-    Create a file namely, **_buildspec.yml_** under **WebAppRepo** folder. Copy the content below to the file and save it. To know more about [how CodeBuild works](http://docs.aws.amazon.com/codebuild/latest/userguide/concepts.html#concepts-how-it-works).
+    Create a file namely, **_buildspec.yml_** under **WebAppRepo** folder. Copy the content below to the file and **save** it. To know more about [how CodeBuild works](http://docs.aws.amazon.com/codebuild/latest/userguide/concepts.html#concepts-how-it-works).
 
 ```
 version: 0.1
@@ -267,25 +270,34 @@ As a sample shown below:
 
 **_Note_** Visit this [page](http://docs.aws.amazon.com/codebuild/latest/userguide/build-spec-ref.html) to know more about build spec and how you can use multiple build specs in the same repo.
 
-2. Run the **_start-build_** command:
+2. Commit & push the build specification file to repository
+```console
+user:~/environment/WebAppRepo/ $ git add buildspec.yml
+user:~/environment/WebAppRepo/ $ git commit -m "adding buildspec.yml"
+user:~/environment/WebAppRepo/ $ git push -u origin master
+
+```
+
+3. Run the **_start-build_** command:
 
 ```console
 user:~/environment/WebAppRepo (master) $ aws codebuild start-build --project-name devops-webapp-project
 ```
 
 **_Note:_** You can start build with more advance configuration setting via JSON. If you are interested to learn more about it, please visit [here](http://docs.aws.amazon.com/codebuild/latest/userguide/run-build.html#run-build-cli).
 
-3. If successful, data would appear showing successful submission. Make a note of the build id value. You will need it in the next step.
-4. In this step, you will view summarized information about the status of your build.
+4. If successful, data would appear showing successful submission. Make a note of the build id value. You will need it in the next step.
+5. In this step, you will view summarized information about the status of your build.
 
 ```console
 user:~/environment/WebAppRepo (master) $ aws codebuild batch-get-builds --ids <<ID>>
 ```
 
 **_Note:_** Replace <<ID>> with the id value that appeared in the output of the previous step.
 
-5. Did the build succeed? if the build failed, why? The reason is build spec YAML file is not pushed to the repository. Push the code changes by **git add, commit, and push**. **Repeat** steps from 2 through 4.
-6. You will also be able to view detailed information about your build in CloudWatch Logs. You can complete this step by visiting the AWS CodeBuild console.
+6. You will also be able to view detailed information about your build in CloudWatch Logs. You can complete this step by visiting the [AWS CodeBuild console](https://console.aws.amazon.com/codebuild/home).
+![buildsuccess](./img/Lab1-CodeBuild-Success.png)
+
 7. In this step, you will verify the **_WebAppOutputArtifact.zip_** file that AWS CodeBuild built and then uploaded to the output bucket. You can complete this step by **visiting** the **AWS CodeBuild console** or the **Amazon S3 console**.
 
 **_Note:_** Troubleshooting CodeBuild - Use the [information](http://docs.aws.amazon.com/codebuild/latest/userguide/troubleshooting.html) to help you identify, diagnose, and address issues.
@@ -295,10 +307,3 @@ user:~/environment/WebAppRepo (master) $ aws codebuild batch-get-builds --ids <<
 This **concludes Lab 1**. In this lab, we successfully created repository with version control using AWS CodeCommit and built our code on the cloud using AWS CodeBuild service. You can now move to the next Lab,
 
 [Lab 2 - Automate deployment for testing](2_Lab2.md)
-
-**_✅ Do It Yourself (DIY):_** Using the CodeCommit Console try to do the following tasks. - Create an additional branch within your repository.
-
-* Make changes to the new branch and compare the changes between branches.
-* Enable triggers on your repository for specific events.
-
-***
diff --git a/2_Lab2.md b/2_Lab2.md
@@ -13,35 +13,9 @@ user:~/environment/WebAppRepo (master) $ aws cloudformation create-stack --stack
 
 **_Note_**
   - The Stack will have a VPC w/ 1 public subnet, an IGW, route tables, ACL, 2 EC2 instances. Also, the EC2 instances will be launched with a User Data script to **automatically install the AWS CodeDeploy agent**.
-  - **Verify** that by visiting the **EC2 Console** and view option for **user data**.You would see the following script.
 
-```console
-#!/bin/bash -ex
-yum install -y aws-cli
-cd /home/ec2-user/
-wget https://aws-codedeploy-us-east-1.s3.amazonaws.com/latest/codedeploy-agent.noarch.rpm
-yum -y install codedeploy-agent.noarch.rpm
-service codedeploy-agent start
-```
-  - **Verify** in **System Log** by clicking Instance Settings->Get System Log for below entries
-
-  ```shell
-Check if there is a codedeployagent config file.
-Start codedeploy-agent in post hook if this is a first install.
-Installing codedeploy-agent auto-update cron in '/etc/cron.d/codedeploy-agent-update'...
-Installing codedeploy-agent auto-update cron in '/etc/cron.d/codedeploy-agent-update'...Complete
-  Verifying  : codedeploy-agent-1.0-1.1458.noarch                           1/1 
-
-Installed:
-  codedeploy-agent.noarch 0:1.0-1.1458                                          
-
-Complete!
-+ service codedeploy-agent start
-  ```
-  
   - You can refer to [this instruction](http://docs.aws.amazon.com/codedeploy/latest/userguide/codedeploy-agent-operations-install.html) to install the CodeDeploy agent for other OSs like Amazon Linux, RHEL, Ubuntu, or Windows.
-  - AWS CodeDeploy can deploy to both Amazon EC2 instances and on-premises instances.To know more [visit](http://docs.aws.amazon.com/codedeploy/latest/userguide/instances.html).
-
+
 ***
 
 ### Stage 2: Create CodeDeploy Application and Deployment group
@@ -64,14 +38,17 @@ user:~/environment/WebAppRepo (master) $ aws deploy create-deployment-group --ap
 
 **_Note:_** We are using the tags to attach instances to the deployment group.
 
-3. Let us review all the changes by visiting the CodeDeploy Console.
+3. Let us review all the changes by visiting the [CodeDeploy Console](https://console.aws.amazon.com/codedeploy/home).
+
+![deploy](./img/Lab2-CodeDeploy-Success.png)
 
 ***
 
 ### Stage 3: Prepare application for deployment
 
 1. Without an AppSpec file, AWS CodeDeploy cannot map the source files in your application revision to their destinations or run scripts at various stages of the deployment.
-2. Copy the template into a text editor and save the file as **_appspec.yml_** in the **_WebAppRepo_** directory of the revision.
+
+2. Copy the template into a text editor and **save** the file as **_appspec.yml_** in the **_WebAppRepo_** directory of the revision.
 
 ```yml
 version: 0.0
@@ -102,6 +79,7 @@ As a sample shown below:
 ![appspec](./img/app-spec.png)
 
 3. **_Review_** the **_script folder_** in the repo for the various scripts like Start, Stop, health check etc. These scripts will be called as per the hook definition in **_appspec.yml_** file during deployment.
+
 4. Since we are going to deploy the application via CodeDeploy, we need to package additional files needed by CodeDeploy. Let us **_make change_** to the **_buildspec.yml_** to incorporate the changes.
 
 ```yml
@@ -129,7 +107,17 @@ artifacts:
 
 ```
 
-5. Save the changes to buildspec.yml. Run **_git add, commit, and push_** the changes to CodeCommit repo.
+5. **Save** the changes to buildspec.yml. 
+
+6. Commit & push the build specification file to repository
+
+```console
+user:~/environment/WebAppRepo/ $ git add buildspec.yml
+user:~/environment/WebAppRepo/ $ git add appspec.yml
+user:~/environment/WebAppRepo/ $ git commit -m "changes to build and app spec"
+user:~/environment/WebAppRepo/ $ git push -u origin master
+
+```
 
 ***
 
@@ -142,6 +130,7 @@ user:~/environment/WebAppRepo (master) $ aws codebuild start-build --project-nam
 ```
 
 2. Visit the CodeBuild Console to ensure build is successful. Upon successful completion of build, we should see new **_WebAppOutputArtifact.zip_** upload to the configured CodeBuild S3 Bucket.
+
 3. Get the **_eTag_** for the object **WebAppOutputArtifact.zip** uploaded to S3 bucket. You can get etag by visiting S3 console. Or, executing the following command.
 
 ```console
@@ -166,20 +155,19 @@ user:~/environment/WebAppRepo (master) $ aws deploy create-deployment --applicat
 5. **Confirm** via IAM Roles, if associated EC2 instance has appropriate permissions to read from bucket specified above. If not, you will get Access Denied at the DownloadBundle step during deployment.
 
 6. **Verify** the deployment status by visiting the **CodeDeploy console**.
+
+![deployment-success](./img/Lab2-CodeDeploy-deploymentSuccess.png)
+
 7. Check the deploy console for status. if the deployment failed, then look at the error message and correct the deployment issue.
+
 8. if the status of deployment is success, we should be able to view the web application deployed successfully to the EC2 server namely **_DevWebApp01_**
+
 9. Go to the **EC2 Console**, get the **public DNS name** of the server and open the url in a browser. You should see a sample web application.
 
+![webpage](./img/webpage-success.png)
+
 ### Summary
 
 This **concludes Lab 2**. In this lab, we successfully created CodeDeploy application and deployment group. We also modified buildspec.yml to include additional components needed for deployment. We also successfully completed deployment of application to test server.You can now move to the next Lab,
 
 [Lab 3 - Setup CI/CD using AWS CodePipeline](3_Lab3.md)
-
-**_✅ Do It Yourself (DIY):_** Environment variable for CodeBuild. How can we specifiy environment variable for your Build Environment. Environment variable contains a mapping of key/value scalars, where each mapping represents a single custom environment variable in plain text. key is the name of the custom environment variable, and value is that variable's value. To know more about how to pass environment variable. [Check the build spec reference](http://docs.aws.amazon.com/codebuild/latest/userguide/build-spec-ref.html)
-
-* Use SSM as Parameter Store.
-* If you want to store environment variables outside, then use Amazon EC2 Systems Manager Parameter Store. [Check this for how to store parameter and secure them using KMS](http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-walk.html#sysman-paramstore-console).
-* To allow AWS CodeBuild to retrieve custom environment variables stored in Amazon EC2 Systems Manager Parameter Store, you must add the ssm:GetParameters action to your AWS CodeBuild service role.
-
-***