refactoring: moved kopia/kopia/policy to kopia/kopia/snapshot/policy

Makefile

@@ -1,3 +1,5 @@
+COVERAGE_PACKAGES=./repo/...,./fs/...,./snapshot/...
+
 all: install install-examples test lint vet integration-tests
 
 install:
@@ -52,7 +54,7 @@ dev-deps:
 	gometalinter.v2 --install
 
 test-with-coverage: install
-	go test -count=1 -coverprofile=tmp.cov --coverpkg github.com/kopia/kopia/... -timeout 90s github.com/kopia/kopia/...
+	go test -count=1 -coverprofile=tmp.cov --coverpkg $(COVERAGE_PACKAGES) -timeout 90s github.com/kopia/kopia/...
 
 test: install
 	go test -count=1 -timeout 90s github.com/kopia/kopia/...

cli/command_policy.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 func policyTargets(ctx context.Context, rep *repo.Repository, globalFlag *bool, targetsFlag *[]string) ([]snapshot.SourceInfo, error) {

cli/command_policy_edit.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/kopia/kopia/internal/editor"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 const policyEditHelpText = `

cli/command_policy_ls.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 var (

cli/command_policy_remove.go

@@ -3,8 +3,8 @@ package cli
 import (
 	"context"
 
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 var (

cli/command_policy_set.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/kopia/kopia/fs/ignorefs"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 var (

cli/command_policy_show.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/kopia/kopia/internal/units"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 var (

cli/command_repository_create.go

@@ -8,11 +8,11 @@ import (
 
 	"github.com/kopia/kopia/fs/ignorefs"
 	"github.com/kopia/kopia/internal/units"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/repo/block"
 	"github.com/kopia/kopia/repo/object"
 	"github.com/kopia/kopia/repo/storage"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 var (

cli/command_snapshot_create.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/kopia/kopia/internal/upload"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 const (

cli/command_snapshot_estimate.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/kopia/kopia/fs/ignorefs"
-	"github.com/kopia/kopia/policy"
+	"github.com/kopia/kopia/snapshot/policy"
 
 	"github.com/kopia/kopia/repo"
 

cli/command_snapshot_expire.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"sort"
 
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 var (

cli/command_snapshot_list.go

@@ -10,10 +10,10 @@ import (
 	"github.com/kopia/kopia/fs"
 	"github.com/kopia/kopia/fs/repofs"
 	"github.com/kopia/kopia/internal/units"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/repo/object"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 var (

internal/server/api_policy_list.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/kopia/kopia/internal/serverapi"
-	"github.com/kopia/kopia/policy"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 func (s *Server) handlePolicyList(ctx context.Context, r *http.Request) (interface{}, *apiError) {

internal/server/api_snapshot_list.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/kopia/kopia/fs"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 type snapshotListEntry struct {

internal/server/source_manager.go

@@ -8,8 +8,8 @@ import (
 	"github.com/kopia/kopia/fs/localfs"
 	"github.com/kopia/kopia/internal/serverapi"
 	"github.com/kopia/kopia/internal/upload"
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 // sourceManager manages the state machine of each source

internal/serverapi/serverapi.go

@@ -3,9 +3,9 @@ package serverapi
 import (
 	"time"
 
-	"github.com/kopia/kopia/policy"
 	"github.com/kopia/kopia/repo/block"
 	"github.com/kopia/kopia/snapshot"
+	"github.com/kopia/kopia/snapshot/policy"
 )
 
 // StatusResponse is the response of 'status' HTTP API command.

policy/policy_manager.go → snapshot/policy/policy_manager.go

@@ -17,7 +17,7 @@ import (
 // GlobalPolicySourceInfo is a source where global policy is attached.
 var GlobalPolicySourceInfo = snapshot.SourceInfo{}
 
-var log = kopialogging.Logger("kopia/policy")
+var log = kopialogging.Logger("kopia/snapshot/policy")
 
 // GetEffectivePolicy calculates effective snapshot policy for a given source by combining the source-specifc policy (if any)
 // with parent policies. The source must contain a path.