fix: update remove flow

Author: yugasun

.github/workflows/release.yml

@@ -43,6 +43,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           GIT_AUTHOR_NAME: slsplus
-          GIT_AUTHOR_EMAIL: yuga.sun.bj@gmail.com
+          GIT_AUTHOR_EMAIL: slsplus.sz@gmail.com
           GIT_COMMITTER_NAME: slsplus
-          GIT_COMMITTER_EMAIL: yuga.sun.bj@gmail.com
+          GIT_COMMITTER_EMAIL: slsplus.sz@gmail.com

.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
         run: |
           npm update --no-save
           npm update --save-dev --no-save
-      - name: Running integration tests
+      - name: Running tests
         run: npm run test
         env:
           TENCENT_SECRET_ID: ${{ secrets.TENCENT_SECRET_ID }}

tests/integration.test.js __tests__/index.test.jstests/integration.test.js renamed to __tests__/index.test.js

@@ -1,17 +1,15 @@
-require('dotenv').config()
-const { generateId, getServerlessSdk } = require('./utils')
+const { join } = require('path');
+require('dotenv').config({ path: join(__dirname, '.env.test') });
+
+const { generateId, getServerlessSdk } = require('./lib/utils')
 const execSync = require('child_process').execSync
 const path = require('path')
 const axios = require('axios')
 
-// set enough timeout for deployment to finish
-jest.setTimeout(300000)
-
-// the yaml file we're testing against
 const instanceYaml = {
   org: 'orgDemo',
   app: 'appDemo',
-  component: 'express',
+  component: 'express@dev',
   name: `express-integration-tests-${generateId()}`,
   stage: 'dev',
   inputs: {
@@ -28,15 +26,13 @@ const credentials = {
   }
 }
 
-// get serverless construct sdk
 const sdk = getServerlessSdk(instanceYaml.org)
 
 it('should successfully deploy express app', async () => {
   const instance = await sdk.deploy(instanceYaml, credentials)
 
   expect(instance).toBeDefined()
   expect(instance.instanceName).toEqual(instanceYaml.name)
-  // get src from template by default
   expect(instance.outputs.templateUrl).toBeDefined()
   expect(instance.outputs.region).toEqual(instanceYaml.inputs.region)
   expect(instance.outputs.apigw).toBeDefined()
@@ -47,14 +43,14 @@ it('should successfully deploy express app', async () => {
 
 it('should successfully update source code', async () => {
   // change source to own source './src' and need to install packages before deploy
-  const srcPath = path.join(__dirname, 'src')
+  const srcPath = path.join(__dirname, '..', 'example')
   execSync('npm install', { cwd: srcPath })
   instanceYaml.inputs.src = srcPath
 
   const instance = await sdk.deploy(instanceYaml, credentials)
   const response = await axios.get(instance.outputs.apigw.url)
 
-  expect(response.data).toEqual('hello world')
+  expect(response.data.includes('Serverless Framework')).toBeTruthy()
   expect(instance.outputs.templateUrl).not.toBeDefined()
 })
 

tests/utils.js __tests__/lib/utils.jstests/utils.js renamed to __tests__/lib/utils.js

@@ -0,0 +1,14 @@
+const { join } = require('path')
+require('dotenv').config({ path: join(__dirname, '.env.test') })
+
+const config = {
+  verbose: true,
+  silent: false,
+  testTimeout: 600000,
+  testEnvironment: 'node',
+  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(js|ts)$',
+  testPathIgnorePatterns: ['/node_modules/', '/__tests__/lib/'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
+}
+
+module.exports = config

jest.config.js

@@ -5,7 +5,7 @@
     "access": "public"
   },
   "scripts": {
-    "test": "jest ./tests/integration.test.js --testEnvironment node",
+    "test": "jest",
     "commitlint": "commitlint -f HEAD@{15}",
     "lint": "eslint --ext .js,.ts,.tsx .",
     "lint:fix": "eslint --fix --ext .js,.ts,.tsx .",

package.json

@@ -1,5 +1,5 @@
 name: express
-version: 0.2.1
+version: 0.2.2
 author: Tencent Cloud, Inc.
 org: Tencent Cloud, Inc.
 description: Deploy a serverless Express.js application on Tencent SCF and API Gateway.

serverless.component.yml

@@ -247,10 +247,6 @@ class ServerlessComponent extends Component {
       const scf = new Scf(credentials, curRegion)
       const apigw = new Apigw(credentials, curRegion)
       const handler = async () => {
-        await scf.remove({
-          functionName: curState.functionName,
-          namespace: curState.namespace
-        })
         // if disable apigw, no need to remove
         if (state.apigwDisabled !== true) {
           await apigw.remove({
@@ -261,6 +257,10 @@ class ServerlessComponent extends Component {
             customDomains: curState.customDomains
           })
         }
+        await scf.remove({
+          functionName: curState.functionName,
+          namespace: curState.namespace
+        })
       }
       removeHandlers.push(handler())
     }