xdsclient: export genericResourceTypeDecoder (#8406)

easwars · web-flow · commit 1787f9427568 · 2025-06-24T21:07:51.000-07:00
diff --git a/xds/internal/xdsclient/xdsresource/cluster_resource_type.go b/xds/internal/xdsclient/xdsresource/cluster_resource_type.go
@@ -156,5 +156,5 @@ func WatchCluster(p Producer, name string, w ClusterWatcher) (cancel func()) {
 // NewGenericClusterResourceTypeDecoder returns a xdsclient.Decoder that
 // wraps the xdsresource.clusterType.
 func NewGenericClusterResourceTypeDecoder(bc *bootstrap.Config, gServerCfgMap map[xdsclient.ServerConfig]*bootstrap.ServerConfig) xdsclient.Decoder {
-	return &genericResourceTypeDecoder{resourceType: clusterType, bootstrapConfig: bc, gServerConfigMap: gServerCfgMap}
+	return &GenericResourceTypeDecoder{ResourceType: clusterType, BootstrapConfig: bc, ServerConfigMap: gServerCfgMap}
 }
diff --git a/xds/internal/xdsclient/xdsresource/endpoints_resource_type.go b/xds/internal/xdsclient/xdsresource/endpoints_resource_type.go
@@ -151,5 +151,5 @@ func WatchEndpoints(p Producer, name string, w EndpointsWatcher) (cancel func())
 // NewGenericEndpointsResourceTypeDecoder returns a xdsclient.Decoder that
 // wraps the xdsresource.endpointsType.
 func NewGenericEndpointsResourceTypeDecoder() xdsclient.Decoder {
-	return &genericResourceTypeDecoder{resourceType: endpointsType}
+	return &GenericResourceTypeDecoder{ResourceType: endpointsType}
 }
diff --git a/xds/internal/xdsclient/xdsresource/listener_resource_type.go b/xds/internal/xdsclient/xdsresource/listener_resource_type.go
@@ -185,5 +185,5 @@ func WatchListener(p Producer, name string, w ListenerWatcher) (cancel func()) {
 // NewGenericListenerResourceTypeDecoder returns a xdsclient.Decoder that wraps
 // the xdsresource.listenerType.
 func NewGenericListenerResourceTypeDecoder(bc *bootstrap.Config) xdsclient.Decoder {
-	return &genericResourceTypeDecoder{resourceType: listenerType, bootstrapConfig: bc}
+	return &GenericResourceTypeDecoder{ResourceType: listenerType, BootstrapConfig: bc}
 }
diff --git a/xds/internal/xdsclient/xdsresource/resource_type.go b/xds/internal/xdsclient/xdsresource/resource_type.go
@@ -171,27 +171,27 @@ func (r resourceTypeState) AllResourcesRequiredInSotW() bool {
 	return r.allResourcesRequiredInSotW
 }
 
-// genericResourceTypeDecoder wraps an xdsresource.Type and implements
+// GenericResourceTypeDecoder wraps an xdsresource.Type and implements
 // xdsclient.Decoder.
 //
 // TODO: #8313 - Delete this once the internal xdsclient usages are updated
 // to use the generic xdsclient.ResourceType interface directly.
-type genericResourceTypeDecoder struct {
-	resourceType     Type
-	bootstrapConfig  *bootstrap.Config
-	gServerConfigMap map[xdsclient.ServerConfig]*bootstrap.ServerConfig
+type GenericResourceTypeDecoder struct {
+	ResourceType    Type
+	BootstrapConfig *bootstrap.Config
+	ServerConfigMap map[xdsclient.ServerConfig]*bootstrap.ServerConfig
 }
 
 // Decode deserialize and validate resource bytes of an xDS resource received
 // from the xDS management server.
-func (gd *genericResourceTypeDecoder) Decode(resourceBytes []byte, gOpts xdsclient.DecodeOptions) (*xdsclient.DecodeResult, error) {
-	raw := &anypb.Any{TypeUrl: gd.resourceType.TypeURL(), Value: resourceBytes}
-	opts := &DecodeOptions{BootstrapConfig: gd.bootstrapConfig}
+func (gd *GenericResourceTypeDecoder) Decode(resourceBytes []byte, gOpts xdsclient.DecodeOptions) (*xdsclient.DecodeResult, error) {
+	raw := &anypb.Any{TypeUrl: gd.ResourceType.TypeURL(), Value: resourceBytes}
+	opts := &DecodeOptions{BootstrapConfig: gd.BootstrapConfig}
 	if gOpts.ServerConfig != nil {
-		opts.ServerConfig = gd.gServerConfigMap[*gOpts.ServerConfig]
+		opts.ServerConfig = gd.ServerConfigMap[*gOpts.ServerConfig]
 	}
 
-	result, err := gd.resourceType.Decode(opts, raw)
+	result, err := gd.ResourceType.Decode(opts, raw)
 	if result == nil {
 		return nil, err
 	}
diff --git a/xds/internal/xdsclient/xdsresource/route_config_resource_type.go b/xds/internal/xdsclient/xdsresource/route_config_resource_type.go
@@ -153,5 +153,5 @@ func WatchRouteConfig(p Producer, name string, w RouteConfigWatcher) (cancel fun
 // NewGenericRouteConfigResourceTypeDecoder returns a xdsclient.Decoder that
 // wraps the xdsresource.routeConfigType.
 func NewGenericRouteConfigResourceTypeDecoder() xdsclient.Decoder {
-	return &genericResourceTypeDecoder{resourceType: routeConfigType}
+	return &GenericResourceTypeDecoder{ResourceType: routeConfigType}
 }

Original file line number	Diff line number	Diff line change
`@@ -156,5 +156,5 @@ func WatchCluster(p Producer, name string, w ClusterWatcher) (cancel func()) {`
`156`	`156`	`// NewGenericClusterResourceTypeDecoder returns a xdsclient.Decoder that`
`157`	`157`	`// wraps the xdsresource.clusterType.`
`158`	`158`	`func NewGenericClusterResourceTypeDecoder(bc bootstrap.Config, gServerCfgMap map[xdsclient.ServerConfig]bootstrap.ServerConfig) xdsclient.Decoder {`
`159`		`- return &genericResourceTypeDecoder{resourceType: clusterType, bootstrapConfig: bc, gServerConfigMap: gServerCfgMap}`
	`159`	`+ return &GenericResourceTypeDecoder{ResourceType: clusterType, BootstrapConfig: bc, ServerConfigMap: gServerCfgMap}`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,5 +151,5 @@ func WatchEndpoints(p Producer, name string, w EndpointsWatcher) (cancel func())`
`151`	`151`	`// NewGenericEndpointsResourceTypeDecoder returns a xdsclient.Decoder that`
`152`	`152`	`// wraps the xdsresource.endpointsType.`
`153`	`153`	`func NewGenericEndpointsResourceTypeDecoder() xdsclient.Decoder {`
`154`		`- return &genericResourceTypeDecoder{resourceType: endpointsType}`
	`154`	`+ return &GenericResourceTypeDecoder{ResourceType: endpointsType}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,5 +185,5 @@ func WatchListener(p Producer, name string, w ListenerWatcher) (cancel func()) {`
`185`	`185`	`// NewGenericListenerResourceTypeDecoder returns a xdsclient.Decoder that wraps`
`186`	`186`	`// the xdsresource.listenerType.`
`187`	`187`	`func NewGenericListenerResourceTypeDecoder(bc *bootstrap.Config) xdsclient.Decoder {`
`188`		`- return &genericResourceTypeDecoder{resourceType: listenerType, bootstrapConfig: bc}`
	`188`	`+ return &GenericResourceTypeDecoder{ResourceType: listenerType, BootstrapConfig: bc}`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,5 +153,5 @@ func WatchRouteConfig(p Producer, name string, w RouteConfigWatcher) (cancel fun`
`153`	`153`	`// NewGenericRouteConfigResourceTypeDecoder returns a xdsclient.Decoder that`
`154`	`154`	`// wraps the xdsresource.routeConfigType.`
`155`	`155`	`func NewGenericRouteConfigResourceTypeDecoder() xdsclient.Decoder {`
`156`		`- return &genericResourceTypeDecoder{resourceType: routeConfigType}`
	`156`	`+ return &GenericResourceTypeDecoder{ResourceType: routeConfigType}`
`157`	`157`	`}`