Upgrade to Go 1.17, protobuf v1.26.0 (#2)

Co-authored-by: James Craig Burley <[email protected]>

Dockerfile

@@ -1,4 +1,6 @@
-FROM namely/protoc-all:1.21_0
+ARG PROTOC_VERSION = 1.42_0
+
+FROM namely/protoc-all:${PROTOC_VERSION}
 
 COPY . .
 

Makefile

@@ -1,6 +1,7 @@
-GRPC_VERSION = 1.29_1
+PROTOC_VERSION = 1.42_0
 
 .PHONY: protos
 protos:
-	docker run --rm -v ${PWD}:/defs namely/protoc-all:${GRPC_VERSION} -f namely/giraffe/stitch.proto -l go -o .
-	mv namely/giraffe/*.go ${PWD}
+	docker run --rm -v ${PWD}:/defs namely/protoc-all:${PROTOC_VERSION} -f namely/giraffe/stitch.proto -l go -o .
+	mv github.com/namely/giraffe-proto/*.go ${PWD}
+	rmdir github.com/namely/giraffe-proto github.com/namely github.com

go.mod

@@ -1,5 +1,5 @@
 module github.com/namely/giraffe-proto
 
-go 1.14
+go 1.17
 
-require github.com/golang/protobuf v1.3.5
+require google.golang.org/protobuf v1.26.0

go.sum

@@ -1,2 +1,8 @@
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

namely/giraffe/stitch.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package namely.giraffe;
 
-option go_package = "giraffe";
+option go_package = "github.com/namely/giraffe-proto;giraffe";
 
 import "google/protobuf/descriptor.proto";