Merge pull request #15 from bhcleek/fix-module

tomcz · web-flow · commit 486f57fbfee2 · 2024-08-22T08:47:17.000+10:00
set module version to v2
diff --git a/cmd/s3backup/main.go b/cmd/s3backup/main.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/urfave/cli/v2"
 
-	"github.com/tomcz/s3backup/internal/client"
-	"github.com/tomcz/s3backup/internal/client/crypto"
-	"github.com/tomcz/s3backup/internal/client/store"
-	"github.com/tomcz/s3backup/internal/config"
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/client"
+	"github.com/tomcz/s3backup/v2/internal/client/crypto"
+	"github.com/tomcz/s3backup/v2/internal/client/store"
+	"github.com/tomcz/s3backup/v2/internal/config"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 var (
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/tomcz/s3backup
+module github.com/tomcz/s3backup/v2
 
 go 1.22
 
diff --git a/internal/client/crypto/aes.go b/internal/client/crypto/aes.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/tomcz/s3backup/internal/client"
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/client"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 type aesCipher struct {
diff --git a/internal/client/crypto/aes_test.go b/internal/client/crypto/aes_test.go
@@ -6,7 +6,7 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 func TestRoundTripAESEncryptDecrypt_GeneratedKey(t *testing.T) {
diff --git a/internal/client/crypto/hash.go b/internal/client/crypto/hash.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/tomcz/s3backup/internal/client"
+	"github.com/tomcz/s3backup/v2/internal/client"
 )
 
 type shaHash struct{}
diff --git a/internal/client/crypto/hash_test.go b/internal/client/crypto/hash_test.go
@@ -6,7 +6,7 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 func TestVerifyHashOnSameFile(t *testing.T) {
diff --git a/internal/client/crypto/keygen.go b/internal/client/crypto/keygen.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 const (
diff --git a/internal/client/crypto/rsa.go b/internal/client/crypto/rsa.go
@@ -14,8 +14,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/tomcz/s3backup/internal/client"
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/client"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 type rsaCipher struct {
diff --git a/internal/client/crypto/rsa_test.go b/internal/client/crypto/rsa_test.go
@@ -6,7 +6,7 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 func TestRoundTripRSAEncryptDecrypt(t *testing.T) {
diff --git a/internal/client/store/s3.go b/internal/client/store/s3.go
@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 
-	"github.com/tomcz/s3backup/internal/client"
+	"github.com/tomcz/s3backup/v2/internal/client"
 )
 
 const checksumKey = "S3-Backup-Checksum"
diff --git a/internal/client/store/s3_test.go b/internal/client/store/s3_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/johannesboyne/gofakes3/backend/s3mem"
 	"gotest.tools/v3/assert"
 
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 func TestSplitRemotePath(t *testing.T) {
diff --git a/internal/config/vault_test.go b/internal/config/vault_test.go
@@ -11,7 +11,7 @@ import (
 
 	"gotest.tools/v3/assert"
 
-	"github.com/tomcz/s3backup/internal/utils"
+	"github.com/tomcz/s3backup/v2/internal/utils"
 )
 
 const loginJSON = `{

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/tomcz/s3backup`
	`1`	`+module github.com/tomcz/s3backup/v2`
`2`	`2`
`3`	`3`	`go 1.22`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"io"`
`9`	`9`	`"os"`
`10`	`10`
`11`		`- "github.com/tomcz/s3backup/internal/client"`
`12`		`- "github.com/tomcz/s3backup/internal/utils"`
	`11`	`+ "github.com/tomcz/s3backup/v2/internal/client"`
	`12`	`+ "github.com/tomcz/s3backup/v2/internal/utils"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type aesCipher struct {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`"gotest.tools/v3/assert"`
`8`	`8`
`9`		`- "github.com/tomcz/s3backup/internal/utils"`
	`9`	`+ "github.com/tomcz/s3backup/v2/internal/utils"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func TestRoundTripAESEncryptDecrypt_GeneratedKey(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"io"`
`8`	`8`	`"os"`
`9`	`9`
`10`		`- "github.com/tomcz/s3backup/internal/client"`
	`10`	`+ "github.com/tomcz/s3backup/v2/internal/client"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type shaHash struct{}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"os"`
`13`	`13`	`"strings"`
`14`	`14`
`15`		`- "github.com/tomcz/s3backup/internal/utils"`
	`15`	`+ "github.com/tomcz/s3backup/v2/internal/utils"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ import (`
`14`	`14`	`"io"`
`15`	`15`	`"os"`
`16`	`16`
`17`		`- "github.com/tomcz/s3backup/internal/client"`
`18`		`- "github.com/tomcz/s3backup/internal/utils"`
	`17`	`+ "github.com/tomcz/s3backup/v2/internal/client"`
	`18`	`+ "github.com/tomcz/s3backup/v2/internal/utils"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`type rsaCipher struct {`