Format SAM Deploy Scripts, Remove Debugging (#98)

* Format SAM Deploy Scripts, Remove Debugging

* Wrap quotes around s3:// path

examples/sam/distributedtracing/deploy.sh

@@ -1,21 +1,22 @@
 #!/bin/bash
 
 accountId=$1
-
 trustedAccountId=$2
-
 region=$3
+
 echo "Deploying example in region ${region} for NR account ${accountId} with trustedAccountId ${trustedAccountId}"
 
-sam build --use-container #--skip-pull-image
+sam build --use-container
 
 bucket="newrelic-example-${region}-${accountId}"
 
-aws s3 mb --region ${region} s3://${bucket}
+aws s3 mb --region "${region}" "s3://${bucket}"
+
+sam package --region "${region}" --s3-bucket "${bucket}" --output-template-file packaged.yaml
 
-sam package --region ${region} --s3-bucket=${bucket} --output-template-file packaged.yaml
-aws cloudformation deploy --region ${region} \
-  --template-file packaged.yaml \
-  --stack-name Newrelic-Dt-Example \
-  --capabilities CAPABILITY_IAM \
-  --parameter-overrides "NRAccountId=${accountId}" "TrustedAccountId=${trustedAccountId}"
+sam deploy \
+	--region "${region}" \
+	--template-file packaged.yaml \
+	--stack-name Newrelic-Dt-Example \
+	--capabilities CAPABILITY_IAM \
+	--parameter-overrides "NRAccountId=${accountId}" "TrustedAccountId=${trustedAccountId}"

examples/sam/dotnet/deploy.sh

@@ -9,11 +9,13 @@ sam build
 
 bucket="newrelic-example-${region}-${accountId}"
 
-aws s3 mb --region ${region} s3://${bucket}
+aws s3 mb --region "${region}" "s3://${bucket}"
 
-sam package --region ${region} --s3-bucket=${bucket} --output-template-file packaged.yaml
-aws cloudformation deploy --region ${region} \
-  --template-file packaged.yaml \
-  --stack-name NewrelicExampleDotnet \
-  --capabilities CAPABILITY_IAM \
-  --parameter-overrides "NRAccountId=${accountId}"
+sam package --region "${region}" --s3-bucket "${bucket}" --output-template-file packaged.yaml
+
+sam deploy \
+	--region "${region}" \
+	--template-file packaged.yaml \
+	--stack-name NewrelicExampleDotnet \
+	--capabilities CAPABILITY_IAM \
+	--parameter-overrides "NRAccountId=${accountId}"

examples/sam/go/deploy.sh

@@ -7,22 +7,23 @@ echo "region set to ${region}"
 
 # The Go1.x runtime does not support Lambda Extensions. Instead, Go Lambdas should be written
 # against the "provided" runtime. The aws-lambda-go SDK provides a build tag that makes this easy.
-runtime="provided"
 
 echo "Building stand-alone lambda"
 build_tags="-tags lambda.norpc"
 
 # Custom runtimes need a bootstrap executable. See https://docs.aws.amazon.com/lambda/latest/dg/runtimes-custom.html
 handler="bootstrap"
 
-env GOARCH=amd64 GOOS=linux go build ${build_tags} -ldflags="-s -w" -o ${handler}
+env GOARCH=amd64 GOOS=linux go build "${build_tags}" -ldflags="-s -w" -o ${handler}
 zip go-example.zip "${handler}"
 
 bucket="newrelic-example-${region}-${accountId}"
-aws s3 mb --region ${region} s3://${bucket}
-aws s3 cp go-example.zip s3://${bucket}
-aws cloudformation deploy --region ${region} \
-  --template-file template.yaml \
-  --stack-name NewrelicExampleGo \
-  --capabilities CAPABILITY_IAM \
-  --parameter-overrides "NRAccountId=${accountId}"
+aws s3 mb --region "${region}" "s3://${bucket}"
+aws s3 cp go-example.zip s3://"${bucket}"
+
+aws cloudformation deploy \
+	--region "${region}" \
+	--template-file template.yaml \
+	--stack-name NewrelicExampleGo \
+	--capabilities CAPABILITY_IAM \
+	--parameter-overrides "NRAccountId=${accountId}"

examples/sam/java/deploy.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 
 accountId=$1
-
 region=$2
+
 echo "region set to ${region}"
 
 sam build --use-container
 
 bucket="newrelic-example-${region}-${accountId}"
 
-#aws s3 mb --region ${region} s3://${bucket}
+aws s3 mb --region "${region}" "s3://${bucket}"
+
+sam package --region "${region}" --s3-bucket "${bucket}" --output-template-file packaged.yaml
 
-sam package --region ${region} --s3-bucket ${bucket} --output-template-file packaged.yaml
-sam deploy --region ${region} \
-  --template-file packaged.yaml \
-  --stack-name NewrelicExampleJava2 \
-  --capabilities CAPABILITY_IAM \
-  --parameter-overrides "NRAccountId=${accountId}"
+sam deploy \
+	--region "${region}" \
+	--template-file packaged.yaml \
+	--stack-name NewrelicExampleJava \
+	--capabilities CAPABILITY_IAM \
+	--parameter-overrides "NRAccountId=${accountId}"

examples/sam/node/deploy.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 
 accountId=$1
-
 region=$2
+
 echo "region set to ${region}"
 
 sam build --use-container
 
 bucket="newrelic-example-${region}-${accountId}"
 
-aws s3 mb --region ${region} s3://${bucket}
+aws s3 mb --region "${region}" "s3://${bucket}"
+
+sam package --region "${region}" --s3-bucket "${bucket}" --output-template-file packaged.yaml
 
-sam package --region ${region} --s3-bucket=${bucket} --output-template-file packaged.yaml
-aws cloudformation deploy --region ${region} \
-  --template-file packaged.yaml \
-  --stack-name NewrelicExampleNode \
-  --capabilities CAPABILITY_IAM \
-  --parameter-overrides "NRAccountId=${accountId}"
+sam deploy \
+	--region "${region}" \
+	--template-file packaged.yaml \
+	--stack-name NewrelicExampleNode \
+	--capabilities CAPABILITY_IAM \
+	--parameter-overrides "NRAccountId=${accountId}"

examples/sam/python/deploy.sh

@@ -1,19 +1,21 @@
 #!/bin/bash
 
 accountId=$1
-
 region=$2
+
 echo "region set to ${region}"
 
 sam build --use-container
 
 bucket="newrelic-example-${region}-${accountId}"
 
-aws s3 mb --region ${region} s3://${bucket}
+aws s3 mb --region "${region}" "s3://${bucket}"
+
+sam package --region "${region}" --s3-bucket "${bucket}" --output-template-file packaged.yaml
 
-sam package --region ${region} --s3-bucket=${bucket} --output-template-file packaged.yaml
-aws cloudformation deploy --region ${region} \
-  --template-file packaged.yaml \
-  --stack-name NewrelicExamplePython \
-  --capabilities CAPABILITY_IAM \
-  --parameter-overrides "NRAccountId=${accountId}"
+sam deploy \
+	--region "${region}" \
+	--template-file packaged.yaml \
+	--stack-name NewrelicExamplePython \
+	--capabilities CAPABILITY_IAM \
+	--parameter-overrides "NRAccountId=${accountId}"