fix(cynosdb): close wan error (#173)

* fix(cynosdb): wan status judgement for open/close

* test(cynosdb): remove normal db test

Author: yugasun

__tests__/cynosdb.test.js

@@ -41,45 +41,45 @@ describe('Cynosdb', () => {
     expect(res.length).toBe(6);
   });
 
-  test('[NORMAL] deploy', async () => {
-    const res = await client.deploy(inputs);
-    expect(res).toEqual({
-      dbMode: 'NORMAL',
-      region: inputs.region,
-      region: inputs.region,
-      zone: inputs.zone,
-      vpcConfig: inputs.vpcConfig,
-      instanceCount: 2,
-      adminPassword: expect.stringMatching(pwdReg),
-      clusterId: expect.stringContaining('cynosdbmysql-'),
-      connection: {
-        ip: expect.any(String),
-        port: 3306,
-        readList: [
-          {
-            ip: expect.any(String),
-            port: 3306,
-          },
-        ],
-      },
-    });
-
-    ({ clusterId } = res);
-  });
-
-  test('[NORMAL] remove', async () => {
-    await sleep(300);
-    const res = await client.remove({ clusterId });
-
-    const detail = await getClusterDetail(client.capi, clusterId);
-    expect(res).toEqual(true);
-    expect(detail.Status).toBe('isolated');
-  });
-  test('[NORMAL] offline', async () => {
-    await sleep(300);
-    const res = await offlineCluster(client.capi, clusterId);
-    expect(res).toBeUndefined();
-  });
+  // test('[NORMAL] deploy', async () => {
+  //   const res = await client.deploy(inputs);
+  //   expect(res).toEqual({
+  //     dbMode: 'NORMAL',
+  //     region: inputs.region,
+  //     region: inputs.region,
+  //     zone: inputs.zone,
+  //     vpcConfig: inputs.vpcConfig,
+  //     instanceCount: 2,
+  //     adminPassword: expect.stringMatching(pwdReg),
+  //     clusterId: expect.stringContaining('cynosdbmysql-'),
+  //     connection: {
+  //       ip: expect.any(String),
+  //       port: 3306,
+  //       readList: [
+  //         {
+  //           ip: expect.any(String),
+  //           port: 3306,
+  //         },
+  //       ],
+  //     },
+  //   });
+
+  //   ({ clusterId } = res);
+  // });
+
+  // test('[NORMAL] remove', async () => {
+  //   await sleep(300);
+  //   const res = await client.remove({ clusterId });
+
+  //   const detail = await getClusterDetail(client.capi, clusterId);
+  //   expect(res).toEqual(true);
+  //   expect(detail.Status).toBe('isolated');
+  // });
+  // test('[NORMAL] offline', async () => {
+  //   await sleep(300);
+  //   const res = await offlineCluster(client.capi, clusterId);
+  //   expect(res).toBeUndefined();
+  // });
 
   test('[SERVERLESS] deploy', async () => {
     inputs.dbMode = 'SERVERLESS';

src/modules/cynosdb/utils.js

@@ -251,6 +251,9 @@ async function getClusterGrpsInfo(capi, clusterId) {
 
 async function openPublicAccess(capi, clusterId) {
   const gprInfo = await getClusterGrpsInfo(capi, clusterId);
+  if (gprInfo.WanStatus === 'open') {
+    return gprInfo;
+  }
 
   console.log(`Start opening public access to cluster ${clusterId}`);
   await OpenWan(capi, {
@@ -269,7 +272,9 @@ async function openPublicAccess(capi, clusterId) {
 
 async function closePublicAccess(capi, clusterId) {
   const gprInfo = await getClusterGrpsInfo(capi, clusterId);
-
+  if (gprInfo.WanStatus !== 'open') {
+    return gprInfo;
+  }
   console.log(`Start closing public access to cluster ${clusterId}`);
   await CloseWan(capi, {
     InstanceGrpId: gprInfo.InstanceGrpId,