Merge pull request #789 from henry118/fix

regenerate protobuf with the right protoc compiler version

Author: henry118

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/containernetworking/plugins v1.4.0
 	github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20220427214706-47505a9cf951
 	github.com/gofrs/uuid v3.3.0+incompatible
+	github.com/golang/protobuf v1.5.4
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/miekg/dns v1.1.25
 	github.com/opencontainers/image-spec v1.1.0-rc3
@@ -79,7 +80,6 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect

proto/events.pb.go

@@ -17,7 +17,7 @@ PROTO_GEN_SRC_TTRPC := $(addprefix ttrpc/,$(PROTO_GEN_SRC))
 
 $(PROTO_GEN_SRC_TTRPC): $(PROTO_SRC)
 	protoc -I. -I$(PROTOPATH)\
-		--go-out=:ttrpc \
+		--go_out=:ttrpc \
 		$^
 	protoc -I. -I$(PROTOPATH)\
 		--go-ttrpc_out=:ttrpc \

proto/firecracker.pb.go

@@ -17,10 +17,10 @@ PROTO_GEN_SRC_TTRPC := $(addprefix ttrpc/,$(PROTO_GEN_SRC))
 
 $(PROTO_GEN_SRC_TTRPC): $(PROTO_SRC)
 	protoc -I. -I$(PROTOPATH)\
-		--go_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
+		--go_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto,Mtypes.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
 		$^
 	protoc -I. -I$(PROTOPATH)\
-		--go-ttrpc_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
+		--go-ttrpc_out=Mfirecracker.proto=github.com/firecracker-microvm/firecracker-containerd/proto,Mtypes.proto=github.com/firecracker-microvm/firecracker-containerd/proto:ttrpc \
 		$^
 
 proto: $(PROTO_GEN_SRC_TTRPC)