From 0b146c8b076c6b5ca883e536128d00d9b29d0c28 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Wed, 5 Aug 2020 12:38:43 -0700 Subject: [PATCH] Address PR comments --- packages/grpc-js/src/channel.ts | 1 - packages/grpc-js/src/xds-client.ts | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/grpc-js/src/channel.ts b/packages/grpc-js/src/channel.ts index 49535c19..8c369192 100644 --- a/packages/grpc-js/src/channel.ts +++ b/packages/grpc-js/src/channel.ts @@ -34,7 +34,6 @@ import { CallCredentialsFilterFactory } from './call-credentials-filter'; import { DeadlineFilterFactory } from './deadline-filter'; import { CompressionFilterFactory } from './compression-filter'; import { getDefaultAuthority, mapUriDefaultScheme } from './resolver'; -import { ServiceConfig, validateServiceConfig } from './service-config'; import { trace, log } from './logging'; import { SubchannelAddress } from './subchannel'; import { MaxMessageSizeFilterFactory } from './max-message-size-filter'; diff --git a/packages/grpc-js/src/xds-client.ts b/packages/grpc-js/src/xds-client.ts index cce79824..f867ed7c 100644 --- a/packages/grpc-js/src/xds-client.ts +++ b/packages/grpc-js/src/xds-client.ts @@ -439,7 +439,7 @@ export class XdsClient { for (const resource of message.resources) { if ( protoLoader.isAnyExtension(resource) && - resource['@type'] === LDS_TYPE_URL + resource['@type'] === RDS_TYPE_URL ) { const resp = resource as protoLoader.AnyExtension & RouteConfiguration__Output; @@ -823,7 +823,7 @@ export class XdsClient { private updateRdsNames() { this.adsCall?.write({ node: this.adsNode!, - type_url: CDS_TYPE_URL, + type_url: RDS_TYPE_URL, resource_names: this.routeConfigName ? [this.routeConfigName] : [], response_nonce: this.lastRdsNonce, version_info: this.lastRdsVersionInfo,