codec: fix noop codec to handle *broker.Message

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

auth/options.go

@@ -25,6 +25,7 @@ func NewOptions(opts ...Option) Options {
 }
 
 type Options struct {
+	Name string
 	// Issuer of the service's account
 	Issuer string
 	// ID is the services auth ID
@@ -63,6 +64,13 @@ func Addrs(addrs ...string) Option {
 	}
 }
 
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}
+
 // Issuer of the services account
 func Issuer(i string) Option {
 	return func(o *Options) {

codec/noop.go

@@ -1,6 +1,7 @@
 package codec
 
 import (
+	"encoding/json"
 	"io"
 	"io/ioutil"
 )
@@ -40,7 +41,7 @@ func (c *noopCodec) ReadBody(conn io.Reader, b interface{}) error {
 	case *Frame:
 		v.Data = buf
 	default:
-		return ErrInvalidMessage
+		return json.Unmarshal(buf, v)
 	}
 
 	return nil
@@ -64,7 +65,11 @@ func (c *noopCodec) Write(conn io.Writer, m *Message, b interface{}) error {
 	case []byte:
 		v = vb
 	default:
-		return ErrInvalidMessage
+		var err error
+		v, err = json.Marshal(vb)
+		if err != nil {
+			return err
+		}
 	}
 	_, err := conn.Write(v)
 	return err
@@ -98,11 +103,11 @@ func (c *noopCodec) Marshal(v interface{}) ([]byte, error) {
 	case *Message:
 		return ve.Body, nil
 	}
-	return nil, ErrInvalidMessage
+
+	return json.Marshal(v)
 }
 
 func (c *noopCodec) Unmarshal(d []byte, v interface{}) error {
-	var err error
 	if v == nil {
 		return nil
 	}
@@ -119,9 +124,7 @@ func (c *noopCodec) Unmarshal(d []byte, v interface{}) error {
 		ve.Data = d
 	case *Message:
 		ve.Body = d
-	default:
-		err = ErrInvalidMessage
 	}
 
-	return err
+	return json.Unmarshal(d, v)
 }

config/options.go

@@ -10,6 +10,7 @@ import (
 )
 
 type Options struct {
+	Name       string
 	AllowFail  bool
 	BeforeLoad []func(context.Context, Config) error
 	AfterLoad  []func(context.Context, Config) error
@@ -116,3 +117,10 @@ func StructTag(name string) Option {
 		o.StructTag = name
 	}
 }
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

logger/options.go

@@ -11,6 +11,7 @@ type Option func(*Options)
 
 // Options holds logger options
 type Options struct {
+	Name string
 	// The logging level the logger should log at. default is `InfoLevel`
 	Level Level
 	// fields to always be logged
@@ -72,3 +73,10 @@ func WithContext(ctx context.Context) Option {
 		o.Context = ctx
 	}
 }
+
+// WithName sets the name
+func withName(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

meter/options.go

@@ -93,3 +93,10 @@ func Label(key, val string) Option {
 		o.Labels.vals = append(o.Labels.vals, val)
 	}
 }
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

network/transport/options.go

@@ -12,6 +12,7 @@ import (
 )
 
 type Options struct {
+	Name string
 	// Addrs is the list of intermediary addresses to connect to
 	Addrs []string
 	// Codec is the codec interface to use where headers are not supported
@@ -176,3 +177,10 @@ func Tracer(t tracer.Tracer) Option {
 		o.Tracer = t
 	}
 }
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

network/tunnel/options.go

@@ -22,6 +22,7 @@ type Option func(*Options)
 
 // Options provides network configuration options
 type Options struct {
+	Name string
 	// Id is tunnel id
 	Id string
 	// Address is tunnel address
@@ -181,3 +182,10 @@ func Tracer(t tracer.Tracer) Option {
 		o.Tracer = t
 	}
 }
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

register/options.go

@@ -246,13 +246,13 @@ func DeregisterDomain(d string) DeregisterOption {
 	}
 }
 
-func GetContext(ctx context.Context) LookupOption {
+func LookupContext(ctx context.Context) LookupOption {
 	return func(o *LookupOptions) {
 		o.Context = ctx
 	}
 }
 
-func GetDomain(d string) LookupOption {
+func LookupDomain(d string) LookupOption {
 	return func(o *LookupOptions) {
 		o.Domain = d
 	}
@@ -269,3 +269,10 @@ func ListDomain(d string) ListOption {
 		o.Domain = d
 	}
 }
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

store/options.go

@@ -91,6 +91,13 @@ func Meter(m meter.Meter) Option {
 	}
 }
 
+// Name the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}
+
 // Tracer sets the tracer
 func Tracer(t tracer.Tracer) Option {
 	return func(o *Options) {

tracer/options.go

@@ -53,3 +53,10 @@ func NewOptions(opts ...Option) Options {
 	}
 	return options
 }
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}