freeze Go build dependencies in Gopkg.lock

* use pseudo-depdencies in build/build.go to convince dep
* update Travis, Dockerfile and Docs
* build.Dockerfile image now contains the Go build dependencies
* => faster builds
* bump pdu file after protoc update

fixes #106

.travis.yml

@@ -24,7 +24,7 @@ matrix:
         - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip
         - echo "6003de742ea3fcf703cfec1cd4a3380fd143081a2eb0e559065563496af27807  protoc-3.6.1-linux-x86_64.zip" | sha256sum -c
         - sudo unzip -d /usr protoc-3.6.1-linux-x86_64.zip
-        - ./lazy.sh builddep
+        - ./lazy.sh godep
         - make vendordeps
     script:
       - make
@@ -43,7 +43,7 @@ matrix:
         - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip
         - echo "6003de742ea3fcf703cfec1cd4a3380fd143081a2eb0e559065563496af27807  protoc-3.6.1-linux-x86_64.zip" | sha256sum -c
         - sudo unzip -d /usr protoc-3.6.1-linux-x86_64.zip
-        - ./lazy.sh builddep
+        - ./lazy.sh godep
         - make vendordeps
     script:
       - make

Gopkg.lock

@@ -1,6 +1,14 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
+[[projects]]
+  branch = "master"
+  digest = "1:8cf2cf1ab10480b5e0df950dac1517aaabde05d055d9d955652997ae4b9ecbbf"
+  name = "github.com/alvaroloes/enumer"
+  packages = ["."]
+  pruneopts = ""
+  revision = "6bcfe2edaac32ad71b88ce4cf92d34cd643e4ecb"
+
 [[projects]]
   branch = "master"
   digest = "1:c0bec5f9b98d0bc872ff5e834fac186b807b656683bd29cb82fb207a1513fabb"
@@ -64,7 +72,15 @@
 [[projects]]
   digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18"
   name = "github.com/golang/protobuf"
-  packages = ["proto"]
+  packages = [
+    "proto",
+    "protoc-gen-go",
+    "protoc-gen-go/descriptor",
+    "protoc-gen-go/generator",
+    "protoc-gen-go/generator/internal/remap",
+    "protoc-gen-go/grpc",
+    "protoc-gen-go/plugin",
+  ]
   pruneopts = ""
   revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5"
   version = "v1.2.0"
@@ -141,6 +157,14 @@
   revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
   version = "v1.0.0"
 
+[[projects]]
+  branch = "master"
+  digest = "1:f60ff065b58bd53e641112b38bbda9d2684deb828393c7ffb89c69a1ee301d17"
+  name = "github.com/pascaldekloe/name"
+  packages = ["."]
+  pruneopts = ""
+  revision = "0fd16699aae1833640fca52a937944c6f3b1d58c"
+
 [[projects]]
   digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
   name = "github.com/pkg/errors"
@@ -159,7 +183,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:1392748e290ca66ac8447ef24961f8ae9e1d846a53af0f58a5a0256982ce0577"
+  digest = "1:25559b520313b941b1395cd5d5ee66086b27dc15a1391c0f2aad29d5c2321f4b"
   name = "github.com/problame/go-netssh"
   packages = ["."]
   pruneopts = ""
@@ -285,14 +309,24 @@
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
+[[projects]]
+  branch = "master"
+  digest = "1:4cd780b2ee42c8eac9c02bfb6e6b52dcbaef770774458c8938f5cbfb73a7b6d3"
+  name = "golang.org/x/tools"
+  packages = ["cmd/stringer"]
+  pruneopts = ""
+  revision = "d0ca3933b724e6be513276cc2edb34e10d667438"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
   input-imports = [
+    "github.com/alvaroloes/enumer",
     "github.com/fatih/color",
     "github.com/gdamore/tcell/termbox",
     "github.com/go-logfmt/logfmt",
     "github.com/golang/protobuf/proto",
+    "github.com/golang/protobuf/protoc-gen-go",
     "github.com/jinzhu/copier",
     "github.com/kr/pretty",
     "github.com/mattn/go-isatty",
@@ -308,6 +342,7 @@
     "github.com/stretchr/testify/require",
     "github.com/zrepl/yaml-config",
     "golang.org/x/sys/unix",
+    "golang.org/x/tools/cmd/stringer",
   ]
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -73,3 +73,11 @@ ignored = [ "github.com/inconshreveable/mousetrap" ]
 [[constraint]]
   name = "github.com/gdamore/tcell"
   version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/tools"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/alvaroloes/enumer"

