fix(cynosdb): add offline step for remove

Author: yugasun

__tests__/cynosdb.test.js

@@ -4,7 +4,6 @@ const {
   sleep,
   generatePwd,
   isValidPwd,
-  offlineCluster,
 } = require('../src/modules/cynosdb/utils');
 
 describe('Cynosdb', () => {
@@ -186,12 +185,6 @@ describe('Cynosdb', () => {
 
     const detail = await getClusterDetail(client.capi, clusterId);
     expect(res).toEqual(true);
-    expect(detail.Status).toBe('isolated');
-  });
-
-  test('[SERVERLESS] offline', async () => {
-    await sleep(300);
-    const res = await offlineCluster(client.capi, clusterId);
-    expect(res).toBeUndefined();
+    expect(detail).toBeUndefined();
   });
 });

src/modules/cynosdb/index.js

@@ -4,6 +4,7 @@ const {
   getClusterDetail,
   getClusterInstances,
   isolateCluster,
+  offlineCluster,
   generatePwd,
   formatConnectOutput,
   resetPwd,
@@ -156,6 +157,7 @@ class Cynosdb {
     if (clusterDetail && clusterDetail.ClusterId) {
       // need circle for deleting, after host status is 6, then we can delete it
       await isolateCluster(this.capi, clusterId);
+      await offlineCluster(this.capi, clusterId);
     }
     return true;
   }

src/modules/cynosdb/utils.js

@@ -6,7 +6,8 @@ const {
   IsolateCluster,
   ResetAccountPassword,
   DescribeServerlessInstanceSpecs,
-  OfflineCluster,
+  // OfflineCluster,
+  OfflineInstance,
   DescribeInstances,
   OpenWan,
   CloseWan,
@@ -248,40 +249,45 @@ async function isolateCluster(capi, clusterId) {
  * @param {*} clusterId cluster id
  * @param {*} instanceId instance id
  */
-async function offlineInstance(capi, clusterId, instanceId) {
-  console.log(`Start offlining CynosDB instance id: ${instanceId}`);
-  await OfflineCluster(capi, {
-    ClusterId: clusterId,
-    InstanceIdList: [instanceId],
-  });
-  const detail = await waitResponse({
-    callback: async () => getInstanceDetail(capi, clusterId),
-    targetResponse: undefined,
-    timeout: TIMEOUT,
-  });
-  console.log(`Offlined CynosDB instance id: ${instanceId}`);
-  return detail;
-}
-
-/**
- * offline db cluster
- * @param {object} capi capi client
- * @param {string} clusterId cluster id
- */
 async function offlineCluster(capi, clusterId) {
-  console.log(`Start offlining CynosDB cluster id: ${clusterId}`);
-  await OfflineCluster(capi, {
+  // 1. get cluster instances
+  const instances = await getClusterInstances(capi, clusterId);
+  const instanceIds = instances.map((item) => item.InstanceId);
+  console.log(`Start offlining CynosDB id: ${clusterId}`);
+
+  await OfflineInstance(capi, {
     ClusterId: clusterId,
+    InstanceIdList: instanceIds,
   });
+
   const detail = await waitResponse({
     callback: async () => getClusterDetail(capi, clusterId),
     targetResponse: undefined,
     timeout: TIMEOUT,
   });
-  console.log(`Offlined CynosDB cluster id: ${clusterId}.`);
+  console.log(`Offlined CynosDB id: ${clusterId}`);
   return detail;
 }
 
+// /**
+//  * offline db cluster
+//  * @param {object} capi capi client
+//  * @param {string} clusterId cluster id
+//  */
+// async function offlineCluster(capi, clusterId) {
+//   console.log(`Start offlining CynosDB cluster id: ${clusterId}`);
+//   await OfflineCluster(capi, {
+//     ClusterId: clusterId,
+//   });
+//   const detail = await waitResponse({
+//     callback: async () => getClusterDetail(capi, clusterId),
+//     targetResponse: undefined,
+//     timeout: TIMEOUT,
+//   });
+//   console.log(`Offlined CynosDB cluster id: ${clusterId}.`);
+//   return detail;
+// }
+
 async function resetPwd(capi, inputs) {
   console.log(
     `Start reset password for CynosDB cluster id: ${inputs.clusterId}, account: ${inputs.adminName}`,
@@ -358,7 +364,6 @@ module.exports = {
   getClusterInstances,
   isolateCluster,
   offlineCluster,
-  offlineInstance,
   getInstanceDetail,
   openPublicAccess,
   closePublicAccess,