From 4f8db6907ef2f4c98bdad2cc60fb0ca873bfd144 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Thu, 10 Aug 2023 09:40:37 -0700 Subject: [PATCH] grpc-js-xds: Fix a typo in xds_cluster_impl parsing code --- .../grpc-js-xds/src/load-balancer-xds-cluster-impl.ts | 2 +- packages/grpc-js-xds/test/framework.ts | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/grpc-js-xds/src/load-balancer-xds-cluster-impl.ts b/packages/grpc-js-xds/src/load-balancer-xds-cluster-impl.ts index e5db45af..9a930451 100644 --- a/packages/grpc-js-xds/src/load-balancer-xds-cluster-impl.ts +++ b/packages/grpc-js-xds/src/load-balancer-xds-cluster-impl.ts @@ -115,7 +115,7 @@ class XdsClusterImplLoadBalancingConfig implements TypedLoadBalancingConfig { if ('eds_service_name' in obj && !(obj.eds_service_name === undefined || typeof obj.eds_service_name === 'string')) { throw new Error('xds_cluster_impl config eds_service_name field must be a string if provided'); } - if ('max_concurrent_requests' in obj && (!obj.max_concurrent_requests === undefined || typeof obj.max_concurrent_requests === 'number')) { + if ('max_concurrent_requests' in obj && !(obj.max_concurrent_requests === undefined || typeof obj.max_concurrent_requests === 'number')) { throw new Error('xds_cluster_impl config max_concurrent_requests must be a number if provided'); } if (!('drop_categories' in obj && Array.isArray(obj.drop_categories))) { diff --git a/packages/grpc-js-xds/test/framework.ts b/packages/grpc-js-xds/test/framework.ts index 25081120..f5e7bc1d 100644 --- a/packages/grpc-js-xds/test/framework.ts +++ b/packages/grpc-js-xds/test/framework.ts @@ -84,7 +84,15 @@ export class FakeEdsCluster implements FakeCluster { type: 'EDS', eds_cluster_config: {eds_config: {ads: {}}, service_name: this.endpointName}, lb_policy: 'ROUND_ROBIN', - lrs_server: {self: {}} + lrs_server: {self: {}}, + circuit_breakers: { + thresholds: [ + { + priority: 'DEFAULT', + max_requests: {value: 1000} + } + ] + } } }