Merge branch 'develop' into main

Author: chenhaiyun

.viperlightignore

@@ -1,16 +1,23 @@
-# Ignore Config used with code.amazon.com
-Config
+README.md:105
+CODE_OF_CONDUCT.md:4
+CONTRIBUTING.md:51
+docs/UserManual.md
+docs/UserManual_CN.md
+docs/S3-SSE-KMS-Policy.md:40
+docs/tutortial-beijing-to-oregon-s3.md
+docs/tutortial-beijing-to-oregon-s3_CN.md
+docs/tutortial-migration-oss-to-s3.md
+docs/tutortial-migration-oss-to-s3_CN.md
+
+source/portal/src/pages/creation/ecr/StepTwoECR.tsx
+source/portal/src/pages/creation/s3/comps/MoreSettings.tsx
+source/portal/src/common/info/CredentialInfo.tsx
+
 
-^dist/
-node_modules/
 package-lock.json
 
-docs/
-docs/UserManual.md
-source/portal/src/common/info/CredentialInfo.tsx
-README.md
-CODE_OF_CONDUCT.md
-CONTRIBUTING.md
-source/portal/src/pages/creation/ecr/StepTwoECR.tsx
-source/portal/src/pages/creation/s3/StepTwoS3.tsx
-source/portal/src/pages/creation/s3/comps/MoreSettings.tsx
+Config
+node_modules/
+build/
+cdk.out
+deployment/regional-s3-assets/

CONTRIBUTING.md

@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/aws-awslabs/aws-data-replication-hub/issues), or [recently closed](https://github.com/aws-awslabs/aws-data-replication-hub/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
+When filing an issue, please check [existing open](https://github.com/awslabs/data-transfer-hub/issues), or [recently closed](https://github.com/awslabs/data-transfer-hub/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -57,6 +57,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/aws-awslabs/aws-data-replication-hub/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/awslabs/data-transfer-hub/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

README.md

@@ -9,6 +9,7 @@ Amazon Web Services cloud-native services. You can launch this solution and star
 
 With Data Transfer Hub, you can perform any of the following tasks:
 - Transfer Amazon S3 objects between AWS China Regions and AWS Standard Regions.
+- Transfer Amazon S3 objects between AWS GovCloud and AWS Standard Regions.
 - Transfer data from other cloud providers’ object storage services (including Alibaba
 Cloud OSS, Tencent COS, Qiniu Kodo, and S3 Compatible storage) to Amazon S3.
 - Transfer Amazon ECR images between AWS China Regions and AWS Standard Regions.
@@ -25,6 +26,7 @@ gcr.io, Red Hat Quay.io) to Amazon ECR.
 - [x] CloudFormation Deployment
 - [x] S3 Plugin
     - [x] Amazon S3 object copy between AWS standard regions and AWS China regions
+    - [x] Amazon S3 object copy between AWS standard regions and AWS GovCloud
     - [x] Data transfer from Alibaba Cloud OSS to Amazon S3
     - [x] Data transfer from Tencent COS to Amazon S3
     - [x] Data transfer from Qiniu Kodo to Amazon S3

docs/images/homepage.png

@@ -216,6 +216,14 @@ Click the **创建触发器/create trigger** to create the trigger for the funct
 
 ![portal](images/tutortial/OSS-to-s3/aliyun_create_trigger.png)
 
-Then config the trigger as the picture show below.
+Then config the trigger as the picture show below. For **触发事件/Trigger Event**, please choose:
+
+```
+oss:ObjectCreated:PutObject
+oss:ObjectCreated:PostObject 
+oss:ObjectCreated:CopyObject
+oss:ObjectCreated:CompleteMultipartUpload
+oss:ObjectCreated:AppendObject
+```
 
 ![portal](images/tutortial/OSS-to-s3/aliyun_trigger_config.png)

docs/images/tutortial/OSS-to-s3/aliyun_trigger_config.png

@@ -1,4 +1,7 @@
 # 将阿里云 OSS 中的数据迁移到 Amazon S3
+
+[English](./tutortial-migration-oss-to-s3.md)
+
 本教程为将数据从 **阿里云 OSS** 中的数据传输到的 **Amazon S3** 指南。
 
 我们假设您已经完成了Data Transfer Hub解决方案的部署。 并将解决方案部署在 **俄勒冈州（us-west-2）** 区域。
@@ -221,6 +224,14 @@ zip -r code.zip *
 
 ![portal](images/tutortial/OSS-to-s3/aliyun_create_trigger.png)
 
-然后配置触发器，如下图所示。
+然后配置触发器，如下图所示。 **触发事件**, 请选择:
+
+```
+oss:ObjectCreated:PutObject
+oss:ObjectCreated:PostObject 
+oss:ObjectCreated:CopyObject
+oss:ObjectCreated:CompleteMultipartUpload
+oss:ObjectCreated:AppendObject
+```
 
 ![portal](images/tutortial/OSS-to-s3/aliyun_trigger_config.png)