From 40f3b8b3d3befd02e48b79ba8dcde5b5490ed8ff Mon Sep 17 00:00:00 2001
From: Dylan <dylanpdx@gmail.com>
Date: Tue, 6 Dec 2022 22:42:27 +0000
Subject: [PATCH] Deploy config update

---
 .github/workflows/deploy.yml | 35 ++++++++++++++++++++++++++++++++++-
 serverless.yml               | 18 +++++++++---------
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9711064..a64e5d6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,7 +25,40 @@ jobs:
           cache: 'npm'
 
       - name: Install packages
-        run: npm install serverless && npm install
+        run: npm install -g serverless
+
+      - name: Install serverless-wsgi
+        run: serverless plugin install -n serverless-wsgi
+
+      - name: Install serverless-python-requirements
+        run: serverless plugin install -n serverless-python-requirements
+
+      - name: Install serverless-plugin-common-excludes
+        run: serverless plugin install -n serverless-plugin-common-excludes
+
+      - name: Install serverless-plugin-include-dependencies
+        run: serverless plugin install -n serverless-plugin-include-dependencies
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: arn:aws:iam::001057775987:role/GithubActionsOIDC-vxtwitter-Role-ZYPHWRSFIP80
+          role-duration-seconds: 900
+          aws-region: us-east-1
 
       - name: Deploy
         run: serverless deploy
+        env:
+          VXTWITTER_LINK_CACHE: ${{ secrets.VXTWITTER_LINK_CACHE }}
+          VXTWITTER_DATABASE: ${{ secrets.VXTWITTER_DATABASE }}
+          VXTWITTER_METHOD: ${{ secrets.VXTWITTER_METHOD }}
+          VXTWITTER_COLOR: ${{ secrets.VXTWITTER_COLOR }}
+          VXTWITTER_APP_NAME: ${{ secrets.VXTWITTER_APP_NAME }}
+          VXTWITTER_REPO: ${{ secrets.VXTWITTER_REPO }}
+          VXTWITTER_URL: ${{ secrets.VXTWITTER_URL }}
+          VXTWITTER_COMBINATION_METHOD: ${{ secrets.VXTWITTER_COMBINATION_METHOD }}
diff --git a/serverless.yml b/serverless.yml
index 516be44..b5f039d 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -18,14 +18,14 @@ provider:
   environment:
     VXTWITTER_CACHE_TABLE: ${self:custom.tableName}
     RUNNING_SERVERLESS: 1
-    VXTWITTER_LINK_CACHE: dynamodb
-    VXTWITTER_DATABASE: none
-    VXTWITTER_METHOD: hybrid
-    VXTWITTER_COLOR: \#43B581
-    VXTWITTER_APP_NAME: vxTwitter
-    VXTWITTER_REPO: https://github.com/dylanpdx/BetterTwitFix
-    VXTWITTER_URL: https://vxtwitter.com
-    VXTWITTER_COMBINATION_METHOD: local
+    VXTWITTER_LINK_CACHE: ${env:VXTWITTER_LINK_CACHE, 'json'}
+    VXTWITTER_DATABASE: ${env:VXTWITTER_DATABASE, 'none'}
+    VXTWITTER_METHOD: ${env:VXTWITTER_METHOD, 'hybrid'}
+    VXTWITTER_COLOR: ${env:VXTWITTER_COLOR, '#43B581'}
+    VXTWITTER_APP_NAME: ${env:VXTWITTER_APP_NAME, 'vxTwitter'}
+    VXTWITTER_REPO: ${env:VXTWITTER_REPO, 'https://github.com/dylanpdx/BetterTwitFix'}
+    VXTWITTER_URL: ${env:VXTWITTER_URL, 'https://vxtwitter.com'}
+    VXTWITTER_COMBINATION_METHOD: ${env:VXTWITTER_COMBINATION_METHOD, 'local'}
 
 package:
   patterns:
@@ -54,7 +54,7 @@ custom:
     app: twitfix.app
   pythonRequirements:
     layer: true
-    dockerizePip: true
+    dockerizePip: false
 
 	
 resources: