fix package name

mosn · Jul 22, 2022 · 6349308 · 6349308
1 parent 50498e8
commit 6349308
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/cmd/layotto/main.go b/cmd/layotto/main.go
@@ -24,13 +24,13 @@ import (
 
 	"mosn.io/layotto/components/oss"
 
-	aws2 "mosn.io/layotto/components/oss/aws"
+	aws_oss "mosn.io/layotto/components/oss/aws"
 
-	aliyun2 "mosn.io/layotto/components/oss/aliyun"
+	aliyun_oss "mosn.io/layotto/components/oss/aliyun"
 
 	"mosn.io/mosn/pkg/istio"
 
-	"mosn.io/layotto/components/file/aliyun"
+	aliyun_file "mosn.io/layotto/components/file/aliyun"
 
 	"github.com/dapr/components-contrib/secretstores"
 	"github.com/dapr/components-contrib/secretstores/aws/parameterstore"
@@ -277,16 +277,16 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 
 		// File
 		runtime.WithFileFactory(
-			file.NewFileFactory("aliyunOSS", aliyun.NewAliyunFile),
+			file.NewFileFactory("aliOSS", aliyun_file.NewAliyunFile),
 			file.NewFileFactory("minioOSS", minio.NewMinioOss),
 			file.NewFileFactory("awsOSS", aws.NewAwsFile),
 			file.NewFileFactory("tencentCloudOSS", tencentcloud.NewTencentCloudOSS),
 			file.NewFileFactory("local", local.NewLocalStore),
 			file.NewFileFactory("qiniuOSS", qiniu.NewQiniuOSS),
 		),
 		runtime.WithOssFactory(
-			oss.NewOssFactory("aws.oss", aws2.NewAwsOss),
-			oss.NewOssFactory("aliyun.oss", aliyun2.NewAliyunOss),
+			oss.NewOssFactory("aws.oss", aws_oss.NewAwsOss),
+			oss.NewOssFactory("aliyun.oss", aliyun_oss.NewAliyunOss),
 		),
 		// PubSub
 		runtime.WithPubSubFactory(

diff --git a/cmd/layotto_multiple_api/main.go b/cmd/layotto_multiple_api/main.go
@@ -24,11 +24,11 @@ import (
 
 	"mosn.io/layotto/components/oss"
 
-	aws2 "mosn.io/layotto/components/oss/aws"
+	aws_oss "mosn.io/layotto/components/oss/aws"
 
-	aliyun2 "mosn.io/layotto/components/oss/aliyun"
+	aliyun_oss "mosn.io/layotto/components/oss/aliyun"
 
-	"mosn.io/layotto/components/file/aliyun"
+	aliyun_file "mosn.io/layotto/components/file/aliyun"
 	"mosn.io/layotto/components/file/local"
 
 	"mosn.io/mosn/pkg/istio"
@@ -60,7 +60,7 @@ import (
 
 	"mosn.io/layotto/cmd/layotto_multiple_api/helloworld/component"
 	"mosn.io/layotto/components/custom"
-	"mosn.io/layotto/components/file/aws"
+	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"
@@ -287,18 +287,18 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 
 		// File
 		runtime.WithFileFactory(
-			file.NewFileFactory("aliyunOSS", aliyun.NewAliyunFile),
+			file.NewFileFactory("aliOSS", aliyun_file.NewAliyunFile),
 			file.NewFileFactory("minioOSS", minio.NewMinioOss),
-			file.NewFileFactory("awsOSS", aws.NewAwsFile),
+			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.NewOssFactory("aws.oss", aws2.NewAwsOss),
-			oss.NewOssFactory("aliyun.oss", aliyun2.NewAliyunOss),
+			oss.NewOssFactory("aws.oss", aws_oss.NewAwsOss),
+			oss.NewOssFactory("aliyun.oss", aliyun_oss.NewAliyunOss),
 		),
 
 		// PubSub

diff --git a/cmd/layotto_without_xds/main.go b/cmd/layotto_without_xds/main.go
@@ -24,12 +24,12 @@ import (
 
 	"mosn.io/layotto/components/oss"
 
-	aws2 "mosn.io/layotto/components/oss/aws"
+	aws_oss "mosn.io/layotto/components/oss/aws"
 
-	aliyun2 "mosn.io/layotto/components/oss/aliyun"
+	aliyun_oss "mosn.io/layotto/components/oss/aliyun"
 
 	"mosn.io/layotto/components/file/aliyun"
-	"mosn.io/layotto/components/file/aws"
+	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"
@@ -261,7 +261,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 		runtime.WithFileFactory(
 			file.NewFileFactory("aliOSS", aliyun.NewAliyunFile),
 			file.NewFileFactory("minioOSS", minio.NewMinioOss),
-			file.NewFileFactory("awsOSS", aws.NewAwsFile),
+			file.NewFileFactory("awsOSS", aws_file.NewAwsFile),
 			file.NewFileFactory("tencentCloudOSS", tencentcloud.NewTencentCloudOSS),
 			file.NewFileFactory("local", local.NewLocalStore),
 			file.NewFileFactory("qiniuOSS", qiniu.NewQiniuOSS),
@@ -401,8 +401,8 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 
 		//OSS
 		runtime.WithOssFactory(
-			oss.NewOssFactory("aws.oss", aws2.NewAwsOss),
-			oss.NewOssFactory("aliyun.oss", aliyun2.NewAliyunOss),
+			oss.NewOssFactory("aws.oss", aws_oss.NewAwsOss),
+			oss.NewOssFactory("aliyun.oss", aliyun_oss.NewAliyunOss),
 		),
 
 		// Sequencer