Skip to content

Commit 31d481a

Browse files
JinnyYiJinnyYi
authored
Implement GSP-73 Organization rename (#51)
1 parent 26091b7 commit 31d481a

File tree

16 files changed

+62
-79
lines changed

16 files changed

+62
-79
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
1818
- *: Add UnimplementedStub (#35)
1919
- storage: Implement SSE support (#37)
2020
- tests: Introduce STORAGE_QINGSTOR_INTEGRATION_TEST (#39)
21-
- storage: Implement AOS-40 (#41)
21+
- storage: Implement GSP-40 (#41)
2222

2323
### Changed
2424

@@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
2727
- docs: Migrate zulip to matrix
2828
- docs: Remove zulip
2929
- ci: Only run Integration Test while push to master
30-
- storage: Rename SSE related pairs to meet AOS-38 (#38)
30+
- storage: Rename SSE related pairs to meet GSP-38 (#38)
3131

3232
### Fixed
3333

@@ -61,5 +61,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
6161

6262
- Implement qingstor services.
6363

64-
[v2.1.0]: https://github.com/aos-dev/go-service-qingstor/compare/v2.0.0...v2.1.0
65-
[v2.0.0]: https://github.com/aos-dev/go-service-qingstor/compare/v1.0.0...v2.0.0
64+
[v2.1.0]: https://github.com/beyondstorage/go-service-qingstor/compare/v2.0.0...v2.1.0
65+
[v2.0.0]: https://github.com/beyondstorage/go-service-qingstor/compare/v1.0.0...v2.0.0

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# go-services-qingstor
22

3-
[![Build Status](https://github.com/aos-dev/go-service-qingstor/workflows/Unit%20Test/badge.svg?branch=master)](https://github.com/aos-dev/go-service-qingstor/actions?query=workflow%3A%22Unit+Test%22)
3+
[![Build Status](https://github.com/beyondstorage/go-service-qingstor/workflows/Unit%20Test/badge.svg?branch=master)](https://github.com/beyondstorage/go-service-qingstor/actions?query=workflow%3A%22Unit+Test%22)
44
[![License](https://img.shields.io/badge/license-apache%20v2-blue.svg)](https://github.com/Xuanwo/storage/blob/master/LICENSE)
55
[![go-service-qingstor](https://img.shields.io/matrix/go-service-qingstor:aos.dev.svg?server_fqdn=chat.aos.dev&label=%23go-service-qingstor%3Aaos.dev&logo=matrix)](https://matrix.to/#/#go-service-qingstor:aos.dev)
66

7-
[QingStor Object Storage](https://www.qingcloud.com/products/objectstorage/) services support for [go-storage](https://github.com/aos-dev/go-storage)
7+
[QingStor Object Storage](https://www.qingcloud.com/products/objectstorage/) services support for [go-storage](https://github.com/beyondstorage/go-storage)
88

99
## Install
1010

1111
```go
12-
go get github.com/aos-dev/go-service-qingstor/v2
12+
go get github.com/beyondstorage/go-service-qingstor/v3
1313
```

‎doc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Package qingstor provided support for qingstor object storage (https://www.qingc
44
package qingstor
55

66
//go:generate go run github.com/golang/mock/mockgen -package qingstor -destination mock_test.go github.com/qingstor/qingstor-sdk-go/v4/interface Service,Bucket
7-
//go:generate go run -tags tools github.com/aos-dev/go-storage/v3/cmd/definitions service.toml
7+
//go:generate go run -tags tools github.com/beyondstorage/go-storage/v4/cmd/definitions service.toml

‎errors.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package qingstor
22

3-
import "github.com/aos-dev/go-storage/v3/services"
3+
import "github.com/beyondstorage/go-storage/v4/services"
44

55
var (
66
// ErrBucketNameInvalid will be returned while bucket name is invalid.

‎generated.go‎

Lines changed: 9 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
module github.com/aos-dev/go-service-qingstor/v2
1+
module github.com/beyondstorage/go-service-qingstor/v3
22

33
go 1.14
44

55
require (
66
bou.ke/monkey v1.0.2
7-
github.com/aos-dev/go-integration-test/v3 v3.0.1-0.20210512065058-b6c8caf13bc6
8-
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210513125055-cb9106d884d5
7+
github.com/beyondstorage/go-integration-test/v4 v4.0.0-20210521062555-83f8f166943f
8+
github.com/beyondstorage/go-storage/v4 v4.0.0-20210521045436-248353dfc077
99
github.com/golang/mock v1.5.0
1010
github.com/google/uuid v1.2.0
1111
github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14

‎go.sum‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ github.com/Xuanwo/go-bufferpool v0.0.0-20200622083641-bc954721ce54 h1:wA7f87ODtF
44
github.com/Xuanwo/go-bufferpool v0.0.0-20200622083641-bc954721ce54/go.mod h1:Mle++9GGouhOwGj52i9PJLNAPmW2nb8PWBP7JJzNCzk=
55
github.com/Xuanwo/templateutils v0.1.0 h1:WpkWOqQtIQ2vAIpJLa727DdN8WtxhUkkbDGa6UhntJY=
66
github.com/Xuanwo/templateutils v0.1.0/go.mod h1:OdE0DJ+CJxDBq6psX5DPV+gOZi8bhuHuVUpPCG++Wb8=
7-
github.com/aos-dev/go-integration-test/v3 v3.0.1-0.20210512065058-b6c8caf13bc6 h1:73QZDkTGFyWpkWVrjs0GEM1VREyEmM7RtzddWtBYXho=
8-
github.com/aos-dev/go-integration-test/v3 v3.0.1-0.20210512065058-b6c8caf13bc6/go.mod h1:iMlF4lL4WavgZezGscajjSNcUdFnacX8Dek6lhE0oJA=
9-
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210512033924-5adf27cfdf96/go.mod h1:6arAU5t7CXEsxDPs87xqgHmvEj8/GQfHlV61CxxC0Ww=
10-
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210513125055-cb9106d884d5 h1:xiJN6PvJPDDVac4Ha+ekuGUjRh49O1a1xwxrJPCwlto=
11-
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210513125055-cb9106d884d5/go.mod h1:qareAWtwrRlx4Fw6XIhtAbQnM7I3wylhaQ5Gr3Q5Geg=
12-
github.com/aos-dev/specs/go v0.0.0-20210512024100-386a13f23a83/go.mod h1:gNah3KaPJEfysh7uCCX+sYjQC3g2yx2VgBkFlT945Ws=
13-
github.com/aos-dev/specs/go v0.0.0-20210512093613-3e7634b4a7f5 h1:MmXROEim7Z9u1lFLRvZCy/yKBhq3k1Q/nvaVQmVvZUU=
14-
github.com/aos-dev/specs/go v0.0.0-20210512093613-3e7634b4a7f5/go.mod h1:owye99eWsZvtg5kCEKtSp+AsRPsANhnXgCzHacu4icM=
7+
github.com/beyondstorage/go-integration-test/v4 v4.0.0-20210521062555-83f8f166943f h1:2a44nxIWm5DgEb6/gnD3We/32Bx19ET0iOM4+mxOmp8=
8+
github.com/beyondstorage/go-integration-test/v4 v4.0.0-20210521062555-83f8f166943f/go.mod h1:PUhp+CDYnsysCKVU7poqIK7ZWTfADkOu2Z/PjlSIhsY=
9+
github.com/beyondstorage/go-storage/v4 v4.0.0-20210521045436-248353dfc077 h1:BxqrLLELv6ZvP4+DZlwPAwBhNYkQqpZFvujvUT8zGiY=
10+
github.com/beyondstorage/go-storage/v4 v4.0.0-20210521045436-248353dfc077/go.mod h1:oa2dYco+xplPj99WSBnYVw/xXvRkIKWSSVDQKNZ5Kz8=
11+
github.com/beyondstorage/specs/go v0.0.0-20210521044836-3d41c1d9c97f h1:KMXKB/LACUmnOfLfjND8222qtzWT9lWRUdsPOlM4FqE=
12+
github.com/beyondstorage/specs/go v0.0.0-20210521044836-3d41c1d9c97f/go.mod h1:f5VvmLHc/dNJwl+/yAv/TOHdev3phvuEswx8DIXiSQQ=
1513
github.com/dave/dst v0.26.2 h1:lnxLAKI3tx7MgLNVDirFCsDTlTG9nKTk7GcptKcWSwY=
1614
github.com/dave/dst v0.26.2/go.mod h1:UMDJuIRPfyUCC78eFuB+SV/WI8oDeyFDvM/JR6NI3IU=
1715
github.com/dave/gopackages v0.0.0-20170318123100-46e7023ec56e/go.mod h1:i00+b/gKdIDIxuLDFob7ustLAVqhsZRk2qVZrArELGQ=
@@ -37,7 +35,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
3735
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
3836
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
3937
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
40-
github.com/pelletier/go-toml v1.9.0/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
4138
github.com/pelletier/go-toml v1.9.1 h1:a6qW1EVNZWH9WGI6CsYdD8WAylkoXBS5yv0XHlh17Tc=
4239
github.com/pelletier/go-toml v1.9.1/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
4340
github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14 h1:XeOYlK9W1uCmhjJSsY78Mcuh7MVkNjTzmHx1yBzizSU=

‎service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/qingstor/qingstor-sdk-go/v4/service"
77

8-
ps "github.com/aos-dev/go-storage/v3/pairs"
9-
. "github.com/aos-dev/go-storage/v3/types"
8+
ps "github.com/beyondstorage/go-storage/v4/pairs"
9+
. "github.com/beyondstorage/go-storage/v4/types"
1010
)
1111

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

‎servicer_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"github.com/qingstor/qingstor-sdk-go/v4/service"
1717
"github.com/stretchr/testify/assert"
1818

19-
"github.com/aos-dev/go-storage/v3/pairs"
20-
"github.com/aos-dev/go-storage/v3/pkg/credential"
21-
"github.com/aos-dev/go-storage/v3/services"
22-
"github.com/aos-dev/go-storage/v3/types"
19+
"github.com/beyondstorage/go-storage/v4/pairs"
20+
"github.com/beyondstorage/go-storage/v4/pkg/credential"
21+
"github.com/beyondstorage/go-storage/v4/services"
22+
"github.com/beyondstorage/go-storage/v4/types"
2323
)
2424

2525
func TestService_String(t *testing.T) {

‎storage.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"github.com/pengsrc/go-shared/convert"
88
"github.com/qingstor/qingstor-sdk-go/v4/service"
99

10-
"github.com/aos-dev/go-storage/v3/pkg/headers"
11-
"github.com/aos-dev/go-storage/v3/pkg/iowrap"
12-
"github.com/aos-dev/go-storage/v3/services"
13-
. "github.com/aos-dev/go-storage/v3/types"
10+
"github.com/beyondstorage/go-storage/v4/pkg/headers"
11+
"github.com/beyondstorage/go-storage/v4/pkg/iowrap"
12+
"github.com/beyondstorage/go-storage/v4/services"
13+
. "github.com/beyondstorage/go-storage/v4/types"
1414
)
1515

1616
func (s *Storage) commitAppend(ctx context.Context, o *Object, opt pairStorageCommitAppend) (err error) {
@@ -152,7 +152,7 @@ func (s *Storage) delete(ctx context.Context, path string, opt pairStorageDelete
152152
// QingStor AbortMultipartUpload is idempotent, so we don't need to check upload_not_exists error.
153153
//
154154
// References
155-
// - [AOS-46](https://github.com/aos-dev/specs/blob/master/rfcs/46-idempotent-delete.md)
155+
// - [GSP-46](https://github.com/beyondstorage/specs/blob/master/rfcs/46-idempotent-delete.md)
156156
// - https://docs.qingcloud.com/qingstor/api/object/multipart/abort_multipart_upload.html
157157
_, err = s.bucket.AbortMultipartUploadWithContext(ctx, rp, &service.AbortMultipartUploadInput{
158158
UploadID: service.String(opt.MultipartID),
@@ -165,7 +165,7 @@ func (s *Storage) delete(ctx context.Context, path string, opt pairStorageDelete
165165

166166
// QingStor DeleteObject is idempotent, so we don't need to check object_not_exists error.
167167
//
168-
// - [AOS-46](https://github.com/aos-dev/specs/blob/master/rfcs/46-idempotent-delete.md)
168+
// - [GSP-46](https://github.com/beyondstorage/specs/blob/master/rfcs/46-idempotent-delete.md)
169169
// - https://docs.qingcloud.com/qingstor/api/object/delete
170170
_, err = s.bucket.DeleteObjectWithContext(ctx, rp)
171171
if err != nil {
@@ -214,12 +214,12 @@ func (s *Storage) listMultipart(ctx context.Context, o *Object, opt pairStorageL
214214
return NewPartIterator(ctx, s.nextPartPage, input), nil
215215
}
216216

217-
func (s *Storage) metadata(ctx context.Context, opt pairStorageMetadata) (meta *StorageMeta, err error) {
217+
func (s *Storage) metadata(opt pairStorageMetadata) (meta *StorageMeta) {
218218
meta = NewStorageMeta()
219219
meta.Name = *s.properties.BucketName
220220
meta.WorkDir = s.workDir
221221
meta.SetLocation(*s.properties.Zone)
222-
return meta, nil
222+
return meta
223223
}
224224

225225
func (s *Storage) move(ctx context.Context, src string, dst string, opt pairStorageMove) (err error) {
@@ -560,7 +560,6 @@ func (s *Storage) writeMultipart(ctx context.Context, o *Object, r io.Reader, si
560560
err = ErrPartNumberInvalid
561561
return
562562
}
563-
564563
input := &service.UploadMultipartInput{
565564
PartNumber: service.Int(index),
566565
UploadID: service.String(o.MustGetMultipartID()),

0 commit comments

Comments
 (0)