Make zfs.DatasetPath json.Marshaler and json.Unmarshaler

Had to resort to using pointers to zfs.DatasetPath everywhere... Should find a better solution for that.
2017-08-06 13:04:29 +02:00
parent 2ce07c9342
commit cba083cadf
11 changed files with 75 additions and 57 deletions
@@ -1,7 +1,14 @@
 package rpc

-import "io"
-import "github.com/zrepl/zrepl/zfs"
+import (
+	"encoding/json"
+	"io"
+
+	"github.com/zrepl/zrepl/zfs"
+)
+
+var _ json.Marshaler = &zfs.DatasetPath{}
+var _ json.Unmarshaler = &zfs.DatasetPath{}

 type RequestId [16]byte
 type RequestType uint8
@@ -26,11 +33,11 @@ type FilesystemRequest struct {
 }

 type FilesystemVersionsRequest struct {
-	Filesystem zfs.DatasetPath
+	Filesystem *zfs.DatasetPath
 }

 type InitialTransferRequest struct {
-	Filesystem        zfs.DatasetPath
+	Filesystem        *zfs.DatasetPath
 	FilesystemVersion zfs.FilesystemVersion
 }

@@ -39,7 +46,7 @@ func (r InitialTransferRequest) Respond(snapshotReader io.Reader) {
 }

 type IncrementalTransferRequest struct {
-	Filesystem zfs.DatasetPath
+	Filesystem *zfs.DatasetPath
 	From       zfs.FilesystemVersion
 	To         zfs.FilesystemVersion
 }