Skip to content

Commit 6e29db8

Browse files
authored
fix: stream route generate missing parent part (api7#109)
1 parent 85eeb9e commit 6e29db8

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

apps/cli/src/differ/differv3.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ export class DifferV3 {
154154
ADCSDK.ResourceType.STREAM_ROUTE,
155155
local?.stream_routes?.map((res) => [
156156
res.name,
157-
ADCSDK.utils.generateId(res.name),
157+
ADCSDK.utils.generateId(generateResourceName(res.name)),
158158
res,
159159
]) ?? [],
160160
remote?.stream_routes?.map((res) => [
161161
res.name,
162-
ADCSDK.utils.generateId(res.name),
162+
ADCSDK.utils.generateId(generateResourceName(res.name)),
163163
res,
164164
]) ?? [],
165165
),

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

+25
Original file line numberDiff line numberDiff line change
@@ -794,4 +794,29 @@ describe('Differ V3 - basic', () => {
794794
),
795795
).toEqual([]);
796796
});
797+
798+
it('ensure route and stream route id generated currect', () => {
799+
const services: Array<ADCSDK.Service> = [
800+
{
801+
name: 'HTTP',
802+
routes: [
803+
{
804+
name: 'HTTP 1',
805+
uris: ['/1'],
806+
},
807+
],
808+
},
809+
{
810+
name: 'Stream',
811+
stream_routes: [
812+
{
813+
name: 'Stream 1',
814+
server_port: 5432,
815+
},
816+
],
817+
},
818+
];
819+
820+
expect(DifferV3.diff({ services }, { services }, {})).toEqual([]);
821+
});
797822
});

libs/backend-api7/src/transformer.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ export class FromADC {
156156
plugins: service.plugins,
157157
path_prefix: service.path_prefix,
158158
hosts: service.hosts,
159-
type: service.stream_routes ? 'stream' : 'http',
159+
type: ['tcp', 'udp', 'tls'].includes(service.upstream.scheme)
160+
? 'stream'
161+
: 'http',
160162
});
161163
}
162164

0 commit comments

Comments
 (0)