fix: add deleting compatibility for all resources

Author: yugasun

src/baas/apigw/index.js

@@ -23,6 +23,15 @@ class Apigw {
     }
   }
 
+  async deleteRequest(inputs) {
+    inputs.Region = this.region
+    try {
+      await this.apigwClient.request(inputs)
+    } catch (e) {
+      console.log(e)
+    }
+  }
+
   async createOrUpdateService(serviceConf) {
     const {
       serviceId,
@@ -570,7 +579,7 @@ class Apigw {
         // 1.1 unbind secrete ids
         const { secrets } = curApi.usagePlan
         if (secrets && secrets.secretIds) {
-          await this.request({
+          await this.deleteRequest({
             Action: 'UnBindSecretIds',
             secretIds: secrets.secretIds,
             usagePlanId: curApi.usagePlan.usagePlanId
@@ -581,11 +590,11 @@ class Apigw {
           if (curApi.usagePlan.secrets.created === true) {
             for (let sIdx = 0; sIdx < secrets.secretIds.length; sIdx++) {
               const secretId = secrets.secretIds[sIdx]
-              await this.request({
+              await this.deleteRequest({
                 Action: 'DisableApiKey',
                 secretId
               })
-              await this.request({
+              await this.deleteRequest({
                 Action: 'DeleteApiKey',
                 secretId
               })
@@ -595,7 +604,7 @@ class Apigw {
         }
 
         // 1.2 unbind environment
-        await this.request({
+        await this.deleteRequest({
           Action: 'UnBindEnvironment',
           serviceId,
           usagePlanIds: [curApi.usagePlan.usagePlanId],
@@ -612,7 +621,7 @@ class Apigw {
           console.log(
             `Removing any previously deployed usage plan ids ${curApi.usagePlan.usagePlanId}`
           )
-          await this.request({
+          await this.deleteRequest({
             Action: 'DeleteUsagePlan',
             usagePlanId: curApi.usagePlan.usagePlanId
           })
@@ -622,7 +631,7 @@ class Apigw {
       // 2. delete only apis created by serverless framework
       if (curApi.apiId && curApi.created === true) {
         console.log(`Removing api: ${curApi.apiId}`)
-        await this.request({
+        await this.deleteRequest({
           Action: 'DeleteApi',
           apiId: curApi.apiId,
           serviceId
@@ -636,7 +645,7 @@ class Apigw {
         const curDomain = customDomains[i]
         if (curDomain.subDomain && curDomain.created === true) {
           console.log(`Unbinding custom domain: ${curDomain.subDomain}`)
-          await this.request({
+          await this.deleteRequest({
             Action: 'UnBindSubDomain',
             serviceId,
             subDomain: curDomain.subDomain
@@ -647,7 +656,7 @@ class Apigw {
 
     // 3. unrelease service
     console.log(`Unreleasing service: ${serviceId}, environment: ${environment}`)
-    await this.request({
+    await this.deleteRequest({
       Action: 'UnReleaseService',
       serviceId,
       environmentName: environment,
@@ -657,7 +666,7 @@ class Apigw {
     if (created === true) {
       // delete service
       console.log(`Removing service: ${serviceId}`)
-      await this.request({
+      await this.deleteRequest({
         Action: 'DeleteService',
         serviceId
       })

src/baas/cdn/index.js

@@ -211,7 +211,8 @@ class Cdn {
       // disable first
       await StopCdnDomain(this.capi, { Domain: domain })
     } else if (Status === 'processing') {
-      throw new Error(`Status is not operational for ${domain}`)
+      console.log(`Status is not operational for ${domain}`)
+      return {}
     }
     console.log(`Waiting for offline ${domain}...`)
     await waitResponse({

src/baas/cos/index.js

@@ -329,14 +329,10 @@ class Cos {
 
   async getBucket(inputs = {}) {
     const getBucketHandler = util.promisify(this.cosClient.getBucket.bind(this.cosClient))
-    try {
-      return await getBucketHandler({
-        Bucket: inputs.bucket,
-        Region: this.region
-      })
-    } catch (e) {
-      throw new Error(JSON.stringify(e))
-    }
+    return getBucketHandler({
+      Bucket: inputs.bucket,
+      Region: this.region
+    })
   }
 
   async upload(inputs = {}) {
@@ -495,41 +491,49 @@ class Cos {
     console.log(`Removing bucket from ${this.region} ...`)
 
     // 获取全部文件
-    const fileListResult = await this.getBucket(inputs)
-
+    let detail
     try {
-      const fileList = []
-      if (fileListResult && fileListResult.Contents && fileListResult.Contents.length > 0) {
-        // delete files
-        for (let i = 0; i < fileListResult.Contents.length; i++) {
-          fileList.push({
-            Key: fileListResult.Contents[i].Key
-          })
+      detail = await this.getBucket(inputs)
+    } catch (e) {
+      if (e.error && e.error.Code && e.error.Code === 'NoSuchBucket') {
+        console.log(`Bucket ${inputs.bucket} not exist`)
+        return
+      }
+    }
+
+    if (detail && detail.Contents) {
+      // delete files
+      const objectList = (detail.Contents || []).map((item) => {
+        return {
+          Key: item.Key
         }
+      })
+
+      try {
         const deleteMultipleObjectHandler = util.promisify(
           this.cosClient.deleteMultipleObject.bind(this.cosClient)
         )
-        try {
-          await deleteMultipleObjectHandler({
-            Region: this.region,
-            Bucket: inputs.bucket,
-            Objects: fileList
-          })
-        } catch (e) {
-          throw new Error(JSON.stringify(e))
-        }
+        await deleteMultipleObjectHandler({
+          Region: this.region,
+          Bucket: inputs.bucket,
+          Objects: objectList
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      try {
         const deleteBucketHandler = util.promisify(this.cosClient.deleteBucket.bind(this.cosClient))
-        try {
-          await deleteBucketHandler({
-            Region: this.region,
-            Bucket: inputs.bucket
-          })
-        } catch (e) {
-          throw new Error(JSON.stringify(e))
+        await deleteBucketHandler({
+          Region: this.region,
+          Bucket: inputs.bucket
+        })
+      } catch (e) {
+        if (e.error && e.error.Code && e.error.Code === 'NoSuchBucket') {
+          console.log(`Bucket ${inputs.bucket} not exist`)
+        } else {
+          throw e
         }
       }
-    } catch (e) {
-      throw new Error(JSON.stringify(e))
     }
   }
 }

src/baas/scf/index.js

@@ -497,24 +497,33 @@ class Scf {
 
   // 移除函数的主逻辑
   async remove(inputs = {}) {
-    console.log(`Deleteing funtion ${inputs.functionName || inputs.FunctionName} ...`)
+    console.log(`Deleteing function ${inputs.functionName || inputs.FunctionName} ...`)
     const functionName = inputs.functionName || inputs.FunctionName
     const namespace = inputs.namespace || inputs.Namespace || defaultNamespace
 
     // check function exist, then delete
-    const func = await this.getFunction(functionName, namespace)
+    const func = await this.getFunction(namespace, functionName)
 
     if (!func) {
       console.log(`Funtion ${functionName} not exist...`)
       return
     }
 
+    if (func.Status === 'Updating' || func.Status === 'Creating') {
+      console.log(`Funtion ${functionName} status is ${func.Status}, can not delete...`)
+      return
+    }
+
     await this.deleteFunction(functionName, namespace)
 
     if (inputs.Triggers) {
       for (let i = 0; i < inputs.Triggers.length; i++) {
         if (inputs.Triggers[i].serviceId) {
-          await this.deleteAPIGW(inputs.Triggers[i])
+          try {
+            await this.deleteAPIGW(inputs.Triggers[i])
+          } catch (e) {
+            console.log(e)
+          }
         }
       }
     }

src/baas/tag/index.js

@@ -29,12 +29,9 @@ class Tag {
 
     console.log(`Modify tags ... `)
     try {
-      const tagsResult = await this.tagClient.request(tagsInputs)
-      if (tagsResult.Response && tagsResult.Response.Error) {
-        throw new Error(JSON.stringify(tagsResult.Response))
-      }
+      await this.tagClient.request(tagsInputs)
     } catch (e) {
-      throw e
+      console.log(e)
     }
     console.log(`Modified tags.`)
 

src/baas/vpc/index.js

@@ -139,12 +139,20 @@ class Vpc {
     const { vpcId, subnetId } = inputs
     if (subnetId) {
       console.log(`Start removing subnet ${subnetId}`)
-      await utils.deleteSubnet(this.capi, subnetId)
+      try {
+        await utils.deleteSubnet(this.capi, subnetId)
+      } catch (e) {
+        console.log(e)
+      }
       console.log(`Removed subnet ${subnetId}`)
     }
     if (vpcId) {
       console.log(`Start removing vpc ${vpcId}`)
-      await utils.deleteVpc(this.capi, vpcId)
+      try {
+        await utils.deleteVpc(this.capi, vpcId)
+      } catch (e) {
+        console.log(e)
+      }
       console.log(`Removed vpc ${vpcId}`)
     }