Merge pull request #148 from silinternational/develop

Release 3.1.1 - GitHub Actions

Author: briskt

.github/workflows/test-and-deploy.yml

@@ -0,0 +1,34 @@
+name: Test and Deploy
+
+on:
+  push:
+
+env:
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+  test_and_deploy:
+    name: Test and Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '18.x'
+    - name: Test
+      run: |  
+        npm install --no-fund -g [email protected]
+        npm ci --no-fund
+        npm test
+        serverless --version
+        serverless info --conceal
+    - if: github.ref_name == 'develop'
+      run: serverless deploy --verbose --stage dev --region us-east-1
+    - if: github.ref_name == 'develop'
+      run: serverless deploy --verbose --stage dev --region us-west-2
+    - if: github.ref_name == 'main'
+      run: serverless deploy --verbose --stage prod --region us-east-1
+    - if: github.ref_name == 'main'
+      run: serverless deploy --verbose --stage prod --region us-west-2

README.md

@@ -4,7 +4,7 @@ A Serverless API for registering and validating Multi-Factor Authentication meth
 Currently supports Time-based One Time Passwords (TOTP) and FIDO U2F devices (YubiKeys).
 
 For details about the various API endpoints, see
-[the RAML file](https://github.com/silinternational/serverless-mfa-api/blob/master/api.raml).
+[the RAML file](https://github.com/silinternational/serverless-mfa-api/blob/main/api.raml).
 
 ## Basic Workflow
 
@@ -73,21 +73,6 @@ For details about the various API endpoints, see
   must be HTTPS. It does  not need the full path though, so https://myapp.com is sufficient if the page is at
   https://myapp.com/auth/login.
 
-## Continuous Integration / Continuous Deployment (CI/CD)
-
-To set this up on Codeship, do the following:
-
-- Create a Codeship Basic project.
-- Give it a Setup Command of `./codeship/setup.sh`
-- Give it a Test Command of `./codeship/test.sh`
-- Create a Deployment Pipeline for the `develop` branch with this command:
-  `./codeship/deploy-dev.sh`
-- Create a Deployment Pipeline for the `master` branch with this command:
-  `./codeship/deploy-prod.sh`
-- Provide `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables
-  with the credentials of the AWS IAM user that Serverless (running on Codeship)
-  should act as when deploying this API.
-
 ## Automated Backups ##
 While DynamoDB supports On Demand backups as well as Continuous Backups with
 Point-in-time Recovery (PITR), both of these methods [restore to a new
@@ -328,7 +313,7 @@ terraform taint module.serverless-user.aws_iam_access_key.serverless
 ```
 2. Run a new plan on Terraform Cloud
 3. Review the new plan and apply if it is correct
-4. Copy the new key and secret from the Terraform output into Codeship
+4. Copy the new key and secret from the Terraform output into GitHub Repository Secrets
 
 ## Glossary
 

codeship/deploy.sh

@@ -4,7 +4,6 @@
   "dependencies": {
     "aws-sdk": "^2.1039.0",
     "bcryptjs": "^2.4.3",
-    "crypto-js": "^3.3.0",
     "qrcode": "^0.9.0",
     "speakeasy": "^2.0.0",
     "u2f": "^0.1.3",