fix: 增加对 aliyun oss 的支持||fix: Added support for Aliyun OSS (#1069)

* 1、增加对 aliyun oss 的支持 ListObjectsInput 增加 fetch_owner 表示是否获取 owner 信息 ListObjectsOutput 中 Object 增加 type 表示Object 当前的状态 * 1、增加 Aliyun OSS 属性对于 Layotto 属性的转换 * 1、修复 ListObjectsInput fetch_owner 的类型错误 --------- Co-authored-by: zhengzhiqi.zzq <zhengzhiqi.zzq@antfin.com>
mosn · Sep 27, 2024 · b4fed4d · b4fed4d
1 parent 9db2aa0
commit b4fed4d
Show file tree

Hide file tree

Showing 6 changed files with 1,151 additions and 1,089 deletions.
diff --git a/components/oss/aliyun/oss.go b/components/oss/aliyun/oss.go
@@ -274,6 +274,7 @@ func (a *AliyunOSS) ListObjects(ctx context.Context, req *l8oss.ListObjectsInput
 		object := &l8oss.Object{
 			ETag:         v.ETag,
 			Key:          v.Key,
+			Type:         v.Type,
 			LastModified: v.LastModified.Unix(),
 			Owner:        &l8oss.Owner{ID: v.Owner.ID, DisplayName: v.Owner.DisplayName},
 			Size:         v.Size,

diff --git a/components/oss/oss.go b/components/oss/oss.go
@@ -233,6 +233,7 @@ type ListObjectsInput struct {
 	MaxKeys             int32  `json:"maxKeys,omitempty"`
 	Prefix              string `json:"prefix,omitempty"`
 	RequestPayer        string `json:"request_payer,omitempty"`
+	FetchOwner          bool   `json:"fetch_owner,omitempty"`
 }
 type ListObjectsOutput struct {
 	CommonPrefixes []string          `json:"common_prefixes,omitempty"`
@@ -254,6 +255,7 @@ type Object struct {
 	Owner        *Owner `json:"owner,omitempty"`
 	Size         int64  `json:"size,omitempty"`
 	StorageClass string `json:"storage_class,omitempty"`
+	Type         string `json:"type,omitempty"`
 }
 type Owner struct {
 	DisplayName string `json:"display_name,omitempty"`

diff --git a/pkg/grpc/extension/s3/s3_test.go b/pkg/grpc/extension/s3/s3_test.go
@@ -340,6 +340,7 @@ func TestListObjects(t *testing.T) {
 		MaxKeys:             1,
 		Prefix:              "Prefix",
 		RequestPayer:        "RequestPayer",
+		FetchOwner:          true,
 	}
 	_, err := s3Server.ListObjects(ctx, req)
 	assert.Equal(t, status.Errorf(codes.InvalidArgument, NotSupportStoreName, "NoStore"), err)
@@ -354,13 +355,48 @@ func TestListObjects(t *testing.T) {
 			MaxKeys:             1,
 			Prefix:              "Prefix",
 			RequestPayer:        "RequestPayer",
+			FetchOwner:          true,
 		},
 	).Return(output, nil)
 	req.StoreName = MOCKSERVER
 	resp, err := s3Server.ListObjects(ctx, req)
 	assert.Nil(t, err)
 	assert.Equal(t, true, resp.IsTruncated)
 	assert.Equal(t, "delimiter", resp.Delimiter)
+
+	ctx = context.TODO()
+	req = &s3.ListObjectsInput{
+		StoreName:           "NoStore",
+		Bucket:              "layotto",
+		Delimiter:           "delimiter",
+		EncodingType:        "EncodingType",
+		ExpectedBucketOwner: "ExpectedBucketOwner",
+		Marker:              "Marker",
+		MaxKeys:             1,
+		Prefix:              "Prefix",
+		RequestPayer:        "RequestPayer",
+	}
+	_, err = s3Server.ListObjects(ctx, req)
+	assert.Equal(t, status.Errorf(codes.InvalidArgument, NotSupportStoreName, "NoStore"), err)
+	output = &l8s3.ListObjectsOutput{Delimiter: "delimiter", IsTruncated: true}
+	mockossServer.EXPECT().ListObjects(ctx,
+		&l8s3.ListObjectsInput{
+			Bucket:              "layotto",
+			Delimiter:           "delimiter",
+			EncodingType:        "EncodingType",
+			ExpectedBucketOwner: "ExpectedBucketOwner",
+			Marker:              "Marker",
+			MaxKeys:             1,
+			Prefix:              "Prefix",
+			RequestPayer:        "RequestPayer",
+			FetchOwner:          false,
+		},
+	).Return(output, nil)
+	req.StoreName = MOCKSERVER
+	resp, err = s3Server.ListObjects(ctx, req)
+	assert.Nil(t, err)
+	assert.Equal(t, true, resp.IsTruncated)
+	assert.Equal(t, "delimiter", resp.Delimiter)
 }
 
 // TestGetObjectCannedAcl