Skip to content

Commit aa20bc0

Browse files
abyss-wabyss-w
authored
revert: Change package Name (#1337)
* revert: Change the package name * revert(*): Change the package name * chore: Modified go.mod for service uss
1 parent 22fdc10 commit aa20bc0

File tree

269 files changed

+798
-746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+798
-746
lines changed

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ package main
3333
import (
3434
"log"
3535

36-
"go.beyondstorage.io/v5/services"
37-
"go.beyondstorage.io/v5/types"
36+
"github.com/beyondstorage/go-storage/v5/services"
37+
"github.com/beyondstorage/go-storage/v5/types"
3838

3939
// Add fs support
40-
_ "go.beyondstorage.io/services/fs/v4"
40+
_ "github.com/beyondstorage/go-storage/services/fs/v4"
4141
// Add s3 support
42-
_ "go.beyondstorage.io/services/s3/v3"
42+
_ "github.com/beyondstorage/go-storage/services/s3/v3"
4343
// Add gcs support
44-
_ "go.beyondstorage.io/services/gcs/v3"
44+
_ "github.com/beyondstorage/go-storage/services/gcs/v3"
4545
// Add azblob support
46-
_ "go.beyondstorage.io/services/azblob/v3"
46+
_ "github.com/beyondstorage/go-storage/services/azblob/v3"
4747
// More support could be found under BeyondStorage.
48-
_ "go.beyondstorage.io/services/xxx"
48+
_ "github.com/beyondstorage/go-storage/services/xxx"
4949
)
5050

5151
func main() {

‎README.zh-CN.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ package main
2727
import (
2828
"log"
2929

30-
"go.beyondstorage.io/v5/services"
31-
"go.beyondstorage.io/v5/types"
30+
"github.com/beyondstorage/go-storage/v5/services"
31+
"github.com/beyondstorage/go-storage/v5/types"
3232

3333
// 添加 fs 支持
34-
_ "go.beyondstorage.io/services/fs/v4"
34+
_ "github.com/beyondstorage/go-storage/services/fs/v4"
3535
// 添加 s3 支持
36-
_ "go.beyondstorage.io/services/s3/v3"
36+
_ "github.com/beyondstorage/go-storage/services/s3/v3"
3737
// 添加 gcs 支持
38-
_ "go.beyondstorage.io/services/gcs/v3"
38+
_ "github.com/beyondstorage/go-storage/services/gcs/v3"
3939
// 添加 azblob 支持
40-
_ "go.beyondstorage.io/services/azblob/v3"
40+
_ "github.com/beyondstorage/go-storage/services/azblob/v3"
4141
// 更多支持，可在 BeyondStorage 下获取
42-
_ "go.beyondstorage.io/services/xxx"
42+
_ "github.com/beyondstorage/go-storage/services/xxx"
4343
)
4444

4545
func main() {

‎credential/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module go.beyondstorage.io/credential
1+
module github.com/beyondstorage/go-storage/credential
22

33
go 1.16
44

‎definitions/gen_namespace.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func GenerateNamespace(path string) {
2121
f.NewImport().
2222
AddPath("fmt").
2323
AddLine().
24-
AddPath("go.beyondstorage.io/v5/types")
24+
AddPath("github.com/beyondstorage/go-storage/v5/types")
2525

2626
gf.generateNamespace(NamespaceService, OperationsService)
2727
gf.generateNamespace(NamespaceStorage, OperationsStorage)

‎definitions/gen_pair.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func GeneratePair(path string) {
1212
f.AddLineComment("Code generated by go generate cmd/definitions; DO NOT EDIT.")
1313
f.AddPackage("pairs")
1414
f.NewImport().
15-
AddPath("go.beyondstorage.io/v5/types")
15+
AddPath("github.com/beyondstorage/go-storage/v5/types")
1616

1717
ps := SortPairs(PairArray)
1818

‎definitions/gen_service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ func (gs *genService) generateHeader() {
108108
AddPath("time").
109109
AddPath("errors").
110110
AddLine().
111-
AddPath("go.beyondstorage.io/v5/services").
112-
AddPath("go.beyondstorage.io/v5/types")
111+
AddPath("github.com/beyondstorage/go-storage/v5/services").
112+
AddPath("github.com/beyondstorage/go-storage/v5/types")
113113

114114
f.NewVar().
115115
AddDecl("_", "types.Storager").

‎definitions/namespace.generated.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎definitions/tests/generated_test.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎definitions/tests/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
def "go.beyondstorage.io/v5/definitions"
5-
"go.beyondstorage.io/v5/types"
4+
def "github.com/beyondstorage/go-storage/v5/definitions"
5+
"github.com/beyondstorage/go-storage/v5/types"
66
)
77

88
//go:generate go run .

‎definitions/tests/service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"context"
5-
"go.beyondstorage.io/v5/types"
5+
"github.com/beyondstorage/go-storage/v5/types"
66
)
77

88
type Service struct {

‎definitions/tests/storage_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"context"
5-
"go.beyondstorage.io/v5/types"
5+
"github.com/beyondstorage/go-storage/v5/types"
66
"io"
77
)
88

‎docs/rfcs/970-service-factory.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ package main
2020
import (
2121
"log"
2222

23-
"go.beyondstorage.io/v5/services"
24-
"go.beyondstorage.io/v5/types"
23+
"github.com/beyondstorage/go-storage/v5/services"
24+
"github.com/beyondstorage/go-storage/v5/types"
2525

26-
_ "go.beyondstorage.io/services/s3/v3"
26+
_ "github.com/beyondstorage/go-storage/services/s3/v3"
2727
)
2828

2929
func main() {

‎endpoint/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module go.beyondstorage.io/endpoint
1+
module github.com/beyondstorage/go-storageo/endpoint
22

33
go 1.16
44

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module go.beyondstorage.io/v5
1+
module github.com/beyondstorage/go-storage/v5
22

33
go 1.16
44

‎internal/cmd/definitions/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
def "go.beyondstorage.io/v5/definitions"
4+
def "github.com/beyondstorage/go-storage/v5/definitions"
55
)
66

77
//go:generate go run .

‎pairs/generated.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/fswrap/fileinfo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"time"
66

7-
"go.beyondstorage.io/v5/types"
7+
"github.com/beyondstorage/go-storage/v5/types"
88
)
99

1010
type fileInfoWrapper struct {

‎pkg/fswrap/httpfs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"net/http"
88
"os"
99

10-
"go.beyondstorage.io/v5/pairs"
11-
"go.beyondstorage.io/v5/types"
10+
"github.com/beyondstorage/go-storage/v5/pairs"
11+
"github.com/beyondstorage/go-storage/v5/types"
1212
)
1313

1414
var (

‎pkg/fswrap/iofs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"io/fs"
1010
"path"
1111

12-
"go.beyondstorage.io/v5/pairs"
13-
"go.beyondstorage.io/v5/types"
12+
"github.com/beyondstorage/go-storage/v5/pairs"
13+
"github.com/beyondstorage/go-storage/v5/types"
1414
)
1515

1616
var (

‎services/azblob/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Azure azblob service support for [go-storage](https://github.com/beyondstorage/g
77
## Install
88

99
```go
10-
go get go.beyondstorage.io/services/azblob/v3
10+
go get github.com/beyondstorage/go-storage/services/azblob/v3
1111
```
1212

1313
## Usage
@@ -16,8 +16,8 @@ go get go.beyondstorage.io/services/azblob/v3
1616
import (
1717
"log"
1818

19-
_ "go.beyondstorage.io/services/azblob/v3"
20-
"go.beyondstorage.io/v5/services"
19+
_ "github.com/beyondstorage/go-storage/services/azblob/v3"
20+
"github.com/beyondstorage/go-storage/v5/services"
2121
)
2222

2323
func main() {

‎services/azblob/error.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package azblob
22

3-
import "go.beyondstorage.io/v5/services"
3+
import "github.com/beyondstorage/go-storage/v5/services"
44

55
var (
66
// ErrEncryptionKeyInvalid will be returned while encryption key is invalid.

‎services/azblob/generated.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎services/azblob/go.mod

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
module go.beyondstorage.io/services/azblob/v3
1+
module github.com/beyondstorage/go-storage/services/azblob/v3
22

33
go 1.16
44

55
require (
66
github.com/Azure/azure-storage-blob-go v0.14.0
7+
github.com/beyondstorage/go-storage/credential v1.0.0
8+
github.com/beyondstorage/go-storage/endpoint v1.2.0
9+
github.com/beyondstorage/go-storage/v5 v5.0.0
710
github.com/google/uuid v1.3.0
8-
go.beyondstorage.io/credential v1.0.0
9-
go.beyondstorage.io/endpoint v1.2.0
10-
go.beyondstorage.io/v5 v5.0.0
1111
)
1212

13-
replace go.beyondstorage.io/v5 => ../../
13+
replace (
14+
github.com/beyondstorage/go-storage/credential => ../../credential
15+
github.com/beyondstorage/go-storage/endpoint => ../../endpoint
16+
github.com/beyondstorage/go-storage/v5 => ../../
17+
)

‎services/azblob/go.sum

+10-11
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,19 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
4444
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
4545
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4646
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
47-
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
48-
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
47+
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
48+
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
4949
github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
5050
github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
5151
github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg=
5252
github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
5353
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
54-
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
55-
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
54+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
5655
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
56+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
57+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
58+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
5759
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
58-
go.beyondstorage.io/credential v1.0.0 h1:xJ7hBXmeUE0+rbW+RYZSz4KgHpXvc9g7oQ56f8dXdBk=
59-
go.beyondstorage.io/credential v1.0.0/go.mod h1:7KAYievVw4a8u/eLZmnQt65Z91n84sMQj3LFbt8Xous=
60-
go.beyondstorage.io/endpoint v1.2.0 h1:/7mgKquTykeqJ9op82hso2+WQfECeywGd/Lda1N3tF4=
61-
go.beyondstorage.io/endpoint v1.2.0/go.mod h1:oZ7Z7HZ7mAo337JBLjuCF/DM66HVEUu6+hw68c3UcLs=
6260
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
6361
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
6462
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
@@ -74,13 +72,13 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
7472
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7573
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
7674
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
77-
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7875
golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7976
golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
8077
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
8178
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
82-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
8379
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
80+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
81+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
8482
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
8583
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
8684
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -96,5 +94,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
9694
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
9795
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
9896
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
99-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
10097
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
98+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
99+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎services/azblob/internal/cmd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
def "go.beyondstorage.io/v5/definitions"
4+
def "github.com/beyondstorage/go-storage/v5/definitions"
55
)
66

77
func main() {

‎services/azblob/internal/cmd/meta.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
def "go.beyondstorage.io/v5/definitions"
5-
"go.beyondstorage.io/v5/types"
4+
def "github.com/beyondstorage/go-storage/v5/definitions"
5+
"github.com/beyondstorage/go-storage/v5/types"
66
)
77

88
var Metadata = def.Metadata{

‎services/azblob/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/Azure/azure-storage-blob-go/azblob"
77

8-
typ "go.beyondstorage.io/v5/types"
8+
typ "github.com/beyondstorage/go-storage/v5/types"
99
)
1010

1111
func (s *Service) create(ctx context.Context, name string, opt pairServiceCreate) (store typ.Storager, err error) {

‎services/azblob/storage.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010

1111
"github.com/Azure/azure-storage-blob-go/azblob"
1212

13-
ps "go.beyondstorage.io/v5/pairs"
14-
"go.beyondstorage.io/v5/pkg/iowrap"
15-
"go.beyondstorage.io/v5/services"
16-
"go.beyondstorage.io/v5/types"
13+
ps "github.com/beyondstorage/go-storage/v5/pairs"
14+
"github.com/beyondstorage/go-storage/v5/pkg/iowrap"
15+
"github.com/beyondstorage/go-storage/v5/services"
16+
"github.com/beyondstorage/go-storage/v5/types"
1717
)
1818

1919
func (s *Storage) commitAppend(ctx context.Context, o *types.Object, opt pairStorageCommitAppend) (err error) {

‎services/azblob/tests/storage_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"testing"
66

7-
"go.beyondstorage.io/v5/tests"
7+
"github.com/beyondstorage/go-storage/v5/tests"
88
)
99

1010
func TestStorage(t *testing.T) {

‎services/azblob/tests/utils_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"os"
55
"testing"
66

7+
azblob "github.com/beyondstorage/go-storage/services/azblob/v3"
8+
ps "github.com/beyondstorage/go-storage/v5/pairs"
9+
"github.com/beyondstorage/go-storage/v5/types"
710
"github.com/google/uuid"
8-
azblob "go.beyondstorage.io/services/azblob/v3"
9-
ps "go.beyondstorage.io/v5/pairs"
10-
"go.beyondstorage.io/v5/types"
1111
)
1212

1313
func setupTest(t *testing.T) types.Storager {

0 commit comments

Comments
 (0)