build.Dockerfile

@@ -11,12 +11,21 @@ RUN unzip -d /usr protoc-3.6.1-linux-x86_64.zip
 ADD lazy.sh /tmp/lazy.sh
 ADD docs/requirements.txt /tmp/requirements.txt
 ENV ZREPL_LAZY_DOCS_REQPATH=/tmp/requirements.txt
-RUN /tmp/lazy.sh devsetup
+RUN /tmp/lazy.sh docdep
 
 # prepare volume mount of git checkout to /zrepl
 RUN mkdir -p /go/src/github.com/zrepl/zrepl
-RUN chmod -R 0777 /go
 RUN mkdir -p /.cache && chmod -R 0777 /.cache
 WORKDIR /go/src/github.com/zrepl/zrepl
 
+ADD Gopkg.toml Gopkg.lock  ./
+
+# godep will install the Go dependencies to vendor in order to then build and install
+# build dependencies like stringer to $GOPATH/bin.
+# However, since users volume-mount their Git checkout into /go/src/github.com/zrepl/zrepl
+# the vendor directory will be empty at build time, allowing them to experiment with
+# new checkouts, etc.
+# Thus, we only use the vendored deps for building dependencies.
+RUN /tmp/lazy.sh godep
+RUN chmod -R 0777 /go
 

build/build.go

@@ -0,0 +1,22 @@
+//+build windows
+
+// This package cannot actually be built, and since the Travis
+// tests run go test ./..., we have to avoid a build attempt.
+// Windows is not supported atm, so this works ¯\_(ツ)_/¯
+
+// This package is a pseudo-user of build-time dependencies for zrepl,
+// mostly for various code-generation tools.
+//
+// The imports are necessary to satisfy go dep
+package main
+
+import (
+	_ "fmt"
+	_ "github.com/alvaroloes/enumer"
+	_ "github.com/golang/protobuf/protoc-gen-go"
+	_ "golang.org/x/tools/cmd/stringer"
+)
+
+func main() {
+	fmt.Println("just a placeholder")
+}

docs/installation.rst

@@ -66,10 +66,14 @@ Alternatively, you can install build dependencies on your local system and then
     mkdir -p "${GOPATH}/src/github.com/zrepl/zrepl"
     git clone https://github.com/zrepl/zrepl.git "${GOPATH}/src/github.com/zrepl/zrepl"
     cd "${GOPATH}/src/github.com/zrepl/zrepl"
+    python3 -m venv3
+    source venv3/bin/activate
     ./lazy.sh devsetup
     make vendordeps release
 
-Build results are located in the ``artifacts/`` directory.
+The Python venv is used for the documentation build dependencies.
+If you just want to build the zrepl binary, leave it out and use `./lazy.sh godep` instead.
+Either way, all build results are located in the ``artifacts/`` directory.
 
 .. NOTE::
 

lazy.sh

@@ -25,23 +25,26 @@ fi
 
 CHECKOUTPATH="${GOPATH}/src/github.com/zrepl/zrepl"
 
