From f438c511bf3a3dbb66ce8e9d2d5e5b2f0b56af7e Mon Sep 17 00:00:00 2001 From: Joseph Gorse Date: Tue, 13 Sep 2016 10:11:22 -0400 Subject: [PATCH] Protobuf versioning fix (#7) * Fixed GRPC versioning issue, updated protobuf files * Updated makefile for new golang build image --- Makefile | 3 ++- agent/grpc/host/host.pb.go | 28 ++++++++++---------- glide.lock | 44 +++++++++++++++++-------------- plugins/lldp/grpc/lldp/lldp.pb.go | 44 +++++++++++++++---------------- 4 files changed, 62 insertions(+), 57 deletions(-) diff --git a/Makefile b/Makefile index 25c10b7..2da8047 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ SHELL = /bin/bash TTY = $(shell if [ -t 0 ]; then echo "-ti"; fi) DOCKER_DIR = /go/src/github.com/${ORGANIZATION}/${PROJECT} -DOCKER_IMAGE = rackhd/golang:1.7.0-wheezy +DOCKER_IMAGE = rackhd/golang:1.7.1-wheezy DOCKER_CMD = docker run --rm -v ${PWD}:${DOCKER_DIR} ${TTY} -w ${DOCKER_DIR} ${DOCKER_IMAGE} @@ -71,6 +71,7 @@ build-local: lint-local @go build -o $(GOOUT)/inservice-lldp $(LDFLAGS) plugins/lldp/*.go @go build -o $(GOOUT)/inservice-catalog-compute $(LDFLAGS) plugins/catalog-compute/*.go @go build -o $(GOOUT)/inservice-cli $(LDFLAGS) cmd/cli/*.go + @cp ./inservice.json $(GOOUT)/inservice.json lint: diff --git a/agent/grpc/host/host.pb.go b/agent/grpc/host/host.pb.go index 014d2be..3cc229e 100644 --- a/agent/grpc/host/host.pb.go +++ b/agent/grpc/host/host.pb.go @@ -268,18 +268,18 @@ var _Host_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("host.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 203 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x4d, 0x0e, 0x82, 0x30, - 0x14, 0x84, 0xad, 0xa9, 0x24, 0x3e, 0x15, 0xe3, 0xd3, 0x18, 0xc2, 0x4a, 0xbb, 0x72, 0x85, 0x06, - 0x17, 0x6e, 0x3c, 0x80, 0x6b, 0x38, 0x01, 0x26, 0x4d, 0xdc, 0x48, 0x91, 0x3e, 0x6e, 0xe4, 0x41, - 0xb5, 0xa5, 0xfc, 0x25, 0xc6, 0xdd, 0x63, 0x98, 0x99, 0x7c, 0x53, 0x80, 0x87, 0xd2, 0x14, 0x15, - 0xa5, 0x22, 0x85, 0xdc, 0xdc, 0x42, 0xc0, 0x3c, 0xa5, 0xac, 0xa4, 0x44, 0xbe, 0x2a, 0xa9, 0x09, - 0x11, 0x78, 0x9e, 0x3d, 0x65, 0xc0, 0x76, 0xec, 0x30, 0x4d, 0xec, 0x2d, 0x96, 0xb0, 0x70, 0x1e, - 0x5d, 0xa8, 0x5c, 0x4b, 0xb1, 0x87, 0x59, 0x4a, 0xaa, 0xf8, 0x97, 0xf1, 0x4d, 0xaf, 0xb1, 0xb8, - 0x48, 0xdd, 0x41, 0x95, 0x76, 0x21, 0x71, 0x05, 0xbf, 0x11, 0x6a, 0xcb, 0xaf, 0x1a, 0xdc, 0x82, - 0xa7, 0xad, 0x2b, 0x18, 0x5b, 0xd5, 0x7d, 0xc5, 0x6f, 0x06, 0xfc, 0xf6, 0xe5, 0xc7, 0x18, 0x26, - 0x96, 0x0d, 0x31, 0xb2, 0xdb, 0xfa, 0x63, 0xc2, 0xf5, 0x40, 0x73, 0x24, 0x23, 0x3c, 0x02, 0x37, - 0x6c, 0xb8, 0x6a, 0x7e, 0xb7, 0x53, 0x42, 0xec, 0x4b, 0x6d, 0xe0, 0x02, 0x5e, 0xcd, 0x8a, 0x5d, - 0x63, 0x37, 0x25, 0xdc, 0x0c, 0xc5, 0x26, 0x76, 0x62, 0x77, 0xcf, 0x3e, 0xf5, 0xf9, 0x13, 0x00, - 0x00, 0xff, 0xff, 0x1c, 0xd9, 0xa4, 0xc6, 0x78, 0x01, 0x00, 0x00, + // 205 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0xca, 0xc8, 0x2f, 0x2e, + 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x01, 0xb1, 0x95, 0x94, 0xb8, 0x78, 0x82, 0x4b, + 0x12, 0x8b, 0x4a, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x84, 0xb8, 0x58, 0xf2, 0x12, + 0x73, 0x53, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xc0, 0x6c, 0x25, 0x7e, 0x2e, 0x5e, 0xa8, + 0x9a, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x25, 0x45, 0x2e, 0xee, 0xe0, 0x92, 0xfc, 0x02, 0x7c, + 0x7a, 0xf8, 0x40, 0xe6, 0x82, 0x94, 0x40, 0xb5, 0x40, 0xcc, 0x28, 0x29, 0x2d, 0x86, 0x6a, 0x52, + 0xb2, 0xe1, 0xe2, 0x83, 0x09, 0x40, 0x94, 0x60, 0x33, 0x46, 0x48, 0x8c, 0x8b, 0xad, 0x18, 0xac, + 0x4a, 0x82, 0x09, 0x2c, 0x0a, 0xe5, 0x19, 0x2d, 0x61, 0xe4, 0x62, 0xf1, 0xc8, 0x2f, 0x2e, 0x11, + 0x32, 0xe2, 0x62, 0x05, 0xbb, 0x4d, 0x48, 0x48, 0x0f, 0xec, 0x37, 0x64, 0xcf, 0x48, 0x09, 0xa3, + 0x88, 0x41, 0x5d, 0xc2, 0x20, 0xa4, 0xcf, 0xc5, 0x02, 0x72, 0x9b, 0x90, 0x20, 0x4c, 0x1a, 0xee, + 0x15, 0x29, 0x21, 0x64, 0x21, 0xb8, 0x06, 0x73, 0x2e, 0x36, 0x88, 0x5b, 0x85, 0x10, 0x26, 0x22, + 0xbc, 0x22, 0x25, 0x82, 0x2a, 0x08, 0xd3, 0x66, 0xc0, 0x98, 0xc4, 0x06, 0x0e, 0x6a, 0x63, 0x40, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xd9, 0xa4, 0xc6, 0x78, 0x01, 0x00, 0x00, } diff --git a/glide.lock b/glide.lock index e14797d..a17490e 100644 --- a/glide.lock +++ b/glide.lock @@ -1,21 +1,19 @@ hash: 3c6851290e497feed1ea8aa6ec752d26c9c722378dcb3e49f273e0be2682b5f8 -updated: 2016-08-19T20:12:42.341113445Z +updated: 2016-09-13T08:48:31.607584111-04:00 imports: -- name: github.com/BurntSushi/toml - version: 99064174e013895bbd9b025c31100bd1d9b590ca - name: github.com/fsnotify/fsnotify version: f12c6236fe7b5cf6bcf30e5935d08cb079d78334 - name: github.com/golang/protobuf - version: f592bd283e9ef86337a432eb50e592278c3d534d + version: 1f49d83d9aa00e6ce4fc8258c71cc7786aec968a subpackages: - proto - name: github.com/google/gopacket - version: c4d647984d4671d9dd91770dae77923a0b48b389 + version: 632566d585d0456397d2058bd9cb800c48e3230b subpackages: - layers - pcap - name: github.com/hashicorp/hcl - version: d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1 + version: 99df0eb941dd8ddbc83d3f3605a34f6a686ac85e subpackages: - hcl/ast - hcl/parser @@ -32,39 +30,43 @@ imports: - name: github.com/kr/fs version: 2788f0dbd16903de03cb8186e5c7d97b69ad387b - name: github.com/magiconair/properties - version: 61b492c03cf472e0c6419be5899b8e0dc28b1b88 + version: 0723e352fa358f9322c938cc2dadda874e9151a9 - name: github.com/mitchellh/mapstructure version: ca63d7c062ee3c9f34db231e352b60012b4fd0c1 +- name: github.com/pelletier/go-buffruneio + version: df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d +- name: github.com/pelletier/go-toml + version: 31055c2ff0bb0c7f9095aec0d220aed21108121e - name: github.com/pkg/errors - version: a22138067af1c4942683050411a841ade67fe1eb + version: 17b591df37844cde689f4d5813e5cea0927d8dd2 - name: github.com/pkg/sftp - version: a71e8f580e3b622ebff585309160b1cc549ef4d2 + version: 8197a2e580736b78d704be0fc47b2324c0591a32 - name: github.com/spf13/afero - version: b28a7effac979219c2a2ed6205a4d70e4b1bcd02 + version: 20500e2abd0d1f4564a499e83d11d6c73cd58c27 subpackages: - mem - sftp - name: github.com/spf13/cast version: e31f36ffc91a2ba9ddb72a4b6a607ff9b3d3cb63 - name: github.com/spf13/cobra - version: 7c674d9e72017ed25f6d2b5e497a1368086b6a6f + version: 9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744 - name: github.com/spf13/jwalterweatherman version: 33c24e77fb80341fe7130ee7c594256ff08ccc46 - name: github.com/spf13/pflag - version: 6454a84b6da0ea8b628d5d8a26759f62c6c161b4 + version: 7b17cc4658ef5ca157b986ea5c0b43af7938532b - name: github.com/spf13/viper - version: 654fc7bb54d0c138ef80405ff577391f79c0c32d + version: 16990631d4aa7e38f73dbbbf37fa13e67c648531 - name: github.com/twinj/uuid - version: b505f2cca343b7b21416b27b1f2ad88469800892 + version: 7bbe408d339787c56ec15568c947c0959db1b275 - name: golang.org/x/crypto - version: 88d0005bf4c3ec17306ecaca4281a8d8efd73e91 + version: e311231e83195f401421a286060d65643f9c9d40 subpackages: - ssh - curve25519 - ed25519 - ed25519/internal/edwards25519 - name: golang.org/x/net - version: 07b51741c1d6423d4a6abab1c49940ec09cb1aaf + version: 749a502dd1eaf3e5bfd4f8956748c502357c0bbe subpackages: - context - ipv4 @@ -72,20 +74,22 @@ imports: - trace - bpf - internal/iana + - internal/netreflect - http2/hpack + - idna - lex/httplex - internal/timeseries - name: golang.org/x/sys - version: a646d33e2ee3172a661fc09bca23bb4889a41bc8 + version: 30de6d19a3bd89a5f38ae4028e23aaa5582648af subpackages: - unix - name: golang.org/x/text - version: d69c40b4be55797923cec7457fac7a244d91a9b6 + version: 1e65e9bf72c307081cea196f47ef37aed17eb316 subpackages: - transform - unicode/norm - name: google.golang.org/grpc - version: 0032a855ba5c8a3c8e0d71c2deef354b70af1584 + version: a0ff1e78a98cd140c2d18a0210ab0a2a183a2b4c subpackages: - codes - credentials @@ -96,5 +100,5 @@ imports: - transport - peer - name: gopkg.in/yaml.v2 - version: e4d366fc3c7938e2958e662b4258c7a89e1f0e3e + version: 31c299268d302dd0aa9a0dcf765a3d58971ac83f testImports: [] diff --git a/plugins/lldp/grpc/lldp/lldp.pb.go b/plugins/lldp/grpc/lldp/lldp.pb.go index 2a5a5ff..9870353 100644 --- a/plugins/lldp/grpc/lldp/lldp.pb.go +++ b/plugins/lldp/grpc/lldp/lldp.pb.go @@ -333,26 +333,26 @@ var _Lldp_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("lldp.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 327 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x52, 0x4b, 0x4e, 0xc3, 0x30, - 0x14, 0x24, 0x34, 0x69, 0xe9, 0x53, 0x3f, 0xc8, 0xa0, 0xca, 0x62, 0x85, 0xb2, 0xea, 0xaa, 0x42, - 0xb0, 0x40, 0x2c, 0xd8, 0x81, 0x10, 0x52, 0x61, 0x91, 0x1b, 0xb8, 0xf5, 0x6b, 0x6b, 0x29, 0x4d, - 0x22, 0xdb, 0x7c, 0xba, 0xe4, 0x6a, 0x9c, 0x89, 0x03, 0x90, 0x67, 0xa7, 0xe9, 0x47, 0xd9, 0xcd, - 0xcc, 0x9b, 0xb1, 0xc7, 0x1f, 0x80, 0x34, 0x95, 0xc5, 0xa4, 0xd0, 0xb9, 0xcd, 0x59, 0x48, 0x38, - 0x1e, 0x40, 0xef, 0x79, 0x5d, 0xd8, 0xcd, 0x1b, 0x1a, 0x23, 0x96, 0x18, 0xff, 0x06, 0x70, 0xf6, - 0x8e, 0x6a, 0xb9, 0x9a, 0xe5, 0x9a, 0x8d, 0xa0, 0x5d, 0xe4, 0xda, 0x2a, 0xc9, 0x83, 0xeb, 0x60, - 0xdc, 0x4d, 0x2a, 0xc6, 0xc6, 0x30, 0x24, 0x24, 0xd1, 0xcc, 0xb5, 0x2a, 0xac, 0xca, 0x33, 0x7e, - 0xea, 0x0c, 0xc7, 0x32, 0xe3, 0xd0, 0x31, 0x1b, 0x93, 0x89, 0x35, 0xf2, 0x96, 0x73, 0x6c, 0x69, - 0x35, 0x21, 0x2f, 0x0f, 0xeb, 0x09, 0x51, 0x9a, 0x08, 0x29, 0x75, 0x59, 0x88, 0x47, 0x7e, 0x52, - 0x51, 0xc6, 0x20, 0xfc, 0x4c, 0x45, 0xc6, 0xdb, 0x4e, 0x76, 0x98, 0x34, 0xbb, 0x29, 0x90, 0x77, - 0xbc, 0x46, 0x38, 0xfe, 0x09, 0xa0, 0xfb, 0x9a, 0x59, 0xd4, 0x0b, 0x31, 0x47, 0x76, 0x09, 0x91, - 0xca, 0x24, 0x7e, 0xbb, 0x43, 0x44, 0x89, 0x27, 0xec, 0x1c, 0x5a, 0x6b, 0xfb, 0xe1, 0x7a, 0x47, - 0x09, 0x41, 0x5a, 0x69, 0xaf, 0xa8, 0xc3, 0x2c, 0x86, 0xde, 0x4a, 0x68, 0xf9, 0x25, 0x34, 0x52, - 0x89, 0xaa, 0xea, 0x81, 0x46, 0xeb, 0x2f, 0x52, 0xb1, 0xf4, 0x6d, 0xfb, 0x89, 0x27, 0xb7, 0x7f, - 0x01, 0x84, 0xd3, 0xf2, 0x86, 0xd9, 0x03, 0x0c, 0xa6, 0xca, 0xd8, 0xba, 0x4f, 0x79, 0x8c, 0x89, - 0x7b, 0x86, 0xfd, 0x7b, 0xbf, 0x1a, 0x7a, 0xad, 0x76, 0xc5, 0x27, 0x37, 0x41, 0x19, 0xbd, 0x78, - 0xc1, 0x5d, 0xf2, 0x09, 0xad, 0x50, 0xa9, 0x61, 0xc7, 0xde, 0x86, 0x30, 0x7b, 0x84, 0xd1, 0xc1, - 0xae, 0xdb, 0x37, 0x6d, 0x48, 0x0f, 0xbc, 0xb0, 0x75, 0xb8, 0x9d, 0xef, 0xa1, 0x4f, 0xf1, 0x5d, - 0xaa, 0xa9, 0x73, 0x43, 0x70, 0xd6, 0x76, 0x9f, 0xeb, 0xee, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x15, - 0x5e, 0x19, 0x0d, 0x6a, 0x02, 0x00, 0x00, + // 328 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x52, 0xcd, 0x4e, 0xf3, 0x30, + 0x10, 0xfc, 0xf2, 0x35, 0x69, 0xe9, 0xaa, 0x3f, 0x68, 0x41, 0x95, 0xc5, 0x09, 0xe5, 0xd4, 0x53, + 0x85, 0xe0, 0x80, 0x7a, 0xe0, 0x06, 0x42, 0x48, 0x85, 0x43, 0xde, 0xc0, 0xad, 0xb7, 0xad, 0xa5, + 0x34, 0xb1, 0x6c, 0xf3, 0xd3, 0x23, 0xaf, 0xc6, 0x33, 0xf1, 0x00, 0xc8, 0x76, 0x9a, 0xfe, 0x28, + 0xb7, 0x99, 0xd9, 0x19, 0x7b, 0x92, 0x35, 0x40, 0x9e, 0x0b, 0x35, 0x51, 0xba, 0xb4, 0x25, 0xc6, + 0x0e, 0xa7, 0x03, 0xe8, 0x3d, 0x6d, 0x94, 0xdd, 0xbe, 0x92, 0x31, 0x7c, 0x45, 0xe9, 0x4f, 0x04, + 0x67, 0x6f, 0x24, 0x57, 0xeb, 0x79, 0xa9, 0x71, 0x04, 0x6d, 0x55, 0x6a, 0x2b, 0x05, 0x8b, 0xae, + 0xa3, 0x71, 0x37, 0xab, 0x18, 0x8e, 0x61, 0xe8, 0x90, 0x20, 0xb3, 0xd0, 0x52, 0x59, 0x59, 0x16, + 0xec, 0xbf, 0x37, 0x9c, 0xca, 0xc8, 0xa0, 0x63, 0xb6, 0xa6, 0xe0, 0x1b, 0x62, 0x2d, 0xef, 0xd8, + 0xd1, 0x6a, 0xe2, 0xbc, 0x2c, 0xae, 0x27, 0x8e, 0xba, 0x09, 0x17, 0x42, 0x93, 0x31, 0x2c, 0x09, + 0x93, 0x8a, 0x22, 0x42, 0xfc, 0x91, 0xf3, 0x82, 0xb5, 0xbd, 0xec, 0xb1, 0xd3, 0xec, 0x56, 0x11, + 0xeb, 0x04, 0xcd, 0xe1, 0xf4, 0x3b, 0x82, 0xee, 0x4b, 0x61, 0x49, 0x2f, 0xf9, 0x82, 0xf0, 0x12, + 0x12, 0x59, 0x08, 0xfa, 0xf2, 0x1f, 0x91, 0x64, 0x81, 0xe0, 0x39, 0xb4, 0x36, 0xf6, 0xdd, 0xf7, + 0x4e, 0x32, 0x07, 0xdd, 0x49, 0x07, 0x45, 0x3d, 0xc6, 0x14, 0x7a, 0x6b, 0xae, 0xc5, 0x27, 0xd7, + 0xe4, 0x4a, 0x54, 0x55, 0x8f, 0x34, 0x77, 0xfe, 0x32, 0xe7, 0xab, 0xd0, 0xb6, 0x9f, 0x05, 0x72, + 0xfb, 0x1b, 0x41, 0x3c, 0xcb, 0x85, 0xc2, 0x29, 0x0c, 0x66, 0xd2, 0xd8, 0xba, 0x8f, 0x41, 0x9c, + 0xf8, 0x35, 0x1c, 0xfe, 0xf7, 0xab, 0x61, 0xd0, 0x6a, 0x57, 0xfa, 0xef, 0x26, 0xc2, 0x29, 0x5c, + 0x3c, 0xd3, 0x3e, 0xf9, 0x48, 0x96, 0xcb, 0xdc, 0xe0, 0xa9, 0xb7, 0x21, 0x8c, 0x0f, 0x30, 0x3a, + 0xba, 0x75, 0xb7, 0xd3, 0x86, 0xf4, 0x20, 0x08, 0x3b, 0x87, 0xbf, 0xf9, 0x1e, 0xfa, 0x2e, 0xbe, + 0x4f, 0x35, 0x75, 0x6e, 0x08, 0xce, 0xdb, 0xfe, 0x71, 0xdd, 0xfd, 0x05, 0x00, 0x00, 0xff, 0xff, + 0x15, 0x5e, 0x19, 0x0d, 0x6a, 0x02, 0x00, 0x00, }