move implementation to internal/ directory (#828)

Makefile

@@ -177,14 +177,14 @@ wrapup-and-checksum:
 	tar --mtime='1970-01-01' --sort=name \
 		--transform 's/$(ARTIFACTDIR)/zrepl-$(_ZREPL_VERSION)-noarch/' \
 		--transform 's#dist#zrepl-$(_ZREPL_VERSION)-noarch/dist#' \
-		--transform 's#config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \
+		--transform 's#internal/config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \
 		-acf $(NOARCH_TARBALL) \
 		$(ARTIFACTDIR)/docs/html \
 		$(ARTIFACTDIR)/bash_completion \
 		$(ARTIFACTDIR)/_zrepl.zsh_completion \
 		$(ARTIFACTDIR)/go_env.txt \
 		dist \
-		config/samples
+		internal/config/samples
 	rm -rf "$(ARTIFACTDIR)/release"
 	mkdir -p "$(ARTIFACTDIR)/release"
 	cp -l $(ARTIFACTDIR)/zrepl* \
@@ -282,7 +282,7 @@ cover-platform:
 
 TEST_PLATFORM_BIN_PATH := $(ARTIFACTDIR)/platformtest-$(ZREPL_TARGET_TUPLE)
 test-platform-bin:
-	$(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./platformtest/harness
+	$(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./internal/platformtest/harness
 test-platform:
 	export _TEST_PLATFORM_CMD="\"$(TEST_PLATFORM_BIN_PATH)\""; \
 		$(MAKE) _test-or-cover-platform-impl
@@ -299,7 +299,7 @@ ifndef _TEST_PLATFORM_CMD
 endif
 	rm -f "$(ZREPL_PLATFORMTEST_ZFS_LOG)"
 	rm -f "$(ARTIFACTDIR)/platformtest.cover"
-	platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \
+	internal/platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \
 		$(_TEST_PLATFORM_CMD) \
 		-poolname "$(ZREPL_PLATFORMTEST_POOLNAME)" \
 		-imagepath "$(ZREPL_PLATFORMTEST_IMAGEPATH)" \

docs/conf.py

@@ -181,7 +181,7 @@ texinfo_documents = [
 extlinks = {
     'issue':('https://github.com/zrepl/zrepl/issues/%s', 'issue #%s'),
     'repomasterlink':('https://github.com/zrepl/zrepl/blob/master/%s', '%s'),
-    'sampleconf':('https://github.com/zrepl/zrepl/blob/master/config/samples%s', 'config/samples%s'),
+    'sampleconf':('https://github.com/zrepl/zrepl/blob/master/internal/config/samples%s', 'internal/config/samples%s'),
     'commit':('https://github.com/zrepl/zrepl/commit/%s', 'commit %s'),
         }
 

docs/quickstart/backup_to_external_disk.rst

@@ -31,7 +31,7 @@ A few additional requirements:
 The following config snippet implements the setup described above.
 You will likely want to customize some aspects mentioned in the top comment in the file.
 
-.. literalinclude:: ../../config/samples/quickstart_backup_to_external_disk.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_backup_to_external_disk.yml
 
 
 Offline Backups with two (or more) External Disks

docs/quickstart/continuous_server_backup.rst

@@ -77,7 +77,7 @@ Configure server ``prod``
 
 We define a **push job** named ``prod_to_backups`` in ``/etc/zrepl/zrepl.yml`` on host ``prod`` :
 
-.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_sender.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_sender.yml
 
 .. _tutorial-configure-prod:
 
@@ -86,7 +86,7 @@ Configure server ``backups``
 
 We define a corresponding **sink job** named ``sink`` in ``/etc/zrepl/zrepl.yml`` on host ``backups`` :
 
-.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_receiver.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_receiver.yml
 
 Go Back To Quickstart Guide
 ---------------------------

docs/quickstart/fan_out_replication.rst

@@ -80,12 +80,12 @@ Mutual TLS via the :ref:`TLS client authentication transport <transport-tcp+tlsc
 Configure source server A
 -------------------------
 
-.. literalinclude:: ../../config/samples/quickstart_fan_out_replication_source.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_fan_out_replication_source.yml
 
 Configure each target server
 ----------------------------
 
-.. literalinclude:: ../../config/samples/quickstart_fan_out_replication_target.yml
+.. literalinclude:: ../../internal/config/samples/quickstart_fan_out_replication_target.yml
 
 Go Back To Quickstart Guide
 ---------------------------

internal/cli/cli.go

@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 var rootArgs struct {

internal/client/configcheck.go

@@ -11,11 +11,11 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/job"
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 var configcheckArgs struct {

internal/client/migrate.go

@@ -9,12 +9,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/job"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 var (

internal/client/pprof.go

@@ -1,6 +1,6 @@
 package client
 
-import "github.com/zrepl/zrepl/cli"
+import "github.com/zrepl/zrepl/internal/cli"
 
 var PprofCmd = &cli.Subcommand{
 	Use: "pprof",

internal/client/pprof_activity_trace.go

@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/net/websocket"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
 )
 
 var pprofActivityTraceCmd = &cli.Subcommand{

internal/client/pprof_listen.go

@@ -6,9 +6,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/daemon"
 )
 
 var pprofListenCmd struct {

internal/client/signal.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/daemon"
 )
 
 var SignalCmd = &cli.Subcommand{

internal/client/status/client/client.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/daemon"
 )
 
 type Client struct {

internal/client/status/status.go

@@ -9,11 +9,11 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/client/status/client"
+	"github.com/zrepl/zrepl/internal/client/status/client"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/daemon"
-	"github.com/zrepl/zrepl/util/choices"
+	"github.com/zrepl/zrepl/internal/util/choices"
 )
 
 type Client interface {

internal/client/status/status_dump.go

@@ -9,7 +9,7 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel"
 )
 
 func dump(c Client, job string) error {

internal/client/status/status_interactive.go

@@ -10,7 +10,7 @@ import (
 	tview "code.rocketnine.space/tslocum/cview"
 	"github.com/gdamore/tcell/v2"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel"
 )
 
 func interactive(c Client, flag statusFlags) error {

internal/client/status/status_legacy.go

@@ -12,7 +12,7 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel"
 )
 
 func legacy(c Client, flag statusFlags) error {

internal/client/status/viewmodel/render.go

@@ -10,12 +10,12 @@ import (
 	"github.com/go-playground/validator/v10"
 	yaml "github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/client/status/viewmodel/stringbuilder"
+	"github.com/zrepl/zrepl/internal/client/status/viewmodel/stringbuilder"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/daemon"
-	"github.com/zrepl/zrepl/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/job"
-	"github.com/zrepl/zrepl/daemon/pruner"
+	"github.com/zrepl/zrepl/internal/daemon/pruner"
-	"github.com/zrepl/zrepl/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
-	"github.com/zrepl/zrepl/replication/report"
+	"github.com/zrepl/zrepl/internal/replication/report"
 )
 
 type M struct {

internal/client/stdinserver.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/problame/go-netssh"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 
 	"context"
 	"errors"

internal/client/testcmd.go

@@ -9,10 +9,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var TestCmd = &cli.Subcommand{

internal/client/version.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon"
+	"github.com/zrepl/zrepl/internal/daemon"
-	"github.com/zrepl/zrepl/version"
+	"github.com/zrepl/zrepl/internal/version"
 )
 
 var versionArgs struct {

internal/client/zfsabstractions.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var (

internal/client/zfsabstractions_create.go

@@ -1,6 +1,6 @@
 package client
 
-import "github.com/zrepl/zrepl/cli"
+import "github.com/zrepl/zrepl/internal/cli"
 
 var zabsCmdCreate = &cli.Subcommand{
 	Use:             "create",

internal/client/zfsabstractions_create_step_hold.go

@@ -7,9 +7,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 var zabsCreateStepHoldFlags struct {

internal/client/zfsabstractions_list.go

@@ -11,9 +11,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 var zabsListFlags struct {

internal/client/zfsabstractions_release.go

@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
 
-	"github.com/zrepl/zrepl/cli"
+	"github.com/zrepl/zrepl/internal/cli"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
 )
 
 // shared between release-all and release-step

internal/config/config.go

@@ -10,8 +10,8 @@ import (
 	"github.com/robfig/cron/v3"
 	"github.com/zrepl/yaml-config"
 
-	"github.com/zrepl/zrepl/util/datasizeunit"
+	"github.com/zrepl/zrepl/internal/util/datasizeunit"
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
 )
 
 type ParseFlags uint

internal/config/config_recv_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	zfsprop "github.com/zrepl/zrepl/zfs/property"
+	zfsprop "github.com/zrepl/zrepl/internal/zfs/property"
 )
 
 func TestRecvOptions(t *testing.T) {

internal/config/config_test.go

@@ -22,7 +22,7 @@ func TestSampleConfigsAreParsedWithoutErrors(t *testing.T) {
 		t.Errorf("glob failed: %+v", err)
 	}
 
-	paths = append(paths, "../packaging/systemd-default-zrepl.yml")
+	paths = append(paths, "../../packaging/systemd-default-zrepl.yml")
 
 	for _, p := range paths {
 

internal/daemon/control.go

@@ -14,14 +14,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/job"
-	"github.com/zrepl/zrepl/daemon/nethelpers"
+	"github.com/zrepl/zrepl/internal/daemon/nethelpers"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
-	"github.com/zrepl/zrepl/version"
+	"github.com/zrepl/zrepl/internal/version"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 type controlJob struct {

internal/daemon/daemon.go

@@ -13,18 +13,18 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/job"
+	"github.com/zrepl/zrepl/internal/daemon/job"
-	"github.com/zrepl/zrepl/daemon/job/reset"
+	"github.com/zrepl/zrepl/internal/daemon/job/reset"
-	"github.com/zrepl/zrepl/daemon/job/wakeup"
+	"github.com/zrepl/zrepl/internal/daemon/job/wakeup"
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
-	"github.com/zrepl/zrepl/version"
+	"github.com/zrepl/zrepl/internal/version"
-	"github.com/zrepl/zrepl/zfs/zfscmd"
+	"github.com/zrepl/zrepl/internal/zfs/zfscmd"
 )
 
 func Run(ctx context.Context, conf *config.Config) error {

internal/daemon/filters/fsmapfilter.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type DatasetMapFilter struct {

internal/daemon/filters/fsmapfilter_test.go

@@ -3,7 +3,7 @@ package filters
 import (
 	"testing"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 func TestDatasetMapFilter(t *testing.T) {

internal/daemon/hooks/hook_config.go

@@ -3,8 +3,8 @@ package hooks
 import (
 	"fmt"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type List []Hook

internal/daemon/hooks/hook_exec.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 // Re-export type here so that

internal/daemon/hooks/hook_logging.go

@@ -6,9 +6,9 @@ import (
 	"context"
 	"sync"
 
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 type Logger = logger.Logger

internal/daemon/hooks/hook_type_callback.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type HookJobCallback func(ctx context.Context) error

internal/daemon/hooks/hook_type_command.go

@@ -12,11 +12,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
-	"github.com/zrepl/zrepl/util/circlog"
+	"github.com/zrepl/zrepl/internal/util/circlog"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 )
 
 type HookEnvVar string

internal/daemon/hooks/hook_type_mysql_lock_tables.go

@@ -12,9 +12,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 // Hook to implement the following recommmendation from MySQL docs

internal/daemon/hooks/hook_type_postgres_checkpoint.go

@@ -10,9 +10,9 @@ import (
 	"github.com/lib/pq"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type PgChkptHook struct {

internal/daemon/hooks/hooks_test.go

@@ -11,13 +11,13 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/hooks"
+	"github.com/zrepl/zrepl/internal/daemon/hooks"
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type comparisonAssertionFunc func(require.TestingT, interface{}, interface{}, ...interface{})

internal/daemon/job/active.go

@@ -9,23 +9,23 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/envconst"
+	"github.com/zrepl/zrepl/internal/util/envconst"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/job/reset"
+	"github.com/zrepl/zrepl/internal/daemon/job/reset"
-	"github.com/zrepl/zrepl/daemon/job/wakeup"
+	"github.com/zrepl/zrepl/internal/daemon/job/wakeup"
-	"github.com/zrepl/zrepl/daemon/pruner"
+	"github.com/zrepl/zrepl/internal/daemon/pruner"
-	"github.com/zrepl/zrepl/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/replication"
+	"github.com/zrepl/zrepl/internal/replication"
-	"github.com/zrepl/zrepl/replication/driver"
+	"github.com/zrepl/zrepl/internal/replication/driver"
-	"github.com/zrepl/zrepl/replication/logic"
+	"github.com/zrepl/zrepl/internal/replication/logic"
-	"github.com/zrepl/zrepl/replication/report"
+	"github.com/zrepl/zrepl/internal/replication/report"
-	"github.com/zrepl/zrepl/rpc"
+	"github.com/zrepl/zrepl/internal/rpc"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/transport"
-	"github.com/zrepl/zrepl/transport/fromconfig"
+	"github.com/zrepl/zrepl/internal/transport/fromconfig"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type ActiveSide struct {

internal/daemon/job/active_test.go

@@ -6,8 +6,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/transport"
 )
 
 func TestFakeActiveSideDirectMethodInvocationClientIdentityDoesNotPassValidityTest(t *testing.T) {

internal/daemon/job/build_jobs.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/util/bandwidthlimit"
+	"github.com/zrepl/zrepl/internal/util/bandwidthlimit"
 )
 
 func JobsFromConfig(c *config.Config, parseFlags config.ParseFlags) ([]Job, error) {

internal/daemon/job/build_jobs_sendrecvoptions.go

@@ -3,11 +3,11 @@ package job
 import (
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/util/nodefault"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type SendingJobConfig interface {

internal/daemon/job/build_jobs_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
 )
 
 func TestValidateReceivingSidesDoNotOverlap(t *testing.T) {
@@ -113,7 +113,7 @@ jobs:
 }
 
 func TestSampleConfigsAreBuiltWithoutErrors(t *testing.T) {
-	paths, err := filepath.Glob("../../config/samples/*")
+	paths, err := filepath.Glob("../../../internal/config/samples/*")
 	if err != nil {
 		t.Errorf("glob failed: %+v", err)
 	}

internal/daemon/job/job.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type Logger = logger.Logger

internal/daemon/job/passive.go

@@ -7,16 +7,16 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/logging"
+	"github.com/zrepl/zrepl/internal/daemon/logging"
-	"github.com/zrepl/zrepl/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/rpc"
+	"github.com/zrepl/zrepl/internal/rpc"
-	"github.com/zrepl/zrepl/transport"
+	"github.com/zrepl/zrepl/internal/transport"
-	"github.com/zrepl/zrepl/transport/fromconfig"
+	"github.com/zrepl/zrepl/internal/transport/fromconfig"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type PassiveSide struct {

internal/daemon/job/snapjob.go

@@ -9,18 +9,18 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
-	"github.com/zrepl/zrepl/util/bandwidthlimit"
+	"github.com/zrepl/zrepl/internal/util/bandwidthlimit"
-	"github.com/zrepl/zrepl/util/nodefault"
+	"github.com/zrepl/zrepl/internal/util/nodefault"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/filters"
+	"github.com/zrepl/zrepl/internal/daemon/filters"
-	"github.com/zrepl/zrepl/daemon/job/wakeup"
+	"github.com/zrepl/zrepl/internal/daemon/job/wakeup"
-	"github.com/zrepl/zrepl/daemon/pruner"
+	"github.com/zrepl/zrepl/internal/daemon/pruner"
-	"github.com/zrepl/zrepl/daemon/snapper"
+	"github.com/zrepl/zrepl/internal/daemon/snapper"
-	"github.com/zrepl/zrepl/endpoint"
+	"github.com/zrepl/zrepl/internal/endpoint"
-	"github.com/zrepl/zrepl/replication/logic/pdu"
+	"github.com/zrepl/zrepl/internal/replication/logic/pdu"
-	"github.com/zrepl/zrepl/zfs"
+	"github.com/zrepl/zrepl/internal/zfs"
 )
 
 type SnapJob struct {

internal/daemon/logging/build_logging.go

@@ -10,10 +10,10 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/internal/config"
-	"github.com/zrepl/zrepl/daemon/logging/trace"
+	"github.com/zrepl/zrepl/internal/daemon/logging/trace"
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
-	"github.com/zrepl/zrepl/tlsconf"
+	"github.com/zrepl/zrepl/internal/tlsconf"
 )
 
 func OutletsFromConfig(in config.LoggingOutletEnumList) (*logger.Outlets, error) {

internal/daemon/logging/logging_formatters.go

@@ -10,7 +10,7 @@ import (
 	"github.com/go-logfmt/logfmt"
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 const (

internal/daemon/logging/logging_outlets.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/zrepl/zrepl/logger"
+	"github.com/zrepl/zrepl/internal/logger"
 )
 
 type EntryFormatter interface {

internal/daemon/logging/trace/trace.go

@@ -99,7 +99,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 var metrics struct {

internal/daemon/logging/trace/trace_callback.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/zrepl/zrepl/util/chainlock"
+	"github.com/zrepl/zrepl/internal/util/chainlock"
 )
 
 type SpanInfo interface {