-builddep() {
+godep() {
-    step "Install build depdencies using 'go get' to \$GOPATH/bin"
+    step "Install go dep using 'go get' to \$GOPATH/bin"
-    go get -u golang.org/x/tools/cmd/stringer
     go get -u github.com/golang/dep/cmd/dep
-    go get -u github.com/golang/protobuf/protoc-gen-go
+    if ! type dep ; then
-    go get -u github.com/alvaroloes/enumer
+        echo "Unable to install go dep" 1>&2
-    if ! type stringer || ! type dep || ! type protoc-gen-go || ! type enumer ; then
+        exit 1
+    fi
+    step "Fetching dependencies using 'dep ensure'"
+    dep ensure -v -vendor-only
+    step "go install build dependencies fetched using dep"
+    # these will be in the vendor directory
+    go build -o "$GOPATH/bin/stringer"      ./vendor/golang.org/x/tools/cmd/stringer
+    go build -o "$GOPATH/bin/protoc-gen-go" ./vendor/github.com/golang/protobuf/protoc-gen-go
+    go build -o "$GOPATH/bin/enumer"        ./vendor/github.com/alvaroloes/enumer
+    if ! type stringer || ! type protoc-gen-go || ! type enumer ; then
         echo "Installed dependencies but can't find them in \$PATH, adjust it to contain \$GOPATH/bin" 1>&2
         exit 1
     fi
 }
 
-godep() {
-    step "Fetching dependencies using 'dep ensure'"
-    dep ensure
-}
-
 docdep() {
     if ! type pip3; then
         step "pip3 binary not installed or not in \$PATH" 1>&2
@@ -62,13 +65,13 @@ release() {
 
 for cmd in "$@"; do
     case "$cmd" in
-        builddep|godep|docdep|release_bins|docs)
+        godep|docdep|release_bins|docs)
             eval $cmd
             continue
             ;;
         devsetup)
             step "Installing development dependencies"
-            builddep
+            godep
             docdep
             step "Development dependencies installed"
             continue

replication/pdu/pdu.pb.go

@@ -3,11 +3,9 @@
 
 package pdu
 
-import (
+import proto "github.com/golang/protobuf/proto"
-	fmt "fmt"
+import fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
+import math "math"
-	math "math"
-)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -31,7 +29,6 @@ var FilesystemVersion_VersionType_name = map[int32]string{
 	0: "Snapshot",
 	1: "Bookmark",
 }
