From 54c9dcb7c1fed440a58dbe36f79b26dcb2afd4c6 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <me@cschwarz.com>
Date: Wed, 22 Aug 2018 10:11:14 +0200
Subject: [PATCH] move replication policy constants to package replication

---
 cmd/config_job_local.go  |  4 ++--
 cmd/config_job_pull.go   |  4 ++--
 cmd/config_parse.go      |  8 ++++----
 cmd/endpoint/endpoint.go | 11 -----------
 replication/policy.go    | 12 ++++++++++++
 5 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 replication/policy.go

diff --git a/cmd/config_job_local.go b/cmd/config_job_local.go
index c168c18..fafac4d 100644
--- a/cmd/config_job_local.go
+++ b/cmd/config_job_local.go
@@ -17,7 +17,7 @@ type LocalJob struct {
 	Mapping           *DatasetMapFilter
 	SnapshotPrefix    string
 	Interval          time.Duration
-	InitialReplPolicy endpoint.InitialReplPolicy
+	InitialReplPolicy replication.InitialReplPolicy
 	PruneLHS          PrunePolicy
 	PruneRHS          PrunePolicy
 	Debug             JobDebugSettings
@@ -60,7 +60,7 @@ func parseLocalJob(c JobParsingContext, name string, i map[string]interface{}) (
 		return
 	}
 
-	if j.InitialReplPolicy, err = parseInitialReplPolicy(asMap.InitialReplPolicy, endpoint.DEFAULT_INITIAL_REPL_POLICY); err != nil {
+	if j.InitialReplPolicy, err = parseInitialReplPolicy(asMap.InitialReplPolicy, replication.DEFAULT_INITIAL_REPL_POLICY); err != nil {
 		return
 	}
 
diff --git a/cmd/config_job_pull.go b/cmd/config_job_pull.go
index 255e47c..48ce8de 100644
--- a/cmd/config_job_pull.go
+++ b/cmd/config_job_pull.go
@@ -24,7 +24,7 @@ type PullJob struct {
 	// constructed from mapping during parsing
 	pruneFilter       *DatasetMapFilter
 	SnapshotPrefix    string
-	InitialReplPolicy endpoint.InitialReplPolicy
+	InitialReplPolicy replication.InitialReplPolicy
 	Prune             PrunePolicy
 	Debug             JobDebugSettings
 
@@ -73,7 +73,7 @@ func parsePullJob(c JobParsingContext, name string, i map[string]interface{}) (j
 		return nil, err
 	}
 
-	j.InitialReplPolicy, err = parseInitialReplPolicy(asMap.InitialReplPolicy, endpoint.DEFAULT_INITIAL_REPL_POLICY)
+	j.InitialReplPolicy, err = parseInitialReplPolicy(asMap.InitialReplPolicy, replication.DEFAULT_INITIAL_REPL_POLICY)
 	if err != nil {
 		err = errors.Wrap(err, "cannot parse 'initial_repl_policy'")
 		return
diff --git a/cmd/config_parse.go b/cmd/config_parse.go
index eef40ec..1a773c6 100644
--- a/cmd/config_parse.go
+++ b/cmd/config_parse.go
@@ -11,8 +11,8 @@ import (
 	"regexp"
 	"strconv"
 	"time"
+	"github.com/zrepl/zrepl/replication"
 	"github.com/problame/go-streamrpc"
-	"github.com/zrepl/zrepl/cmd/endpoint"
 )
 
 var ConfigFileDefaultLocations []string = []string{
@@ -226,7 +226,7 @@ func parseConnect(i map[string]interface{}) (c streamrpc.Connecter, err error) {
 
 }
 
-func parseInitialReplPolicy(v interface{}, defaultPolicy endpoint.InitialReplPolicy) (p endpoint.InitialReplPolicy, err error) {
+func parseInitialReplPolicy(v interface{}, defaultPolicy replication.InitialReplPolicy) (p replication.InitialReplPolicy, err error) {
 	s, ok := v.(string)
 	if !ok {
 		goto err
@@ -236,9 +236,9 @@ func parseInitialReplPolicy(v interface{}, defaultPolicy endpoint.InitialReplPol
 	case s == "":
 		p = defaultPolicy
 	case s == "most_recent":
-		p = endpoint.InitialReplPolicyMostRecent
+		p = replication.InitialReplPolicyMostRecent
 	case s == "all":
-		p = endpoint.InitialReplPolicyAll
+		p = replication.InitialReplPolicyAll
 	default:
 		goto err
 	}
diff --git a/cmd/endpoint/endpoint.go b/cmd/endpoint/endpoint.go
index 9f31412..927cdd6 100644
--- a/cmd/endpoint/endpoint.go
+++ b/cmd/endpoint/endpoint.go
@@ -13,17 +13,6 @@ import (
 	"github.com/zrepl/zrepl/replication"
 )
 
-// FIXME: remove this
-type InitialReplPolicy string
-
-const (
-	InitialReplPolicyMostRecent InitialReplPolicy = "most_recent"
-	InitialReplPolicyAll        InitialReplPolicy = "all"
-)
-
-// FIXME: remove this
-const DEFAULT_INITIAL_REPL_POLICY = InitialReplPolicyMostRecent
-
 // Sender implements replication.ReplicationEndpoint for a sending side
 type Sender struct {
 	FSFilter 				zfs.DatasetFilter
diff --git a/replication/policy.go b/replication/policy.go
new file mode 100644
index 0000000..ea9b190
--- /dev/null
+++ b/replication/policy.go
@@ -0,0 +1,12 @@
+package replication
+
+// FIXME: Leftovers from previous versions, not used currently
+type InitialReplPolicy string
+
+const (
+	InitialReplPolicyMostRecent InitialReplPolicy = "most_recent"
+	InitialReplPolicyAll        InitialReplPolicy = "all"
+)
+
+const DEFAULT_INITIAL_REPL_POLICY = InitialReplPolicyMostRecent
+