fix

Author: bzp2010

libs/backend-apisix-standalone/e2e/cache.e2e-spec.ts

@@ -1,23 +1,14 @@
 import { DifferV3 } from '@api7/adc-differ';
 import * as ADCSDK from '@api7/adc-sdk';
 import axios from 'axios';
-import { lastValueFrom } from 'rxjs';
 
 import { BackendAPISIXStandalone } from '../src';
 import {
   config as configCache,
   rawConfig as rawConfigCache,
 } from '../src/cache';
 import { server, token } from './support/constants';
-import {
-  createEvent,
-  deleteEvent,
-  dumpConfiguration,
-  refreshDumpCache,
-  restartAPISIX,
-  syncEvents,
-  updateEvent,
-} from './support/utils';
+import { dumpConfiguration, restartAPISIX, syncEvents } from './support/utils';
 
 describe('Cache - Single APISIX', () => {
   let backend: BackendAPISIXStandalone;
@@ -43,7 +34,7 @@ describe('Cache - Single APISIX', () => {
     expect(rawConfigCache).toBeDefined();
     expect(rawConfigCache.size).toEqual(0);
 
-    await expect(lastValueFrom(backend.dump())).resolves.not.toThrow();
+    await expect(dumpConfiguration(backend)).resolves.not.toThrow();
 
     expect(configCache.size).toEqual(1);
     expect(rawConfigCache.size).toEqual(1);
@@ -59,7 +50,7 @@ describe('Cache - Single APISIX', () => {
     let apiCall = 0;
     const sub = backend.on('AXIOS_DEBUG', () => apiCall++);
 
-    await expect(lastValueFrom(backend.dump())).resolves.not.toThrow();
+    await expect(dumpConfiguration(backend)).resolves.not.toThrow();
     expect(apiCall).toEqual(0);
 
     sub.unsubscribe();
@@ -85,7 +76,7 @@ describe('Cache - Single APISIX', () => {
   } as ADCSDK.Configuration;
   const now = new Date();
   it('update config', async () => {
-    const oldConfig = await lastValueFrom(backend.dump());
+    const oldConfig = await dumpConfiguration(backend);
     const events = DifferV3.diff(config, oldConfig);
     expect(events).toHaveLength(1 + 1 + 2); // service * 1 + route * 1 + consumer * 2
     expect(

libs/backend-apisix-standalone/e2e/support/utils.ts

@@ -95,18 +95,10 @@ export const overrideEventResourceId = (
   return event;
 };
 
-// This backend needs to use the data from the dump to assist in generating new data for the sync,
-// the cache is in the backend, so just wait for the dump to complete.
-export const refreshDumpCache = (backend: BackendAPISIX) =>
-  lastValueFrom(
-    backend.dump().pipe(
-      toArray(),
-      //tap(() => console.log(backend.__TEST_ONLY.GET_LAST_DUMP())),
-    ),
-  );
-
-export const sortResult = <T>(result: Array<T>, field: string) =>
-  structuredClone(result).sort((a, b) => a[field].localeCompare(b[field]));
+export const sortResult = <T extends Record<string, string>>(
+  result: Array<T>,
+  field: string,
+) => structuredClone(result).sort((a, b) => a[field].localeCompare(b[field]));
 
 export const wait = (ms: number) =>
   new Promise((resolve) => setTimeout(resolve, ms));