Update options to be public. This means people can implement the interfaces and actually use the options

client/options.go

@@ -8,87 +8,99 @@ import (
 	"github.com/micro/go-micro/transport"
 )
 
-type options struct {
-	contentType string
-	broker      broker.Broker
-	codecs      map[string]codec.NewCodec
-	registry    registry.Registry
-	selector    selector.Selector
-	transport   transport.Transport
-	wrappers    []Wrapper
+type Options struct {
+	ContentType string
+	Broker      broker.Broker
+	Codecs      map[string]codec.NewCodec
+	Registry    registry.Registry
+	Selector    selector.Selector
+	Transport   transport.Transport
+	Wrappers    []Wrapper
+
+	// Other options to be used by client implementations
+	Options map[string]string
 }
 
-type callOptions struct {
-	selectOptions []selector.SelectOption
+type CallOptions struct {
+	SelectOptions []selector.SelectOption
+
+	// Other options to be used by client implementations
+	Options map[string]string
 }
 
-type publishOptions struct{}
+type PublishOptions struct {
+	// Other options to be used by client implementations
+	Options map[string]string
+}
 
-type requestOptions struct {
-	stream bool
+type RequestOptions struct {
+	Stream bool
+
+	// Other options to be used by client implementations
+	Options map[string]string
 }
 
 // Broker to be used for pub/sub
 func Broker(b broker.Broker) Option {
-	return func(o *options) {
-		o.broker = b
+	return func(o *Options) {
+		o.Broker = b
 	}
 }
 
 // Codec to be used to encode/decode requests for a given content type
 func Codec(contentType string, c codec.NewCodec) Option {
-	return func(o *options) {
-		o.codecs[contentType] = c
+	return func(o *Options) {
+		o.Codecs[contentType] = c
 	}
 }
 
 // Default content type of the client
 func ContentType(ct string) Option {
-	return func(o *options) {
-		o.contentType = ct
+	return func(o *Options) {
+		o.ContentType = ct
 	}
 }
 
 // Registry to find nodes for a given service
 func Registry(r registry.Registry) Option {
-	return func(o *options) {
-		o.registry = r
+	return func(o *Options) {
+		o.Registry = r
 	}
 }
 
 // Transport to use for communication e.g http, rabbitmq, etc
 func Transport(t transport.Transport) Option {
-	return func(o *options) {
-		o.transport = t
+	return func(o *Options) {
+		o.Transport = t
 	}
 }
 
 // Select is used to select a node to route a request to
 func Selector(s selector.Selector) Option {
-	return func(o *options) {
-		o.selector = s
+	return func(o *Options) {
+		o.Selector = s
 	}
 }
 
 // Adds a Wrapper to a list of options passed into the client
 func Wrap(w Wrapper) Option {
-	return func(o *options) {
-		o.wrappers = append(o.wrappers, w)
+	return func(o *Options) {
+		o.Wrappers = append(o.Wrappers, w)
 	}
 }
 
 // Call Options
 
 func WithSelectOption(so selector.SelectOption) CallOption {
-	return func(o *callOptions) {
-		o.selectOptions = append(o.selectOptions, so)
+	return func(o *CallOptions) {
+		o.SelectOptions = append(o.SelectOptions, so)
 	}
 }
 
 // Request Options
 
 func StreamingRequest() RequestOption {
-	return func(o *requestOptions) {
-		o.stream = true
+	return func(o *RequestOptions) {
+		o.Stream = true
 	}
 }