modify bucket replication api (#366)

Co-authored-by: huiguangjun <40553369+huiguangjun@users.noreply.github.com>

Author: yangzong18

oss/client.go

@@ -1954,6 +1954,43 @@ func (client Client) PutBucketReplication(bucketName string, xmlBody string, opt
 	return CheckRespCode(resp.StatusCode, []int{http.StatusOK})
 }
 
+// PutBucketRTC put bucket replication rtc
+// bucketName    the bucket name.
+// rtc the bucket rtc config.
+// error    it's nil if no error, otherwise it's an error object.
+//
+func (client Client) PutBucketRTC(bucketName string, rtc PutBucketRTC, options ...Option) error {
+	bs, err := xml.Marshal(rtc)
+	if err != nil {
+		return err
+	}
+	err = client.PutBucketRTCXml(bucketName, string(bs), options...)
+	return err
+}
+
+// PutBucketRTCXml put bucket rtc configuration
+// bucketName    the bucket name.
+// xmlBody    the rtc configuration in xml format.
+// error    it's nil if no error, otherwise it's an error object.
+//
+func (client Client) PutBucketRTCXml(bucketName string, xmlBody string, options ...Option) error {
+	buffer := new(bytes.Buffer)
+	buffer.Write([]byte(xmlBody))
+
+	contentType := http.DetectContentType(buffer.Bytes())
+	headers := map[string]string{}
+	headers[HTTPHeaderContentType] = contentType
+
+	params := map[string]interface{}{}
+	params["rtc"] = nil
+	resp, err := client.do("PUT", bucketName, params, headers, buffer, options...)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	return CheckRespCode(resp.StatusCode, []int{http.StatusOK})
+}
+
 // GetBucketReplication get bucket replication configuration
 // bucketName    the bucket name.
 // string    the replication configuration.

oss/client_test.go

@@ -4469,14 +4469,14 @@ func (s *OssClientSuite) TestBucketReplicationDeleteWithEmptyRuleID(c *C) {
 	data, err := client1.GetBucketReplication(sourceBucketNameTest)
 	c.Assert(err, IsNil)
 
-	var result GetResult
+	var result GetBucketReplicationResult
 	err = xml.Unmarshal([]byte(data), &result)
 	c.Assert(err, IsNil)
 
-	c.Assert(result.Rules[0].Status, Equals, "starting")
-	c.Assert(result.Rules[0].Destination.Location, Equals, "oss-cn-"+destinationRegion)
-	c.Assert(result.Rules[0].Destination.Bucket, Equals, destinationBucketNameTest)
-	c.Assert(result.Rules[0].HistoricalObjectReplication, Equals, "enabled")
+	c.Assert(result.Rule[0].Status, Equals, "starting")
+	c.Assert(result.Rule[0].Destination.Location, Equals, "oss-cn-"+destinationRegion)
+	c.Assert(result.Rule[0].Destination.Bucket, Equals, destinationBucketNameTest)
+	c.Assert(result.Rule[0].HistoricalObjectReplication, Equals, "enabled")
 
 	ruleID := ""
 
@@ -4517,6 +4517,16 @@ func (s *OssClientSuite) TestBucketReplicationGetLocation(c *C) {
 
 	c.Assert(strings.Contains(data, "<ReplicationLocation>"), Equals, true)
 
+	stringData, err := client1.GetBucketReplicationLocation(sourceBucketNameTest)
+	var repResult GetBucketReplicationLocationResult
+	err = xml.Unmarshal([]byte(stringData), &repResult)
+	c.Assert(err, IsNil)
+	c.Assert(repResult.Location[0], Equals, "oss-ap-northeast-1")
+	c.Assert(repResult.Location[9], Equals, "oss-cn-beijing")
+	c.Assert(repResult.LocationTransferType[1].Location, Equals, "oss-eu-central-1")
+	c.Assert(repResult.LocationTransferType[1].TransferTypes, Equals, "oss_acc")
+	c.Assert(repResult.RTCLocation[2], Equals, "oss-cn-shanghai")
+
 	err = client1.DeleteBucket(sourceBucketNameTest)
 	c.Assert(err, IsNil)
 }
@@ -4619,6 +4629,17 @@ func (s *OssClientSuite) TestBucketReplicationGetProgressWithRuleID(c *C) {
 	c.Assert(progressResult.Rules[0].Destination.Bucket, Equals, secondDestinationBucketNameTest)
 	c.Assert(progressResult.Rules[0].HistoricalObjectReplication, Equals, "enabled")
 
+	stringData, err := client1.GetBucketReplicationProgress(sourceBucketNameTest, ruleID)
+
+	var reqProgress GetBucketReplicationProgressResult
+	err = xml.Unmarshal([]byte(stringData), &reqProgress)
+	c.Assert(err, IsNil)
+	c.Assert(reqProgress.Rule[0].ID, Equals, ruleID)
+	c.Assert(reqProgress.Rule[0].Status, Equals, "starting")
+	c.Assert(reqProgress.Rule[0].Destination.Location, Equals, "oss-cn-"+secondDestinationRegion)
+	c.Assert(reqProgress.Rule[0].Destination.Bucket, Equals, secondDestinationBucketNameTest)
+	c.Assert(reqProgress.Rule[0].HistoricalObjectReplication, Equals, "enabled")
+
 	err = client1.DeleteBucket(sourceBucketNameTest)
 	c.Assert(err, IsNil)
 

oss/conn.go

@@ -49,7 +49,7 @@ var signKeyList = []string{"acl", "uploads", "location", "cors",
 	"x-oss-enable-md5", "x-oss-enable-sha1", "x-oss-enable-sha256",
 	"x-oss-hash-ctx", "x-oss-md5-ctx", "transferAcceleration",
 	"regionList", "cloudboxes", "x-oss-ac-source-ip", "x-oss-ac-subnet-mask", "x-oss-ac-vpc-id", "x-oss-ac-forward-allow",
-	"metaQuery", "resourceGroup",
+	"metaQuery", "resourceGroup","rtc",
 }
 
 // init initializes Conn

oss/type.go

@@ -1349,6 +1349,88 @@ type ReplicationXML struct {
 	ID      string   `xml:"ID,omitempty"`
 }
 
+// PutBucketReplication define the bucket replication config
+type PutBucketReplication BucketReplicationXml
+
+// GetBucketReplicationResult define get bucket's replication config
+type GetBucketReplicationResult BucketReplicationXml
+
+// GetBucketReplicationLocationResult define get bucket's replication location
+type GetBucketReplicationLocationResult BucketReplicationLocationXml
+
+// GetBucketReplicationProgressResult define get bucket's replication progress
+type GetBucketReplicationProgressResult BucketReplicationProgressXml
+
+// PutBucketRTC define the bucket rtc config
+type PutBucketRTC BucketRTCXml
+
+// BucketReplicationXml define the xml of bucket replication config
+type BucketReplicationXml struct {
+	XMLName xml.Name          `xml:"ReplicationConfiguration"`
+	Rule    []ReplicationRule `xml:"Rule,omitempty"`
+}
+
+// BucketReplicationProgressXml define the xml of bucket replication config
+type BucketReplicationProgressXml struct {
+	XMLName xml.Name          `xml:"ReplicationProgress"`
+	Rule    []ReplicationRule `xml:"Rule,omitempty"`
+}
+
+// BucketRTCXml define the xml of bucket rtc config
+type BucketRTCXml struct {
+	XMLName xml.Name `xml:"ReplicationRule"`
+	RTC     *string  `xml:"RTC>Status,omitempty"`
+	ID      string   `xml:"ID,omitempty"`
+}
+
+// ReplicationRule define the xml of bucket replication config rule
+type ReplicationRule struct {
+	ID                          string                      `xml:"ID,omitempty"`
+	RTC                         *string                     `xml:"RTC>Status,omitempty"`
+	PrefixSet                   *ReplicationRulePrefix      `xml:"PrefixSet,omitempty"`
+	Action                      string                      `xml:"Action,omitempty"`
+	Destination                 *ReplicationRuleDestination `xml:"Destination,omitempty"`
+	HistoricalObjectReplication string                      `xml:"HistoricalObjectReplication,omitempty"`
+	Status                      string                      `xml:"Status,omitempty"`
+	SyncRole                    string                      `xml:"SyncRole,omitempty"`
+	SourceSelectionCriteria     *string                     `xml:"SourceSelectionCriteria>SseKmsEncryptedObjects>Status,omitempty"`
+	EncryptionConfiguration     *string                     `xml:"EncryptionConfiguration>ReplicaKmsKeyID,omitempty"`
+	Progress                    *ReplicationRuleProgress    `xml:"Progress,omitempty"`
+	HistoricalObject            string                      `xml:"HistoricalObject,omitempty"`
+}
+
+type ReplicationRulePrefix struct {
+	Prefix []*string `xml:"Prefix,omitempty"`
+}
+
+type ReplicationRuleDestination struct {
+	Bucket       string `xml:"Bucket,omitempty"`
+	Location     string `xml:"Location,omitempty"`
+	TransferType string `xml:"TransferType,omitempty"`
+}
+
+// BucketReplicationLocationXml define the xml of bucket replication location info
+type BucketReplicationLocationXml struct {
+	XMLName              xml.Name                          `xml:"ReplicationLocation"`
+	Location             []string                          `xml:"Location,omitempty"`
+	LocationTransferType []ReplicationLocationTransferType `xml:"LocationTransferTypeConstraint>LocationTransferType,omitempty"`
+	RTCLocation          []string                          `xml:"LocationRTCConstraint>Location,omitempty"`
+}
+
+type ReplicationLocation struct {
+	Location string `xml:"Location,omitempty"`
+}
+
+type ReplicationLocationTransferType struct {
+	Location      string `xml:"Location,omitempty"`
+	TransferTypes string `xml:"TransferTypes>Type,omitempty"`
+}
+
+type ReplicationRuleProgress struct {
+	HistoricalObject string `xml:"HistoricalObject,omitempty"`
+	NewObject        string `xml:"NewObject,omitempty"`
+}
+
 // CnameConfigurationXML define cname configuration
 type CnameConfigurationXML struct {
 	XMLName xml.Name `xml:"BucketCnameConfiguration"`
@@ -1489,7 +1571,6 @@ type BucketAccessMonitorXml struct {
 	Status  string   `xml:"Status"` // access monitor status
 }
 
-
 // ListBucketCnameResult define the cname list of the bucket
 type ListBucketCnameResult BucketCnameXml