Merge pull request #18 from ryanrigato/dev

bundle upload in vm
ryanrigato · Jun 1, 2024 · ad2f1d2 · ad2f1d2
2 parents f8dc72d + f45a6d9
commit ad2f1d2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 34 deletions.
diff --git a/.github/workflows/tvratings_pipeline.yml b/.github/workflows/tvratings_pipeline.yml
@@ -47,4 +47,5 @@ jobs:
         shell: bash
         env:
           AWS_ACCOUNT_ID: ${{secrets.AWS_ACCOUNT_ID}}
+          PROJECT_NAME: ${{vars.PROJECT_NAME}}
         run: 'scripts/tvratings_build_test.sh'
diff --git a/scripts/app_deployment.sh b/scripts/app_deployment.sh
@@ -6,18 +6,6 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-
-git add -A
-
-git commit -m "$1"
-
-
-export PROJECT_NAME="tvratings"
-export BUCKET_NAME="${PROJECT_NAME}-app-artifacts"
-export DEPLOYMENT_PACKAGE="${PROJECT_NAME}_deployment_package.zip"
-export FUNCTION_NAME="${PROJECT_NAME}-alexa-skill"
-
-
 source avenv/bin/activate
 
 secret_scan_results=$(detect-secrets scan | \
@@ -31,31 +19,13 @@ fi
 
 python -m unittest
 
-# removes the deployment .zip package locally if it exists
-if [ -e $DEPLOYMENT_PACKAGE ]; then
-    rm $DEPLOYMENT_PACKAGE
-fi
-
-zip $DEPLOYMENT_PACKAGE -r tvratings externals  \
-    -x *__pycache__*  --quiet
-
-
-#add tvratings_skill.py to root of project
-zip -u $DEPLOYMENT_PACKAGE -j handlers/tvratings_skill.py  \
-    -x *__pycache__* --quiet
+deactivate
 
-aws s3api put-object --bucket $BUCKET_NAME \
-    --key $DEPLOYMENT_PACKAGE \
-    --body $DEPLOYMENT_PACKAGE \
-    --tagging "cloudformation_managed=no&project=${PROJECT_NAME}&prod=yes"
+git add -A
 
+git commit -m "$1"
 
-aws lambda update-function-code --function-name $FUNCTION_NAME \
-    --s3-bucket $BUCKET_NAME \
-    --s3-key $DEPLOYMENT_PACKAGE \
-    --no-cli-pager
 
-deactivate
 
 git push origin dev
 

diff --git a/scripts/tvratings_build_test.sh b/scripts/tvratings_build_test.sh
@@ -3,6 +3,9 @@ set -e
 
 export BUCKET_NAME="${PROJECT_NAME}-app-artifacts"
 export DEPLOYMENT_PACKAGE="${PROJECT_NAME}_deployment_package.zip"
+export FUNCTION_NAME="${PROJECT_NAME}-alexa-skill"
+
+
 
 
 python -m venv avenv
@@ -25,3 +28,34 @@ python -m unittest
 deactivate
 
 echo "--------beginning bundle--------"
+
+# removes the deployment .zip package locally if it exists
+if [ -e $DEPLOYMENT_PACKAGE ]; then
+    rm $DEPLOYMENT_PACKAGE
+fi
+
+zip $DEPLOYMENT_PACKAGE -r tvratings externals  \
+    -x *__pycache__*  --quiet
+
+
+#add tvratings_skill.py to root of project
+zip -u $DEPLOYMENT_PACKAGE -j handlers/tvratings_skill.py  \
+    -x *__pycache__* --quiet
+
+echo "--------bundle complete--------"
+
+aws s3api put-object --bucket $BUCKET_NAME \
+    --key $DEPLOYMENT_PACKAGE \
+    --body $DEPLOYMENT_PACKAGE \
+    --tagging "cloudformation_managed=no&project=${PROJECT_NAME}&prod=yes"
+
+
+aws lambda update-function-code --function-name $FUNCTION_NAME \
+    --s3-bucket $BUCKET_NAME \
+    --s3-key $DEPLOYMENT_PACKAGE \
+    --no-cli-pager
+
+
+
+echo "----------------------"
+echo "deployment successful"
diff --git a/templates/tvratings_alexa_skill.template b/templates/tvratings_alexa_skill.template
@@ -19,7 +19,7 @@ Parameters:
     Default: tvratings_skill.alexa_lambda_handler
 
   githubUser:
-    Default: rrigato
+    Default: ryanrigato
     Description: 'GitHub organization name'
     Type: String