From 8f2781f52a56a24397791013a93d95ed19adf7d5 Mon Sep 17 00:00:00 2001 From: Anton Korotkov <106995168+korotkov-aerospike@users.noreply.github.com> Date: Sun, 29 Dec 2024 11:31:36 +0200 Subject: [PATCH] APPS-1375 Set v3 version suffix in the module path (#293) v2 -> v3 --- build/readme/readme_example_generator.go | 4 ++-- cmd/backup/main.go | 16 ++++++++-------- go.mod | 2 +- .../configuration/configuration_manager.go | 6 +++--- .../configuration/configuration_manager_http.go | 4 ++-- .../configuration/configuration_manager_local.go | 4 ++-- internal/server/configuration/storage_manager.go | 6 +++--- internal/server/handlers/backup.go | 6 +++--- internal/server/handlers/config.go | 6 +++--- internal/server/handlers/config_cluster.go | 4 ++-- internal/server/handlers/config_cluster_test.go | 2 +- internal/server/handlers/config_policy.go | 4 ++-- internal/server/handlers/config_policy_test.go | 2 +- internal/server/handlers/config_routine.go | 4 ++-- internal/server/handlers/config_routines_test.go | 2 +- internal/server/handlers/config_storage.go | 4 ++-- internal/server/handlers/config_storage_test.go | 2 +- internal/server/handlers/config_test.go | 2 +- internal/server/handlers/handlers_test.go | 6 +++--- internal/server/handlers/restore.go | 6 +++--- internal/server/handlers/restore_test.go | 4 ++-- internal/server/handlers/service.go | 8 ++++---- internal/server/handlers/system.go | 4 ++-- internal/server/middleware/rate_limiter.go | 2 +- internal/server/router.go | 2 +- internal/server/server.go | 8 ++++---- internal/util/util.go | 2 +- pkg/dto/aerospike_cluster.go | 2 +- pkg/dto/backup_details.go | 2 +- pkg/dto/backup_policy.go | 2 +- pkg/dto/backup_policy_test.go | 2 +- pkg/dto/backup_routine.go | 4 ++-- pkg/dto/backup_service_config.go | 2 +- pkg/dto/base_dto.go | 2 +- pkg/dto/compare_test.go | 2 +- pkg/dto/compression_policy.go | 2 +- pkg/dto/config.go | 4 ++-- pkg/dto/config_test.go | 4 ++-- pkg/dto/convert_test.go | 4 ++-- pkg/dto/current_backup.go | 2 +- pkg/dto/encryption_policy.go | 2 +- pkg/dto/http_server_config.go | 2 +- pkg/dto/logger_config.go | 2 +- pkg/dto/restore_namespace.go | 2 +- pkg/dto/restore_policy.go | 2 +- pkg/dto/restore_request.go | 2 +- pkg/dto/restore_result.go | 2 +- pkg/dto/secret_agent.go | 2 +- pkg/dto/storage.go | 2 +- pkg/dto/storage_azure.go | 2 +- pkg/dto/storage_gcp.go | 2 +- pkg/dto/storage_local.go | 2 +- pkg/dto/storage_s3.go | 2 +- pkg/dto/time_bounds.go | 2 +- pkg/model/aerospike_cluster.go | 2 +- pkg/model/backup_policy.go | 2 +- pkg/model/config_default.go | 2 +- pkg/model/secret_agent.go | 2 +- pkg/service/aerospike/client_manager.go | 2 +- pkg/service/aerospike/client_manager_test.go | 2 +- pkg/service/aerospike/namespace_validator.go | 4 ++-- .../aerospike/namespace_validator_test.go | 2 +- pkg/service/backup_backend.go | 4 ++-- pkg/service/backup_backend_test.go | 2 +- pkg/service/backup_backends_holder.go | 2 +- pkg/service/backup_go.go | 6 +++--- pkg/service/backup_job.go | 2 +- pkg/service/backup_list_reader.go | 2 +- pkg/service/backup_routine_handler.go | 8 ++++---- pkg/service/backup_routine_handler_test.go | 4 ++-- pkg/service/backup_scheduler.go | 2 +- pkg/service/backup_scheduler_test.go | 4 ++-- pkg/service/cluster_config_writer.go | 4 ++-- pkg/service/cluster_configuration.go | 4 ++-- pkg/service/config_applier.go | 4 ++-- pkg/service/estimates.go | 2 +- pkg/service/jobs_holder.go | 2 +- pkg/service/paths.go | 2 +- pkg/service/restore_config.go | 2 +- pkg/service/restore_data.go | 6 +++--- pkg/service/restore_data_test.go | 2 +- pkg/service/restore_manager.go | 2 +- pkg/service/restore_mock.go | 2 +- pkg/service/restore_run.go | 6 +++--- pkg/service/retention_manager.go | 4 ++-- pkg/service/retention_manager_test.go | 4 ++-- pkg/service/storage/accessor.go | 2 +- pkg/service/storage/azure.go | 2 +- pkg/service/storage/gcp.go | 2 +- pkg/service/storage/local.go | 2 +- pkg/service/storage/operations.go | 2 +- pkg/service/storage/s3.go | 2 +- pkg/service/types.go | 2 +- pkg/validation/config_validation.go | 4 ++-- 94 files changed, 151 insertions(+), 151 deletions(-) diff --git a/build/readme/readme_example_generator.go b/build/readme/readme_example_generator.go index 18f2e6d7..b2a8db5c 100644 --- a/build/readme/readme_example_generator.go +++ b/build/readme/readme_example_generator.go @@ -8,8 +8,8 @@ import ( "regexp" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "gopkg.in/yaml.v3" ) diff --git a/cmd/backup/main.go b/cmd/backup/main.go index 011895b3..a9f96bee 100644 --- a/cmd/backup/main.go +++ b/cmd/backup/main.go @@ -10,14 +10,14 @@ import ( "syscall" "time" - backup "github.com/aerospike/aerospike-backup-service/v2" - "github.com/aerospike/aerospike-backup-service/v2/internal/server" - "github.com/aerospike/aerospike-backup-service/v2/internal/server/configuration" - "github.com/aerospike/aerospike-backup-service/v2/internal/server/handlers" - "github.com/aerospike/aerospike-backup-service/v2/internal/util" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + backup "github.com/aerospike/aerospike-backup-service/v3" + "github.com/aerospike/aerospike-backup-service/v3/internal/server" + "github.com/aerospike/aerospike-backup-service/v3/internal/server/configuration" + "github.com/aerospike/aerospike-backup-service/v3/internal/server/handlers" + "github.com/aerospike/aerospike-backup-service/v3/internal/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" "github.com/reugn/go-quartz/logger" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 02e6ef30..41bef068 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/aerospike/aerospike-backup-service/v2 +module github.com/aerospike/aerospike-backup-service/v3 go 1.22 diff --git a/internal/server/configuration/configuration_manager.go b/internal/server/configuration/configuration_manager.go index a96702bb..15cb6667 100644 --- a/internal/server/configuration/configuration_manager.go +++ b/internal/server/configuration/configuration_manager.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" "gopkg.in/yaml.v3" ) diff --git a/internal/server/configuration/configuration_manager_http.go b/internal/server/configuration/configuration_manager_http.go index d0bfb2da..fdb907b6 100644 --- a/internal/server/configuration/configuration_manager_http.go +++ b/internal/server/configuration/configuration_manager_http.go @@ -6,8 +6,8 @@ import ( "fmt" "net/http" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" ) // httpConfigurationManager implements the Manager interface, diff --git a/internal/server/configuration/configuration_manager_local.go b/internal/server/configuration/configuration_manager_local.go index 56342d95..ca39527c 100644 --- a/internal/server/configuration/configuration_manager_local.go +++ b/internal/server/configuration/configuration_manager_local.go @@ -7,8 +7,8 @@ import ( "os" "sync" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" ) // fileConfigurationManager implements the Manager interface, diff --git a/internal/server/configuration/storage_manager.go b/internal/server/configuration/storage_manager.go index b7fd6028..5276332e 100644 --- a/internal/server/configuration/storage_manager.go +++ b/internal/server/configuration/storage_manager.go @@ -5,9 +5,9 @@ import ( "context" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" ) // storageManager implements Manager interface. diff --git a/internal/server/handlers/backup.go b/internal/server/handlers/backup.go index a6949c49..d2a9ccfe 100644 --- a/internal/server/handlers/backup.go +++ b/internal/server/handlers/backup.go @@ -7,9 +7,9 @@ import ( "strconv" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service" "github.com/gorilla/mux" "github.com/reugn/go-quartz/quartz" ) diff --git a/internal/server/handlers/config.go b/internal/server/handlers/config.go index 477640a3..3cc0e429 100644 --- a/internal/server/handlers/config.go +++ b/internal/server/handlers/config.go @@ -6,9 +6,9 @@ import ( "log/slog" "net/http" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/validation" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/validation" ) func (s *Service) ConfigActionHandler(w http.ResponseWriter, r *http.Request) { diff --git a/internal/server/handlers/config_cluster.go b/internal/server/handlers/config_cluster.go index 1ffccc9c..da498032 100644 --- a/internal/server/handlers/config_cluster.go +++ b/internal/server/handlers/config_cluster.go @@ -5,8 +5,8 @@ import ( "log/slog" "net/http" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/gorilla/mux" ) diff --git a/internal/server/handlers/config_cluster_test.go b/internal/server/handlers/config_cluster_test.go index 258aab9d..b47e4931 100644 --- a/internal/server/handlers/config_cluster_test.go +++ b/internal/server/handlers/config_cluster_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" "github.com/aws/smithy-go/ptr" "github.com/gorilla/mux" "github.com/steinfletcher/apitest" diff --git a/internal/server/handlers/config_policy.go b/internal/server/handlers/config_policy.go index 29c347f6..be758b65 100644 --- a/internal/server/handlers/config_policy.go +++ b/internal/server/handlers/config_policy.go @@ -5,8 +5,8 @@ import ( "log/slog" "net/http" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/gorilla/mux" ) diff --git a/internal/server/handlers/config_policy_test.go b/internal/server/handlers/config_policy_test.go index 57068ae5..ce22e977 100644 --- a/internal/server/handlers/config_policy_test.go +++ b/internal/server/handlers/config_policy_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" "github.com/gorilla/mux" "github.com/steinfletcher/apitest" "github.com/stretchr/testify/require" diff --git a/internal/server/handlers/config_routine.go b/internal/server/handlers/config_routine.go index 52010247..72e130e5 100644 --- a/internal/server/handlers/config_routine.go +++ b/internal/server/handlers/config_routine.go @@ -5,8 +5,8 @@ import ( "log/slog" "net/http" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/gorilla/mux" ) diff --git a/internal/server/handlers/config_routines_test.go b/internal/server/handlers/config_routines_test.go index c9a0677c..4ff67151 100644 --- a/internal/server/handlers/config_routines_test.go +++ b/internal/server/handlers/config_routines_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" "github.com/gorilla/mux" "github.com/steinfletcher/apitest" "github.com/stretchr/testify/require" diff --git a/internal/server/handlers/config_storage.go b/internal/server/handlers/config_storage.go index 2a7b47fa..9f055c04 100644 --- a/internal/server/handlers/config_storage.go +++ b/internal/server/handlers/config_storage.go @@ -5,8 +5,8 @@ import ( "log/slog" "net/http" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/gorilla/mux" ) diff --git a/internal/server/handlers/config_storage_test.go b/internal/server/handlers/config_storage_test.go index 5c4db646..61b0a177 100644 --- a/internal/server/handlers/config_storage_test.go +++ b/internal/server/handlers/config_storage_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" "github.com/gorilla/mux" "github.com/steinfletcher/apitest" "github.com/stretchr/testify/require" diff --git a/internal/server/handlers/config_test.go b/internal/server/handlers/config_test.go index 92d7f9a0..690b4b9d 100644 --- a/internal/server/handlers/config_test.go +++ b/internal/server/handlers/config_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" "github.com/gorilla/mux" "github.com/steinfletcher/apitest" "github.com/stretchr/testify/require" diff --git a/internal/server/handlers/handlers_test.go b/internal/server/handlers/handlers_test.go index a753b018..24848004 100644 --- a/internal/server/handlers/handlers_test.go +++ b/internal/server/handlers/handlers_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service" "github.com/reugn/go-quartz/quartz" "github.com/stretchr/testify/require" ) diff --git a/internal/server/handlers/restore.go b/internal/server/handlers/restore.go index 1727ec84..67790957 100644 --- a/internal/server/handlers/restore.go +++ b/internal/server/handlers/restore.go @@ -10,9 +10,9 @@ import ( "strconv" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service" "github.com/gorilla/mux" ) diff --git a/internal/server/handlers/restore_test.go b/internal/server/handlers/restore_test.go index ecd2af62..6d1cdee6 100644 --- a/internal/server/handlers/restore_test.go +++ b/internal/server/handlers/restore_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/gorilla/mux" "github.com/steinfletcher/apitest" "github.com/stretchr/testify/require" diff --git a/internal/server/handlers/service.go b/internal/server/handlers/service.go index 85b12b2b..3f8df245 100644 --- a/internal/server/handlers/service.go +++ b/internal/server/handlers/service.go @@ -4,10 +4,10 @@ import ( "log/slog" "sync" - "github.com/aerospike/aerospike-backup-service/v2/internal/server/configuration" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/internal/server/configuration" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" "github.com/reugn/go-quartz/quartz" ) diff --git a/internal/server/handlers/system.go b/internal/server/handlers/system.go index a99f84db..92bcac16 100644 --- a/internal/server/handlers/system.go +++ b/internal/server/handlers/system.go @@ -5,8 +5,8 @@ import ( "log/slog" "net/http" - backup "github.com/aerospike/aerospike-backup-service/v2" - _ "github.com/aerospike/aerospike-backup-service/v2/docs" // auto-generated Swagger spec + backup "github.com/aerospike/aerospike-backup-service/v3" + _ "github.com/aerospike/aerospike-backup-service/v3/docs" // auto-generated Swagger spec "github.com/prometheus/client_golang/prometheus/promhttp" httpSwagger "github.com/swaggo/http-swagger/v2" ) diff --git a/internal/server/middleware/rate_limiter.go b/internal/server/middleware/rate_limiter.go index 0c23423f..acafacf4 100644 --- a/internal/server/middleware/rate_limiter.go +++ b/internal/server/middleware/rate_limiter.go @@ -4,7 +4,7 @@ import ( "net" "net/http" - "github.com/aerospike/aerospike-backup-service/v2/internal/util" + "github.com/aerospike/aerospike-backup-service/v3/internal/util" ) func RateLimiter(rateLimiter *util.IPRateLimiter, whiteList *util.IPWhiteList, diff --git a/internal/server/router.go b/internal/server/router.go index 54b63c82..e81cff95 100644 --- a/internal/server/router.go +++ b/internal/server/router.go @@ -3,7 +3,7 @@ package server import ( "net/http" - "github.com/aerospike/aerospike-backup-service/v2/internal/server/handlers" + "github.com/aerospike/aerospike-backup-service/v3/internal/server/handlers" "github.com/gorilla/mux" ) diff --git a/internal/server/server.go b/internal/server/server.go index 1438f147..28ce2a2b 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -7,10 +7,10 @@ import ( "net/http" "strings" - "github.com/aerospike/aerospike-backup-service/v2/internal/server/handlers" - "github.com/aerospike/aerospike-backup-service/v2/internal/server/middleware" - "github.com/aerospike/aerospike-backup-service/v2/internal/util" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/internal/server/handlers" + "github.com/aerospike/aerospike-backup-service/v3/internal/server/middleware" + "github.com/aerospike/aerospike-backup-service/v3/internal/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "golang.org/x/time/rate" ) diff --git a/internal/util/util.go b/internal/util/util.go index 381425e7..233ff2e9 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "gopkg.in/natefinch/lumberjack.v2" ) diff --git a/pkg/dto/aerospike_cluster.go b/pkg/dto/aerospike_cluster.go index fd707a18..bbe79ce6 100644 --- a/pkg/dto/aerospike_cluster.go +++ b/pkg/dto/aerospike_cluster.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // AerospikeCluster represents the configuration for an Aerospike cluster for backup. diff --git a/pkg/dto/backup_details.go b/pkg/dto/backup_details.go index f4d73b15..d8010f25 100644 --- a/pkg/dto/backup_details.go +++ b/pkg/dto/backup_details.go @@ -3,7 +3,7 @@ package dto import ( "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // BackupDetails contains information about a backup. diff --git a/pkg/dto/backup_policy.go b/pkg/dto/backup_policy.go index a5508313..53cac609 100644 --- a/pkg/dto/backup_policy.go +++ b/pkg/dto/backup_policy.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // BackupPolicy represents a scheduled backup policy. diff --git a/pkg/dto/backup_policy_test.go b/pkg/dto/backup_policy_test.go index c4fe217c..ac2f2911 100644 --- a/pkg/dto/backup_policy_test.go +++ b/pkg/dto/backup_policy_test.go @@ -3,7 +3,7 @@ package dto import ( "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/dto/backup_routine.go b/pkg/dto/backup_routine.go index 573b4930..c90b7458 100644 --- a/pkg/dto/backup_routine.go +++ b/pkg/dto/backup_routine.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" "github.com/aws/smithy-go/ptr" "github.com/reugn/go-quartz/quartz" ) diff --git a/pkg/dto/backup_service_config.go b/pkg/dto/backup_service_config.go index 495a1856..e5163c73 100644 --- a/pkg/dto/backup_service_config.go +++ b/pkg/dto/backup_service_config.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // BackupServiceConfig represents the backup service configuration properties. diff --git a/pkg/dto/base_dto.go b/pkg/dto/base_dto.go index 02dc25e8..128fd891 100644 --- a/pkg/dto/base_dto.go +++ b/pkg/dto/base_dto.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "gopkg.in/yaml.v3" ) diff --git a/pkg/dto/compare_test.go b/pkg/dto/compare_test.go index 9825f1c4..6aa69a68 100644 --- a/pkg/dto/compare_test.go +++ b/pkg/dto/compare_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/dto/compression_policy.go b/pkg/dto/compression_policy.go index 8b8fe011..adbf3ee8 100644 --- a/pkg/dto/compression_policy.go +++ b/pkg/dto/compression_policy.go @@ -3,7 +3,7 @@ package dto import ( "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // Compression modes diff --git a/pkg/dto/config.go b/pkg/dto/config.go index 909ccb46..81684896 100644 --- a/pkg/dto/config.go +++ b/pkg/dto/config.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" ) // Config represents the service configuration file. diff --git a/pkg/dto/config_test.go b/pkg/dto/config_test.go index d871dbf5..5f40a6c1 100644 --- a/pkg/dto/config_test.go +++ b/pkg/dto/config_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" ) func validConfig() *Config { diff --git a/pkg/dto/convert_test.go b/pkg/dto/convert_test.go index 7ab3918d..c293e38d 100644 --- a/pkg/dto/convert_test.go +++ b/pkg/dto/convert_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" saClient "github.com/aerospike/backup-go/pkg/secret-agent" "github.com/aws/smithy-go/ptr" "github.com/stretchr/testify/assert" diff --git a/pkg/dto/current_backup.go b/pkg/dto/current_backup.go index 368e36ff..cbfba66d 100644 --- a/pkg/dto/current_backup.go +++ b/pkg/dto/current_backup.go @@ -3,7 +3,7 @@ package dto import ( "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // CurrentBackups represent the current state of backups (full and incremental) diff --git a/pkg/dto/encryption_policy.go b/pkg/dto/encryption_policy.go index 80b90424..babc772d 100644 --- a/pkg/dto/encryption_policy.go +++ b/pkg/dto/encryption_policy.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // Encryption modes diff --git a/pkg/dto/http_server_config.go b/pkg/dto/http_server_config.go index 347a9fa1..28e09fd9 100644 --- a/pkg/dto/http_server_config.go +++ b/pkg/dto/http_server_config.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // HTTPServerConfig represents the service's HTTP server configuration. diff --git a/pkg/dto/logger_config.go b/pkg/dto/logger_config.go index 47de118d..0058146e 100644 --- a/pkg/dto/logger_config.go +++ b/pkg/dto/logger_config.go @@ -5,7 +5,7 @@ import ( "fmt" "slices" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // LoggerConfig represents the backup service logger configuration. diff --git a/pkg/dto/restore_namespace.go b/pkg/dto/restore_namespace.go index 77639f59..e04af241 100644 --- a/pkg/dto/restore_namespace.go +++ b/pkg/dto/restore_namespace.go @@ -3,7 +3,7 @@ package dto import ( "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // RestoreNamespace specifies an alternative namespace name for the restore diff --git a/pkg/dto/restore_policy.go b/pkg/dto/restore_policy.go index 86f0d87c..5d7271d4 100644 --- a/pkg/dto/restore_policy.go +++ b/pkg/dto/restore_policy.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // RestorePolicy represents a policy for the restore operation. diff --git a/pkg/dto/restore_request.go b/pkg/dto/restore_request.go index 7bbee0a5..7d4baafc 100644 --- a/pkg/dto/restore_request.go +++ b/pkg/dto/restore_request.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // RestoreRequest represents a restore operation request from custom storage diff --git a/pkg/dto/restore_result.go b/pkg/dto/restore_result.go index c3c3a681..7d33436e 100644 --- a/pkg/dto/restore_result.go +++ b/pkg/dto/restore_result.go @@ -1,6 +1,6 @@ package dto -import "github.com/aerospike/aerospike-backup-service/v2/pkg/model" +import "github.com/aerospike/aerospike-backup-service/v3/pkg/model" type JobStatus string diff --git a/pkg/dto/secret_agent.go b/pkg/dto/secret_agent.go index cb7c7e06..a9d827aa 100644 --- a/pkg/dto/secret_agent.go +++ b/pkg/dto/secret_agent.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" saClient "github.com/aerospike/backup-go/pkg/secret-agent" ) diff --git a/pkg/dto/storage.go b/pkg/dto/storage.go index b83d0d00..d3a4488d 100644 --- a/pkg/dto/storage.go +++ b/pkg/dto/storage.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // Storage represents the configuration for a backup storage details. diff --git a/pkg/dto/storage_azure.go b/pkg/dto/storage_azure.go index eda753b9..c3b35cf1 100644 --- a/pkg/dto/storage_azure.go +++ b/pkg/dto/storage_azure.go @@ -3,7 +3,7 @@ package dto import ( "errors" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // AzureStorage represents the configuration for Azure Blob storage. diff --git a/pkg/dto/storage_gcp.go b/pkg/dto/storage_gcp.go index 98a1e43d..92f900f7 100644 --- a/pkg/dto/storage_gcp.go +++ b/pkg/dto/storage_gcp.go @@ -3,7 +3,7 @@ package dto import ( "errors" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // GcpStorage represents the configuration for GCP storage. diff --git a/pkg/dto/storage_local.go b/pkg/dto/storage_local.go index 076a9b5e..0a72ff90 100644 --- a/pkg/dto/storage_local.go +++ b/pkg/dto/storage_local.go @@ -3,7 +3,7 @@ package dto import ( "errors" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // LocalStorage represents the configuration for local storage. diff --git a/pkg/dto/storage_s3.go b/pkg/dto/storage_s3.go index eb96b95a..c50605b4 100644 --- a/pkg/dto/storage_s3.go +++ b/pkg/dto/storage_s3.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // S3Storage represents the configuration for S3 storage. diff --git a/pkg/dto/time_bounds.go b/pkg/dto/time_bounds.go index 5c32cbcf..2125ee41 100644 --- a/pkg/dto/time_bounds.go +++ b/pkg/dto/time_bounds.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // TimeBounds represents a period of time between two timestamps. diff --git a/pkg/model/aerospike_cluster.go b/pkg/model/aerospike_cluster.go index a3befa56..b6a40cf2 100644 --- a/pkg/model/aerospike_cluster.go +++ b/pkg/model/aerospike_cluster.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" as "github.com/aerospike/aerospike-client-go/v7" ) diff --git a/pkg/model/backup_policy.go b/pkg/model/backup_policy.go index bba2d3bb..b395ab51 100644 --- a/pkg/model/backup_policy.go +++ b/pkg/model/backup_policy.go @@ -3,7 +3,7 @@ package model import ( "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/aerospike/backup-go/models" ) diff --git a/pkg/model/config_default.go b/pkg/model/config_default.go index ecbd1958..3d19c84c 100644 --- a/pkg/model/config_default.go +++ b/pkg/model/config_default.go @@ -3,7 +3,7 @@ package model import ( "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/aerospike/backup-go/models" ) diff --git a/pkg/model/secret_agent.go b/pkg/model/secret_agent.go index 11424d37..c487d193 100644 --- a/pkg/model/secret_agent.go +++ b/pkg/model/secret_agent.go @@ -5,7 +5,7 @@ import ( "fmt" "sync" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/aerospike/backup-go" ) diff --git a/pkg/service/aerospike/client_manager.go b/pkg/service/aerospike/client_manager.go index 1abe5ae5..f165e053 100644 --- a/pkg/service/aerospike/client_manager.go +++ b/pkg/service/aerospike/client_manager.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" as "github.com/aerospike/aerospike-client-go/v7" "github.com/aerospike/backup-go" "golang.org/x/sync/semaphore" diff --git a/pkg/service/aerospike/client_manager_test.go b/pkg/service/aerospike/client_manager_test.go index 34459f34..6378b468 100644 --- a/pkg/service/aerospike/client_manager_test.go +++ b/pkg/service/aerospike/client_manager_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" as "github.com/aerospike/aerospike-client-go/v7" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/mocks" diff --git a/pkg/service/aerospike/namespace_validator.go b/pkg/service/aerospike/namespace_validator.go index 1c0ab753..6eabee0f 100644 --- a/pkg/service/aerospike/namespace_validator.go +++ b/pkg/service/aerospike/namespace_validator.go @@ -6,8 +6,8 @@ import ( "log/slog" "strings" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" as "github.com/aerospike/aerospike-client-go/v7" "github.com/aerospike/backup-go" ) diff --git a/pkg/service/aerospike/namespace_validator_test.go b/pkg/service/aerospike/namespace_validator_test.go index a00e432d..59e045ca 100644 --- a/pkg/service/aerospike/namespace_validator_test.go +++ b/pkg/service/aerospike/namespace_validator_test.go @@ -5,7 +5,7 @@ package aerospike import ( "testing" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" as "github.com/aerospike/aerospike-client-go/v7" "github.com/stretchr/testify/assert" ) diff --git a/pkg/service/backup_backend.go b/pkg/service/backup_backend.go index c5018b1b..60121a81 100644 --- a/pkg/service/backup_backend.go +++ b/pkg/service/backup_backend.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" "gopkg.in/yaml.v3" ) diff --git a/pkg/service/backup_backend_test.go b/pkg/service/backup_backend_test.go index 7e3b8558..5c3b9414 100644 --- a/pkg/service/backup_backend_test.go +++ b/pkg/service/backup_backend_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/stretchr/testify/require" ) diff --git a/pkg/service/backup_backends_holder.go b/pkg/service/backup_backends_holder.go index acc4ec06..50aa80ff 100644 --- a/pkg/service/backup_backends_holder.go +++ b/pkg/service/backup_backends_holder.go @@ -3,7 +3,7 @@ package service import ( "sync" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // BackendsHolder is an interface for storing backup backends. diff --git a/pkg/service/backup_go.go b/pkg/service/backup_go.go index d9068f1a..7e658dda 100644 --- a/pkg/service/backup_go.go +++ b/pkg/service/backup_go.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" a "github.com/aerospike/aerospike-client-go/v7" "github.com/aerospike/backup-go" ) diff --git a/pkg/service/backup_job.go b/pkg/service/backup_job.go index 4fa4a6f0..345fd5e9 100644 --- a/pkg/service/backup_job.go +++ b/pkg/service/backup_job.go @@ -6,7 +6,7 @@ import ( "log/slog" "sync/atomic" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/reugn/go-quartz/quartz" ) diff --git a/pkg/service/backup_list_reader.go b/pkg/service/backup_list_reader.go index b2f36433..257bdeca 100644 --- a/pkg/service/backup_list_reader.go +++ b/pkg/service/backup_list_reader.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) // BackupListReader allows to read list of existing backups. diff --git a/pkg/service/backup_routine_handler.go b/pkg/service/backup_routine_handler.go index 24d2eb31..fc27d168 100644 --- a/pkg/service/backup_routine_handler.go +++ b/pkg/service/backup_routine_handler.go @@ -7,10 +7,10 @@ import ( "log/slog" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/models" ) diff --git a/pkg/service/backup_routine_handler_test.go b/pkg/service/backup_routine_handler_test.go index 8004a334..f1d7d521 100644 --- a/pkg/service/backup_routine_handler_test.go +++ b/pkg/service/backup_routine_handler_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/models" "github.com/stretchr/testify/assert" diff --git a/pkg/service/backup_scheduler.go b/pkg/service/backup_scheduler.go index 308b137f..bae63b96 100644 --- a/pkg/service/backup_scheduler.go +++ b/pkg/service/backup_scheduler.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/reugn/go-quartz/quartz" ) diff --git a/pkg/service/backup_scheduler_test.go b/pkg/service/backup_scheduler_test.go index 090dba95..a46cf50e 100644 --- a/pkg/service/backup_scheduler_test.go +++ b/pkg/service/backup_scheduler_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/reugn/go-quartz/quartz" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/pkg/service/cluster_config_writer.go b/pkg/service/cluster_config_writer.go index bdc4cd5b..6542c017 100644 --- a/pkg/service/cluster_config_writer.go +++ b/pkg/service/cluster_config_writer.go @@ -5,8 +5,8 @@ import ( "log/slog" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" "github.com/aerospike/backup-go" ) diff --git a/pkg/service/cluster_configuration.go b/pkg/service/cluster_configuration.go index 5dfd8505..4173f9bb 100644 --- a/pkg/service/cluster_configuration.go +++ b/pkg/service/cluster_configuration.go @@ -3,8 +3,8 @@ package service import ( "log/slog" - _ "github.com/aerospike/aerospike-backup-service/v2/modules/schema" // it's required to load configuration schemas in init method - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + _ "github.com/aerospike/aerospike-backup-service/v3/modules/schema" // it's required to load configuration schemas in init method + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" as "github.com/aerospike/aerospike-client-go/v7" "github.com/aerospike/aerospike-management-lib/asconfig" "github.com/aerospike/aerospike-management-lib/info" diff --git a/pkg/service/config_applier.go b/pkg/service/config_applier.go index d3d128ea..032cb296 100644 --- a/pkg/service/config_applier.go +++ b/pkg/service/config_applier.go @@ -6,8 +6,8 @@ import ( "log/slog" "sync" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" "github.com/reugn/go-quartz/matcher" "github.com/reugn/go-quartz/quartz" ) diff --git a/pkg/service/estimates.go b/pkg/service/estimates.go index eb430d47..0ffe971f 100644 --- a/pkg/service/estimates.go +++ b/pkg/service/estimates.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) func currentBackupStatus(handlers map[string]CancelableBackupHandler) *model.RunningJob { diff --git a/pkg/service/jobs_holder.go b/pkg/service/jobs_holder.go index 757ba2b5..d9d4725c 100644 --- a/pkg/service/jobs_holder.go +++ b/pkg/service/jobs_holder.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) type jobInfo struct { diff --git a/pkg/service/paths.go b/pkg/service/paths.go index a52eb45c..f192594d 100644 --- a/pkg/service/paths.go +++ b/pkg/service/paths.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) const ( diff --git a/pkg/service/restore_config.go b/pkg/service/restore_config.go index 6032cc59..4d62226d 100644 --- a/pkg/service/restore_config.go +++ b/pkg/service/restore_config.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" ) type configRetriever struct { diff --git a/pkg/service/restore_data.go b/pkg/service/restore_data.go index 4c10b829..017bf273 100644 --- a/pkg/service/restore_data.go +++ b/pkg/service/restore_data.go @@ -8,9 +8,9 @@ import ( "path/filepath" "sync" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" "github.com/aerospike/backup-go" ) diff --git a/pkg/service/restore_data_test.go b/pkg/service/restore_data_test.go index 961267fe..fe81b6e7 100644 --- a/pkg/service/restore_data_test.go +++ b/pkg/service/restore_data_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" "github.com/stretchr/testify/require" ) diff --git a/pkg/service/restore_manager.go b/pkg/service/restore_manager.go index 41957549..8bf67529 100644 --- a/pkg/service/restore_manager.go +++ b/pkg/service/restore_manager.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" ) type RestoreManager interface { diff --git a/pkg/service/restore_mock.go b/pkg/service/restore_mock.go index 340543eb..1e8f98e1 100644 --- a/pkg/service/restore_mock.go +++ b/pkg/service/restore_mock.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/models" ) diff --git a/pkg/service/restore_run.go b/pkg/service/restore_run.go index 624a9413..71443acb 100644 --- a/pkg/service/restore_run.go +++ b/pkg/service/restore_run.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" a "github.com/aerospike/aerospike-client-go/v7" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/io/encoding/asb" diff --git a/pkg/service/retention_manager.go b/pkg/service/retention_manager.go index 499e70bb..da927528 100644 --- a/pkg/service/retention_manager.go +++ b/pkg/service/retention_manager.go @@ -7,8 +7,8 @@ import ( "slices" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/storage" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/storage" ) // RetentionManager defines the interface for deleting old backups. diff --git a/pkg/service/retention_manager_test.go b/pkg/service/retention_manager_test.go index d3022bb6..ad4d2ada 100644 --- a/pkg/service/retention_manager_test.go +++ b/pkg/service/retention_manager_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" - "github.com/aerospike/aerospike-backup-service/v2/pkg/util" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/service/storage/accessor.go b/pkg/service/storage/accessor.go index 0f533d2d..dade1b86 100644 --- a/pkg/service/storage/accessor.go +++ b/pkg/service/storage/accessor.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" ) diff --git a/pkg/service/storage/azure.go b/pkg/service/storage/azure.go index 0c0c6e7d..a5523a00 100644 --- a/pkg/service/storage/azure.go +++ b/pkg/service/storage/azure.go @@ -7,7 +7,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" azure "github.com/aerospike/backup-go/io/azure/blob" ) diff --git a/pkg/service/storage/gcp.go b/pkg/service/storage/gcp.go index d789fde3..50813aab 100644 --- a/pkg/service/storage/gcp.go +++ b/pkg/service/storage/gcp.go @@ -6,7 +6,7 @@ import ( "path/filepath" "cloud.google.com/go/storage" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" gcp "github.com/aerospike/backup-go/io/gcp/storage" "google.golang.org/api/option" diff --git a/pkg/service/storage/local.go b/pkg/service/storage/local.go index 108885c7..48dbe619 100644 --- a/pkg/service/storage/local.go +++ b/pkg/service/storage/local.go @@ -4,7 +4,7 @@ import ( "context" "path/filepath" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/io/local" ) diff --git a/pkg/service/storage/operations.go b/pkg/service/storage/operations.go index 636e04fe..68e24ca8 100644 --- a/pkg/service/storage/operations.go +++ b/pkg/service/storage/operations.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" ) diff --git a/pkg/service/storage/s3.go b/pkg/service/storage/s3.go index feb297dd..d33b9e58 100644 --- a/pkg/service/storage/s3.go +++ b/pkg/service/storage/s3.go @@ -5,7 +5,7 @@ import ( "net/http" "path/filepath" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/io/aws/s3" "github.com/aws/aws-sdk-go-v2/aws" diff --git a/pkg/service/types.go b/pkg/service/types.go index f9e58e62..132702ff 100644 --- a/pkg/service/types.go +++ b/pkg/service/types.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/aerospike/aerospike-backup-service/v2/pkg/model" + "github.com/aerospike/aerospike-backup-service/v3/pkg/model" "github.com/aerospike/backup-go" "github.com/aerospike/backup-go/models" ) diff --git a/pkg/validation/config_validation.go b/pkg/validation/config_validation.go index 06643ae6..ef28061f 100644 --- a/pkg/validation/config_validation.go +++ b/pkg/validation/config_validation.go @@ -3,8 +3,8 @@ package validation import ( "fmt" - "github.com/aerospike/aerospike-backup-service/v2/pkg/dto" - "github.com/aerospike/aerospike-backup-service/v2/pkg/service/aerospike" + "github.com/aerospike/aerospike-backup-service/v3/pkg/dto" + "github.com/aerospike/aerospike-backup-service/v3/pkg/service/aerospike" ) var nsValidator = &aerospike.NoopNamespaceValidator{}