-
 var FilesystemVersion_VersionType_value = map[string]int32{
 	"Snapshot": 0,
 	"Bookmark": 1,
@@ -40,9 +37,8 @@ var FilesystemVersion_VersionType_value = map[string]int32{
 func (x FilesystemVersion_VersionType) String() string {
 	return proto.EnumName(FilesystemVersion_VersionType_name, int32(x))
 }
-
 func (FilesystemVersion_VersionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{5, 0}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{5, 0}
 }
 
 type ListFilesystemReq struct {
@@ -55,17 +51,16 @@ func (m *ListFilesystemReq) Reset()         { *m = ListFilesystemReq{} }
 func (m *ListFilesystemReq) String() string { return proto.CompactTextString(m) }
 func (*ListFilesystemReq) ProtoMessage()    {}
 func (*ListFilesystemReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{0}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{0}
 }
-
 func (m *ListFilesystemReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFilesystemReq.Unmarshal(m, b)
 }
 func (m *ListFilesystemReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFilesystemReq.Marshal(b, m, deterministic)
 }
-func (m *ListFilesystemReq) XXX_Merge(src proto.Message) {
+func (dst *ListFilesystemReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFilesystemReq.Merge(m, src)
+	xxx_messageInfo_ListFilesystemReq.Merge(dst, src)
 }
 func (m *ListFilesystemReq) XXX_Size() int {
 	return xxx_messageInfo_ListFilesystemReq.Size(m)
@@ -87,17 +82,16 @@ func (m *ListFilesystemRes) Reset()         { *m = ListFilesystemRes{} }
 func (m *ListFilesystemRes) String() string { return proto.CompactTextString(m) }
 func (*ListFilesystemRes) ProtoMessage()    {}
 func (*ListFilesystemRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{1}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{1}
 }
-
 func (m *ListFilesystemRes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFilesystemRes.Unmarshal(m, b)
 }
 func (m *ListFilesystemRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFilesystemRes.Marshal(b, m, deterministic)
 }
-func (m *ListFilesystemRes) XXX_Merge(src proto.Message) {
+func (dst *ListFilesystemRes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFilesystemRes.Merge(m, src)
+	xxx_messageInfo_ListFilesystemRes.Merge(dst, src)
 }
 func (m *ListFilesystemRes) XXX_Size() int {
 	return xxx_messageInfo_ListFilesystemRes.Size(m)
@@ -127,17 +121,16 @@ func (m *Filesystem) Reset()         { *m = Filesystem{} }
 func (m *Filesystem) String() string { return proto.CompactTextString(m) }
 func (*Filesystem) ProtoMessage()    {}
 func (*Filesystem) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{2}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{2}
 }
-
 func (m *Filesystem) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Filesystem.Unmarshal(m, b)
 }
 func (m *Filesystem) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Filesystem.Marshal(b, m, deterministic)
 }
-func (m *Filesystem) XXX_Merge(src proto.Message) {
+func (dst *Filesystem) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Filesystem.Merge(m, src)
+	xxx_messageInfo_Filesystem.Merge(dst, src)
 }
 func (m *Filesystem) XXX_Size() int {
 	return xxx_messageInfo_Filesystem.Size(m)
@@ -173,17 +166,16 @@ func (m *ListFilesystemVersionsReq) Reset()         { *m = ListFilesystemVersion
 func (m *ListFilesystemVersionsReq) String() string { return proto.CompactTextString(m) }
 func (*ListFilesystemVersionsReq) ProtoMessage()    {}
 func (*ListFilesystemVersionsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{3}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{3}
 }
-
 func (m *ListFilesystemVersionsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFilesystemVersionsReq.Unmarshal(m, b)
 }
 func (m *ListFilesystemVersionsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFilesystemVersionsReq.Marshal(b, m, deterministic)
 }
-func (m *ListFilesystemVersionsReq) XXX_Merge(src proto.Message) {
+func (dst *ListFilesystemVersionsReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFilesystemVersionsReq.Merge(m, src)
+	xxx_messageInfo_ListFilesystemVersionsReq.Merge(dst, src)
 }
 func (m *ListFilesystemVersionsReq) XXX_Size() int {
 	return xxx_messageInfo_ListFilesystemVersionsReq.Size(m)
@@ -212,17 +204,16 @@ func (m *ListFilesystemVersionsRes) Reset()         { *m = ListFilesystemVersion
 func (m *ListFilesystemVersionsRes) String() string { return proto.CompactTextString(m) }
 func (*ListFilesystemVersionsRes) ProtoMessage()    {}
 func (*ListFilesystemVersionsRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{4}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{4}
 }
-
 func (m *ListFilesystemVersionsRes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ListFilesystemVersionsRes.Unmarshal(m, b)
 }
 func (m *ListFilesystemVersionsRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ListFilesystemVersionsRes.Marshal(b, m, deterministic)
 }
-func (m *ListFilesystemVersionsRes) XXX_Merge(src proto.Message) {
+func (dst *ListFilesystemVersionsRes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ListFilesystemVersionsRes.Merge(m, src)
+	xxx_messageInfo_ListFilesystemVersionsRes.Merge(dst, src)
 }
 func (m *ListFilesystemVersionsRes) XXX_Size() int {
 	return xxx_messageInfo_ListFilesystemVersionsRes.Size(m)
@@ -255,17 +246,16 @@ func (m *FilesystemVersion) Reset()         { *m = FilesystemVersion{} }
 func (m *FilesystemVersion) String() string { return proto.CompactTextString(m) }
 func (*FilesystemVersion) ProtoMessage()    {}
 func (*FilesystemVersion) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{5}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{5}
 }
-
 func (m *FilesystemVersion) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FilesystemVersion.Unmarshal(m, b)
 }
 func (m *FilesystemVersion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FilesystemVersion.Marshal(b, m, deterministic)
 }
-func (m *FilesystemVersion) XXX_Merge(src proto.Message) {
+func (dst *FilesystemVersion) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FilesystemVersion.Merge(m, src)
+	xxx_messageInfo_FilesystemVersion.Merge(dst, src)
 }
 func (m *FilesystemVersion) XXX_Size() int {
 	return xxx_messageInfo_FilesystemVersion.Size(m)
@@ -336,17 +326,16 @@ func (m *SendReq) Reset()         { *m = SendReq{} }
 func (m *SendReq) String() string { return proto.CompactTextString(m) }
 func (*SendReq) ProtoMessage()    {}
 func (*SendReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{6}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{6}
 }
-
 func (m *SendReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendReq.Unmarshal(m, b)
 }
 func (m *SendReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendReq.Marshal(b, m, deterministic)
 }
-func (m *SendReq) XXX_Merge(src proto.Message) {
+func (dst *SendReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendReq.Merge(m, src)
+	xxx_messageInfo_SendReq.Merge(dst, src)
 }
 func (m *SendReq) XXX_Size() int {
 	return xxx_messageInfo_SendReq.Size(m)
@@ -418,17 +407,16 @@ func (m *Property) Reset()         { *m = Property{} }
 func (m *Property) String() string { return proto.CompactTextString(m) }
 func (*Property) ProtoMessage()    {}
 func (*Property) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{7}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{7}
 }
-
 func (m *Property) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Property.Unmarshal(m, b)
 }
 func (m *Property) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Property.Marshal(b, m, deterministic)
 }
-func (m *Property) XXX_Merge(src proto.Message) {
+func (dst *Property) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Property.Merge(m, src)
+	xxx_messageInfo_Property.Merge(dst, src)
 }
 func (m *Property) XXX_Size() int {
 	return xxx_messageInfo_Property.Size(m)
@@ -469,17 +457,16 @@ func (m *SendRes) Reset()         { *m = SendRes{} }
 func (m *SendRes) String() string { return proto.CompactTextString(m) }
 func (*SendRes) ProtoMessage()    {}
 func (*SendRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{8}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{8}
 }
-
 func (m *SendRes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SendRes.Unmarshal(m, b)
 }
 func (m *SendRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SendRes.Marshal(b, m, deterministic)
 }
-func (m *SendRes) XXX_Merge(src proto.Message) {
+func (dst *SendRes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SendRes.Merge(m, src)
+	xxx_messageInfo_SendRes.Merge(dst, src)
 }
 func (m *SendRes) XXX_Size() int {
 	return xxx_messageInfo_SendRes.Size(m)
@@ -524,17 +511,16 @@ func (m *ReceiveReq) Reset()         { *m = ReceiveReq{} }
 func (m *ReceiveReq) String() string { return proto.CompactTextString(m) }
 func (*ReceiveReq) ProtoMessage()    {}
 func (*ReceiveReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{9}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{9}
 }
-
 func (m *ReceiveReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceiveReq.Unmarshal(m, b)
 }
 func (m *ReceiveReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceiveReq.Marshal(b, m, deterministic)
 }
-func (m *ReceiveReq) XXX_Merge(src proto.Message) {
+func (dst *ReceiveReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceiveReq.Merge(m, src)
+	xxx_messageInfo_ReceiveReq.Merge(dst, src)
 }
 func (m *ReceiveReq) XXX_Size() int {
 	return xxx_messageInfo_ReceiveReq.Size(m)
@@ -569,17 +555,16 @@ func (m *ReceiveRes) Reset()         { *m = ReceiveRes{} }
 func (m *ReceiveRes) String() string { return proto.CompactTextString(m) }
 func (*ReceiveRes) ProtoMessage()    {}
 func (*ReceiveRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{10}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{10}
 }
-
 func (m *ReceiveRes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReceiveRes.Unmarshal(m, b)
 }
 func (m *ReceiveRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReceiveRes.Marshal(b, m, deterministic)
 }
-func (m *ReceiveRes) XXX_Merge(src proto.Message) {
+func (dst *ReceiveRes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReceiveRes.Merge(m, src)
+	xxx_messageInfo_ReceiveRes.Merge(dst, src)
 }
 func (m *ReceiveRes) XXX_Size() int {
 	return xxx_messageInfo_ReceiveRes.Size(m)
@@ -603,17 +588,16 @@ func (m *DestroySnapshotsReq) Reset()         { *m = DestroySnapshotsReq{} }
 func (m *DestroySnapshotsReq) String() string { return proto.CompactTextString(m) }
 func (*DestroySnapshotsReq) ProtoMessage()    {}
 func (*DestroySnapshotsReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{11}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{11}
 }
-
 func (m *DestroySnapshotsReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DestroySnapshotsReq.Unmarshal(m, b)
 }
 func (m *DestroySnapshotsReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DestroySnapshotsReq.Marshal(b, m, deterministic)
 }
-func (m *DestroySnapshotsReq) XXX_Merge(src proto.Message) {
+func (dst *DestroySnapshotsReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DestroySnapshotsReq.Merge(m, src)
+	xxx_messageInfo_DestroySnapshotsReq.Merge(dst, src)
 }
 func (m *DestroySnapshotsReq) XXX_Size() int {
 	return xxx_messageInfo_DestroySnapshotsReq.Size(m)
@@ -650,17 +634,16 @@ func (m *DestroySnapshotRes) Reset()         { *m = DestroySnapshotRes{} }
 func (m *DestroySnapshotRes) String() string { return proto.CompactTextString(m) }
 func (*DestroySnapshotRes) ProtoMessage()    {}
 func (*DestroySnapshotRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{12}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{12}
 }
-
 func (m *DestroySnapshotRes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DestroySnapshotRes.Unmarshal(m, b)
 }
 func (m *DestroySnapshotRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DestroySnapshotRes.Marshal(b, m, deterministic)
 }
-func (m *DestroySnapshotRes) XXX_Merge(src proto.Message) {
+func (dst *DestroySnapshotRes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DestroySnapshotRes.Merge(m, src)
+	xxx_messageInfo_DestroySnapshotRes.Merge(dst, src)
 }
 func (m *DestroySnapshotRes) XXX_Size() int {
 	return xxx_messageInfo_DestroySnapshotRes.Size(m)
@@ -696,17 +679,16 @@ func (m *DestroySnapshotsRes) Reset()         { *m = DestroySnapshotsRes{} }
 func (m *DestroySnapshotsRes) String() string { return proto.CompactTextString(m) }
 func (*DestroySnapshotsRes) ProtoMessage()    {}
 func (*DestroySnapshotsRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{13}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{13}
 }
-
 func (m *DestroySnapshotsRes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_DestroySnapshotsRes.Unmarshal(m, b)
 }
 func (m *DestroySnapshotsRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_DestroySnapshotsRes.Marshal(b, m, deterministic)
 }
-func (m *DestroySnapshotsRes) XXX_Merge(src proto.Message) {
+func (dst *DestroySnapshotsRes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DestroySnapshotsRes.Merge(m, src)
+	xxx_messageInfo_DestroySnapshotsRes.Merge(dst, src)
 }
 func (m *DestroySnapshotsRes) XXX_Size() int {
 	return xxx_messageInfo_DestroySnapshotsRes.Size(m)
@@ -739,17 +721,16 @@ func (m *ReplicationCursorReq) Reset()         { *m = ReplicationCursorReq{} }
 func (m *ReplicationCursorReq) String() string { return proto.CompactTextString(m) }
 func (*ReplicationCursorReq) ProtoMessage()    {}
 func (*ReplicationCursorReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{14}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{14}
 }
-
 func (m *ReplicationCursorReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReplicationCursorReq.Unmarshal(m, b)
 }
 func (m *ReplicationCursorReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReplicationCursorReq.Marshal(b, m, deterministic)
 }
-func (m *ReplicationCursorReq) XXX_Merge(src proto.Message) {
+func (dst *ReplicationCursorReq) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReplicationCursorReq.Merge(m, src)
+	xxx_messageInfo_ReplicationCursorReq.Merge(dst, src)
 }
 func (m *ReplicationCursorReq) XXX_Size() int {
 	return xxx_messageInfo_ReplicationCursorReq.Size(m)
@@ -888,17 +869,16 @@ func (m *ReplicationCursorReq_GetOp) Reset()         { *m = ReplicationCursorReq
 func (m *ReplicationCursorReq_GetOp) String() string { return proto.CompactTextString(m) }
 func (*ReplicationCursorReq_GetOp) ProtoMessage()    {}
 func (*ReplicationCursorReq_GetOp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{14, 0}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{14, 0}
 }
-
 func (m *ReplicationCursorReq_GetOp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReplicationCursorReq_GetOp.Unmarshal(m, b)
 }
 func (m *ReplicationCursorReq_GetOp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReplicationCursorReq_GetOp.Marshal(b, m, deterministic)
 }
-func (m *ReplicationCursorReq_GetOp) XXX_Merge(src proto.Message) {
+func (dst *ReplicationCursorReq_GetOp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReplicationCursorReq_GetOp.Merge(m, src)
+	xxx_messageInfo_ReplicationCursorReq_GetOp.Merge(dst, src)
 }
 func (m *ReplicationCursorReq_GetOp) XXX_Size() int {
 	return xxx_messageInfo_ReplicationCursorReq_GetOp.Size(m)
@@ -920,17 +900,16 @@ func (m *ReplicationCursorReq_SetOp) Reset()         { *m = ReplicationCursorReq
 func (m *ReplicationCursorReq_SetOp) String() string { return proto.CompactTextString(m) }
 func (*ReplicationCursorReq_SetOp) ProtoMessage()    {}
 func (*ReplicationCursorReq_SetOp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{14, 1}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{14, 1}
 }
-
 func (m *ReplicationCursorReq_SetOp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReplicationCursorReq_SetOp.Unmarshal(m, b)
 }
 func (m *ReplicationCursorReq_SetOp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReplicationCursorReq_SetOp.Marshal(b, m, deterministic)
 }
-func (m *ReplicationCursorReq_SetOp) XXX_Merge(src proto.Message) {
+func (dst *ReplicationCursorReq_SetOp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReplicationCursorReq_SetOp.Merge(m, src)
+	xxx_messageInfo_ReplicationCursorReq_SetOp.Merge(dst, src)
 }
 func (m *ReplicationCursorReq_SetOp) XXX_Size() int {
 	return xxx_messageInfo_ReplicationCursorReq_SetOp.Size(m)
@@ -962,17 +941,16 @@ func (m *ReplicationCursorRes) Reset()         { *m = ReplicationCursorRes{} }
 func (m *ReplicationCursorRes) String() string { return proto.CompactTextString(m) }
 func (*ReplicationCursorRes) ProtoMessage()    {}
 func (*ReplicationCursorRes) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5e683fe3d6db3968, []int{15}
+	return fileDescriptor_pdu_fe566e6b212fcf8d, []int{15}
 }
-
 func (m *ReplicationCursorRes) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ReplicationCursorRes.Unmarshal(m, b)
 }
 func (m *ReplicationCursorRes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ReplicationCursorRes.Marshal(b, m, deterministic)
 }
-func (m *ReplicationCursorRes) XXX_Merge(src proto.Message) {
+func (dst *ReplicationCursorRes) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReplicationCursorRes.Merge(m, src)
+	xxx_messageInfo_ReplicationCursorRes.Merge(dst, src)
 }
 func (m *ReplicationCursorRes) XXX_Size() int {
 	return xxx_messageInfo_ReplicationCursorRes.Size(m)
@@ -1089,7 +1067,6 @@ func _ReplicationCursorRes_OneofSizer(msg proto.Message) (n int) {
 }
 
 func init() {
-	proto.RegisterEnum("pdu.FilesystemVersion_VersionType", FilesystemVersion_VersionType_name, FilesystemVersion_VersionType_value)
 	proto.RegisterType((*ListFilesystemReq)(nil), "pdu.ListFilesystemReq")
 	proto.RegisterType((*ListFilesystemRes)(nil), "pdu.ListFilesystemRes")
 	proto.RegisterType((*Filesystem)(nil), "pdu.Filesystem")
@@ -1108,11 +1085,12 @@ func init() {
 	proto.RegisterType((*ReplicationCursorReq_GetOp)(nil), "pdu.ReplicationCursorReq.GetOp")
 	proto.RegisterType((*ReplicationCursorReq_SetOp)(nil), "pdu.ReplicationCursorReq.SetOp")
 	proto.RegisterType((*ReplicationCursorRes)(nil), "pdu.ReplicationCursorRes")
+	proto.RegisterEnum("pdu.FilesystemVersion_VersionType", FilesystemVersion_VersionType_name, FilesystemVersion_VersionType_value)
 }
 
-func init() { proto.RegisterFile("pdu.proto", fileDescriptor_5e683fe3d6db3968) }
+func init() { proto.RegisterFile("pdu.proto", fileDescriptor_pdu_fe566e6b212fcf8d) }
 
-var fileDescriptor_5e683fe3d6db3968 = []byte{
+var fileDescriptor_pdu_fe566e6b212fcf8d = []byte{
 	// 659 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdb, 0x6e, 0x13, 0x31,
 	0x10, 0xcd, 0xe6, 0xba, 0x99, 0x94, 0x5e, 0xdc, 0xaa, 0x2c, 0x15, 0x82, 0xc8, 0xbc, 0x04, 0x24,