fix status

Author: dfounderliu

.eslintrc.js

@@ -43,7 +43,6 @@ module.exports = {
       }
     ],
     'no-alert': 'error',
-    'no-console': 'error',
     'no-const-assign': 'error',
     'no-else-return': 'error',
     'no-empty': 'off',

Changelog.md

@@ -1,4 +1,10 @@
 # 变更历史
 
+
+
+## 2020-02-06
+* 修复rollback操作可能出现函数状态错误问题
+* 优化函数状态检测部分代码
+
 ## 2019-11-26
 * 更新函数状态，提高部署成功率

deploy/lib/deployFunction.js

@@ -21,19 +21,7 @@ class DeployFunction extends AbstractHandler {
       }
       this.serverless.cli.log('Updating code... ')
       await this.updateFunctionCode(ns, funcObject)
-      // when update code Status is Active, continue
-      let status = 'Updating'
-      let times = 90
-      while (status == 'Updating' || status == 'Creating') {
-        const tempFunc = await this.getFunction(ns, funcObject.FuncName)
-        status = tempFunc.Status
-        await utils.sleep(1000)
-        times = times - 1
-        if (times <= 0) {
-          throw `Function ${funcObject.FuncName} update failed`
-        }
-      }
-      if (status != 'Active') {
+      if ((await this.checkStatus(ns, funcObject)) == false) {
         throw `Function ${funcObject.FuncName} update failed`
       }
       this.serverless.cli.log('Updating configure... ')
@@ -43,6 +31,18 @@ class DeployFunction extends AbstractHandler {
     return null
   }
 
+  async checkStatus(ns, funcObject) {
+    let status = 'Updating'
+    let times = 90
+    while ((status == 'Updating' || status == 'Creating') && times > 0) {
+      const tempFunc = await this.getFunction(ns, funcObject.FuncName)
+      status = tempFunc.Status
+      await utils.sleep(1000)
+      times = times - 1
+    }
+    return status != 'Active' ? false : true
+  }
+
   async addRole() {
     try {
       const roleName = 'SCF_QcsRole'

deploy/tencentDeploy.js

@@ -66,19 +66,7 @@ class TencentDeploy {
       this.serverless.cli.log(`Setting tags for function ${funcObject.FuncName}`)
       await func.createTags('default', funcObject.FuncName, funcObject.Properties.Tags)
 
-      // Function status
-      let status = 'Updating'
-      let times = 90
-      while (status == 'Updating' || status == 'Creating') {
-        const tempFunc = await func.getFunction('default', funcObject.FuncName)
-        status = tempFunc.Status
-        await utils.sleep(1000)
-        times = times - 1
-        if (times <= 0) {
-          throw `Function ${funcObject.FuncName} create/update failed`
-        }
-      }
-      if (status != 'Active') {
+      if ((await func.checkStatus('default', funcObject)) == false) {
         throw `Function ${funcObject.FuncName} create/update failed`
       }
 

deploy/tencentDeployFunction.js

@@ -79,19 +79,7 @@ class TencentDeployFunction {
     const oldFunc = await func.deploy('default', funcObject)
     this.serverless.cli.log(`Created function ${funcObject.FuncName}`)
 
-    // when update code Status is Active, continue
-    let status = 'Updating'
-    let times = 90
-    while (status == 'Updating' || status == 'Creating') {
-      const tempFunc = await func.getFunction('default', funcObject.FuncName)
-      status = tempFunc.Status
-      await utils.sleep(1000)
-      times = times - 1
-      if (times <= 0) {
-        throw `Function ${funcObject.FuncName} create/update failed`
-      }
-    }
-    if (status != 'Active') {
+    if ((await func.checkStatus('default', funcObject)) == false) {
       throw `Function ${funcObject.FuncName} create/update failed`
     }
 
@@ -101,18 +89,7 @@ class TencentDeployFunction {
     this.serverless.cli.log(`Setting tags for function ${funcObject.FuncName}`)
     await func.createTags('default', funcObject.FuncName, funcObject.Properties.Tags)
 
-    // Function status
-    status = 'Updating'
-    while (status == 'Updating' || status == 'Creating') {
-      const tempFunc = await func.getFunction('default', funcObject.FuncName)
-      status = tempFunc.Status
-      await utils.sleep(1000)
-      times = times - 1
-      if (times <= 0) {
-        throw `Function ${funcObject.FuncName} create/update failed`
-      }
-    }
-    if (status != 'Active') {
+    if ((await func.checkStatus('default', funcObject)) == false) {
       throw `Function ${funcObject.FuncName} create/update failed`
     }
 

invoke/tencentInvoke.js

@@ -27,9 +27,6 @@ class TencentInvoke {
     this.options = await provider.getUserCred(this.options)
     await provider.getUserAuth(this.options.credentials.tencent_owneruin)
     try {
-      const options = {
-        region: this.options.region
-      }
       const invokeHandler = new Invoke(this.options, this.serverless)
       let context = null
       if (this.options.data) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-tencent-scf",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "Provider plugin for the Serverless Framework v1.x which adds support for Tencent Cloud Functions.",
   "main": "index.js",
   "author": "Tencent Cloud, Inc.",
@@ -44,8 +44,8 @@
     "tencentcloud-sdk-nodejs": "^3.0.87",
     "universal-analytics": "^0.4.20",
     "tencent-login": "^0.1.6",
-    "serverless-tencent-tools": "^0.0.10",
-    "serverless-tencent-auth-tool": "^1.0.13"
+    "serverless-tencent-tools": "^0.0.11",
+    "serverless-tencent-auth-tool": "^1.0.18"
   },
   "devDependencies": {
     "coveralls": "^3.0.5",

provider/tencentProvider.js

@@ -7,11 +7,14 @@ const util = require('util')
 const QRCode = require('qrcode')
 const TencentLogin = require('tencent-login')
 const tencentcloud = require('tencentcloud-sdk-nodejs')
-const { GetUserAuthInfo } = require('serverless-tencent-tools').Account
+const serverlessTencentTools = require('serverless-tencent-tools')
+const { GetUserAuthInfo } = serverlessTencentTools.Account
+const { DataReport } = serverlessTencentTools.Others.DataReport
 const ClientProfile = require('tencentcloud-sdk-nodejs/tencentcloud/common/profile/client_profile.js')
 const HttpProfile = require('tencentcloud-sdk-nodejs/tencentcloud/common/profile/http_profile.js')
 const AbstractModel = require('tencentcloud-sdk-nodejs/tencentcloud/common/abstract_model')
 const AbstractClient = require('tencentcloud-sdk-nodejs/tencentcloud/common/abstract_client')
+
 const constants = {
   providerName: 'tencent'
 }
@@ -50,6 +53,19 @@ class TencentProvider {
     this.getCredentials(this.serverless, this.options)
     this.serverless.setProvider(constants.providerName, this)
     this.provider = this
+    let commands = ''
+    const commandsAttr = this.serverless.pluginManager.cliCommands
+    for (let i = 0; i < commandsAttr.length; i++) {
+      commands = commands + (i == 0 ? '' : '_') + commandsAttr[i]
+    }
+    this.reportInputs = {
+      name: 'serverless-tencent-scf',
+      project: this.serverless.service.service,
+      action: commands
+    }
+    try {
+      new DataReport().report(this.reportInputs)
+    } catch (e) {}
   }
 
   static getProviderName() {
@@ -75,14 +91,19 @@ class TencentProvider {
       })
       options.credentials.tencent_appid = appid.AppId
       options.credentials.tencent_owneruin = appid.OwnerUin
+      this.tempUin = appid.OwnerUin
     }
     return options
   }
 
   async getUserAuth(uin) {
     try {
+      try {
+        this.reportInputs.uin = uin
+        new DataReport().report(this.reportInputs)
+      } catch (e) {}
       const getUserAuthInfo = new GetUserAuthInfo()
-      const result = await getUserAuthInfo.isAuth(uin, { client: 'plugin' })
+      const result = await getUserAuthInfo.isAuth(uin, this.reportInputs)
       if (result['Error'] == true) {
         console.log('Failed to get real name authentication result.')
         process.exit(-1)

rollback/tencentRollback.js

@@ -88,9 +88,17 @@ class TencentRollback {
               const oldFunc = await func.deploy('default', funcObject)
               this.serverless.cli.log(`Rollback function ${funcObject.FuncName}`)
 
+              if ((await func.checkStatus('default', funcObject)) == false) {
+                throw `Function ${funcObject.FuncName} create/update failed`
+              }
+
               this.serverless.cli.log(`Rollback configure for function ${funcObject.FuncName}`)
               await func.updateConfiguration('default', oldFunc, funcObject)
 
+              if ((await func.checkStatus('default', funcObject)) == false) {
+                throw `Function ${funcObject.FuncName} create/update failed`
+              }
+
               this.serverless.cli.log(`Setting tags for function ${funcObject.FuncName}`)
               await func.createTags('default', funcObject.FuncName, funcObject.Properties.Tags)