format source tree using goimports

Makefile

@@ -30,6 +30,9 @@ generate: #not part of the build, must do that manually
 	protoc -I=replication/logic/pdu --go_out=plugins=grpc:replication/logic/pdu replication/logic/pdu/pdu.proto
 	go generate -x ./...
 
+format:
+	goimports -srcdir . -local 'github.com/zrepl/zrepl' -w $(shell find . -type f -name '*.go' -not -path "./vendor/*")
+
 build:
 	@echo "INFO: In case of missing dependencies, run 'make vendordeps'"
 	$(GO_BUILD) -o "$(ARTIFACTDIR)/zrepl"

build/build.go

@@ -11,7 +11,9 @@
 package main
 
 import (
+	"fmt"
 	_ "fmt"
+
 	_ "github.com/alvaroloes/enumer"
 	_ "github.com/golang/protobuf/protoc-gen-go"
 	_ "golang.org/x/tools/cmd/stringer"

cli/cli.go

@@ -2,10 +2,12 @@ package cli
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
 	"github.com/zrepl/zrepl/config"
-	"os"
 )
 
 var rootArgs struct {
@@ -110,7 +112,6 @@ func addSubcommandToCobraCmd(c *cobra.Command, s *Subcommand) {
 	c.AddCommand(&cmd)
 }
 
-
 func Run() {
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)

client/configcheck.go

@@ -3,16 +3,18 @@ package client
 import (
 	"encoding/json"
 	"fmt"
+	"os"
+
 	"github.com/kr/pretty"
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 	"github.com/zrepl/yaml-config"
+
 	"github.com/zrepl/zrepl/cli"
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon/job"
 	"github.com/zrepl/zrepl/daemon/logging"
 	"github.com/zrepl/zrepl/logger"
-	"os"
 )
 
 var configcheckArgs struct {
@@ -71,7 +73,6 @@ var ConfigcheckCmd = &cli.Subcommand{
 			}
 		}
 
-
 		whatMap := map[string]func(){
 			"all": func() {
 				o := struct {
@@ -109,4 +110,3 @@ var ConfigcheckCmd = &cli.Subcommand{
 		}
 	},
 }
-

client/jsonclient.go

@@ -4,10 +4,11 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"github.com/pkg/errors"
 	"io"
 	"net"
 	"net/http"
+
+	"github.com/pkg/errors"
 )
 
 func controlHttpClient(sockpath string) (client http.Client, err error) {

client/migrate.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
+
 	"github.com/zrepl/zrepl/zfs"
 
 	"github.com/zrepl/zrepl/cli"

client/pprof.go

@@ -2,11 +2,12 @@ package client
 
 import (
 	"errors"
+	"log"
+	"os"
+
 	"github.com/zrepl/zrepl/cli"
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon"
-	"log"
-	"os"
 )
 
 var pprofArgs struct {

client/signal.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"github.com/pkg/errors"
+
 	"github.com/zrepl/zrepl/cli"
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon"

client/status.go

@@ -2,15 +2,6 @@ package client
 
 import (
 	"fmt"
-	"github.com/gdamore/tcell/termbox"
-	"github.com/pkg/errors"
-	"github.com/spf13/pflag"
-	"github.com/zrepl/yaml-config"
-	"github.com/zrepl/zrepl/cli"
-	"github.com/zrepl/zrepl/daemon"
-	"github.com/zrepl/zrepl/daemon/job"
-	"github.com/zrepl/zrepl/daemon/pruner"
-	"github.com/zrepl/zrepl/replication/report"
 	"io"
 	"math"
 	"net/http"
@@ -19,6 +10,17 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/gdamore/tcell/termbox"
+	"github.com/pkg/errors"
+	"github.com/spf13/pflag"
+	"github.com/zrepl/yaml-config"
+
+	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/daemon/job"
+	"github.com/zrepl/zrepl/daemon/pruner"
+	"github.com/zrepl/zrepl/replication/report"
 )
 
 type byteProgressMeasurement struct {
@@ -53,8 +55,7 @@ func (p *bytesProgressHistory) Update(currentVal int64) (bytesPerSecondAvg int64
 		return 0, 0
 	}
 
-
-	deltaV := currentVal - p.last.val;
+	deltaV := currentVal - p.last.val
 	deltaT := time.Now().Sub(p.last.time)
 	rate := float64(deltaV) / deltaT.Seconds()
 
@@ -159,7 +160,6 @@ func (t *tui) addIndent(indent int) {
 	t.moveLine(0, 0)
 }
 
-
 var statusFlags struct {
 	Raw bool
 }
@@ -471,7 +471,8 @@ func (t *tui) renderPrunerReport(r *pruner.Report) {
 	}
 
 	switch state {
-	case pruner.Plan: fallthrough
+	case pruner.Plan:
+		fallthrough
 	case pruner.PlanErr:
 		return
 	}
@@ -560,7 +561,6 @@ func rightPad(str string, length int, pad string) string {
 	return str + times(pad, length-len(str))
 }
 
-
 func leftPad(str string, length int, pad string) string {
 	if len(str) > length {
 		return str[len(str)-length:]

client/stdinserver.go

@@ -1,13 +1,15 @@
 package client
 
 import (
-	"github.com/zrepl/zrepl/cli"
 	"os"
 
+	"github.com/problame/go-netssh"
+
+	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/config"
+
 	"context"
 	"errors"
-	"github.com/problame/go-netssh"
-	"github.com/zrepl/zrepl/config"
 	"log"
 	"path"
 )

client/testcmd.go

@@ -2,8 +2,10 @@ package client
 
 import (
 	"fmt"
+
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
+
 	"github.com/zrepl/zrepl/cli"
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon/filters"
@@ -51,8 +53,10 @@ func runTestFilterCmd(subcommand *cli.Subcommand, args []string) error {
 		return err
 	}
 	switch j := job.Ret.(type) {
-	case *config.SourceJob: confFilter = j.Filesystems
-	case *config.PushJob: confFilter = j.Filesystems
+	case *config.SourceJob:
+		confFilter = j.Filesystems
+	case *config.PushJob:
+		confFilter = j.Filesystems
 	default:
 		return fmt.Errorf("job type %T does not have filesystems filter", j)
 	}

client/version.go

@@ -2,12 +2,14 @@ package client
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/spf13/pflag"
+
 	"github.com/zrepl/zrepl/cli"
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon"
 	"github.com/zrepl/zrepl/version"
-	"os"
 )
 
 var versionArgs struct {

config/config.go

@@ -2,8 +2,6 @@ package config
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
-	"github.com/zrepl/yaml-config"
 	"io/ioutil"
 	"log/syslog"
 	"os"
@@ -11,6 +9,9 @@ import (
 	"regexp"
 	"strconv"
 	"time"
+
+	"github.com/pkg/errors"
+	"github.com/zrepl/yaml-config"
 )
 
 type Config struct {
@@ -34,11 +35,16 @@ type JobEnum struct {
 func (j JobEnum) Name() string {
 	var name string
 	switch v := j.Ret.(type) {
-	case *SnapJob: name = v.Name
-	case *PushJob: name = v.Name
-	case *SinkJob: name = v.Name
-	case *PullJob: name = v.Name
-	case *SourceJob: name = v.Name
+	case *SnapJob:
+		name = v.Name
+	case *PushJob:
+		name = v.Name
+	case *SinkJob:
+		name = v.Name
+	case *PullJob:
+		name = v.Name
+	case *SourceJob:
+		name = v.Name
 	default:
 		panic(fmt.Sprintf("unknown job type %T", v))
 	}
@@ -448,26 +454,46 @@ func (t *SyslogFacility) UnmarshalYAML(u func(interface{}, bool) error) (err err
 	}
 	var level syslog.Priority
 	switch s {
-		case "kern":     level = syslog.LOG_KERN
-		case "user":     level = syslog.LOG_USER
-		case "mail":     level = syslog.LOG_MAIL
-		case "daemon":   level = syslog.LOG_DAEMON
-		case "auth":     level = syslog.LOG_AUTH
-		case "syslog":   level = syslog.LOG_SYSLOG
-		case "lpr":      level = syslog.LOG_LPR
-		case "news":     level = syslog.LOG_NEWS
-		case "uucp":     level = syslog.LOG_UUCP
-		case "cron":     level = syslog.LOG_CRON
-		case "authpriv": level = syslog.LOG_AUTHPRIV
-		case "ftp":      level = syslog.LOG_FTP
-		case "local0":   level = syslog.LOG_LOCAL0
-		case "local1":   level = syslog.LOG_LOCAL1
-		case "local2":   level = syslog.LOG_LOCAL2
-		case "local3":   level = syslog.LOG_LOCAL3
-		case "local4":   level = syslog.LOG_LOCAL4
-		case "local5":   level = syslog.LOG_LOCAL5
-		case "local6":   level = syslog.LOG_LOCAL6
-		case "local7":   level = syslog.LOG_LOCAL7
+	case "kern":
+		level = syslog.LOG_KERN
+	case "user":
+		level = syslog.LOG_USER
+	case "mail":
+		level = syslog.LOG_MAIL
+	case "daemon":
+		level = syslog.LOG_DAEMON
+	case "auth":
+		level = syslog.LOG_AUTH
+	case "syslog":
+		level = syslog.LOG_SYSLOG
+	case "lpr":
+		level = syslog.LOG_LPR
+	case "news":
+		level = syslog.LOG_NEWS
+	case "uucp":
+		level = syslog.LOG_UUCP
+	case "cron":
+		level = syslog.LOG_CRON
+	case "authpriv":
+		level = syslog.LOG_AUTHPRIV
+	case "ftp":
+		level = syslog.LOG_FTP
+	case "local0":
+		level = syslog.LOG_LOCAL0
+	case "local1":
+		level = syslog.LOG_LOCAL1
+	case "local2":
+		level = syslog.LOG_LOCAL2
+	case "local3":
+		level = syslog.LOG_LOCAL3
+	case "local4":
+		level = syslog.LOG_LOCAL4
+	case "local5":
+		level = syslog.LOG_LOCAL5
+	case "local6":
+		level = syslog.LOG_LOCAL6
+	case "local7":
+		level = syslog.LOG_LOCAL7
 	default:
 		return fmt.Errorf("invalid syslog level: %q", s)
 	}

config/config_global_test.go

@@ -2,11 +2,12 @@ package config
 
 import (
 	"fmt"
+	"log/syslog"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/zrepl/yaml-config"
-	"log/syslog"
-	"testing"
 )
 
 func testValidGlobalSection(t *testing.T, s string) *Config {

config/config_minimal_test.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"testing"
+
 	"github.com/stretchr/testify/assert"
 )
 

config/config_snapshotting_test.go

@@ -2,9 +2,10 @@ package config
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSnapshotting(t *testing.T) {

daemon/control.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/daemon/job"
 	"github.com/zrepl/zrepl/daemon/nethelpers"
 	"github.com/zrepl/zrepl/logger"

daemon/daemon.go

@@ -3,8 +3,16 @@ package daemon
 import (
 	"context"
 	"fmt"
+	"os"
+	"os/signal"
+	"strings"
+	"sync"
+	"syscall"
+	"time"
+
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon/job"
 	"github.com/zrepl/zrepl/daemon/job/reset"
@@ -12,12 +20,6 @@ import (
 	"github.com/zrepl/zrepl/daemon/logging"
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/version"
-	"os"
-	"os/signal"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
 )
 
 func Run(conf *config.Config) error {
@@ -79,7 +81,6 @@ func Run(conf *config.Config) error {
 		jobs.start(ctx, job, true)
 	}
 
-
 	log.Info("starting daemon")
 
 	// start regular jobs

daemon/filters/fsmapfilter.go

@@ -2,10 +2,12 @@ package filters
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/pkg/errors"
+
 	"github.com/zrepl/zrepl/endpoint"
 	"github.com/zrepl/zrepl/zfs"
-	"strings"
 )
 
 type DatasetMapFilter struct {

daemon/filters/fsvfilter.go

@@ -1,8 +1,9 @@
 package filters
 
 import (
-	"github.com/zrepl/zrepl/zfs"
 	"strings"
+
+	"github.com/zrepl/zrepl/zfs"
 )
 
 type AnyFSVFilter struct{}
@@ -17,7 +18,6 @@ func (AnyFSVFilter) Filter(t zfs.VersionType, name string) (accept bool, err err
 	return true, nil
 }
 
-
 type PrefixFilter struct {
 	prefix    string
 	fstype    zfs.VersionType

daemon/job/build_jobs.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+
 	"github.com/zrepl/zrepl/config"
 )
 

daemon/job/job.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/zfs"
 )
@@ -29,7 +30,6 @@ func WithLogger(ctx context.Context, l Logger) context.Context {
 	return context.WithValue(ctx, contextKeyLog, l)
 }
 
-
 type Job interface {
 	Name() string
 	Run(ctx context.Context)
@@ -94,12 +94,14 @@ func (s *Status) UnmarshalJSON(in []byte) (err error) {
 		var st SnapJobStatus
 		err = json.Unmarshal(jobJSON, &st)
 		s.JobSpecific = &st
-	case TypePull: fallthrough
+	case TypePull:
+		fallthrough
 	case TypePush:
 		var st ActiveSideStatus
 		err = json.Unmarshal(jobJSON, &st)
 		s.JobSpecific = &st
-	case TypeSource: fallthrough
+	case TypeSource:
+		fallthrough
 	case TypeSink:
 		var st PassiveStatus
 		err = json.Unmarshal(jobJSON, &st)

daemon/job/snapjob.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon/filters"
 	"github.com/zrepl/zrepl/daemon/job/wakeup"

daemon/logging/logging_formatters.go

@@ -4,11 +4,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/fatih/color"
 	"github.com/go-logfmt/logfmt"
 	"github.com/pkg/errors"
+
 	"github.com/zrepl/zrepl/logger"
-	"time"
 )
 
 const (

daemon/logging/logging_outlets.go

@@ -4,12 +4,14 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"github.com/pkg/errors"
-	"github.com/zrepl/zrepl/logger"
 	"io"
 	"log/syslog"
 	"net"
 	"time"
+
+	"github.com/pkg/errors"
+
+	"github.com/zrepl/zrepl/logger"
 )
 
 type EntryFormatter interface {

daemon/nethelpers/helpers.go

@@ -1,10 +1,11 @@
 package nethelpers
 
 import (
-	"github.com/pkg/errors"
 	"net"
 	"os"
 	"path/filepath"
+
+	"github.com/pkg/errors"
 )
 
 func PreparePrivateSockpath(sockpath string) error {

daemon/prometheus.go

@@ -2,15 +2,17 @@ package daemon
 
 import (
 	"context"
+	"net"
+	"net/http"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon/job"
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/rpc/dataconn/frameconn"
 	"github.com/zrepl/zrepl/zfs"
-	"net"
-	"net/http"
 )
 
 type prometheusJob struct {
@@ -93,4 +95,3 @@ func (o prometheusJobOutlet) WriteEntry(entry logger.Entry) error {
 	prom.taskLogEntries.WithLabelValues(o.jobName, entry.Level.String()).Inc()
 	return nil
 }
-

daemon/pruner/pruner.go

@@ -3,17 +3,19 @@ package pruner
 import (
 	"context"
 	"fmt"
+	"sort"
+	"strings"
+	"sync"
+	"time"
+
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/pruning"
 	"github.com/zrepl/zrepl/replication/logic/pdu"
 	"github.com/zrepl/zrepl/util/envconst"
-	"sort"
-	"strings"
-	"sync"
-	"time"
 )
 
 // Try to keep it compatible with gitub.com/zrepl/zrepl/endpoint.Endpoint
@@ -524,7 +526,6 @@ tfss_loop:
 		}
 	})
 
-
 }
 
 // attempts to exec pfs, puts it back into the queue with the result

daemon/pruner/pruner_queue.go

@@ -79,5 +79,4 @@ func(q *execQueue) Put(fs *fs, err error, done bool) {
 	})
 	q.mtx.Unlock()
 
-
 }

daemon/snapper/snapper.go

@@ -1,18 +1,19 @@
 package snapper
 
 import (
-	"github.com/zrepl/zrepl/config"
-	"github.com/pkg/errors"
-	"time"
 	"context"
-	"github.com/zrepl/zrepl/daemon/filters"
 	"fmt"
-	"github.com/zrepl/zrepl/zfs"
 	"sort"
-	"github.com/zrepl/zrepl/logger"
 	"sync"
-)
+	"time"
 
+	"github.com/pkg/errors"
+
+	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/zfs"
+)
 
 //go:generate stringer -type=SnapState
 type SnapState uint
@@ -386,4 +387,3 @@ func findSyncPoint(log Logger, fss []*zfs.DatasetPath, prefix string, interval t
 	return snaptimes[0].time, nil
 
 }
-

daemon/snapper/snapper_all.go

@@ -3,6 +3,7 @@ package snapper
 import (
 	"context"
 	"fmt"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/daemon/filters"
 )

endpoint/context.go

@@ -2,6 +2,7 @@ package endpoint
 
 import (
 	"context"
+
 	"github.com/zrepl/zrepl/logger"
 )
 

endpoint/endpoint.go

@@ -7,6 +7,7 @@ import (
 	"path"
 
 	"github.com/pkg/errors"
+
 	"github.com/zrepl/zrepl/replication/logic/pdu"
 	"github.com/zrepl/zrepl/util/chainlock"
 	"github.com/zrepl/zrepl/zfs"

logger/datastructures.go

@@ -4,10 +4,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/fatih/color"
-	"github.com/pkg/errors"
 	"sync"
 	"time"
+
+	"github.com/fatih/color"
+	"github.com/pkg/errors"
 )
 
 type Level int

logger/logger_test.go

@@ -2,10 +2,12 @@ package logger_test
 
 import (
 	"fmt"
-	"github.com/kr/pretty"
-	"github.com/zrepl/zrepl/logger"
 	"testing"
 	"time"
+
+	"github.com/kr/pretty"
+
+	"github.com/zrepl/zrepl/logger"
 )
 
 type TestOutlet struct {

pruning/keep_grid.go

@@ -2,12 +2,14 @@ package pruning
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/pruning/retentiongrid"
 	"regexp"
 	"sort"
 	"time"
+
+	"github.com/pkg/errors"
+
+	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/pruning/retentiongrid"
 )
 
 // KeepGrid fits snapshots that match a given regex into a retentiongrid.Grid,

pruning/keep_helpers_test.go

@@ -1,8 +1,9 @@
 package pruning
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestShallowCopySnapList(t *testing.T) {

pruning/keep_last_n.go

@@ -1,8 +1,9 @@
 package pruning
 
 import (
-	"github.com/pkg/errors"
 	"sort"
+
+	"github.com/pkg/errors"
 )
 
 type KeepLastN struct {

pruning/keep_last_n_test.go

@@ -1,9 +1,10 @@
 package pruning
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestKeepLastN(t *testing.T) {

pruning/pruning.go

@@ -2,9 +2,11 @@ package pruning
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
-	"github.com/zrepl/zrepl/config"
 	"time"
+
+	"github.com/pkg/errors"
+
+	"github.com/zrepl/zrepl/config"
 )
 
 type KeepRule interface {

pruning/retentiongrid/retentiongrid_test.go

@@ -2,11 +2,12 @@ package retentiongrid
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"strconv"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 type retentionIntervalStub struct {

replication/driver/replication_driver.go

@@ -10,11 +10,12 @@ import (
 	"sync"
 	"time"
 
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
 	"github.com/zrepl/zrepl/replication/report"
 	"github.com/zrepl/zrepl/util/chainlock"
 	"github.com/zrepl/zrepl/util/envconst"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 type interval struct {

replication/driver/replication_driver_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+
 	"github.com/zrepl/zrepl/replication/report"
 
 	"github.com/stretchr/testify/assert"

replication/logic/pdu/pdu_extras.go

@@ -2,8 +2,9 @@ package pdu
 
 import (
 	"fmt"
-	"github.com/zrepl/zrepl/zfs"
 	"time"
+
+	"github.com/zrepl/zrepl/zfs"
 )
 
 func (v *FilesystemVersion) RelName() string {

replication/logic/pdu/pdu_test.go

@@ -1,9 +1,10 @@
 package pdu
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFilesystemVersion_RelName(t *testing.T) {

replication/logic/replication_logic.go

@@ -26,7 +26,7 @@ type Endpoint interface {
 	ListFilesystems(ctx context.Context, req *pdu.ListFilesystemReq) (*pdu.ListFilesystemRes, error)
 	ListFilesystemVersions(ctx context.Context, req *pdu.ListFilesystemVersionsReq) (*pdu.ListFilesystemVersionsRes, error)
 	DestroySnapshots(ctx context.Context, req *pdu.DestroySnapshotsReq) (*pdu.DestroySnapshotsRes, error)
-	WaitForConnectivity(ctx context.Context) (error)
+	WaitForConnectivity(ctx context.Context) error
 }
 
 type Sender interface {

rpc/dataconn/dataconn_client.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/proto"
+
 	"github.com/zrepl/zrepl/replication/logic/pdu"
 	"github.com/zrepl/zrepl/rpc/dataconn/stream"
 	"github.com/zrepl/zrepl/transport"
@@ -214,7 +215,6 @@ func (c *Client) ReqRecv(ctx context.Context, req *pdu.ReceiveReq, streamCopier
 	return res.res, cause
 }
 
-
 func (c *Client) ReqPing(ctx context.Context, req *pdu.PingReq) (*pdu.PingRes, error) {
 	conn, err := c.getWire(ctx)
 	if err != nil {

rpc/dataconn/dataconn_server.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/golang/protobuf/proto"
+
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/replication/logic/pdu"
 	"github.com/zrepl/zrepl/rpc/dataconn/stream"

rpc/dataconn/frameconn/frameconn.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/rpc/dataconn/base2bufpool"
 	"github.com/zrepl/zrepl/rpc/dataconn/timeoutconn"
 )

rpc/dataconn/frameconn/frameconn_shutdown_fsm.go

@@ -34,4 +34,3 @@ func (f *shutdownFSM) IsShuttingDown() bool {
 	defer f.mtx.Unlock()
 	return f.state != shutdownStateOpen
 }
-

rpc/dataconn/frameconn/frameconn_test.go

@@ -19,4 +19,3 @@ func TestIsPublicFrameType(t *testing.T) {
 	assert.True(t, IsPublicFrameType(255))
 	assert.False(t, IsPublicFrameType(rstFrameType))
 }
-

rpc/dataconn/heartbeatconn/heartbeatconn_test.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+
 	"github.com/zrepl/zrepl/rpc/dataconn/frameconn"
 )
 

rpc/dataconn/stream/stream_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/rpc/dataconn/heartbeatconn"
 	"github.com/zrepl/zrepl/util/socketpair"

rpc/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go

@@ -11,6 +11,7 @@ import (
 
 	netssh "github.com/problame/go-netssh"
 	"github.com/zrepl/yaml-config"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/transport"
 	transportconfig "github.com/zrepl/zrepl/transport/fromconfig"

rpc/dataconn/timeoutconn/timeoutconn_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
 	"github.com/zrepl/zrepl/util/socketpair"
 )
 

rpc/grpcclientidentity/authlistener_grpc_adaptor.go

@@ -18,11 +18,12 @@ import (
 	"net"
 	"time"
 
-	"github.com/zrepl/zrepl/logger"
-	"github.com/zrepl/zrepl/transport"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/peer"
+
+	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/transport"
 )
 
 type Logger = logger.Logger

rpc/grpcclientidentity/example/pdu/grpcauth.pb.go

@@ -5,10 +5,11 @@ package pdu
 
 import (
 	fmt "fmt"
+	math "math"
+
 	proto "github.com/golang/protobuf/proto"
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
-	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

rpc/netadaptor/authlistener_netlistener_adaptor.go

@@ -25,8 +25,9 @@ package netadaptor
 import (
 	"context"
 	"fmt"
-	"github.com/zrepl/zrepl/logger"
 	"net"
+
+	"github.com/zrepl/zrepl/logger"
 	"github.com/zrepl/zrepl/transport"
 )
 

rpc/rpc_client.go

@@ -12,6 +12,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/google/uuid"
+
 	"github.com/zrepl/zrepl/replication/logic"
 	"github.com/zrepl/zrepl/replication/logic/pdu"
 	"github.com/zrepl/zrepl/rpc/dataconn"

rpc/rpc_doc.go

@@ -115,4 +115,3 @@ package rpc
 // - remove the comments //
 // - vim: set virtualedit+=all
 // - vim: set ft=text
-

rpc/rpc_mux.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/zrepl/zrepl/transport"
 	"github.com/zrepl/zrepl/rpc/transportmux"
+	"github.com/zrepl/zrepl/transport"
 	"github.com/zrepl/zrepl/util/envconst"
 )
 

rpc/transportmux/transportmux.go

@@ -64,7 +64,7 @@ func (l *demuxListener) Close() error { return nil } // TODO
 // This is a protocol constant, changing it breaks the wire protocol.
 const LabelLen = 64
 
-func padLabel(out []byte, label string) (error) {
+func padLabel(out []byte, label string) error {
 	if len(label) > LabelLen {
 		return fmt.Errorf("label %q exceeds max length (is %d, max %d)", label, len(label), LabelLen)
 	}
@@ -202,4 +202,3 @@ func MuxConnecter(rawConnecter transport.Connecter, labels []string, timeout tim
 	}
 	return ret, nil
 }
-

rpc/versionhandshake/versionhandshake.go

@@ -39,7 +39,7 @@ func (e HandshakeError) Temporary() bool {
 	if e.isAcceptError {
 		return true
 	}
-	te, ok := e.IOError.(interface{ Temporary() bool });
+	te, ok := e.IOError.(interface{ Temporary() bool })
 	return ok && te.Temporary()
 }
 

rpc/versionhandshake/versionhandshake_test.go

@@ -3,13 +3,15 @@ package versionhandshake
 import (
 	"bytes"
 	"fmt"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/zrepl/zrepl/util/socketpair"
 	"io"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/zrepl/zrepl/util/socketpair"
 )
 
 func TestHandshakeMessage_Encode(t *testing.T) {
@@ -23,8 +25,6 @@ func TestHandshakeMessage_Encode(t *testing.T) {
 	enc := string(encB)
 	t.Logf("enc: %s", enc)
 
-
-
 	assert.False(t, strings.ContainsAny(enc[0:10], " "))
 	assert.True(t, enc[10] == ' ')
 

rpc/versionhandshake/versionhandshake_transport_wrappers.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"net"
 	"time"
+
 	"github.com/zrepl/zrepl/transport"
 )
 
@@ -41,7 +42,7 @@ type HandshakeListener struct {
 	timeout time.Duration
 }
 
-func (l HandshakeListener) Addr() (net.Addr) { return l.l.Addr() }
+func (l HandshakeListener) Addr() net.Addr { return l.l.Addr() }
 
 func (l HandshakeListener) Close() error { return l.l.Close() }
 

transport/fromconfig/transport_fromconfig.go

@@ -4,7 +4,9 @@ package fromconfig
 
 import (
 	"fmt"
+
 	"github.com/pkg/errors"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/transport"
 	"github.com/zrepl/zrepl/transport/local"
@@ -35,7 +37,6 @@ func ListenerFactoryFromConfig(g *config.Global, in config.ServeEnum) (transport
 	return l, err
 }
 
-
 func ConnecterFromConfig(g *config.Global, in config.ConnectEnum) (transport.Connecter, error) {
 	var (
 		connecter transport.Connecter

transport/local/connect_local.go

@@ -3,6 +3,7 @@ package local
 import (
 	"context"
 	"fmt"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/transport"
 )
@@ -26,4 +27,3 @@ func (c *LocalConnecter) Connect(dialCtx context.Context) (transport.Wire, error
 	l := GetLocalListener(c.listenerName)
 	return l.Connect(dialCtx, c.clientIdentity)
 }
-

transport/local/serve_local.go

@@ -3,11 +3,12 @@ package local
 import (
 	"context"
 	"fmt"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/util/socketpair"
 	"net"
 	"sync"
+
+	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/util/socketpair"
 )
 
 var localListeners struct {
@@ -16,7 +17,7 @@ var localListeners struct {
 	mtx  sync.Mutex
 }
 
-func GetLocalListener(listenerName string) (*LocalListener) {
+func GetLocalListener(listenerName string) *LocalListener {
 
 	localListeners.init.Do(func() {
 		localListeners.m = make(map[string]*LocalListener)
@@ -88,7 +89,7 @@ func (localAddr) Network() string { return "local" }
 
 func (a localAddr) String() string { return a.S }
 
-func (l *LocalListener) Addr() (net.Addr) { return localAddr{"<listening>"} }
+func (l *LocalListener) Addr() net.Addr { return localAddr{"<listening>"} }
 
 func (l *LocalListener) Accept(ctx context.Context) (*transport.AuthConn, error) {
 	respondToRequest := func(req connectRequest, res connectResult) (err error) {

transport/ssh/connect_ssh.go

@@ -2,12 +2,14 @@ package ssh
 
 import (
 	"context"
+	"time"
+
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
 	"github.com/problame/go-netssh"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/transport"
-	"time"
 )
 
 type SSHStdinserverConnecter struct {

transport/ssh/serve_stdinserver.go

@@ -1,16 +1,18 @@
 package ssh
 
 import (
-	"github.com/problame/go-netssh"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/daemon/nethelpers"
-	"github.com/zrepl/zrepl/transport"
+	"context"
 	"fmt"
 	"net"
 	"path"
-	"context"
-	"github.com/pkg/errors"
 	"sync/atomic"
+
+	"github.com/pkg/errors"
+	"github.com/problame/go-netssh"
+
+	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/daemon/nethelpers"
+	"github.com/zrepl/zrepl/transport"
 )
 
 func MultiStdinserverListenerFactoryFromConfig(g *config.Global, in *config.StdinserverServer) (transport.AuthenticatedListenerFactory, error) {

transport/tcp/serve_tcp.go

@@ -1,10 +1,12 @@
 package tcp
 
 import (
-	"github.com/zrepl/zrepl/config"
-	"net"
-	"github.com/pkg/errors"
 	"context"
+	"net"
+
+	"github.com/pkg/errors"
+
+	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/transport"
 )
 
@@ -79,4 +81,3 @@ func (f *TCPAuthListener) Accept(ctx context.Context) (*transport.AuthConn, erro
 	}
 	return transport.NewAuthConn(nc, clientIdent), nil
 }
-

transport/tls/connect_tls.go

@@ -6,6 +6,7 @@ import (
 	"net"
 
 	"github.com/pkg/errors"
+
 	"github.com/zrepl/zrepl/config"
 	"github.com/zrepl/zrepl/tlsconf"
 	"github.com/zrepl/zrepl/transport"

transport/tls/serve_tls.go

@@ -1,16 +1,18 @@
 package tls
 
 import (
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/pkg/errors"
-	"github.com/zrepl/zrepl/config"
-	"github.com/zrepl/zrepl/transport"
-	"github.com/zrepl/zrepl/tlsconf"
 	"net"
 	"time"
-	"context"
+
+	"github.com/pkg/errors"
+
+	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/tlsconf"
+	"github.com/zrepl/zrepl/transport"
 )
 
 type TLSListenerFactory struct {
@@ -85,5 +87,3 @@ func (l tlsAuthListener) Accept(ctx context.Context) (*transport.AuthConn, error
 	adaptor := newWireAdaptor(tlsConn, tcpConn)
 	return transport.NewAuthConn(adaptor, cn), nil
 }
-
-

util/bytecounter/bytecounter_streamcopier_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"github.com/zrepl/zrepl/zfs"
 )
 

util/chunking_test.go

@@ -3,11 +3,12 @@ package util
 import (
 	"bytes"
 	"encoding/binary"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"reflect"
 	"testing"
 	"testing/quick"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUnchunker(t *testing.T) {

util/contextflexibletimeout_test.go

@@ -2,10 +2,11 @@ package util
 
 import (
 	"context"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestContextWithOptionalDeadline(t *testing.T) {

util/iocommand.go

@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/zrepl/zrepl/util/envconst"
 	"io"
 	"os"
 	"os/exec"
 	"syscall"
 	"time"
+
+	"github.com/zrepl/zrepl/util/envconst"
 )
 
 // An IOCommand exposes a forked process's std(in|out|err) through the io.ReadWriteCloser interface.

zfs/datasetpath_visitor_test.go

@@ -1,8 +1,9 @@
 package zfs
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNewDatasetPathTree(t *testing.T) {

zfs/mapping.go

@@ -13,6 +13,7 @@ type DatasetFilter interface {
 func NoFilter() DatasetFilter {
 	return noFilter{}
 }
+
 type noFilter struct{}
 
 var _ DatasetFilter = noFilter{}

zfs/replication_history.go

@@ -2,8 +2,9 @@ package zfs
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"strconv"
+
+	"github.com/pkg/errors"
 )
 
 const ReplicationCursorBookmarkName = "zrepl_replication_cursor"

zfs/resume_token_test.go

@@ -2,9 +2,11 @@ package zfs_test
 
 import (
 	"context"
-	"github.com/stretchr/testify/assert"
-	"github.com/zrepl/zrepl/zfs"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/zrepl/zrepl/zfs"
 )
 
 type ResumeTokenTest struct {

zfs/versions.go

@@ -5,11 +5,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/prometheus/client_golang/prometheus"
 	"io"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 type VersionType string

zfs/zfs.go

@@ -15,9 +15,11 @@ import (
 	"time"
 
 	"context"
-	"github.com/prometheus/client_golang/prometheus"
 	"regexp"
 	"strconv"
+
+	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/zrepl/zrepl/util/envconst"
 )
 
@@ -416,7 +418,6 @@ type sendStream struct {
 	closeMtx     sync.Mutex
 	stdoutReader *os.File
 	opErr        error
-
 }
 
 func (s *sendStream) Read(p []byte) (n int, err error) {
@@ -553,7 +554,6 @@ func ZFSSend(ctx context.Context, fs string, from, to string, token string) (str
 	return newSendStreamCopier(stream), err
 }
 
-
 type DrySendType string
 
 const (
@@ -563,8 +563,10 @@ const (
 
 func DrySendTypeFromString(s string) (DrySendType, error) {
 	switch s {
-	case string(DrySendTypeFull): return DrySendTypeFull, nil
-	case string(DrySendTypeIncremental): return DrySendTypeIncremental, nil
+	case string(DrySendTypeFull):
+		return DrySendTypeFull, nil
+	case string(DrySendTypeIncremental):
+		return DrySendTypeIncremental, nil
 	default:
 		return "", fmt.Errorf("unknown dry send type %q", s)
 	}
@@ -602,7 +604,6 @@ func (s *DrySendInfo) unmarshalZFSOutput(output []byte) (err error) {
 	return fmt.Errorf("no match for info line (regex1 %s) (regex2 %s)", sendDryRunInfoLineRegexFull, sendDryRunInfoLineRegexIncremental)
 }
 
-
 // unmarshal info line, looks like this:
 //   full	zroot/test/a@1	5389768
 //   incremental	zroot/test/a@1	zroot/test/a@2	5383936
@@ -947,13 +948,27 @@ const (
 
 func (s zfsPropertySource) zfsGetSourceFieldPrefixes() []string {
 	prefixes := make([]string, 0, 7)
-	if s&sourceLocal != 0 {prefixes = append(prefixes, "local")}
-	if s&sourceDefault != 0 {prefixes = append(prefixes, "default")}
-	if s&sourceInherited != 0 {prefixes = append(prefixes, "inherited")}
-	if s&sourceNone != 0 {prefixes = append(prefixes, "-")}
-	if s&sourceTemporary != 0 { prefixes = append(prefixes, "temporary")}
-	if s&sourceReceived != 0 { prefixes = append(prefixes, "received")}
-	if s == sourceAny { prefixes = append(prefixes, "") }
+	if s&sourceLocal != 0 {
+		prefixes = append(prefixes, "local")
+	}
+	if s&sourceDefault != 0 {
+		prefixes = append(prefixes, "default")
+	}
+	if s&sourceInherited != 0 {
+		prefixes = append(prefixes, "inherited")
+	}
+	if s&sourceNone != 0 {
+		prefixes = append(prefixes, "-")
+	}
+	if s&sourceTemporary != 0 {
+		prefixes = append(prefixes, "temporary")
+	}
+	if s&sourceReceived != 0 {
+		prefixes = append(prefixes, "received")
+	}
+	if s == sourceAny {
+		prefixes = append(prefixes, "")
+	}
 	return prefixes
 }
 
@@ -1010,8 +1025,10 @@ func ZFSDestroy(dataset string) (err error) {
 		filesystem = dataset
 	} else {
 		switch dataset[idx] {
-		case '@': dstype = "snapshot"
-		case '#': dstype = "bookmark"
+		case '@':
+			dstype = "snapshot"
+		case '#':
+			dstype = "bookmark"
 		}
 		filesystem = dataset[:idx]
 	}

zfs/zfs_test.go

@@ -1,8 +1,9 @@
 package zfs
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestZFSListHandlesProducesZFSErrorOnNonZeroExit(t *testing.T) {