From 4e148cbb77ffd2cb5670f9b8b692b8d22db0f99d Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Fri, 3 Feb 2023 15:16:42 -0800 Subject: [PATCH] Use the load-balancer filename prefix for the new LB policies --- packages/grpc-js-xds/src/index.ts | 4 ++-- packages/grpc-js-xds/src/load-balancer-cds.ts | 2 +- ...{xds-cluster-impl.ts => load-balancer-xds-cluster-impl.ts} | 0 ...ster-resolver.ts => load-balancer-xds-cluster-resolver.ts} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename packages/grpc-js-xds/src/{xds-cluster-impl.ts => load-balancer-xds-cluster-impl.ts} (100%) rename packages/grpc-js-xds/src/{xds-cluster-resolver.ts => load-balancer-xds-cluster-resolver.ts} (99%) diff --git a/packages/grpc-js-xds/src/index.ts b/packages/grpc-js-xds/src/index.ts index 933fafb5..51926ac4 100644 --- a/packages/grpc-js-xds/src/index.ts +++ b/packages/grpc-js-xds/src/index.ts @@ -17,8 +17,8 @@ import * as resolver_xds from './resolver-xds'; import * as load_balancer_cds from './load-balancer-cds'; -import * as xds_cluster_resolver from './xds-cluster-resolver'; -import * as xds_cluster_impl from './xds-cluster-impl'; +import * as xds_cluster_resolver from './load-balancer-xds-cluster-resolver'; +import * as xds_cluster_impl from './load-balancer-xds-cluster-impl'; import * as load_balancer_lrs from './load-balancer-lrs'; import * as load_balancer_priority from './load-balancer-priority'; import * as load_balancer_weighted_target from './load-balancer-weighted-target'; diff --git a/packages/grpc-js-xds/src/load-balancer-cds.ts b/packages/grpc-js-xds/src/load-balancer-cds.ts index b29daffd..84d8de25 100644 --- a/packages/grpc-js-xds/src/load-balancer-cds.ts +++ b/packages/grpc-js-xds/src/load-balancer-cds.ts @@ -33,7 +33,7 @@ import { Watcher } from './xds-stream-state/xds-stream-state'; import { OutlierDetection__Output } from './generated/envoy/config/cluster/v3/OutlierDetection'; import { Duration__Output } from './generated/google/protobuf/Duration'; import { EXPERIMENTAL_OUTLIER_DETECTION } from './environment'; -import { DiscoveryMechanism, XdsClusterResolverChildPolicyHandler, XdsClusterResolverLoadBalancingConfig } from './xds-cluster-resolver'; +import { DiscoveryMechanism, XdsClusterResolverChildPolicyHandler, XdsClusterResolverLoadBalancingConfig } from './load-balancer-xds-cluster-resolver'; import { CLUSTER_CONFIG_TYPE_URL, decodeSingleResource } from './resources'; const TRACER_NAME = 'cds_balancer'; diff --git a/packages/grpc-js-xds/src/xds-cluster-impl.ts b/packages/grpc-js-xds/src/load-balancer-xds-cluster-impl.ts similarity index 100% rename from packages/grpc-js-xds/src/xds-cluster-impl.ts rename to packages/grpc-js-xds/src/load-balancer-xds-cluster-impl.ts diff --git a/packages/grpc-js-xds/src/xds-cluster-resolver.ts b/packages/grpc-js-xds/src/load-balancer-xds-cluster-resolver.ts similarity index 99% rename from packages/grpc-js-xds/src/xds-cluster-resolver.ts rename to packages/grpc-js-xds/src/load-balancer-xds-cluster-resolver.ts index e3dea30b..d8687369 100644 --- a/packages/grpc-js-xds/src/xds-cluster-resolver.ts +++ b/packages/grpc-js-xds/src/load-balancer-xds-cluster-resolver.ts @@ -24,7 +24,7 @@ import { LrsLoadBalancingConfig } from "./load-balancer-lrs"; import { LocalitySubchannelAddress, PriorityChild, PriorityLoadBalancingConfig } from "./load-balancer-priority"; import { WeightedTarget, WeightedTargetLoadBalancingConfig } from "./load-balancer-weighted-target"; import { getSingletonXdsClient, XdsClient } from "./xds-client"; -import { DropCategory, XdsClusterImplLoadBalancingConfig } from "./xds-cluster-impl"; +import { DropCategory, XdsClusterImplLoadBalancingConfig } from "./load-balancer-xds-cluster-impl"; import { Watcher } from "./xds-stream-state/xds-stream-state"; import LoadBalancingConfig = experimental.LoadBalancingConfig;