VOL-1460 Implemented a new approach to protos where go stubs are not committed to the repo.
There are new instructions for clients consuming these protos in Go.
Also removed vendor directory and dep, as it isn't really needed at this point.
Implemented a test to check if protos match up with go files. This is run with make test.
This works by generating them and checking this created any more untracked or unstaged changes.
It requires you to commit your changes locally to pass. This process to should be run by
jenkins to validate a commit. A consistent version of protoc must be used, which the Makefile checks for.
Change-Id: I8de28c515a9535e33909cbbd158fa046f96f3b1f
diff --git a/go/voltha/adapter.pb.go b/go/voltha/adapter.pb.go
index 680fc4b..187844d 100644
--- a/go/voltha/adapter.pb.go
+++ b/go/voltha/adapter.pb.go
@@ -1,13 +1,15 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: voltha_protos/adapter.proto
-package voltha // import "github.com/opencord/voltha-protos/go/voltha"
+package voltha
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import common "github.com/opencord/voltha-protos/go/common"
+import (
+ fmt "fmt"
+ proto "github.com/golang/protobuf/proto"
+ any "github.com/golang/protobuf/ptypes/any"
+ common "github.com/opencord/voltha-protos/go/common"
+ math "math"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
@@ -18,7 +20,7 @@
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type AdapterConfig struct {
// Common adapter config attributes here
@@ -34,16 +36,17 @@
func (m *AdapterConfig) String() string { return proto.CompactTextString(m) }
func (*AdapterConfig) ProtoMessage() {}
func (*AdapterConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_adapter_afe3683afb102200, []int{0}
+ return fileDescriptor_7e998ce153307274, []int{0}
}
+
func (m *AdapterConfig) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AdapterConfig.Unmarshal(m, b)
}
func (m *AdapterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_AdapterConfig.Marshal(b, m, deterministic)
}
-func (dst *AdapterConfig) XXX_Merge(src proto.Message) {
- xxx_messageInfo_AdapterConfig.Merge(dst, src)
+func (m *AdapterConfig) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_AdapterConfig.Merge(m, src)
}
func (m *AdapterConfig) XXX_Size() int {
return xxx_messageInfo_AdapterConfig.Size(m)
@@ -89,16 +92,17 @@
func (m *Adapter) String() string { return proto.CompactTextString(m) }
func (*Adapter) ProtoMessage() {}
func (*Adapter) Descriptor() ([]byte, []int) {
- return fileDescriptor_adapter_afe3683afb102200, []int{1}
+ return fileDescriptor_7e998ce153307274, []int{1}
}
+
func (m *Adapter) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Adapter.Unmarshal(m, b)
}
func (m *Adapter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Adapter.Marshal(b, m, deterministic)
}
-func (dst *Adapter) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Adapter.Merge(dst, src)
+func (m *Adapter) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Adapter.Merge(m, src)
}
func (m *Adapter) XXX_Size() int {
return xxx_messageInfo_Adapter.Size(m)
@@ -162,16 +166,17 @@
func (m *Adapters) String() string { return proto.CompactTextString(m) }
func (*Adapters) ProtoMessage() {}
func (*Adapters) Descriptor() ([]byte, []int) {
- return fileDescriptor_adapter_afe3683afb102200, []int{2}
+ return fileDescriptor_7e998ce153307274, []int{2}
}
+
func (m *Adapters) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Adapters.Unmarshal(m, b)
}
func (m *Adapters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Adapters.Marshal(b, m, deterministic)
}
-func (dst *Adapters) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Adapters.Merge(dst, src)
+func (m *Adapters) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Adapters.Merge(m, src)
}
func (m *Adapters) XXX_Size() int {
return xxx_messageInfo_Adapters.Size(m)
@@ -195,11 +200,9 @@
proto.RegisterType((*Adapters)(nil), "voltha.Adapters")
}
-func init() {
- proto.RegisterFile("voltha_protos/adapter.proto", fileDescriptor_adapter_afe3683afb102200)
-}
+func init() { proto.RegisterFile("voltha_protos/adapter.proto", fileDescriptor_7e998ce153307274) }
-var fileDescriptor_adapter_afe3683afb102200 = []byte{
+var fileDescriptor_7e998ce153307274 = []byte{
// 378 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x6a, 0xe2, 0x40,
0x1c, 0xc6, 0x49, 0x5c, 0xa3, 0x8e, 0xec, 0xae, 0x3b, 0xac, 0x4b, 0x74, 0x91, 0x0d, 0xc2, 0x42,