f

Author: LiteSun

libs/backend-apisix/e2e/resources/service-upstream.e2e-spec.ts

@@ -1,3 +1,4 @@
+import { Differ } from '@api7/adc-differ';
 import * as ADCSDK from '@api7/adc-sdk';
 
 import { BackendAPISIX } from '../../src';
@@ -39,9 +40,7 @@ describe('Service-Upstreams E2E', () => {
     } satisfies ADCSDK.Service;
 
     it('Create service with inline upstream', async () =>
-      syncEvents(backend, [
-        createEvent(ADCSDK.ResourceType.SERVICE, serviceName, service),
-      ]));
+      syncEvents(backend, Differ.diff({ services: [service] }, {})));
 
     it('Dump (inline upstream should exist)', async () => {
       const result = await dumpConfiguration(backend);
@@ -81,9 +80,10 @@ describe('Service-Upstreams E2E', () => {
       },
     } satisfies ADCSDK.Service;
     it('Update service inline upstream', async () =>
-      syncEvents(backend, [
-        updateEvent(ADCSDK.ResourceType.SERVICE, serviceName, updatedService),
-      ]));
+      syncEvents(
+        backend,
+        Differ.diff({ services: [updatedService] }, await dumpConfiguration(backend)),
+      ));
 
     it('Dump (inline upstream should be updated)', async () => {
       const result = await dumpConfiguration(backend);
@@ -101,15 +101,13 @@ describe('Service-Upstreams E2E', () => {
       hosts: ['test.example.com'],
     } satisfies ADCSDK.Service;
     it('Update service to remove inline upstream', async () =>
-      syncEvents(backend, [
-        updateEvent(
-          ADCSDK.ResourceType.SERVICE,
-          serviceName,
-          serviceWithoutUpstream,
-          undefined,
-          updatedService, // oldValue with upstream
+      syncEvents(
+        backend,
+        Differ.diff(
+          { services: [serviceWithoutUpstream] },
+          await dumpConfiguration(backend),
         ),
-      ]));
+      ));
 
     it('Dump (inline upstream should be removed)', async () => {
       const result = await dumpConfiguration(backend);
@@ -134,13 +132,13 @@ describe('Service-Upstreams E2E', () => {
       },
     } satisfies ADCSDK.Service;
     it('Re-add inline upstream for deletion test', async () =>
-      syncEvents(backend, [
-        updateEvent(
-          ADCSDK.ResourceType.SERVICE,
-          serviceName,
-          serviceForDeletion,
+      syncEvents(
+        backend,
+        Differ.diff(
+          { services: [serviceForDeletion] },
+          await dumpConfiguration(backend),
         ),
-      ]));
+      ));
 
     it('Dump (inline upstream should exist again)', async () => {
       const result = await dumpConfiguration(backend);
@@ -150,14 +148,7 @@ describe('Service-Upstreams E2E', () => {
     });
 
     it('Delete service with inline upstream', async () =>
-      syncEvents(backend, [
-        deleteEvent(
-          ADCSDK.ResourceType.SERVICE,
-          serviceName,
-          undefined,
-          serviceForDeletion, // oldValue with upstream
-        ),
-      ]));
+      syncEvents(backend, Differ.diff({}, await dumpConfiguration(backend))));
 
     it('Dump again (service should not exist)', async () => {
       const result = await dumpConfiguration(backend);

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

@@ -34,14 +34,14 @@ export const createEvent = (
   resourceName,
   resourceId:
     resourceType === ADCSDK.ResourceType.CONSUMER ||
-    resourceType === ADCSDK.ResourceType.GLOBAL_RULE ||
-    resourceType === ADCSDK.ResourceType.PLUGIN_METADATA
+      resourceType === ADCSDK.ResourceType.GLOBAL_RULE ||
+      resourceType === ADCSDK.ResourceType.PLUGIN_METADATA
       ? resourceName
       : resourceType === ADCSDK.ResourceType.SSL
         ? ADCSDK.utils.generateId((resource as ADCSDK.SSL).snis.join(','))
         : ADCSDK.utils.generateId(
-            parentName ? `${parentName}.${resourceName}` : resourceName,
-          ),
+          parentName ? `${parentName}.${resourceName}` : resourceName,
+        ),
   newValue: resource,
   parentId: parentName
     ? resourceType === ADCSDK.ResourceType.CONSUMER_CREDENTIAL
@@ -55,39 +55,33 @@ export const updateEvent = (
   resourceName: string,
   resource: object,
   parentName?: string,
-  oldValue?: object,
 ): ADCSDK.Event => {
   const event = createEvent(resourceType, resourceName, resource, parentName);
   event.type = ADCSDK.EventType.UPDATE;
-  if (oldValue) {
-    event.oldValue = oldValue;
-  }
   return event;
 };
 
 export const deleteEvent = (
   resourceType: ADCSDK.ResourceType,
   resourceName: string,
   parentName?: string,
-  oldValue?: object,
 ): ADCSDK.Event => ({
   type: ADCSDK.EventType.DELETE,
   resourceType,
   resourceName,
   resourceId:
     resourceType === ADCSDK.ResourceType.CONSUMER ||
-    resourceType === ADCSDK.ResourceType.GLOBAL_RULE ||
-    resourceType === ADCSDK.ResourceType.PLUGIN_METADATA
+      resourceType === ADCSDK.ResourceType.GLOBAL_RULE ||
+      resourceType === ADCSDK.ResourceType.PLUGIN_METADATA
       ? resourceName
       : ADCSDK.utils.generateId(
-          parentName ? `${parentName}.${resourceName}` : resourceName,
-        ),
+        parentName ? `${parentName}.${resourceName}` : resourceName,
+      ),
   parentId: parentName
     ? resourceType === ADCSDK.ResourceType.CONSUMER_CREDENTIAL
       ? parentName
       : ADCSDK.utils.generateId(parentName)
     : undefined,
-  oldValue,
 });
 
 export const overrideEventResourceId = (

libs/backend-apisix/package.json

@@ -9,7 +9,8 @@
     }
   },
   "devDependencies": {
-    "@api7/adc-sdk": "workspace:*"
+    "@api7/adc-sdk": "workspace:*",
+    "@api7/adc-differ": "workspace:*"
   },
   "nx": {
     "name": "backend-apisix",
@@ -29,4 +30,4 @@
       }
     }
   }
-}
+}