39: Update Lambda runtime and deployment workflow (#49)

Co-authored-by: John Lomen <[email protected]>

Author: GraysonCox

.github/workflows/deploy.yml

@@ -1,7 +1,11 @@
 name: Deployment
 
 on:
-  workflow_dispatch: {}
+  workflow_dispatch:
+    inputs:
+      DEPLOY_PROD:
+        type: boolean
+        default: false
   push:
     branches:
       - main
@@ -19,54 +23,47 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v3
-      - name: Install Node 16
-        uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - run: npm ci
       - run: npm test
+
   deploy-dev:
     name: Deploy-dev
     needs: Build
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v3
-      - name: Install Node 16
-        uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - uses: actions/setup-python@v3
       - uses: aws-actions/setup-sam@v2
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+      - uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.DEV_ROLE_ARN }}
           role-session-name: DeployToDev
-      # sam build
       - run: sam build --use-container
-      # sam deploy
       - run: sam deploy --no-confirm-changeset --no-fail-on-empty-changeset --parameter-overrides SlackTokenSecret=${{ secrets.SLACKTOKEN }} SmallImprovementsTokenSecret=${{ secrets.SITOKEN }}
 
   deploy-prod:
     name: Deploy-prod
     needs: Deploy-dev
+    if: ${{ inputs.DEPLOY_PROD }}
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v3
-      - name: Install Node 16
-        uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
       - uses: actions/setup-python@v3
       - uses: aws-actions/setup-sam@v2
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+      - uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-region: us-east-1
           role-to-assume: ${{ secrets.PROD_ROLE_ARN }}
           role-session-name: DeployToProd
-      # sam build
       - run: sam build --use-container
-      # sam deploy
       - run: sam deploy --no-confirm-changeset --no-fail-on-empty-changeset --parameter-overrides SlackTokenSecret=${{ secrets.SLACKTOKEN }} SmallImprovementsTokenSecret=${{ secrets.SITOKEN }} SlackChannel=CF4U95FN0 ScheduleEnabled=true

.nvmrc

@@ -1 +1 @@
-16.15.0
+22.21.1

src/index.js index.jssrc/index.js renamed to index.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const secretsClient = require('./secrets');
-const smallImprovementsClient = require('./small-improvements');
-const dynamodbClient = require('./dynamodb');
-const slackService = require('./slack-service');
-const filter = require('./filter');
+const secretsClient = require('./src/secrets');
+const smallImprovementsClient = require('./src/small-improvements');
+const dynamodbClient = require('./src/dynamodb');
+const slackService = require('./src/slack-service');
+const filter = require('./src/filter');
 
 async function main(event, context) {
   /*

package.json

@@ -2,7 +2,7 @@
   "name": "small-improvements-slack-bot",
   "version": "1.0.0",
   "description": "Slack bot for integration with Small Improvements API",
-  "main": "src/index.js",
+  "main": "index.js",
   "scripts": {
     "fixlint": "eslint --fix src/*.js test/*.js",
     "lint": "eslint src/*.js test/*.js",

template.yaml

@@ -31,9 +31,9 @@ Resources:
   SmallImprovementsBotLambda:
     Type: AWS::Serverless::Function
     Properties:
-      CodeUri: src/
+      CodeUri: .
       Handler: index.handler
-      Runtime: nodejs16.x
+      Runtime: nodejs22.x
       Timeout: 300
       Environment:
         Variables:

test/index.test.js

@@ -1,4 +1,4 @@
-const index = require('../src/index');
+const index = require('../index');
 const secretsClient = require('../src/secrets');
 const smallImprovementsClient = require('../src/small-improvements');
 const dynamodbClient = require('../src/dynamodb');