Merge d41e5f2 into fa934fe

datasync/syncbase/kv_iterator.go

@@ -15,8 +15,9 @@
 package syncbase
 
 import (
-	"encoding/json"
+	"bytes"
 
+	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
 	"github.com/ligato/cn-infra/datasync"
 )
@@ -97,7 +98,7 @@ func (kv *KeyValBytes) GetKey() string {
 
 // GetValue returns the value of the pair.
 func (kv *KeyValBytes) GetValue(message proto.Message) error {
-	return json.Unmarshal(kv.value, message)
+	return jsonpb.Unmarshal(bytes.NewReader(kv.value), message)
 }
 
 // GetRevision returns revision associated with the latest change in the key-value pair.

datasync/syncbase/msg/change_event.go

@@ -15,9 +15,10 @@
 package msg
 
 import (
+	"bytes"
 	"context"
-	"encoding/json"
 
+	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
 	"github.com/ligato/cn-infra/datasync"
 	"github.com/ligato/cn-infra/logging/logrus"
@@ -87,7 +88,7 @@ func (ev *ChangeWatchResp) GetRevision() int64 {
 
 // GetValue - see the comments in the interface datasync.ChangeEvent.
 func (ev *ChangeWatchResp) GetValue(val proto.Message) error {
-	return json.Unmarshal(ev.message.Content, val) //TODO use contentType...
+	return jsonpb.Unmarshal(bytes.NewReader(ev.message.Content), val) //TODO use contentType...
 }
 
 // GetPrevValue returns the value before change.

docker/dev_cn_infra/Dockerfile

@@ -18,7 +18,7 @@ RUN wget https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz && \
     mv go /usr/local && \
     rm -f go1.9.2.linux-amd64.tar.gz
 
-# build & install Protobuf & gogo protobuf compiler
+# build & install Protobuf & golang protobuf compiler
 RUN apt-get install -y make && \
     apt-get install -y autoconf automake libtool curl make g++ unzip
 

examples/model/doc.go

@@ -1,3 +1,5 @@
 // Package etcdexample explains how to generate Golang structures from
 // protobuf-formatted data.
 package etcdexample
+
+//go:generate protoc --proto_path=. --go_out=. example.proto