From 8e5d7d719c6df33bbc5b275c15115f33f17557d1 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Fri, 24 May 2024 23:04:06 +0200 Subject: [PATCH] cache: move to backend package --- cmd/restic/cmd_cache.go | 2 +- cmd/restic/cmd_check.go | 2 +- cmd/restic/global.go | 2 +- internal/{ => backend}/cache/backend.go | 0 internal/{ => backend}/cache/backend_test.go | 0 internal/{ => backend}/cache/cache.go | 0 internal/{ => backend}/cache/cache_test.go | 0 internal/{ => backend}/cache/dir.go | 0 internal/{ => backend}/cache/dir_test.go | 0 internal/{ => backend}/cache/file.go | 0 internal/{ => backend}/cache/file_test.go | 0 internal/{ => backend}/cache/testing.go | 0 internal/repository/raw_test.go | 2 +- internal/repository/repository.go | 2 +- internal/repository/repository_test.go | 2 +- 15 files changed, 6 insertions(+), 6 deletions(-) rename internal/{ => backend}/cache/backend.go (100%) rename internal/{ => backend}/cache/backend_test.go (100%) rename internal/{ => backend}/cache/cache.go (100%) rename internal/{ => backend}/cache/cache_test.go (100%) rename internal/{ => backend}/cache/dir.go (100%) rename internal/{ => backend}/cache/dir_test.go (100%) rename internal/{ => backend}/cache/file.go (100%) rename internal/{ => backend}/cache/file_test.go (100%) rename internal/{ => backend}/cache/testing.go (100%) diff --git a/cmd/restic/cmd_cache.go b/cmd/restic/cmd_cache.go index 354cec288..651c65fcf 100644 --- a/cmd/restic/cmd_cache.go +++ b/cmd/restic/cmd_cache.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/restic/restic/internal/cache" + "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/fs" "github.com/restic/restic/internal/ui" diff --git a/cmd/restic/cmd_check.go b/cmd/restic/cmd_check.go index 671cab0e6..11a1c7cb5 100644 --- a/cmd/restic/cmd_check.go +++ b/cmd/restic/cmd_check.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" - "github.com/restic/restic/internal/cache" + "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/checker" "github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/fs" diff --git a/cmd/restic/global.go b/cmd/restic/global.go index 9671f2a26..144445cc0 100644 --- a/cmd/restic/global.go +++ b/cmd/restic/global.go @@ -15,6 +15,7 @@ import ( "github.com/restic/restic/internal/backend" "github.com/restic/restic/internal/backend/azure" "github.com/restic/restic/internal/backend/b2" + "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/backend/gs" "github.com/restic/restic/internal/backend/limiter" "github.com/restic/restic/internal/backend/local" @@ -27,7 +28,6 @@ import ( "github.com/restic/restic/internal/backend/sema" "github.com/restic/restic/internal/backend/sftp" "github.com/restic/restic/internal/backend/swift" - "github.com/restic/restic/internal/cache" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/fs" "github.com/restic/restic/internal/options" diff --git a/internal/cache/backend.go b/internal/backend/cache/backend.go similarity index 100% rename from internal/cache/backend.go rename to internal/backend/cache/backend.go diff --git a/internal/cache/backend_test.go b/internal/backend/cache/backend_test.go similarity index 100% rename from internal/cache/backend_test.go rename to internal/backend/cache/backend_test.go diff --git a/internal/cache/cache.go b/internal/backend/cache/cache.go similarity index 100% rename from internal/cache/cache.go rename to internal/backend/cache/cache.go diff --git a/internal/cache/cache_test.go b/internal/backend/cache/cache_test.go similarity index 100% rename from internal/cache/cache_test.go rename to internal/backend/cache/cache_test.go diff --git a/internal/cache/dir.go b/internal/backend/cache/dir.go similarity index 100% rename from internal/cache/dir.go rename to internal/backend/cache/dir.go diff --git a/internal/cache/dir_test.go b/internal/backend/cache/dir_test.go similarity index 100% rename from internal/cache/dir_test.go rename to internal/backend/cache/dir_test.go diff --git a/internal/cache/file.go b/internal/backend/cache/file.go similarity index 100% rename from internal/cache/file.go rename to internal/backend/cache/file.go diff --git a/internal/cache/file_test.go b/internal/backend/cache/file_test.go similarity index 100% rename from internal/cache/file_test.go rename to internal/backend/cache/file_test.go diff --git a/internal/cache/testing.go b/internal/backend/cache/testing.go similarity index 100% rename from internal/cache/testing.go rename to internal/backend/cache/testing.go diff --git a/internal/repository/raw_test.go b/internal/repository/raw_test.go index 28786dbcd..ac65a8dc8 100644 --- a/internal/repository/raw_test.go +++ b/internal/repository/raw_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/restic/restic/internal/backend" + "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/backend/mem" "github.com/restic/restic/internal/backend/mock" - "github.com/restic/restic/internal/cache" "github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/repository" "github.com/restic/restic/internal/restic" diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 34a362c55..7233c7854 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -14,8 +14,8 @@ import ( "github.com/klauspost/compress/zstd" "github.com/restic/chunker" "github.com/restic/restic/internal/backend" + "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/backend/dryrun" - "github.com/restic/restic/internal/cache" "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/errors" diff --git a/internal/repository/repository_test.go b/internal/repository/repository_test.go index 92eb1bbae..679eaaaab 100644 --- a/internal/repository/repository_test.go +++ b/internal/repository/repository_test.go @@ -14,9 +14,9 @@ import ( "time" "github.com/restic/restic/internal/backend" + "github.com/restic/restic/internal/backend/cache" "github.com/restic/restic/internal/backend/local" "github.com/restic/restic/internal/backend/mem" - "github.com/restic/restic/internal/cache" "github.com/restic/restic/internal/crypto" "github.com/restic/restic/internal/errors" "github.com/restic/restic/internal/index"