Skip to content

Commit

Permalink
Bump go module version to v2 (#556)
Browse files Browse the repository at this point in the history
  • Loading branch information
@justinmanley
justinmanley authored Jun 20, 2023
1 parent 439061f commit fa8f356
Show file tree
Hide file tree
Showing 39 changed files with 96 additions and 96 deletions.
8 changes: 4 additions & 4 deletions command/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/urfave/cli/v2"

"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/parallel"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/parallel"
"github.com/peak/s5cmd/v2/storage"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions command/auto_complete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"

"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/urfave/cli/v2"
)

Expand Down
8 changes: 4 additions & 4 deletions command/bucket_version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (

"github.com/urfave/cli/v2"

"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/strutil"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/peak/s5cmd/v2/strutil"
)

var bucketVersionHelpTemplate = `Name:
Expand Down
6 changes: 3 additions & 3 deletions command/cat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/urfave/cli/v2"

"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

var catHelpTemplate = `Name:
Expand Down
2 changes: 1 addition & 1 deletion command/context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"strings"

"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion command/context_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/urfave/cli/v2"
)

Expand Down
12 changes: 6 additions & 6 deletions command/cp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/urfave/cli/v2"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/parallel"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/parallel"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions command/du.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/urfave/cli/v2"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/strutil"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/peak/s5cmd/v2/strutil"
)

var sizeHelpTemplate = `Name:
Expand Down
6 changes: 3 additions & 3 deletions command/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/hashicorp/go-multierror"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/storage/url"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/storage/url"
)

func printDebug(op string, err error, urls ...*url.URL) {
Expand Down
2 changes: 1 addition & 1 deletion command/exclude.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"strings"

"github.com/peak/s5cmd/strutil"
"github.com/peak/s5cmd/v2/strutil"
)

// createExcludesFromWildcard creates regex strings from wildcard.
Expand Down
6 changes: 3 additions & 3 deletions command/expand.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"errors"
"sync"

"github.com/peak/s5cmd/atomic"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/atomic"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

// expandSource returns the full list of objects from the given src argument.
Expand Down
4 changes: 2 additions & 2 deletions command/expand_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/stretchr/testify/mock"

"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

func TestExpandSources(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions command/ls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/urfave/cli/v2"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/strutil"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/peak/s5cmd/v2/strutil"
)

var listHelpTemplate = `Name:
Expand Down
8 changes: 4 additions & 4 deletions command/mb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"github.com/urfave/cli/v2"

"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

var makeBucketHelpTemplate = `Name:
Expand Down
2 changes: 1 addition & 1 deletion command/mv.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package command

import (
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/v2/log/stat"

"github.com/urfave/cli/v2"
)
Expand Down
8 changes: 4 additions & 4 deletions command/rb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

"github.com/urfave/cli/v2"

"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

var removeBucketHelpTemplate = `Name:
Expand Down
10 changes: 5 additions & 5 deletions command/rm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/urfave/cli/v2"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/log"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/log"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

var deleteHelpTemplate = `Name:
Expand Down
2 changes: 1 addition & 1 deletion command/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/kballard/go-shellquote"
"github.com/urfave/cli/v2"

"github.com/peak/s5cmd/parallel"
"github.com/peak/s5cmd/v2/parallel"
)

var runHelpTemplate = `Name:
Expand Down
10 changes: 5 additions & 5 deletions command/select.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/urfave/cli/v2"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/parallel"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/parallel"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

var selectHelpTemplate = `Name:
Expand Down
10 changes: 5 additions & 5 deletions command/sync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"github.com/lanrat/extsort"
"github.com/urfave/cli/v2"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/log/stat"
"github.com/peak/s5cmd/parallel"
"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/log/stat"
"github.com/peak/s5cmd/v2/parallel"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions command/sync_strategy.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package command

import (
errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/storage"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/storage"
)

// SyncStrategy is the interface to make decision whether given source object should be synced
Expand Down
4 changes: 2 additions & 2 deletions command/sync_strategy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"
"time"

errorpkg "github.com/peak/s5cmd/error"
"github.com/peak/s5cmd/storage"
errorpkg "github.com/peak/s5cmd/v2/error"
"github.com/peak/s5cmd/v2/storage"
)

func TestSizeAndModificationStrategy_ShouldSync(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions command/validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
urlpkg "net/url"

"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion command/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/urfave/cli/v2"

"github.com/peak/s5cmd/version"
"github.com/peak/s5cmd/v2/version"
)

func NewVersionCommand() *cli.Command {
Expand Down
2 changes: 1 addition & 1 deletion e2e/app_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

"github.com/peak/s5cmd/command"
"github.com/peak/s5cmd/v2/command"

"gotest.tools/v3/assert"
"gotest.tools/v3/icmd"
Expand Down
4 changes: 2 additions & 2 deletions e2e/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"
"time"

"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/strutil"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/strutil"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
Expand Down
4 changes: 2 additions & 2 deletions error/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/hashicorp/go-multierror"

"github.com/peak/s5cmd/storage"
"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/storage"
"github.com/peak/s5cmd/v2/storage/url"
)

// Error is the type that implements error interface.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/peak/s5cmd
module github.com/peak/s5cmd/v2

go 1.17

Expand Down
4 changes: 2 additions & 2 deletions log/message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package log
import (
"fmt"

"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/strutil"
"github.com/peak/s5cmd/v2/storage/url"
"github.com/peak/s5cmd/v2/strutil"
)

// Message is an interface to print structured logs.
Expand Down
2 changes: 1 addition & 1 deletion log/stat/stat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sync"
"text/tabwriter"

"github.com/peak/s5cmd/strutil"
"github.com/peak/s5cmd/v2/strutil"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os/signal"
"syscall"

"github.com/peak/s5cmd/command"
"github.com/peak/s5cmd/v2/command"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion parallel/global.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package parallel

import "github.com/peak/s5cmd/parallel/fdlimit"
import "github.com/peak/s5cmd/v2/parallel/fdlimit"

var global *Manager

Expand Down
2 changes: 1 addition & 1 deletion storage/fs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/karrick/godirwalk"
"github.com/termie/go-shutil"

"github.com/peak/s5cmd/storage/url"
"github.com/peak/s5cmd/v2/storage/url"
)

// Filesystem is the Storage implementation of a local filesystem.
Expand Down
Loading

0 comments on commit fa8f356

Please sign in to comment.