simplify deploy scripts

mwunderl · mwunderl · commit 770be3069b9d · 2020-03-09T00:45:03.000-07:00
diff --git a/sample-apps/.gitignore b/sample-apps/.gitignore
@@ -1,10 +1,13 @@
 node_modules
+npm-debug.log
 package-lock.json
 package
-out.yml
+*out.yml
 out.json
 bucket-name.txt
 target
 build
 .gradle
 *.zip
+bin
+obj
diff --git a/sample-apps/blank-java/1-create-bucket.sh b/sample-apps/blank-java/1-create-bucket.sh
@@ -3,5 +3,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 2-deploy.sh.template 2-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 2-deploy.sh
diff --git a/sample-apps/blank-java/2-deploy.sh b/sample-apps/blank-java/2-deploy.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
 TEMPLATE=template.yml
 if [ $1 ]
 then
@@ -11,5 +12,5 @@ then
 else
   gradle build -i
 fi
-aws cloudformation package --template-file $TEMPLATE --s3-bucket MY_BUCKET --output-template-file out.yml
+aws cloudformation package --template-file $TEMPLATE --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name blank-java --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/blank-java/4-cleanup.sh b/sample-apps/blank-java/4-cleanup.sh
@@ -13,5 +13,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-rm -f 2-deploy.sh out.yml out.json
+rm -f out.yml out.json
 rm -rf build .gradle target
diff --git a/sample-apps/blank-python/1-create-bucket.sh b/sample-apps/blank-python/1-create-bucket.sh
@@ -3,5 +3,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 2-deploy.sh.template 2-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 2-deploy.sh
diff --git a/sample-apps/blank-python/2-deploy.sh b/sample-apps/blank-python/2-deploy.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -eo pipefail
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
+cd function
+rm -rf package
+pip install --target ./package -r requirements.txt
+cp lambda_function.py package
+cd ../
+aws cloudformation package --template-file template.yml --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
+aws cloudformation deploy --template-file out.yml --stack-name blank-python --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/blank-python/2-deploy.sh.template b/sample-apps/blank-python/2-deploy.sh.template
diff --git a/sample-apps/blank-python/4-cleanup.sh b/sample-apps/blank-python/4-cleanup.sh
@@ -13,5 +13,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-rm -f 2-deploy.sh out.yml out.json
+rm -f out.yml out.json
 rm -rf function/package
diff --git a/sample-apps/blank-ruby/1-create-bucket.sh b/sample-apps/blank-ruby/1-create-bucket.sh
@@ -3,5 +3,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 2-deploy.sh.template 2-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 2-deploy.sh
diff --git a/sample-apps/blank-ruby/2-deploy.sh b/sample-apps/blank-ruby/2-deploy.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 set -eo pipefail
-aws cloudformation package --template-file template.yml --s3-bucket MY_BUCKET --output-template-file out.yml
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
+aws cloudformation package --template-file template.yml --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name blank-ruby --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/blank-ruby/4-cleanup.sh b/sample-apps/blank-ruby/4-cleanup.sh
@@ -13,5 +13,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-rm -f 2-deploy.sh out.yml out.json
+rm -f out.yml out.json
 rm -rf function/node_modules function/package-lock.json
diff --git a/sample-apps/blank/1-create-bucket.sh b/sample-apps/blank/1-create-bucket.sh
@@ -3,5 +3,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 2-deploy.sh.template 2-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 2-deploy.sh
diff --git a/sample-apps/blank/2-deploy.sh b/sample-apps/blank/2-deploy.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 set -eo pipefail
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
 cd function 
 npm install --production
 cd ../
-aws cloudformation package --template-file template.yml --s3-bucket MY_BUCKET --output-template-file out.yml
+aws cloudformation package --template-file template.yml --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name blank --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/blank/4-cleanup.sh b/sample-apps/blank/4-cleanup.sh
@@ -13,5 +13,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-rm -f 2-deploy.sh out.yml out.json
+rm -f out.yml out.json
 rm -rf function/node_modules function/package-lock.json
diff --git a/sample-apps/ec2-spot/.gitignore b/sample-apps/ec2-spot/.gitignore
diff --git a/sample-apps/ec2-spot/1-create-bucket.sh b/sample-apps/ec2-spot/1-create-bucket.sh
@@ -3,5 +3,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 2-deploy.sh.template 2-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 2-deploy.sh
diff --git a/sample-apps/ec2-spot/2-deploy.sh b/sample-apps/ec2-spot/2-deploy.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 set -eo pipefail
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
 cd src/ec2spot
 dotnet lambda package
 cd ../../
-aws cloudformation package --template-file template.yml --s3-bucket MY_BUCKET --output-template-file out.yml
+aws cloudformation package --template-file template.yml --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name ec2-spot --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/ec2-spot/4-cleanup.sh b/sample-apps/ec2-spot/4-cleanup.sh
@@ -12,4 +12,4 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-rm -f 2-deploy.sh out.yml
+rm -f out.yml out.json
diff --git a/sample-apps/error-processor/.gitignore b/sample-apps/error-processor/.gitignore
diff --git a/sample-apps/error-processor/1-create-bucket.sh b/sample-apps/error-processor/1-create-bucket.sh
@@ -3,5 +3,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 2-deploy.sh.template 2-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 2-deploy.sh
diff --git a/sample-apps/error-processor/2-deploy.sh b/sample-apps/error-processor/2-deploy.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 cd processor
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
 npm install --production
 cd ../random-error
 npm install --production
 cd ../
