fix: stream route generate missing parent part (api7#109)

Author: bzp2010

apps/cli/src/differ/differv3.ts

@@ -154,12 +154,12 @@ export class DifferV3 {
         ADCSDK.ResourceType.STREAM_ROUTE,
         local?.stream_routes?.map((res) => [
           res.name,
-          ADCSDK.utils.generateId(res.name),
+          ADCSDK.utils.generateId(generateResourceName(res.name)),
           res,
         ]) ?? [],
         remote?.stream_routes?.map((res) => [
           res.name,
-          ADCSDK.utils.generateId(res.name),
+          ADCSDK.utils.generateId(generateResourceName(res.name)),
           res,
         ]) ?? [],
       ),

apps/cli/src/differ/specs/basic.spec.ts

@@ -794,4 +794,29 @@ describe('Differ V3 - basic', () => {
       ),
     ).toEqual([]);
   });
+
+  it('ensure route and stream route id generated currect', () => {
+    const services: Array<ADCSDK.Service> = [
+      {
+        name: 'HTTP',
+        routes: [
+          {
+            name: 'HTTP 1',
+            uris: ['/1'],
+          },
+        ],
+      },
+      {
+        name: 'Stream',
+        stream_routes: [
+          {
+            name: 'Stream 1',
+            server_port: 5432,
+          },
+        ],
+      },
+    ];
+
+    expect(DifferV3.diff({ services }, { services }, {})).toEqual([]);
+  });
 });

libs/backend-api7/src/transformer.ts

@@ -156,7 +156,9 @@ export class FromADC {
       plugins: service.plugins,
       path_prefix: service.path_prefix,
       hosts: service.hosts,
-      type: service.stream_routes ? 'stream' : 'http',
+      type: ['tcp', 'udp', 'tls'].includes(service.upstream.scheme)
+        ? 'stream'
+        : 'http',
     });
   }