config: no-field for replication anymore

It's closer to the original config and we don't want users to specify
'filesystems' and similar multiple times in a single job definition.

config/config.go

@@ -24,7 +24,8 @@ type JobEnum struct {
 type PushJob struct {
 	Type         string                `yaml:"type"`
 	Name         string                `yaml:"name"`
-	Replication  PushReplication       `yaml:"replication"`
+	Connect     ConnectEnum     `yaml:"connect"`
+	Filesystems FilesystemsFilter `yaml:"filesystems"`
 	Snapshotting Snapshotting          `yaml:"snapshotting"`
 	Pruning      PruningSenderReceiver `yaml:"pruning"`
 	Debug        JobDebugSettings      `yaml:"debug,optional"`
@@ -33,28 +34,26 @@ type PushJob struct {
 type SinkJob struct {
 	Type        string           `yaml:"type"`
 	Name        string           `yaml:"name"`
-	Replication SinkReplication  `yaml:"replication"`
+	RootDataset string    `yaml:"root_dataset"`
+	Serve       ServeEnum `yaml:"serve"`
 	Debug       JobDebugSettings `yaml:"debug,optional"`
 }
 
 type PullJob struct {
 	Type        string                `yaml:"type"`
 	Name        string                `yaml:"name"`
-	Replication PullReplication       `yaml:"replication"`
-	Pruning     PruningSenderReceiver `yaml:"pruning"`
-	Debug       JobDebugSettings      `yaml:"debug,optional"`
-}
-
-type PullReplication struct {
 	Connect     ConnectEnum   `yaml:"connect"`
 	RootDataset string        `yaml:"root_dataset"`
 	Interval    time.Duration `yaml:"interval,positive"`
+	Pruning     PruningSenderReceiver `yaml:"pruning"`
+	Debug       JobDebugSettings      `yaml:"debug,optional"`
 }
 
 type SourceJob struct {
 	Type         string            `yaml:"type"`
 	Name         string            `yaml:"name"`
-	Replication  SourceReplication `yaml:"replication"`
+	Serve       ServeEnum       `yaml:"serve"`
+	Filesystems FilesystemsFilter `yaml:"filesystems"`
 	Snapshotting Snapshotting      `yaml:"snapshotting"`
 	Pruning      PruningLocal      `yaml:"pruning"`
 	Debug        JobDebugSettings  `yaml:"debug,optional"`
@@ -63,31 +62,14 @@ type SourceJob struct {
 type LocalJob struct {
 	Type         string                `yaml:"type"`
 	Name         string                `yaml:"name"`
-	Replication  LocalReplication      `yaml:"replication"`
+	Filesystems FilesystemsFilter `yaml:"filesystems"`
+	RootDataset string          `yaml:"root_dataset"`
 	Snapshotting Snapshotting          `yaml:"snapshotting"`
 	Pruning      PruningSenderReceiver `yaml:"pruning"`
 	Debug        JobDebugSettings      `yaml:"debug,optional"`
 }
 
-type PushReplication struct {
+type FilesystemsFilter map[string]bool
-	Connect     ConnectEnum     `yaml:"connect"`
-	Filesystems map[string]bool `yaml:"filesystems"`
-}
-
-type SinkReplication struct {
-	RootDataset string    `yaml:"root_dataset"`
-	Serve       ServeEnum `yaml:"serve"`
-}
-
-type SourceReplication struct {
-	Serve       ServeEnum       `yaml:"serve"`
-	Filesystems map[string]bool `yaml:"filesystems"`
-}
-
-type LocalReplication struct {
-	Filesystems map[string]bool `yaml:"filesystems"`
-	RootDataset string          `yaml:"root_dataset"`
-}
 
 type Snapshotting struct {
 	SnapshotPrefix string        `yaml:"snapshot_prefix"`

config/config_minimal_test.go

@@ -18,7 +18,6 @@ jobs:
   type: push
   # snapshot the filesystems matched by the left-hand-side of the mapping
   # every 10m with zrepl_ as prefix
-  replication:
   connect:
     type: tcp
     address: localhost:2342

config/config_rpc_test.go

@@ -11,7 +11,6 @@ func TestRPC(t *testing.T) {
 jobs:
 - name: pull_servers
   type: pull
-  replication:
   connect:
     type: tcp
     address: "server1.foo.bar:8888"
@@ -28,7 +27,6 @@ jobs:
 
 - name: pull_servers2
   type: pull
-  replication:
   connect:
     type: tcp
     address: "server1.foo.bar:8888"
@@ -45,7 +43,6 @@ jobs:
 
 - type: sink
   name: "laptop_sink"
-  replication:
   root_dataset: "pool2/backup_laptops"
   serve:
     type: tcp
@@ -58,9 +55,9 @@ jobs:
 
 `)
 
-	assert.Equal(t, 20*time.Second, conf.Jobs[0].Ret.(*PullJob).Replication.Connect.Ret.(*TCPConnect).RPC.Timeout)
+	assert.Equal(t, 20*time.Second, conf.Jobs[0].Ret.(*PullJob).Connect.Ret.(*TCPConnect).RPC.Timeout)
-	assert.Equal(t, uint32(0xabcd), conf.Jobs[1].Ret.(*PullJob).Replication.Connect.Ret.(*TCPConnect).RPC.TxChunkSize)
+	assert.Equal(t, uint32(0xabcd), conf.Jobs[1].Ret.(*PullJob).Connect.Ret.(*TCPConnect).RPC.TxChunkSize)
-	assert.Equal(t, uint32(0x2342), conf.Jobs[2].Ret.(*SinkJob).Replication.Serve.Ret.(*TCPServe).RPC.RxStructuredMaxLen)
+	assert.Equal(t, uint32(0x2342), conf.Jobs[2].Ret.(*SinkJob).Serve.Ret.(*TCPServe).RPC.RxStructuredMaxLen)
 	defConf := RPCConfig{}
 	Default(&defConf)
 	assert.Equal(t, defConf.Timeout, conf.Global.RPC.Timeout)

config/samples/local.yml

@@ -4,7 +4,6 @@ jobs:
   type: local
   # snapshot the filesystems matched by the left-hand-side of the mapping
   # every 10m with zrepl_ as prefix
-  replication:
   filesystems: {
     "pool1/var/db<": true,
     "pool1/usr/home<": true,

config/samples/pull.yml

@@ -1,7 +1,6 @@
 jobs:
 - name: pull_servers
   type: pull
-  replication:
   connect:
     type: tls
     address: "server1.foo.bar:8888"

config/samples/pull_ssh.yml

@@ -2,7 +2,6 @@ jobs:
 
 - name: pull_servers
   type: pull
-  replication:
   connect:
     type: ssh+stdinserver
     host: app-srv.example.com

config/samples/push.yml

@@ -1,14 +1,13 @@
 jobs:
   - type: push
     name: "push"
-    replication:
-      connect:
-        type: tcp
-        address: "backup-server.foo.bar:8888"
     filesystems: {
       "<": true,
       "tmp": false
     }
+    connect:
+      type: tcp
+      address: "backup-server.foo.bar:8888"
     snapshotting:
       snapshot_prefix: zrepl_
       interval: 10m

config/samples/sink.yml

@@ -1,7 +1,6 @@
 jobs:
   - type: sink
     name: "laptop_sink"
-    replication:
     root_dataset: "pool2/backup_laptops"
     serve:
       type: tls

config/samples/source.yml

@@ -1,7 +1,6 @@
 jobs:
 - name: pull_source
   type: source
-  replication:
   serve:
     type: tcp
     listen: "0.0.0.0:8888"

config/samples/source_ssh.yml

@@ -1,7 +1,6 @@
 jobs:
 - name: pull_source
   type: source
-  replication:
   serve:
     type: stdinserver
     client_identity: "client1"

daemon/job/push.go

@@ -29,12 +29,12 @@ func PushFromConfig(g *config.Global, in *config.PushJob) (j *Push, err error) {
 	j = &Push{}
 	j.name = in.Name
 
-	j.clientFactory, err = connecter.FromConfig(g, in.Replication.Connect)
+	j.clientFactory, err = connecter.FromConfig(g, in.Connect)
 	if err != nil {
 		return nil, errors.Wrap(err, "cannot build client")
 	}
 
-	if j.fsfilter, err = filters.DatasetMapFilterFromConfig(in.Replication.Filesystems); err != nil {
+	if j.fsfilter, err = filters.DatasetMapFilterFromConfig(in.Filesystems); err != nil {
 		return nil, errors.Wrap(err, "cannnot build filesystem filter")
 	}
 

daemon/job/sink.go

@@ -25,12 +25,12 @@ func SinkFromConfig(g *config.Global, in *config.SinkJob) (s *Sink, err error) {
 	// FIXME multi client support
 
 	s = &Sink{name: in.Name}
-	if s.l, s.rpcConf, err = serve.FromConfig(g, in.Replication.Serve); err != nil {
+	if s.l, s.rpcConf, err = serve.FromConfig(g, in.Serve); err != nil {
 		return nil, errors.Wrap(err, "cannot build server")
 	}
 
 	fsmap := filters.NewDatasetMapFilter(1, false) // FIXME multi-client support
-	if err := fsmap.Add("<", in.Replication.RootDataset); err != nil {
+	if err := fsmap.Add("<", in.RootDataset); err != nil {
 		return nil, errors.Wrap(err, "unexpected error: cannot build filesystem mapping")
 	}
 	s.fsmap = fsmap