fixed issues and other cleanup

readme.adoc

@@ -50,7 +50,7 @@ By default, the `latest` tag is used for the image. A different tag may be speci
   docker push <repo>/name:<tag>
   docker push <repo>/webapp:<tag>
 
-This is a workaround until https://github.com/aws-samples/aws-compute-options/issues/4 is fixed.
+This is a workaround until https://github.com/aws-samples/aws-microservices-deploy-options/issues/4 is fixed.
 
 === Deployment to Docker Swarm
 
@@ -532,7 +532,9 @@ CloudFormation templates for different regions are listed at https://github.com/
 a| image::./images/deploy-to-aws.png[link=https://console.aws.amazon.com/cloudformation/home?region=us-west-2#/stacks/new?stackName=Codesuite-Demo&templateURL=https://s3.amazonaws.com/codesuite-demo-public/aws-refarch-codesuite-kubernetes.yaml]
 |===
 
-https://github.com/aws-samples/aws-microservices-deploy-options/issues/65
+. Create Git credentials for HTTPS connections to AWS CodeCommit: https://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-gc.html?icmpid=docs_acc_console_connect#setting-up-gc-iam
+. Reset any stored git credentials for CodeCommit in the keychain. Open `Keychain Access`, search for `codecommit` and remove any related entries.
+. Get CodeCommit repo URL from CloudFormation output and follow the instructions at https://github.com/aws-samples/aws-kube-codesuite#test-cicd-platform.
 
 === Deployment Pipeline: Jenkins
 
@@ -677,8 +679,7 @@ Make sure to use a bucket name that is unique.
 This section will explain how to deploy Lambda + API Gateway via CodePipeline.
 
 . `cd apps/lambda`
-. `aws cloudformation deploy --template-file pipeline.yaml --stack-name aws-compute-options-lambda-pipeline --capabilities CAPABILITY_IAM`
-. `git remote add codecommit $(aws cloudformation describe-stacks --stack-name aws-compute-options-lambda-pipeline --query "Stacks[].Outputs[?OutputKey=='RepositoryHttpUrl'].OutputValue" --output text)`
+. `aws cloudformation deploy --template-file pipeline.yaml --stack-name aws-compute-options-lambda-pipeline --capabilities CAPABILITY_IAM`. `git remote add codecommit $(aws cloudformation describe-stacks --stack-name aws-compute-options-lambda-pipeline --query "Stacks[].Outputs[?OutputKey=='RepositoryHttpUrl'].OutputValue" --output text)`
 . Setup your Git credential by following the https://docs.aws.amazon.com/codecommit/latest/userguide/setting-up-https-unixes.html[document]. This is required to push the code into the CodeCommit repo created in the CloudFormation stack. When the Git credential is setup, you can use the following command to push in the code and trigger the pieline to run.
 
   git push codecommit master
@@ -740,14 +741,22 @@ https://github.com/aws-samples/aws-microservices-deploy-options/issues/76
 
 === Monitoring: AWS X-Ray
 
-AWS X-Ray is fully integrated with AWS Lambda. This integration is explained at https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html.
+AWS X-Ray is fully integrated with AWS Lambda. This can be easily enabled for functions published using SAM by the following property:
+
+```
+Tracing: Active
+```
+
+This is explained at https://github.com/awslabs/serverless-application-model/blob/develop/versions/2016-10-31.md#awsserverlessfunction.
+
+More details about AWS Lambda and X-Ray integration is at https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html.
 
 Deploying the functions as explained above will generate X-Ray service map and traces.
 
 === Deployment: Remove the stack
 
   aws cloudformation delete-stack \
-    --stack-name aws-compute-options-lambda
+    --stack-name aws-microservices-deploy-options-lambda
 
 == License