Skip to content

Commit

Permalink
APPS-1375 Set v3 version suffix in the module path (#293)
Browse files Browse the repository at this point in the history
v2 -> v3
  • Loading branch information
korotkov-aerospike authored Dec 29, 2024
1 parent 95b5506 commit 8f2781f
Show file tree
Hide file tree
Showing 94 changed files with 151 additions and 151 deletions.
4 changes: 2 additions & 2 deletions build/readme/readme_example_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
16 changes: 8 additions & 8 deletions cmd/backup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/aerospike/aerospike-backup-service/v2
module github.com/aerospike/aerospike-backup-service/v3

go 1.22

Expand Down
6 changes: 3 additions & 3 deletions internal/server/configuration/configuration_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/server/configuration/configuration_manager_http.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions internal/server/configuration/configuration_manager_local.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions internal/server/configuration/storage_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions internal/server/handlers/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/server/handlers/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions internal/server/handlers/config_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/server/handlers/config_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/server/handlers/config_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/server/handlers/config_policy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/server/handlers/config_routine.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/server/handlers/config_routines_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/server/handlers/config_storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/server/handlers/config_storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/server/handlers/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions internal/server/handlers/handlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/server/handlers/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/server/handlers/restore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions internal/server/handlers/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/server/handlers/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/server/middleware/rate_limiter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion internal/server/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/aerospike_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/backup_details.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/backup_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/backup_policy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/dto/backup_routine.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/backup_service_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/base_dto.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/compare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/dto/compression_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 8f2781f

Please sign in to comment.