feat: implement oss interface

cmd/layotto/main.go

@@ -22,8 +22,16 @@ import (
 	"strconv"
 	"time"
 
+	"mosn.io/layotto/components/oss"
+
+	aws_oss "mosn.io/layotto/components/oss/aws"
+
+	aliyun_oss "mosn.io/layotto/components/oss/aliyun"
+
 	"mosn.io/mosn/pkg/istio"
 
+	aliyun_file "mosn.io/layotto/components/file/aliyun"
+
 	"github.com/dapr/components-contrib/secretstores"
 	"github.com/dapr/components-contrib/secretstores/aws/parameterstore"
 	"github.com/dapr/components-contrib/secretstores/aws/secretmanager"
@@ -34,14 +42,15 @@ import (
 	secretstore_env "github.com/dapr/components-contrib/secretstores/local/env"
 	secretstore_file "github.com/dapr/components-contrib/secretstores/local/file"
 
+	"mosn.io/layotto/components/file/aws"
+	"mosn.io/layotto/components/file/minio"
+	"mosn.io/layotto/components/file/qiniu"
+	"mosn.io/layotto/components/file/tencentcloud"
+
 	"mosn.io/layotto/pkg/grpc/default_api"
 	secretstores_loader "mosn.io/layotto/pkg/runtime/secretstores"
 
 	"mosn.io/layotto/components/file/local"
-	"mosn.io/layotto/components/file/s3/alicloud"
-	"mosn.io/layotto/components/file/s3/aws"
-	"mosn.io/layotto/components/file/s3/minio"
-
 	mock_state "mosn.io/layotto/pkg/mock/components/state"
 
 	dbindings "github.com/dapr/components-contrib/bindings"
@@ -126,10 +135,6 @@ import (
 	sequencer_redis "mosn.io/layotto/components/sequencer/redis"
 	sequencer_zookeeper "mosn.io/layotto/components/sequencer/zookeeper"
 
-	// File
-	"mosn.io/layotto/components/file/s3/qiniu"
-	"mosn.io/layotto/components/file/s3/tencentcloud"
-
 	// Actuator
 	_ "mosn.io/layotto/pkg/actuator"
 	"mosn.io/layotto/pkg/actuator/health"
@@ -200,6 +205,8 @@ import (
 	_ "mosn.io/mosn/pkg/upstream/servicediscovery/dubbod"
 
 	_ "mosn.io/layotto/diagnostics/exporter_iml"
+
+	s3ext "mosn.io/layotto/pkg/grpc/extension/s3"
 )
 
 // loggerForDaprComp is constructed for reusing dapr's components.
@@ -251,6 +258,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 		// register your gRPC API here
 		runtime.WithGrpcAPI(
 			default_api.NewGrpcAPI,
+			s3ext.NewS3Server,
 		),
 		// Hello
 		runtime.WithHelloFactory(
@@ -269,14 +277,17 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 
 		// File
 		runtime.WithFileFactory(
-			file.NewFileFactory("aliOSS", alicloud.NewAliCloudOSS),
+			file.NewFileFactory("aliOSS", aliyun_file.NewAliyunFile),
 			file.NewFileFactory("minioOSS", minio.NewMinioOss),
-			file.NewFileFactory("awsOSS", aws.NewAwsOss),
+			file.NewFileFactory("awsOSS", aws.NewAwsFile),
 			file.NewFileFactory("tencentCloudOSS", tencentcloud.NewTencentCloudOSS),
 			file.NewFileFactory("local", local.NewLocalStore),
 			file.NewFileFactory("qiniuOSS", qiniu.NewQiniuOSS),
 		),
-
+		runtime.WithOssFactory(
+			oss.NewFactory("aws.oss", aws_oss.NewAwsOss),
+			oss.NewFactory("aliyun.oss", aliyun_oss.NewAliyunOss),
+		),
 		// PubSub
 		runtime.WithPubSubFactory(
 			pubsub.NewFactory("redis", func() dapr_comp_pubsub.PubSub {

cmd/layotto_multiple_api/main.go

@@ -22,9 +22,14 @@ import (
 	"strconv"
 	"time"
 
-	"mosn.io/layotto/cmd/layotto_multiple_api/helloworld/component"
-	"mosn.io/layotto/components/custom"
-	"mosn.io/layotto/pkg/grpc/dapr"
+	"mosn.io/layotto/components/oss"
+
+	aws_oss "mosn.io/layotto/components/oss/aws"
+
+	aliyun_oss "mosn.io/layotto/components/oss/aliyun"
+
+	aliyun_file "mosn.io/layotto/components/file/aliyun"
+	"mosn.io/layotto/components/file/local"
 
 	"mosn.io/mosn/pkg/istio"
 
@@ -47,15 +52,21 @@ import (
 	_ "mosn.io/layotto/pkg/wasm/uninstall"
 	_ "mosn.io/layotto/pkg/wasm/update"
 
-	"mosn.io/layotto/components/file/local"
-	"mosn.io/layotto/components/file/s3/alicloud"
-	"mosn.io/layotto/components/file/s3/aws"
-	"mosn.io/layotto/components/file/s3/minio"
+	_ "mosn.io/mosn/pkg/filter/stream/grpcmetric"
 
 	dbindings "github.com/dapr/components-contrib/bindings"
 	"github.com/dapr/components-contrib/bindings/http"
 	"mosn.io/pkg/log"
 
+	"mosn.io/layotto/cmd/layotto_multiple_api/helloworld/component"
+	"mosn.io/layotto/components/custom"
+	aws_file "mosn.io/layotto/components/file/aws"
+	"mosn.io/layotto/components/file/minio"
+	"mosn.io/layotto/components/file/qiniu"
+	"mosn.io/layotto/components/file/tencentcloud"
+	"mosn.io/layotto/pkg/grpc/dapr"
+	s3ext "mosn.io/layotto/pkg/grpc/extension/s3"
+
 	"mosn.io/layotto/components/configstores/etcdv3"
 	"mosn.io/layotto/components/file"
 	"mosn.io/layotto/components/sequencer"
@@ -134,10 +145,6 @@ import (
 	sequencer_redis "mosn.io/layotto/components/sequencer/redis"
 	sequencer_zookeeper "mosn.io/layotto/components/sequencer/zookeeper"
 
-	// File
-	"mosn.io/layotto/components/file/s3/qiniu"
-	"mosn.io/layotto/components/file/s3/tencentcloud"
-
 	// Actuator
 	_ "mosn.io/layotto/pkg/actuator"
 	"mosn.io/layotto/pkg/actuator/health"
@@ -151,7 +158,6 @@ import (
 	mgrpc "mosn.io/mosn/pkg/filter/network/grpc"
 	_ "mosn.io/mosn/pkg/filter/network/proxy"
 	_ "mosn.io/mosn/pkg/filter/stream/flowcontrol"
-	_ "mosn.io/mosn/pkg/filter/stream/grpcmetric"
 	_ "mosn.io/mosn/pkg/metrics/sink"
 	_ "mosn.io/mosn/pkg/metrics/sink/prometheus"
 	_ "mosn.io/mosn/pkg/network"
@@ -262,6 +268,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			// Currently it only support Dapr's InvokeService,secret API,state API and InvokeBinding API.
 			// Note: this feature is still in Alpha state and we don't recommend that you use it in your production environment.
 			dapr.NewDaprAPI_Alpha,
+			s3ext.NewS3Server,
 		),
 		// Hello
 		runtime.WithHelloFactory(
@@ -280,14 +287,20 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 
 		// File
 		runtime.WithFileFactory(
-			file.NewFileFactory("aliOSS", alicloud.NewAliCloudOSS),
+			file.NewFileFactory("aliOSS", aliyun_file.NewAliyunFile),
 			file.NewFileFactory("minioOSS", minio.NewMinioOss),
-			file.NewFileFactory("awsOSS", aws.NewAwsOss),
+			file.NewFileFactory("awsOSS", aws_file.NewAwsFile),
 			file.NewFileFactory("tencentCloudOSS", tencentcloud.NewTencentCloudOSS),
 			file.NewFileFactory("local", local.NewLocalStore),
 			file.NewFileFactory("qiniuOSS", qiniu.NewQiniuOSS),
 		),
 
+		//OSS
+		runtime.WithOssFactory(
+			oss.NewFactory("aws.oss", aws_oss.NewAwsOss),
+			oss.NewFactory("aliyun.oss", aliyun_oss.NewAliyunOss),
+		),
+
 		// PubSub
 		runtime.WithPubSubFactory(
 			pubsub.NewFactory("redis", func() dapr_comp_pubsub.PubSub {

cmd/layotto_without_xds/main.go

@@ -22,6 +22,18 @@ import (
 	"strconv"
 	"time"
 
+	"mosn.io/layotto/components/oss"
+
+	aws_oss "mosn.io/layotto/components/oss/aws"
+
+	aliyun_oss "mosn.io/layotto/components/oss/aliyun"
+
+	"mosn.io/layotto/components/file/aliyun"
+	aws_file "mosn.io/layotto/components/file/aws"
+	"mosn.io/layotto/components/file/minio"
+	"mosn.io/layotto/components/file/qiniu"
+	"mosn.io/layotto/components/file/tencentcloud"
+
 	"github.com/dapr/components-contrib/secretstores"
 	"github.com/dapr/components-contrib/secretstores/aws/parameterstore"
 	"github.com/dapr/components-contrib/secretstores/aws/secretmanager"
@@ -36,9 +48,6 @@ import (
 	secretstores_loader "mosn.io/layotto/pkg/runtime/secretstores"
 
 	"mosn.io/layotto/components/file/local"
-	"mosn.io/layotto/components/file/s3/alicloud"
-	"mosn.io/layotto/components/file/s3/aws"
-	"mosn.io/layotto/components/file/s3/minio"
 
 	mock_state "mosn.io/layotto/pkg/mock/components/state"
 
@@ -123,10 +132,6 @@ import (
 	sequencer_redis "mosn.io/layotto/components/sequencer/redis"
 	sequencer_zookeeper "mosn.io/layotto/components/sequencer/zookeeper"
 
-	// File
-	"mosn.io/layotto/components/file/s3/qiniu"
-	"mosn.io/layotto/components/file/s3/tencentcloud"
-
 	// Actuator
 	_ "mosn.io/layotto/pkg/actuator"
 	"mosn.io/layotto/pkg/actuator/health"
@@ -254,9 +259,9 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 
 		// File
 		runtime.WithFileFactory(
-			file.NewFileFactory("aliOSS", alicloud.NewAliCloudOSS),
+			file.NewFileFactory("aliOSS", aliyun.NewAliyunFile),
 			file.NewFileFactory("minioOSS", minio.NewMinioOss),
-			file.NewFileFactory("awsOSS", aws.NewAwsOss),
+			file.NewFileFactory("awsOSS", aws_file.NewAwsFile),
 			file.NewFileFactory("tencentCloudOSS", tencentcloud.NewTencentCloudOSS),
 			file.NewFileFactory("local", local.NewLocalStore),
 			file.NewFileFactory("qiniuOSS", qiniu.NewQiniuOSS),
@@ -394,6 +399,12 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			}),
 		),
 
+		//OSS
+		runtime.WithOssFactory(
+			oss.NewFactory("aws.oss", aws_oss.NewAwsOss),
+			oss.NewFactory("aliyun.oss", aliyun_oss.NewAliyunOss),
+		),
+
 		// Sequencer
 		runtime.WithSequencerFactory(
 			runtime_sequencer.NewFactory("etcd", func() sequencer.Store {