use json tag instead of wrp tag (#42)

xmidt-org · Feb 5, 2020 · 6e537b4 · 6e537b4
1 parent 2579d30
commit 6e537b4
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 139 deletions.
diff --git a/format.go b/format.go
@@ -31,7 +31,7 @@ func AllFormats() []Format {
 var (
 	jsonHandle = codec.JsonHandle{
 		BasicHandle: codec.BasicHandle{
-			TypeInfos: codec.NewTypeInfos([]string{"wrp"}),
+			TypeInfos: codec.NewTypeInfos([]string{"json"}),
 		},
 		IntegerAsString: 'L',
 	}
@@ -42,7 +42,7 @@ var (
 	msgpackHandle = codec.MsgpackHandle{
 		WriteExt: true,
 		BasicHandle: codec.BasicHandle{
-			TypeInfos: codec.NewTypeInfos([]string{"wrp"}),
+			TypeInfos: codec.NewTypeInfos([]string{"json"}),
 		},
 	}
 )

diff --git a/go.mod b/go.mod
@@ -13,4 +13,5 @@ require (
 	github.com/stretchr/testify v1.2.1
 	github.com/ugorji/go/codec v1.1.7
 	github.com/xmidt-org/webpa-common v1.3.2
+	golang.org/x/tools v0.0.0-20200110142700-428f1ab0ca03 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -20,3 +20,15 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/xmidt-org/webpa-common v1.3.2 h1:dE1Fi+XVnkt3tMGMjH7/hN/UGcaQ/ukKriXuMDyCWnM=
 github.com/xmidt-org/webpa-common v1.3.2/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20200110142700-428f1ab0ca03 h1:iPq9R0Zx+m39Vtm+v/7imzPGK2FOWXJFeIe1EBvHew4=
+golang.org/x/tools v0.0.0-20200110142700-428f1ab0ca03/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/messages.go b/messages.go
@@ -2,7 +2,7 @@ package wrp
 
 import "regexp"
 
-//go:generate codecgen -st "wrp" -o messages_codec.go messages.go
+//go:generate codecgen -st "json" -o messages_codec.go messages.go
 
 var (
 	// eventPattern is the precompiled regex that selects the top level event
@@ -77,96 +77,96 @@ type Message struct {
 	//
 	// required: true
 	// example: 4
-	Type MessageType `wrp:"msg_type"`
+	Type MessageType `json:"msg_type"`
 
 	// Source The device_id name of the device originating the request or response.
 	//
 	// required: false
 	// example: dns:talaria.xmidt.example.com
-	Source string `wrp:"source,omitempty"`
+	Source string `json:"source,omitempty"`
 
 	// Destination The device_id name of the target device of the request or response.
 	//
 	// required: false
 	// example: event:device-status/mac:ffffffffdae4/online
-	Destination string `wrp:"dest,omitempty"`
+	Destination string `json:"dest,omitempty"`
 
 	// TransactionUUID The transaction key for the message
 	//
 	// required: false
 	// example: 546514d4-9cb6-41c9-88ca-ccd4c130c525
-	TransactionUUID string `wrp:"transaction_uuid,omitempty"`
+	TransactionUUID string `json:"transaction_uuid,omitempty"`
 
 	// ContentType The media type of the payload.
 	//
 	// required: false
 	// example: json
-	ContentType string `wrp:"content_type,omitempty"`
+	ContentType string `json:"content_type,omitempty"`
 
 	// Accept  The media type accepted in the response.
 	//
 	// required: false
-	Accept string `wrp:"accept,omitempty"`
+	Accept string `json:"accept,omitempty"`
 
 	// Status The response status from the originating service.
 	//
 	// required: false
-	Status *int64 `wrp:"status,omitempty"`
+	Status *int64 `json:"status,omitempty"`
 
 	// RequestDeliveryResponse The request delivery response is the delivery result of the previous (implied request)
 	// message with a matching transaction_uuid
 	//
 	// required: false
-	RequestDeliveryResponse *int64 `wrp:"rdr,omitempty"`
+	RequestDeliveryResponse *int64 `json:"rdr,omitempty"`
 
 	// Headers The headers associated with the payload.
 	//
 	// required: false
-	Headers []string `wrp:"headers,omitempty"`
+	Headers []string `json:"headers,omitempty"`
 
 	// Metadata The map of name/value pairs used by consumers of WRP messages for filtering & other purposes.
 	//
 	// required: false
 	// example: {"/boot-time":1542834188,"/last-reconnect-reason":"spanish inquisition"}
-	Metadata map[string]string `wrp:"metadata,omitempty"`
+	Metadata map[string]string `json:"metadata,omitempty"`
 
 	// Spans An array of arrays of timing values as a list in the format: "parent" (string), "name" (string),
 	// "start time" (int), "duration" (int), "status" (int)
 	//
 	// required: false
-	Spans [][]string `wrp:"spans,omitempty"`
+	Spans [][]string `json:"spans,omitempty"`
 
 	// IncludeSpans (Deprecated) If the timing values should be included in the response.
 	//
 	// required: false
-	IncludeSpans *bool `wrp:"include_spans,omitempty"`
+	IncludeSpans *bool `json:"include_spans,omitempty"`
 
 	// Path The path to which to apply the payload.
 	//
 	// required: false
-	Path string `wrp:"path,omitempty"`
+	Path string `json:"path,omitempty"`
 
 	// Payload The string encoded of the ContentType
 	//
 	// required: false
 	// example: eyJpZCI6IjUiLCJ0cyI6IjIwMTktMDItMTJUMTE6MTA6MDIuNjE0MTkxNzM1WiIsImJ5dGVzLXNlbnQiOjAsIm1lc3NhZ2VzLXNlbnQiOjEsImJ5dGVzLXJlY2VpdmVkIjowLCJtZXNzYWdlcy1yZWNlaXZlZCI6MH0=
-	Payload []byte `wrp:"payload,omitempty"`
+	Payload []byte `json:"payload,omitempty"`
 
 	// ServiceName The originating point of the request or response
 	//
 	// required: false
-	ServiceName string `wrp:"service_name,omitempty"`
+	ServiceName string `json:"service_name,omitempty"`
 
 	// URL The url to use when connecting to the nanomsg pipeline
 	//
 	// required: false
-	URL string `wrp:"url,omitempty"`
+	URL string `json:"url,omitempty"`
 
 	// PartnerIDs The list of partner ids the message is meant to target.
 	//
 	// required: false
 	// example: ["hello","world"]
-	PartnerIDs []string `wrp:"partner_ids,omitempty"`
+	PartnerIDs []string `json:"partner_ids,omitempty"`
 }
 
 func (msg *Message) FindEventStringSubMatch() string {
@@ -227,20 +227,20 @@ func (msg *Message) SetIncludeSpans(value bool) *Message {
 type SimpleRequestResponse struct {
 	// Type is exposed principally for encoding.  This field *must* be set to SimpleRequestResponseMessageType,
 	// and is automatically set by the BeforeEncode method.
-	Type                    MessageType       `wrp:"msg_type"`
-	Source                  string            `wrp:"source"`
-	Destination             string            `wrp:"dest"`
-	ContentType             string            `wrp:"content_type,omitempty"`
-	Accept                  string            `wrp:"accept,omitempty"`
-	TransactionUUID         string            `wrp:"transaction_uuid,omitempty"`
-	Status                  *int64            `wrp:"status,omitempty"`
-	RequestDeliveryResponse *int64            `wrp:"rdr,omitempty"`
-	Headers                 []string          `wrp:"headers,omitempty"`
-	Metadata                map[string]string `wrp:"metadata,omitempty"`
-	Spans                   [][]string        `wrp:"spans,omitempty"`
-	IncludeSpans            *bool             `wrp:"include_spans,omitempty"`
-	Payload                 []byte            `wrp:"payload,omitempty"`
-	PartnerIDs              []string          `wrp:"partner_ids,omitempty"`
+	Type                    MessageType       `json:"msg_type"`
+	Source                  string            `json:"source"`
+	Destination             string            `json:"dest"`
+	ContentType             string            `json:"content_type,omitempty"`
+	Accept                  string            `json:"accept,omitempty"`
+	TransactionUUID         string            `json:"transaction_uuid,omitempty"`
+	Status                  *int64            `json:"status,omitempty"`
+	RequestDeliveryResponse *int64            `json:"rdr,omitempty"`
+	Headers                 []string          `json:"headers,omitempty"`
+	Metadata                map[string]string `json:"metadata,omitempty"`
+	Spans                   [][]string        `json:"spans,omitempty"`
+	IncludeSpans            *bool             `json:"include_spans,omitempty"`
+	Payload                 []byte            `json:"payload,omitempty"`
+	PartnerIDs              []string          `json:"partner_ids,omitempty"`
 }
 
 func (msg *SimpleRequestResponse) FindEventStringSubMatch() string {
@@ -310,14 +310,14 @@ func (msg *SimpleRequestResponse) Response(newSource string, requestDeliveryResp
 type SimpleEvent struct {
 	// Type is exposed principally for encoding.  This field *must* be set to SimpleEventMessageType,
 	// and is automatically set by the BeforeEncode method.
-	Type        MessageType       `wrp:"msg_type"`
-	Source      string            `wrp:"source"`
-	Destination string            `wrp:"dest"`
-	ContentType string            `wrp:"content_type,omitempty"`
-	Headers     []string          `wrp:"headers,omitempty"`
-	Metadata    map[string]string `wrp:"metadata,omitempty"`
-	Payload     []byte            `wrp:"payload,omitempty"`
-	PartnerIDs  []string          `wrp:"partner_ids,omitempty"`
+	Type        MessageType       `json:"msg_type"`
+	Source      string            `json:"source"`
+	Destination string            `json:"dest"`
+	ContentType string            `json:"content_type,omitempty"`
+	Headers     []string          `json:"headers,omitempty"`
+	Metadata    map[string]string `json:"metadata,omitempty"`
+	Payload     []byte            `json:"payload,omitempty"`
+	PartnerIDs  []string          `json:"partner_ids,omitempty"`
 }
 
 func (msg *SimpleEvent) BeforeEncode() error {
@@ -360,20 +360,20 @@ func (msg *SimpleEvent) Response(newSource string, requestDeliveryResponse int64
 //
 // https://github.com/xmidt-org/wrp-c/wiki/Web-Routing-Protocol#crud-message-definition
 type CRUD struct {
-	Type                    MessageType       `wrp:"msg_type"`
-	Source                  string            `wrp:"source"`
-	Destination             string            `wrp:"dest"`
-	TransactionUUID         string            `wrp:"transaction_uuid,omitempty"`
-	ContentType             string            `wrp:"content_type,omitempty"`
-	Headers                 []string          `wrp:"headers,omitempty"`
-	Metadata                map[string]string `wrp:"metadata,omitempty"`
-	Spans                   [][]string        `wrp:"spans,omitempty"`
-	IncludeSpans            *bool             `wrp:"include_spans,omitempty"`
-	Status                  *int64            `wrp:"status,omitempty"`
-	RequestDeliveryResponse *int64            `wrp:"rdr,omitempty"`
-	Path                    string            `wrp:"path"`
-	Payload                 []byte            `wrp:"payload,omitempty"`
-	PartnerIDs              []string          `wrp:"partner_ids,omitempty"`
+	Type                    MessageType       `json:"msg_type"`
+	Source                  string            `json:"source"`
+	Destination             string            `json:"dest"`
+	TransactionUUID         string            `json:"transaction_uuid,omitempty"`
+	ContentType             string            `json:"content_type,omitempty"`
+	Headers                 []string          `json:"headers,omitempty"`
+	Metadata                map[string]string `json:"metadata,omitempty"`
+	Spans                   [][]string        `json:"spans,omitempty"`
+	IncludeSpans            *bool             `json:"include_spans,omitempty"`
+	Status                  *int64            `json:"status,omitempty"`
+	RequestDeliveryResponse *int64            `json:"rdr,omitempty"`
+	Path                    string            `json:"path"`
+	Payload                 []byte            `json:"payload,omitempty"`
+	PartnerIDs              []string          `json:"partner_ids,omitempty"`
 }
 
 // SetStatus simplifies setting the optional Status field, which is a pointer type tagged with omitempty.
@@ -429,9 +429,9 @@ func (msg *CRUD) Response(newSource string, requestDeliveryResponse int64) Routa
 type ServiceRegistration struct {
 	// Type is exposed principally for encoding.  This field *must* be set to ServiceRegistrationMessageType,
 	// and is automatically set by the BeforeEncode method.
-	Type        MessageType `wrp:"msg_type"`
-	ServiceName string      `wrp:"service_name"`
-	URL         string      `wrp:"url"`
+	Type        MessageType `json:"msg_type"`
+	ServiceName string      `json:"service_name"`
+	URL         string      `json:"url"`
 }
 
 func (msg *ServiceRegistration) BeforeEncode() error {
@@ -445,7 +445,7 @@ func (msg *ServiceRegistration) BeforeEncode() error {
 type ServiceAlive struct {
 	// Type is exposed principally for encoding.  This field *must* be set to ServiceAliveMessageType,
 	// and is automatically set by the BeforeEncode method.
-	Type MessageType `wrp:"msg_type"`
+	Type MessageType `json:"msg_type"`
 }
 
 func (msg *ServiceAlive) BeforeEncode() error {
@@ -459,7 +459,7 @@ func (msg *ServiceAlive) BeforeEncode() error {
 type Unknown struct {
 	// Type is exposed principally for encoding.  This field *must* be set to UnknownMessageType,
 	// and is automatically set by the BeforeEncode method.
-	Type MessageType `wrp:"msg_type"`
+	Type MessageType `json:"msg_type"`
 }
 
 func (msg *Unknown) BeforeEncode() error {