fix: update deploy and remove flow (#42)

* fix: update to deployment to serial flow

* fix: update remove flow

* chore: update version in yaml

* test: update

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 renamed to __tests__/index.test.js

@@ -1,17 +1,12 @@
-require('dotenv').config()
-const { generateId, getServerlessSdk } = require('./utils')
+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: 'koa',
+  component: 'koa@dev',
   name: `koa-integration-tests-${generateId()}`,
   stage: 'dev',
   inputs: {
@@ -21,7 +16,6 @@ const instanceYaml = {
   }
 }
 
-// get credentials from process.env
 const credentials = {
   tencent: {
     SecretId: process.env.TENCENT_SECRET_ID,
@@ -46,15 +40,14 @@ it('should successfully deploy koa 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).toContain('Serverless Framework')
   expect(instance.outputs.templateUrl).not.toBeDefined()
 })
 

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

@@ -86,7 +86,7 @@ inputs:
 | functionName                         |    否    |                 | 云函数名称                                                          |
 | serviceName                          |    否    |                 | API 网关服务名称, 默认创建一个新的服务名称                          |
 | serviceId                            |    否    |                 | API 网关服务 ID,如果存在将使用这个 API 网关服务                     |
-| entryFile                            |  否  |    `sls.js`     | 自定义 server 的入口文件名                                          |
+| entryFile                            |    否    |    `sls.js`     | 自定义 server 的入口文件名                                          |
 | src                                  |    否    | `process.cwd()` | 默认为当前目录, 如果是对象, 配置参数参考 [执行目录](#执行目录)      |
 | layers                               |    否    |                 | 云函数绑定的 layer, 配置参数参考 [层配置](#层配置)                  |
 | [functionConf](#函数配置)            |    否    |                 | 函数配置                                                            |

docs/configure.md

@@ -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: koa
-version: 0.2.0
+version: 0.2.1
 author: 'Tencent Cloud, Inc.'
 org: 'Tencent Cloud, Inc.'
 description: Deploy a serverless Koa.js application onto Tencent SCF and API Gateway.

serverless.component.yml

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "download": "^8.0.0",
-    "tencent-component-toolkit": "^1.16.8",
+    "tencent-component-toolkit": "^1.19.8",
     "type": "^2.1.0"
   }
 }

src/package.json

@@ -184,24 +184,33 @@ class ServerlessComponent extends Component {
       outputs.templateUrl = CONFIGS.templateUrl
     }
 
-    const deployTasks = [this.deployFunction(credentials, functionConf, regionList, outputs)]
+    let apigwOutputs
+    const functionOutputs = await this.deployFunction(
+      credentials,
+      functionConf,
+      regionList,
+      outputs
+    )
     // support apigatewayConf.isDisabled
     if (apigatewayConf.isDisabled !== true) {
-      deployTasks.push(this.deployApigateway(credentials, apigatewayConf, regionList, outputs))
+      apigwOutputs = await this.deployApigateway(credentials, apigatewayConf, regionList, outputs)
     } else {
       this.state.apigwDisabled = true
     }
-    const [functionOutputs, apigwOutputs = {}] = await Promise.all(deployTasks)
 
     // optimize outputs for one region
     if (regionList.length === 1) {
       const [oneRegion] = regionList
       outputs.region = oneRegion
-      outputs['apigw'] = apigwOutputs[oneRegion]
       outputs['scf'] = functionOutputs[oneRegion]
+      if (apigwOutputs) {
+        outputs['apigw'] = apigwOutputs[oneRegion]
+      }
     } else {
-      outputs['apigw'] = apigwOutputs
       outputs['scf'] = functionOutputs
+      if (apigwOutputs) {
+        outputs['apigw'] = apigwOutputs
+      }
     }
 
     this.state.region = regionList[0]
@@ -226,10 +235,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({
@@ -240,6 +245,10 @@ class ServerlessComponent extends Component {
             customDomains: curState.customDomains
           })
         }
+        await scf.remove({
+          functionName: curState.functionName,
+          namespace: curState.namespace
+        })
       }
       removeHandlers.push(handler())
     }