xdsclient: make a function to return the supported resource type implementations...

diff --git a/xds/internal/xdsclient/clientimpl.go b/xds/internal/xdsclient/clientimpl.go
index ce7cc5dddc592bd1173397c9d19dce67c6400cf5..9671827407194baf45032bad9ad4b46baaf0344e 100644 (file)
--- a/xds/internal/xdsclient/clientimpl.go
+++ b/xds/internal/xdsclient/clientimpl.go
@@ -28,8 +28,6 @@ import (
        "google.golang.org/grpc/internal/backoff"
        "google.golang.org/grpc/internal/grpclog"
        "google.golang.org/grpc/internal/xds/bootstrap"
-       "google.golang.org/grpc/xds/internal/xdsclient/xdsresource"
-       "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version"
 
        xdsbootstrap "google.golang.org/grpc/xds/bootstrap"
        "google.golang.org/grpc/xds/internal/clients"
@@ -205,44 +203,13 @@ func buildXDSClientConfig(config *bootstrap.Config, metricsRecorder estats.Metri
                }
        }
 
-       gTransportBuilder := grpctransport.NewBuilder(grpcTransportConfigs)
-
-       resourceTypes := map[string]xdsclient.ResourceType{
-               version.V3ListenerURL: {
-                       TypeURL:                    version.V3ListenerURL,
-                       TypeName:                   xdsresource.ListenerResourceTypeName,
-                       AllResourcesRequiredInSotW: true,
-                       Decoder:                    xdsresource.NewGenericListenerResourceTypeDecoder(config),
-               },
-               version.V3RouteConfigURL: {
-                       TypeURL:                    version.V3RouteConfigURL,
-                       TypeName:                   xdsresource.RouteConfigTypeName,
-                       AllResourcesRequiredInSotW: false,
-                       Decoder:                    xdsresource.NewGenericRouteConfigResourceTypeDecoder(),
-               },
-               version.V3ClusterURL: {
-                       TypeURL:                    version.V3ClusterURL,
-                       TypeName:                   xdsresource.ClusterResourceTypeName,
-                       AllResourcesRequiredInSotW: true,
-                       Decoder:                    xdsresource.NewGenericClusterResourceTypeDecoder(config, gServerCfgMap),
-               },
-               version.V3EndpointsURL: {
-                       TypeURL:                    version.V3EndpointsURL,
-                       TypeName:                   xdsresource.EndpointsResourceTypeName,
-                       AllResourcesRequiredInSotW: false,
-                       Decoder:                    xdsresource.NewGenericEndpointsResourceTypeDecoder(),
-               },
-       }
-
-       mr := &metricsReporter{recorder: metricsRecorder, target: target}
-
        return xdsclient.Config{
                Authorities:      gAuthorities,
                Servers:          gServerCfgs,
                Node:             gNode,
-               TransportBuilder: gTransportBuilder,
-               ResourceTypes:    resourceTypes,
-               MetricsReporter:  mr,
+               TransportBuilder: grpctransport.NewBuilder(grpcTransportConfigs),
+               ResourceTypes:    supportedResourceTypes(config, gServerCfgMap),
+               MetricsReporter:  &metricsReporter{recorder: metricsRecorder, target: target},
        }, nil
 }
 

diff --git a/xds/internal/xdsclient/resource_types.go b/xds/internal/xdsclient/resource_types.go
new file mode 100644 (file)
index 0000000..2f76c83
--- /dev/null
+++ b/xds/internal/xdsclient/resource_types.go
@@ -0,0 +1,54 @@
+/*
+ *
+ * Copyright 2025 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xdsclient
+
+import (
+       "google.golang.org/grpc/internal/xds/bootstrap"
+       "google.golang.org/grpc/xds/internal/clients/xdsclient"
+       "google.golang.org/grpc/xds/internal/xdsclient/xdsresource"
+       "google.golang.org/grpc/xds/internal/xdsclient/xdsresource/version"
+)
+
+func supportedResourceTypes(config *bootstrap.Config, gServerCfgMap map[xdsclient.ServerConfig]*bootstrap.ServerConfig) map[string]xdsclient.ResourceType {
+       return map[string]xdsclient.ResourceType{
+               version.V3ListenerURL: {
+                       TypeURL:                    version.V3ListenerURL,
+                       TypeName:                   xdsresource.ListenerResourceTypeName,
+                       AllResourcesRequiredInSotW: true,
+                       Decoder:                    xdsresource.NewGenericListenerResourceTypeDecoder(config),
+               },
+               version.V3RouteConfigURL: {
+                       TypeURL:                    version.V3RouteConfigURL,
+                       TypeName:                   xdsresource.RouteConfigTypeName,
+                       AllResourcesRequiredInSotW: false,
+                       Decoder:                    xdsresource.NewGenericRouteConfigResourceTypeDecoder(),
+               },
+               version.V3ClusterURL: {
+                       TypeURL:                    version.V3ClusterURL,
+                       TypeName:                   xdsresource.ClusterResourceTypeName,
+                       AllResourcesRequiredInSotW: true,
+                       Decoder:                    xdsresource.NewGenericClusterResourceTypeDecoder(config, gServerCfgMap),
+               },
+               version.V3EndpointsURL: {
+                       TypeURL:                    version.V3EndpointsURL,
+                       TypeName:                   xdsresource.EndpointsResourceTypeName,
+                       AllResourcesRequiredInSotW: false,
+                       Decoder:                    xdsresource.NewGenericEndpointsResourceTypeDecoder(),
+               },
+       }
+}