grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Case insensitive address type matching

This commit is contained in:
Michael Lumish 2025-02-04 14:58:08 -08:00
parent 5f889b2dd2
commit 77dc658b46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/grpc-js-xds/interop/xds-interop-server.ts
View File

@ -230,7 +230,6 @@ async function main() {
const argv = yargs const argv = yargs
.string(['port', 'maintenance_port', 'address_type']) .string(['port', 'maintenance_port', 'address_type'])
.boolean(['secure_mode']) .boolean(['secure_mode'])
.choices('address_type', ['IPV4', 'IPV6', 'IPV4_IPV6'])
.demandOption(['port']) .demandOption(['port'])
.default('address_type', 'IPV4_IPV6') .default('address_type', 'IPV4_IPV6')
.default('secure_mode', false) .default('secure_mode', false)
@ -250,8 +249,9 @@ async function main() {
const reflection = new ReflectionService(packageDefinition, { const reflection = new ReflectionService(packageDefinition, {
services: ['grpc.testing.TestService'] services: ['grpc.testing.TestService']
}) })
const addressType = argv.address_type.toUpperCase();
if (argv.secure_mode) { if (argv.secure_mode) {
if (argv.address_type !== 'IPV4_IPV6') { if (addressType !== 'IPV4_IPV6') {
throw new Error('Secure mode only supports IPV4_IPV6 address type'); throw new Error('Secure mode only supports IPV4_IPV6 address type');
} }
const maintenanceServer = new grpc.Server({interceptors: [adminServiceInterceptor]}); const maintenanceServer = new grpc.Server({interceptors: [adminServiceInterceptor]});
@ -275,7 +275,7 @@ async function main() {
grpc.addAdminServicesToServer(server); grpc.addAdminServicesToServer(server);
server.addService(loadedProto.grpc.testing.TestService.service, testServiceHandler); server.addService(loadedProto.grpc.testing.TestService.service, testServiceHandler);
const creds = grpc.ServerCredentials.createInsecure(); const creds = grpc.ServerCredentials.createInsecure();
switch (argv.address_type) { switch (addressType) {
case 'IPV4_IPV6': case 'IPV4_IPV6':
await serverBindPromise(server, `[::]:${argv.port}`, creds); await serverBindPromise(server, `[::]:${argv.port}`, creds);
break; break;