-aws cloudformation package --template-file template.yml --s3-bucket MY_BUCKET --output-template-file out.yml
+aws cloudformation package --template-file template.yml --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name error-processor --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/error-processor/4-cleanup.sh b/sample-apps/error-processor/4-cleanup.sh
@@ -19,5 +19,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-rm -f 2-deploy.sh out.yml out.json
+rm -f out.yml out.json
 rm -rf processor/node_modules random-error/node_modules processor/package-lock.json random-error/package-lock.json
diff --git a/sample-apps/java-basic/1-create-bucket.sh b/sample-apps/java-basic/1-create-bucket.sh
@@ -3,5 +3,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 2-deploy.sh.template 2-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 2-deploy.sh
diff --git a/sample-apps/java-basic/2-deploy.sh b/sample-apps/java-basic/2-deploy.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
 TEMPLATE=template.yml
 if [ $1 ]
 then
@@ -11,5 +12,5 @@ then
 else
   gradle build -i
 fi
-aws cloudformation package --template-file $TEMPLATE --s3-bucket MY_BUCKET --output-template-file out.yml
+aws cloudformation package --template-file $TEMPLATE --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name java-basic --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/java-basic/4-cleanup.sh b/sample-apps/java-basic/4-cleanup.sh
@@ -13,5 +13,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-rm -f 2-deploy.sh out.yml out.json
+rm -f out.yml out.json
 rm -rf build .gradle target
diff --git a/sample-apps/list-manager/.gitignore b/sample-apps/list-manager/.gitignore
diff --git a/sample-apps/list-manager/1-create-bucket.sh b/sample-apps/list-manager/1-create-bucket.sh
@@ -4,5 +4,3 @@ BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
 aws s3 mb s3://$BUCKET_NAME
-cp 4-deploy.sh.template 4-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 4-deploy.sh
diff --git a/sample-apps/list-manager/4-deploy.sh b/sample-apps/list-manager/4-deploy.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eo pipefail
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
 cd lib/nodejs && npm install && cd ../../
-aws cloudformation package --template-file template.yml --s3-bucket MY_BUCKET --output-template-file out.yml
+aws cloudformation package --template-file template.yml --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name list-manager --capabilities CAPABILITY_NAMED_IAM
diff --git a/sample-apps/list-manager/8-cleanup.sh b/sample-apps/list-manager/8-cleanup.sh
@@ -14,6 +14,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
-
-rm out.yml out.json 4-deploy.sh
+rm out.yml out.json
 rm -rf lib/nodejs/node_modules
diff --git a/sample-apps/rds-mysql/.gitignore b/sample-apps/rds-mysql/.gitignore
diff --git a/sample-apps/rds-mysql/1-create-bucket.sh b/sample-apps/rds-mysql/1-create-bucket.sh
@@ -3,6 +3,4 @@ set -eo pipefail
 BUCKET_ID=$(dd if=/dev/random bs=8 count=1 2>/dev/null | od -An -tx1 | tr -d ' \t\n')
 BUCKET_NAME=lambda-artifacts-$BUCKET_ID
 echo $BUCKET_NAME > bucket-name.txt
-aws s3 mb s3://$BUCKET_NAME
-cp 4-deploy.sh.template 4-deploy.sh
-sed -i'' -e "s/MY_BUCKET/$BUCKET_NAME/" 4-deploy.sh
+aws s3 mb s3://$BUCKET_NAME
diff --git a/sample-apps/rds-mysql/4-deploy.sh b/sample-apps/rds-mysql/4-deploy.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 set -eo pipefail
+ARTIFACT_BUCKET=$(cat bucket-name.txt)
 STACK=rds-mysql
 if [[ $# -eq 1 ]] ; then
     STACK=$1
     echo "Deploying to stack $STACK"
 fi
 cd lib/nodejs && npm install && cd ../../
-aws cloudformation package --template-file template.yml --s3-bucket MY_BUCKET --output-template-file out.yml
+aws cloudformation package --template-file template.yml --s3-bucket $ARTIFACT_BUCKET --output-template-file out.yml
 aws cloudformation deploy --template-file out.yml --stack-name $STACK --capabilities CAPABILITY_NAMED_IAM
 
 # attach to different VPC
diff --git a/sample-apps/rds-mysql/7-cleanup.sh b/sample-apps/rds-mysql/7-cleanup.sh
@@ -18,3 +18,5 @@ if [ -f bucket-name.txt ]; then
         esac
     done
 fi
+
+rm out.yml out.json

-Original file line number
+Diff line change
         esac
     done
 fi
++
 +rm out.yml out.json