fix(cdn): optimize cdn deploy and use v3 sign

Author: yugasun

__tests__/cdn.test.js

@@ -1,15 +1,16 @@
 const { Cdn } = require('../src');
+const { getCdnByDomain } = require('../src/modules/cdn/utils');
 
 describe('Cdn', () => {
+  jest.setTimeout(600000);
   const credentials = {
     SecretId: process.env.TENCENT_SECRET_ID,
     SecretKey: process.env.TENCENT_SECRET_KEY,
   };
   const inputs = {
-    async: true,
+    async: false,
     area: 'overseas',
     domain: 'test.yuga.chat',
-    hostType: 'cos',
     origin: {
       origins: ['up6pwd9-89hm718-xxx.cos-website.ap-guangzhou.myqcloud.com'],
       originType: 'cos',
@@ -31,10 +32,9 @@ describe('Cdn', () => {
   };
   const cdn = new Cdn(credentials, process.env.REGION);
 
-  test('should deploy CDN success', async () => {
+  test('should deploy CDN success with originType = cos', async () => {
     const res = await cdn.deploy(inputs);
     expect(res).toEqual({
-      created: true,
       https: true,
       domain: inputs.domain,
       origins: inputs.origin.origins,
@@ -43,5 +43,26 @@ describe('Cdn', () => {
       resourceId: expect.stringContaining('cdn-'),
     });
   });
+
+
+  test('should deploy CDN success with originType = domain', async () => {
+    inputs.origin.originType = 'domain';
+    const res = await cdn.deploy(inputs);
+    expect(res).toEqual({
+      https: true,
+      domain: inputs.domain,
+      origins: inputs.origin.origins,
+      cname: `${inputs.domain}.cdn.dnsv1.com`,
+      inputCache: JSON.stringify(inputs),
+      resourceId: expect.stringContaining('cdn-'),
+    });
+  });
+
+  test('should remove CDN success', async () => {
+    const res = await cdn.remove(inputs);
+    expect(res).toEqual({});
+    const detail = await getCdnByDomain(cdn.capi, inputs.domain);
+    expect(detail).toBeUndefined();
+  });
 });
 

package.json

@@ -5,6 +5,7 @@
   "main": "src/index.js",
   "scripts": {
     "test": "jest",
+    "test:cdn": "MODULE=cdn jest",
     "format": "npm run lint && npm run prettier",
     "commitlint": "commitlint -f HEAD@{15}",
     "lint": "eslint --ext .js,.ts,.tsx .",

src/modules/cdn/apis.js

@@ -1,9 +1,11 @@
 const { ApiFactory } = require('../../utils/api');
 
 const ACTIONS = [
+  'OpenCdnService',
   'AddCdnDomain',
   'DescribeDomains',
   'UpdateDomainConfig',
+  'StartCdnDomain',
   'StopCdnDomain',
   'DeleteCdnDomain',
   'PushUrlsCache',
@@ -13,6 +15,7 @@ const ACTIONS = [
 
 const APIS = ApiFactory({
   // debug: true,
+  isV3: true,
   serviceType: 'cdn',
   version: '2018-06-06',
   actions: ACTIONS,

src/modules/cdn/index.js

@@ -16,6 +16,7 @@ const {
   camelCaseProperty,
   getCdnByDomain,
   flushEmptyValue,
+  openCdnService,
 } = require('./utils');
 
 class Cdn {
@@ -66,6 +67,7 @@ class Cdn {
   }
 
   async deploy(inputs = {}) {
+    await openCdnService(this.capi);
     const { oldState = {} } = inputs;
     delete inputs.oldState;
     const {
@@ -151,7 +153,7 @@ class Cdn {
       domain: Domain,
       origins: cdnInputs.Origin.Origins,
       cname: `${Domain}.cdn.dnsv1.com`,
-      inputCache: JSON.stringify(cdnInputs),
+      inputCache: JSON.stringify(inputs),
     };
 
     if (Https) {
@@ -172,11 +174,17 @@ class Cdn {
       };
     }
 
-    const cdnInfo = await getCdnByDomain(this.capi, Domain);
+    let cdnInfo = await getCdnByDomain(this.capi, Domain);
 
     const sourceInputs = JSON.parse(JSON.stringify(cdnInputs));
 
     const createOrUpdateCdn = async () => {
+      if (cdnInfo && cdnInfo.Status === 'offline') {
+        console.log(`The CDN domain ${Domain} is offline.`);
+        console.log(`Recreating CDN domain ${Domain}`);
+        await DeleteCdnDomain(this.capi, { Domain: Domain });
+        cdnInfo = null;
+      }
       if (cdnInfo) {
         // update
         console.log(`The CDN domain ${Domain} has existed.`);
@@ -195,15 +203,14 @@ class Cdn {
           cdnInputs.ServiceType = ServiceType || 'web';
           await AddCdnDomain(this.capi, cdnInputs);
         } catch (e) {
-          if (e.code === 9111) {
+          if (e.code === 'ResourceNotFound.CdnUserNotExists') {
             console.log(`Please goto https://console.cloud.tencent.com/cdn open CDN service.`);
           }
           throw e;
         }
         await sleep(1000);
         const detail = await getCdnByDomain(this.capi, Domain);
 
-        outputs.created = true;
         outputs.resourceId = detail && detail.ResourceId;
       }
 

src/modules/cdn/utils.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { DescribeDomains } = require('./apis');
+const { DescribeDomains, OpenCdnService } = require('./apis');
 
 const ONE_SECOND = 1000;
 // timeout 5 minutes
@@ -128,6 +128,19 @@ function flushEmptyValue(obj) {
   return newObj;
 }
 
+async function openCdnService(capi) {
+  try {
+    await OpenCdnService(capi, {
+      PayTypeMainland: 'flux',
+      PayTypeOverseas: 'flux',
+    });
+  } catch (e) {
+    if (e.code !== 'ResourceInUse.CdnUserExists') {
+      throw e;
+    }
+  }
+}
+
 module.exports = {
   ONE_SECOND,
   TIMEOUT,
@@ -139,4 +152,5 @@ module.exports = {
   formatOrigin,
   camelCaseProperty,
   flushEmptyValue,
+  openCdnService,
 };