From 535736bad158bbfd3853ed1d0e23743aaa15299b Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Wed, 12 Jul 2023 12:30:42 +0800 Subject: [PATCH] s3 cos test --- internal/rpc/third/s3.go | 2 +- pkg/common/db/s3/cos/cos.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/rpc/third/s3.go b/internal/rpc/third/s3.go index 84ed90cbd..2b534aefb 100644 --- a/internal/rpc/third/s3.go +++ b/internal/rpc/third/s3.go @@ -129,7 +129,7 @@ func (t *thirdServer) CompleteMultipartUpload(ctx context.Context, req *third.Co return nil, err } return &third.CompleteMultipartUploadResp{ - Url: t.apiAddress(obj.Key), + Url: t.apiAddress(obj.Name), }, nil } diff --git a/pkg/common/db/s3/cos/cos.go b/pkg/common/db/s3/cos/cos.go index 6745b36b8..754f0e662 100644 --- a/pkg/common/db/s3/cos/cos.go +++ b/pkg/common/db/s3/cos/cos.go @@ -170,7 +170,8 @@ func (c *Cos) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, erro if name != "" && name[0] == '/' { name = name[1:] } - info, err := c.client.Object.Head(ctx, c.statObjectURL+name, nil) + //info, err := c.client.Object.Head(ctx, c.statObjectURL+name, nil) + info, err := c.client.Object.Head(ctx, name, nil) if err != nil { return nil, err } @@ -201,7 +202,7 @@ func (c *Cos) StatObject(ctx context.Context, name string) (*s3.ObjectInfo, erro } func (c *Cos) CopyObject(ctx context.Context, src string, dst string) (*s3.CopyObjectInfo, error) { - result, _, err := c.client.Object.Copy(ctx, dst, c.copyURL+src, &cos.ObjectCopyOptions{}) + result, _, err := c.client.Object.Copy(ctx, dst, src, &cos.ObjectCopyOptions{}) if err != nil { return nil, err }