Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rgw/admin: support new-bucket-name for LinkBucket #1046

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rgw/admin/link.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (

// BucketLinkInput the bucket link/unlink input parameters
type BucketLinkInput struct {
Bucket string `url:"bucket" json:"bucket"`
BucketID string `url:"bucket-id" json:"bucket_id"`
UID string `url:"uid" json:"uid"`
anoopcs9 marked this conversation as resolved.
Show resolved Hide resolved
Bucket string `url:"bucket" json:"bucket"`
BucketID string `url:"bucket-id" json:"bucket_id"`
UID string `url:"uid" json:"uid"`
NewBucketName string `url:"new-bucket-name" json:"new_bucket_name"` // Link operation only; optional; use to rename a bucket. While the tenant-id can be specified, this is not necessary in normal operation.
}

// UnlinkBucket unlink a bucket from a specified user
Expand All @@ -34,7 +35,6 @@ func (api *API) LinkBucket(ctx context.Context, link BucketLinkInput) error {
if link.Bucket == "" {
return errMissingBucket
}
// valid parameters not supported by go-ceph: new-bucket-name
_, err := api.call(ctx, http.MethodPut, "/bucket", valueToURLParams(link, []string{"uid", "bucket-id", "bucket"}))
_, err := api.call(ctx, http.MethodPut, "/bucket", valueToURLParams(link, []string{"uid", "bucket-id", "bucket", "new-bucket-name"}))
return err
}
53 changes: 53 additions & 0 deletions rgw/admin/link_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,57 @@ func (suite *RadosGWTestSuite) TestLink() {
err := co.RemoveUser(context.Background(), User{ID: "test-user2"})
assert.NoError(suite.T(), err)
})

}

func (suite *RadosGWTestSuite) TestLinkRename() {
suite.SetupConnection()
co, err := New(suite.endpoint, suite.accessKey, suite.secretKey, newDebugHTTPClient(http.DefaultClient))
assert.NoError(suite.T(), err)

const (
userName = "test-user-bucket-rename"
initialBucketName = "initial-name"
renamedBucketName = "renamed-name"
)

suite.T().Run("create test user for bucket rename", func(_ *testing.T) {
user, err := co.CreateUser(context.Background(), User{ID: userName, DisplayName: userName, Email: "[email protected]"})
assert.NoError(suite.T(), err)
assert.Equal(suite.T(), userName, user.ID)
assert.Zero(suite.T(), len(user.Caps))
})

suite.T().Run("create test bucket for rename", func(t *testing.T) {
s3, err := newS3Agent(suite.accessKey, suite.secretKey, suite.endpoint, true)
assert.NoError(t, err)

err = s3.createBucket(initialBucketName)
assert.NoError(t, err)
})

suite.T().Run("rename bucket", func(t *testing.T) {
err = co.LinkBucket(context.Background(), BucketLinkInput{
UID: userName,
Bucket: initialBucketName,
NewBucketName: renamedBucketName,
})
assert.NoError(suite.T(), err)

_, err = co.GetBucketInfo(context.Background(), Bucket{Bucket: initialBucketName})
assert.ErrorIs(t, err, ErrNoSuchBucket)

_, err = co.GetBucketInfo(context.Background(), Bucket{Bucket: renamedBucketName})
assert.NoError(t, err)
})

suite.T().Run("remove bucket", func(_ *testing.T) {
err := co.RemoveBucket(context.Background(), Bucket{Bucket: renamedBucketName})
assert.NoError(suite.T(), err)
})

suite.T().Run("delete test user for bucket rename", func(_ *testing.T) {
err := co.RemoveUser(context.Background(), User{ID: userName})
assert.NoError(suite.T(), err)
})
}
Loading