feat(api7): allow mutliple uris in route (#191)

api7 · Oct 12, 2024 · 15d7bf6 · 15d7bf6
1 parent 569a17f
commit 15d7bf6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -39,7 +39,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'test/api7') || github.event_name == 'push'
     strategy:
       matrix:
-        version: [3.2.14.6, 3.2.15.0]
+        version: [3.2.14.6, 3.2.15.2, 3.2.16.2]
     env:
       BACKEND_API7_VERSION: ${{ matrix.version }}
       BACKEND_API7_DOWNLOAD_URL: https://run.api7.ai/api7-ee/api7-ee-v${{ matrix.version }}.tar.gz

diff --git a/libs/backend-api7/e2e/sync-and-dump-1.e2e-spec.ts b/libs/backend-api7/e2e/sync-and-dump-1.e2e-spec.ts
@@ -116,13 +116,13 @@ describe('Sync and Dump - 1', () => {
     const route1Name = 'route1';
     const route1 = {
       name: route1Name,
-      uris: ['/route1'],
+      uris: ['/route1', '/route1-2'],
       priority: 100,
     } as ADCSDK.Route;
     const route2Name = 'route2';
     const route2 = {
       name: route2Name,
-      uris: ['/route2'],
+      uris: ['/route2', '/route2-2'],
       plugins: {
         'key-auth': {},
       },

diff --git a/libs/backend-api7/src/transformer.ts b/libs/backend-api7/src/transformer.ts
@@ -17,7 +17,7 @@ export class ToADC {
 
   public transformRoute(route: typing.Route): ADCSDK.Route {
     return ADCSDK.utils.recursiveOmitUndefined<ADCSDK.Route>({
-      uris: route?.paths?.[0] ? [route?.paths?.[0]] : undefined,
+      uris: route.paths,
       name: route.name,
       description: route.desc,
       labels: ToADC.transformLabels(route.labels),
@@ -144,7 +144,7 @@ export class FromADC {
       enable_websocket: route.enable_websocket,
       plugins: route.plugins,
       service_id: serviceId,
-      paths: [route.uris[0]],
+      paths: route.uris,
       priority: route.priority,
     });
   }

diff --git a/libs/backend-api7/src/typing.ts b/libs/backend-api7/src/typing.ts
@@ -23,7 +23,7 @@ export interface Route {
   plugins?: Plugins;
 
   // matcher
-  paths?: Array<string>;
+  paths: Array<string>;
   methods?: Array<string>;
 
   // misc