fixing error with delete issue

Author: EMaher

src/clients/apim-client.ts

@@ -388,7 +388,9 @@ export class ApimClient implements IApimClient {
 
       // Poll for long-running operations
       if (response.status === 202) {
-        await this.pollProvisioningState(context, descriptor);
+        await this.pollProvisioningState(context, descriptor, {
+          treatMissingAsSuccess: true,
+        });
       }
 
       return true;
@@ -692,14 +694,24 @@ export class ApimClient implements IApimClient {
 
   private async pollProvisioningState(
     context: ApimServiceContext,
-    descriptor: ResourceDescriptor
+    descriptor: ResourceDescriptor,
+    options: { treatMissingAsSuccess?: boolean } = {}
   ): Promise<Record<string, unknown>> {
+    const { treatMissingAsSuccess = false } = options;
+
     for (let attempt = 0; attempt < ApimClient.MAX_POLLING_ATTEMPTS; attempt++) {
       await this.delay(ApimClient.POLL_INTERVAL_MS);
 
       const resource = await this.getResource(context, descriptor);
 
       if (!resource) {
+        if (treatMissingAsSuccess) {
+          logger.debug(
+            `Resource no longer present; operation completed: ${buildResourceLabel(descriptor)}`
+          );
+          return {};
+        }
+
         // APIM can transiently return 404 while asynchronously provisioning a
         // resource (e.g. a Key Vault-backed named value). Treat a missing resource
         // as "not yet visible" and continue polling rather than aborting — the

tests/unit/clients/apim-client.test.ts

@@ -630,6 +630,61 @@ describe('ApimClient.putResource provisioning polling', () => {
   });
 });
 
+describe('ApimClient.deleteResource provisioning polling', () => {
+  let client: ApimClient;
+  let fetchSpy: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    client = new ApimClient();
+    fetchSpy = vi.fn();
+    vi.stubGlobal('fetch', fetchSpy);
+
+    /* eslint-disable @typescript-eslint/no-explicit-any */
+    vi.spyOn(client as any, 'getToken').mockResolvedValue('fake-token');
+    vi.spyOn(client as any, 'delay').mockResolvedValue(undefined);
+    /* eslint-enable @typescript-eslint/no-explicit-any */
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.unstubAllGlobals();
+  });
+
+  const descriptor = { type: ResourceType.Api, nameParts: ['delay'] };
+
+  it('should treat 404 during delete polling as successful completion', async () => {
+    fetchSpy
+      // Initial DELETE accepted asynchronously
+      .mockResolvedValueOnce(new Response('', { status: 202 }))
+      // Poll GET returns 404 because delete completed
+      .mockResolvedValueOnce(new Response('', { status: 404 }));
+
+    const deleted = await client.deleteResource(testContext, descriptor);
+
+    expect(deleted).toBe(true);
+    expect(fetchSpy).toHaveBeenCalledTimes(2);
+  });
+
+  it('should continue polling delete until resource disappears', async () => {
+    fetchSpy
+      .mockResolvedValueOnce(new Response('', { status: 202 }))
+      // First poll: resource still exists and is deleting
+      .mockResolvedValueOnce(
+        makeResponse(200, {
+          name: 'delay',
+          properties: { provisioningState: 'Deleting' },
+        })
+      )
+      // Second poll: gone
+      .mockResolvedValueOnce(new Response('', { status: 404 }));
+
+    const deleted = await client.deleteResource(testContext, descriptor);
+
+    expect(deleted).toBe(true);
+    expect(fetchSpy).toHaveBeenCalledTimes(3);
+  });
+});
+
 describe('ApimClient HTTP 429 rate limiting', () => {
   let client: ApimClient;
   let fetchSpy: ReturnType<typeof vi.fn>;