legacy wildcard mode in sotw and delta packages

Signed-off-by: Zhiyan Foo <[email protected]>

Author: zhiyanfoo

pkg/server/config/config.go

@@ -49,22 +49,12 @@ func (o Opts) IsLegacyWildcardActive(typeURL string) bool {
 // this allows for easy inference as to which opt applies to what implementation.
 type XDSOption func(*Opts)
 
-// DeactivateLegacyWildcard deactivates legacy wildcard mode for all resource types.
-// In legacy wildcard mode, empty requests to a stream, are treated as wildcard requests as long
-// as there is no request made with resources or explicit wildcard requests on the same stream.
-// When deactivated, empty requests are treated as a request with no subscriptions to any resource.
-// This is recommended for when you are using the go-control-plane to serve grpc-xds clients.
-// These clients never want to treat an empty request as a wildcard subscription.
 func DeactivateLegacyWildcard() XDSOption {
 	return func(o *Opts) {
 		o.legacyWildcardDeactivated = true
 	}
 }
 
-// DeactivateLegacyWildcardForTypes deactivates legacy wildcard mode for specific resource types.
-// In legacy wildcard mode, empty requests to a stream, are treated as wildcard requests as long
-// as there is no request made with resources or explicit wildcard requests on the same stream.
-// When deactivated, empty requests are treated as a request with no subscriptions to any resource.
 func DeactivateLegacyWildcardForTypes(types []string) XDSOption {
 	return func(o *Opts) {
 		typeMap := make(map[string]struct{}, len(types))

pkg/server/delta/v3/server.go

@@ -57,6 +57,24 @@ func WithLogger(logger log.Logger) config.XDSOption {
 	}
 }
 
+// DeactivateLegacyWildcard deactivates legacy wildcard mode for all resource types.
+// In legacy wildcard mode, empty requests to a stream, are treated as wildcard requests as long
+// as there is no request made with resources or explicit wildcard requests on the same stream.
+// When deactivated, empty requests are treated as a request with no subscriptions to any resource.
+// This is recommended for when you are using the go-control-plane to serve grpc-xds clients.
+// These clients never want to treat an empty request as a wildcard subscription.
+func DeactivateLegacyWildcard() config.XDSOption {
+	return config.DeactivateLegacyWildcard()
+}
+
+// DeactivateLegacyWildcardForTypes deactivates legacy wildcard mode for specific resource types.
+// In legacy wildcard mode, empty requests to a stream, are treated as wildcard requests as long
+// as there is no request made with resources or explicit wildcard requests on the same stream.
+// When deactivated, empty requests are treated as a request with no subscriptions to any resource.
+func DeactivateLegacyWildcardForTypes(types []string) config.XDSOption {
+	return config.DeactivateLegacyWildcardForTypes(types)
+}
+
 // NewServer creates a delta xDS specific server which utilizes a ConfigWatcher and delta Callbacks.
 func NewServer(ctx context.Context, config cache.ConfigWatcher, callbacks Callbacks, opts ...config.XDSOption) Server {
 	s := &server{

pkg/server/sotw/v3/server.go

@@ -74,6 +74,24 @@ func WithLogger(logger log.Logger) config.XDSOption {
 	}
 }
 
+// DeactivateLegacyWildcard deactivates legacy wildcard mode for all resource types.
+// In legacy wildcard mode, empty requests to a stream, are treated as wildcard requests as long
+// as there is no request made with resources or explicit wildcard requests on the same stream.
+// When deactivated, empty requests are treated as a request with no subscriptions to any resource.
+// This is recommended for when you are using the go-control-plane to serve grpc-xds clients.
+// These clients never want to treat an empty request as a wildcard subscription.
+func DeactivateLegacyWildcard() config.XDSOption {
+	return config.DeactivateLegacyWildcard()
+}
+
+// DeactivateLegacyWildcardForTypes deactivates legacy wildcard mode for specific resource types.
+// In legacy wildcard mode, empty requests to a stream, are treated as wildcard requests as long
+// as there is no request made with resources or explicit wildcard requests on the same stream.
+// When deactivated, empty requests are treated as a request with no subscriptions to any resource.
+func DeactivateLegacyWildcardForTypes(types []string) config.XDSOption {
+	return config.DeactivateLegacyWildcardForTypes(types)
+}
+
 type server struct {
 	cache     cache.ConfigWatcher
 	callbacks Callbacks