Merge pull request moby#2134 from charleskorn/fix-2109

Use correct types in filesync.proto
aaronlehmann · May 26, 2021 · 50ad8b1 · 50ad8b1
2 parents 8d5c5f1 + 8854bbc
commit 50ad8b1
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 37 deletions.
diff --git a/session/filesync/filesync.pb.go b/session/filesync/filesync.pb.go
diff --git a/session/filesync/filesync.proto b/session/filesync/filesync.proto
@@ -4,9 +4,11 @@ package moby.filesync.v1;
 
 option go_package = "filesync";
 
+import "github.com/tonistiigi/fsutil/types/wire.proto";
+
 service FileSync{
-  rpc DiffCopy(stream BytesMessage) returns (stream BytesMessage);
-  rpc TarStream(stream BytesMessage) returns (stream BytesMessage);
+  rpc DiffCopy(stream fsutil.types.Packet) returns (stream fsutil.types.Packet);
+  rpc TarStream(stream fsutil.types.Packet) returns (stream fsutil.types.Packet);
 }
 
 service FileSend{
@@ -17,4 +19,4 @@ service FileSend{
 // BytesMessage contains a chunk of byte data
 message BytesMessage{
 	bytes data = 1;
-}
+}
diff --git a/session/filesync/generate.go b/session/filesync/generate.go
@@ -1,3 +1,3 @@
 package filesync
 
-//go:generate protoc --gogoslick_out=plugins=grpc:. filesync.proto
+//go:generate protoc -I=. -I=../../vendor/ -I=../../vendor/github.com/tonistiigi/fsutil/types/ --gogoslick_out=plugins=grpc:. filesync.proto