refactor(utils): update ResourceBase waitUntil and deleteAndWaitUntilFinished methods

update callback types to support both sync and async functions, make callback optional in deleteAndWaitUntilFinished, and improve test coverage for resource operations

- change checkFinishedCallback to accept both boolean and Promise<boolean> return types
- make callback parameter optional in deleteAndWaitUntilFinished method
- rename test suite from 'bind resource' to 'BaseResource'
- add comprehensive tests for deleteAndWaitUntilFinished functionality

refactor(utils): 更新 ResourceBase waitUntil 和 deleteAndWaitUntilFinished 方法

更新回调类型以支持同步和异步函数，将 deleteAndWaitUntilFinished 中的回调设为可选，并改进资源操作的测试覆盖

- 更改 checkFinishedCallback 以接受 boolean 和 Promise<boolean> 返回类型
- 在 deleteAndWaitUntilFinished 方法中将回调参数设为可选
- 将测试套件从 'bind resource' 重命名为 'BaseResource'
- 为 deleteAndWaitUntilFinished 功能添加全面测试

Change-Id: I09d9ff476925be904281f294bcef2560ea96a319
Signed-off-by: OhYee <oyohyee@oyohyee.com>

Author: OhYee

src/utils/resource.ts

@@ -54,7 +54,9 @@ export abstract class ResourceBase {
   // }
 
   waitUntil = async (params: {
-    checkFinishedCallback: (resource: ResourceBase) => Promise<boolean>;
+    checkFinishedCallback: (
+      resource: ResourceBase
+    ) => boolean | Promise<boolean>;
     intervalSeconds?: number;
     timeoutSeconds?: number;
   }): Promise<ResourceBase> => {
@@ -105,7 +107,7 @@ export abstract class ResourceBase {
   };
 
   deleteAndWaitUntilFinished = async (params?: {
-    callback: (resource: ResourceBase) => Promise<void>;
+    callback?: (resource: ResourceBase) => void | Promise<void>;
     intervalSeconds?: number;
     timeoutSeconds?: number;
   }) => {

tests/unittests/utils/resource.test.ts

@@ -579,7 +579,7 @@ import {
 //   });
 // });
 
-describe('bind resource', () => {
+describe('BaseResource', () => {
   class NewClass extends ResourceBase {
     id: string;
     getCount: number = 0;
@@ -594,14 +594,14 @@ describe('bind resource', () => {
     async get() {
       this.getCount++;
 
-      if (this.deleteCount >= 57)
+      if (this.status === Status.DELETING && this.getCount >= 57)
         throw new ResourceNotExistError('BaseClass', this.id);
 
       return this;
     }
 
     async delete() {
-      this.deleteCount++;
+      this.status = Status.DELETING;
       return this;
     }
 
@@ -677,6 +677,8 @@ describe('bind resource', () => {
       intervalSeconds: 1,
       timeoutSeconds: 5,
     });
+
+    await newInstance.waitUntilReadyOrFailed();
   });
 
   test('waitUntilReadyOrFailed with only beforeCheck (no callback)', async () => {
@@ -728,17 +730,91 @@ describe('bind resource', () => {
     newInstance.status = Status.CREATING;
 
     await expect(
-      newInstance.waitUntilReadyOrFailed({
+      newInstance.deleteAndWaitUntilFinished({
+        intervalSeconds: 0.01,
+        timeoutSeconds: 0.5,
+      })
+    ).rejects.toThrow(/Timeout/);
+
+    const ins = await newInstance.deleteAndWaitUntilFinished({
+      intervalSeconds: 0.01,
+      timeoutSeconds: 1,
+    });
+
+    await expect(ins?.status).toBe(Status.DELETING);
+  });
+
+  test('deleteAndWaitUntilFinished', async () => {
+    const newInstance = new NewClass('mock-id');
+    newInstance.status = Status.READY;
+
+    let count = 0;
+    await expect(
+      newInstance.deleteAndWaitUntilFinished({
         intervalSeconds: 1,
         timeoutSeconds: 2,
+        callback: () => {
+          count++;
+        },
       })
     ).rejects.toThrow('Timeout waiting for resource to reach desired state');
+    
+    expect(count).toBeGreaterThanOrEqual(1)
+  });
+
+  test('deleteAndWaitUntilFinished exception', async () => {
+    const newInstance = new NewClass('mock-id');
+    newInstance.status = Status.READY;
+
+    let count = 0;
+    jest.spyOn(newInstance, 'get').mockImplementation(async () => {
+      count++;
+      throw new Error('mock-error');
+    });
+
+    await expect(
+      newInstance.deleteAndWaitUntilFinished({
+        intervalSeconds: 1,
+        timeoutSeconds: 2,
+      })
+    ).rejects.toThrow(/Timeout/);
+
+    expect(count).toBeGreaterThan(1);
+  });
+
+  test('deleteAndWaitUntilFinished exception and unexpected status', async () => {
+    const newInstance = new NewClass('mock-id');
+    newInstance.status = Status.READY;
+
+    let count = 0;
+    jest.spyOn(newInstance, 'get').mockImplementation(async () => {
+      count++;
+      newInstance.status = Status.READY;
+      throw new Error('mock-error');
+    });
+
+    await expect(
+      newInstance.deleteAndWaitUntilFinished({
+        intervalSeconds: 1,
+        timeoutSeconds: 2,
+      })
+    ).rejects.toThrow('Resource status is READY');
+
+    expect(count).toBeGreaterThanOrEqual(1);
   });
 
   test('customMethod', async () => {
     const newInstance = new NewClass('mock-id');
     expect(await newInstance.customMethod()).toBe('mock-custom-method');
   });
+
+  test('setConfig', async () => {
+    const newInstance = new NewClass('mock-id');
+    newInstance.setConfig(new Config({ accessKeyId: 'mock-access-key-id' }));
+    expect((newInstance as any)._config?.accessKeyId).toBe(
+      'mock-access-key-id'
+    );
+  });
 });
 
 describe('custom list params', () => {
@@ -797,8 +873,6 @@ describe('custom list params', () => {
     static listAll = listAllResourcesFunction(this.list);
   }
 
-  
-
   // const NewClass = bindResourceBase(BaseClass);
 
   test('listAll', async () => {