Improve tests by @mikejpeters

.github/workflows/main-workflow.yml → .github/workflows/integration-test.yml

@@ -1,13 +1,15 @@
-name: Main Workflow
+name: Run integration tests
+
 on:
   push:
     branches:
-      - 'master'
-
+      - master
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      SERVERLESS_VERSION: '3.3.0'
     steps:
       - uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -18,9 +20,5 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 16
-      - uses: actions/setup-python@v2
-        with: 
-          python-version: '3.8'
-      - run: pip install -r test/requirements.txt
       - run: npm ci
-      - run: npm test
+      - run: npm run integration-test

.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+# This workflow will publish a package to GitHub Packages when a release is created
+# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
+
+name: Publish package to npmjs
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 16
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.npm_token }}

.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: Run unit tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      SERVERLESS_VERSION: '3.3.0'
+    steps: 
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 16
+      - run: npm ci
+      - run: npm test

index.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const fs = require('fs');
 
-const Confirm = require('enquirer');
+const confirm = require('@serverless/utils/inquirer/confirm');
 
 const bucketUtils = require('./lib/bucketUtils');
 const configure = require('./lib/configure');
@@ -100,7 +100,7 @@ class Client {
         manageResources = this.options.manageResources;
         return this.cliOptions.confirm === false
           ? true
-          : new Confirm(`Are you sure you want to delete bucket '${bucketName}'?`).run();
+          : confirm(`Are you sure you want to delete bucket '${bucketName}'?`);
       })
       .then(goOn => {
         if (goOn) {
@@ -220,9 +220,7 @@ class Client {
         }
 
         deployDescribe.forEach(m => this.serverless.cli.log(m));
-        return this.cliOptions.confirm === false
-          ? true
-          : new Confirm(`Do you want to proceed?`).run();
+        return this.cliOptions.confirm === false ? true : confirm(`Do you want to proceed?`);
       })
       .then(goOn => {
         if (goOn) {
@@ -305,9 +303,7 @@ class Client {
             })
             .then(() => {
               this.serverless.cli.log(
-                `Success! Your site should be available at http://${bucketName}.${
-                  regionUrls[region]
-                }/`
+                `Success! Your site should be available at http://${bucketName}.${regionUrls[region]}/`
               );
             });
         }