CI update: node 18 + run tests for serverless v2 and v3 (#220)

Co-authored-by: Waldemar Hummer <[email protected]>
localstack · May 16, 2023 · 26b4dc5 · 26b4dc5
1 parent 102fe13
commit 26b4dc5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,26 +10,47 @@ jobs:
   serverless-localstack-test:
     name: Serverless LocalStack CI
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        sls-major-version: ["2", "3"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '18'
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
-          cache-name: cache-node-modules
+          cache-name: cache-node-modules-v${{ matrix.sls-major-version }}
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.sls-major-version }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+            ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.sls-major-version }}-
+
+      - name: Install deps
+        run: |
+          npm install
+
+      - name: Update SLS version to v3
+        if: ${{ matrix.sls-major-version == '3' }}
+        run: |
+          npm install serverless@3
+      
+      - name: Check installed version
+        env:
+          EXPECTED_SLS_MAJOR_VERSION: ${{ matrix.sls-major-version }}
+        run : |
+          installed_sls_version=$(npm list | grep serverless@ | sed -E 's/.*serverless@(.*)/\1/')
+          echo "installed serverless version: ${installed_sls_version}"
+          if [ "${installed_sls_version:0:1}" !=  ${EXPECTED_SLS_MAJOR_VERSION} ]; then
+            echo "expected version ${EXPECTED_SLS_MAJOR_VERSION}, but installed ${installed_sls_version}"
+            exit 1
+          fi
 
       - name: Start LocalStack
         run: |
@@ -38,10 +59,6 @@ jobs:
           localstack start -d
           localstack wait -t 30
 
-      - name: Install deps
-        run: |
-          npm ci
-
       - name: Run Lint and Test
         run: |
           set -e

diff --git a/package.json b/package.json
@@ -10,9 +10,7 @@
     "test:watch": "JASMINE_CONFIG_PATH=spec/support/jasmine.json jasmine",
     "test:integration": "JASMINE_CONFIG_PATH=spec/support/jasmine_integration.json jasmine",
     "test:integration:watch": "JASMINE_CONFIG_PATH=spec/support/jasmine_integration.json nodemon -L -i spec/integrate ./node_modules/.bin/jasmine",
-    "test:cover": "jasmine --coverage",
-    "prepublish": "npm run test",
-    "preversion": "npm run test"
+    "test:cover": "jasmine --coverage"
   },
   "repository": {
     "type": "git",

diff --git a/spec/integration/integration.spec.js b/spec/integration/integration.spec.js
@@ -8,7 +8,7 @@ const AWS = require('aws-sdk');
 // Set the region and endpoint in the config for LocalStack
 AWS.config.update({
   region: 'us-east-1',
-  endpoint: 'http://localhost:4566'
+  endpoint: 'http://127.0.0.1:4566'
 });
 AWS.config.credentials = new AWS.Credentials({
   accessKeyId: 'test',

diff --git a/spec/unit/index.spec.js b/spec/unit/index.spec.js
@@ -32,7 +32,7 @@ describe("LocalstackPlugin", () => {
 
   beforeEach(() => {
     sandbox = sinon.createSandbox();
-    serverless = new Serverless();
+    serverless = new Serverless({commands: ['deploy'], options: {}});
     awsProvider = new AwsProvider(serverless, {});
     awsConfig = new AWS.Config();
     AWS.config = awsConfig;
@@ -176,7 +176,8 @@ describe("LocalstackPlugin", () => {
       });
       expect(request.called).to.be.true;
       let templateUrl = request.firstCall.args[2].TemplateURL;
-      expect(templateUrl).to.startsWith(`${config.host}`);
+      // url should either start with 'http://localhost' or 'http://127.0.0.1
+      expect(templateUrl).to.satisfy((url) => url.startsWith(`${config.host}`) || url.startsWith('http://127.0.0.1'));
     });
 
     it('should not send validateTemplate calls to localstack', async () => {