fix: cos-trigger

Author: dfounderliu

src/baas/scf/index.js

@@ -246,6 +246,7 @@ class Scf {
       for (let i = 0; i < releaseEvents.length; i++) {
         const thisTrigger = releaseEvents[i]
         if (thisTrigger.Type == 'cos') {
+          console.log(thisTrigger)
           releaseEventsObj[
             `cos-${thisTrigger.TriggerName}-${thisTrigger.TriggerDesc}`
           ] = thisTrigger
@@ -320,7 +321,12 @@ class Scf {
               }
             })
             trigger.Enable = inputs.events[i]['cos']['parameters']['enable'] ? 'OPEN' : 'CLOSE'
-            triggerUnikey = `cos-${trigger.TriggerName}-${trigger.TriggerDesc}`
+            const tempDest = JSON.stringify({
+              bucketUrl: trigger.TriggerName,
+              event: JSON.parse(trigger.TriggerDesc).event,
+              filter: JSON.parse(trigger.TriggerDesc).filter
+            })
+            triggerUnikey = `cos-${trigger.TriggerName}-${tempDest}`
           } else if (eventType === 'ckafka') {
             const thisTrigger = inputs.events[i]['ckafka']
             trigger.Type = 'ckafka'
@@ -354,10 +360,10 @@ class Scf {
 
           // 判断Trigger是否已经存在
           let deploy = false
+
           if (releaseEventsObj[triggerUnikey]) {
             // 存在Trigger
-            // 判断Trigger是否一致，如果一致跳过，否则删除重建
-
+            // 判断Trigger是否一致，如果一致跳过，否则删除重
             const thisReleaseTrigger = releaseEventsObj[triggerUnikey]
             for (const item in thisReleaseTrigger) {
               if (['TriggerDesc', 'TriggerName', 'Enable', 'CustomArgument'].includes(item)) {
@@ -479,6 +485,9 @@ class Scf {
       if (!funcInfo) {
         funcInfo = await this.getFunction(inputs.namespace || defaultNamespace, inputs.name)
       }
+      if ((await this.checkStatus(inputs.namespace || defaultNamespace, inputs.name)) == false) {
+        throw `Function ${inputs.name} upgrade failed. Please check function status.`
+      }
       await Promise.all([this.deployTags(funcInfo, inputs), this.deployTrigger(funcInfo, inputs)])
     }
 

src/baas/scf/index.test.js

@@ -1,5 +1,5 @@
 const secret = require('../../../../secret')
-const ScfUtils = require('./index').Scf
+const ScfUtils = require('./index')
 
 class ClientTest {
 	async scfTest() {
@@ -8,16 +8,15 @@ class ClientTest {
 			SecretKey: secret.SecretKey
 		})
 		const scfDemo = {
-			name: 'myFunction1',
+			name: 'sync_cos_bucket',
 			code: {
-				bucket: 'sls-cloudfunction-ap-guangzhou',
-				object: 'sls-cloudfunction-default-hello_world-1584670117.zip'
+				bucket: 'sls-cloudfunction-ap-guangzhou-code',
+				object: 'mytestFunction-1585915515.zip'
 			},
 			handler: 'index.main_handler',
 			runtime: 'Python3.6',
-			role: 'SCF_PythonLogsRole',
-			// eip: true,
-			region: 'ap-shanghai',
+			// role: 'SCF_PythonLogsRole',
+			region: 'ap-guangzhou',
 			description: 'My Serverless Function',
 			memorySize: '256',
 			timeout: '20',
@@ -30,38 +29,54 @@ class ClientTest {
 				}
 			},
 			events: [
-				{
-					timer: {
-						name: 'timer',
-						parameters: {
-							cronExpression: '*/6 * * * *',
-							enable: true,
-							argument: 'mytest argument'
-						}
-					}
-				},
-				{
-					apigw: {
-						name: 'serverless',
-						parameters: {
-							protocols: ['http'],
-							serviceName: 'serverless',
-							description: 'the serverless service',
-							environment: 'release',
-							endpoints: [{
-								path: '/users',
-								method: 'POST'
-							}]
-						}
-
-					}
-				}
+				// {
+				// 	timer: {
+				// 		name: 'timer',
+				// 		parameters: {
+				// 			cronExpression: '*/6 * * * *',
+				// 			enable: true,
+				// 			argument: 'mytest argument'
+				// 		}
+				// 	}
+				// },
+        {
+          cos: {
+            name: 'anycodesimage-1256773370.cos.ap-guangzhou.myqcloud.com',
+            parameters: {
+              bucket: 'anycodesimage-1256773370.cos.ap-guangzhou.myqcloud.com',
+              enable: true,
+              events: 'cos:ObjectCreated:*',
+              filter:{
+                prefix: "aaaasad"
+              }
+            }
+          }
+        }
+				// {
+				// 	apigw: {
+				// 		name: 'serverless',
+				// 		parameters: {
+				// 			protocols: ['http'],
+				// 			serviceName: 'serverless',
+				// 			description: 'the serverless service',
+				// 			environment: 'release',
+				// 			endpoints: [{
+				// 				path: '/users',
+				// 				method: 'POST'
+				// 			}]
+				// 		}
+        //
+				// 	}
+				// }
 			]
 		}
 		const result = await scf.deploy(scfDemo)
-		console.log(JSON.stringify(result))
-		console.log(await scf.invoke(result.FunctionName))
-		await scf.remove(result)
+    try{console.log(JSON.stringify(result))}catch (e) {
+      console.log(e)
+    }
+		// console.log(JSON.stringify(result))
+		// console.log(await scf.invoke(result.FunctionName))
+		// await scf.remove(result)
 	}
 }