add

Author: SevenEarth

tencentcloud/connectivity/client.go

@@ -278,8 +278,13 @@ func (me *TencentCloudClient) UseCosClient() *s3.S3 {
 }
 
 // UseTencentCosClient tencent cloud own client for service instead of aws
-func (me *TencentCloudClient) UseTencentCosClient(bucket string) *cos.Client {
-	u, _ := url.Parse(fmt.Sprintf("https://%s.cos.%s.myqcloud.com", bucket, me.Region))
+func (me *TencentCloudClient) UseTencentCosClient(bucket string, cdcId string) *cos.Client {
+	var u *url.URL
+	if cdcId == "" {
+		u, _ = url.Parse(fmt.Sprintf("https://%s.cos.%s.myqcloud.com", bucket, me.Region))
+	} else {
+		u, _ = url.Parse(fmt.Sprintf("https://%s.%s.cos-cdc.%s.myqcloud.com", bucket, cdcId, me.Region))
+	}
 
 	if me.tencentCosConn != nil && me.tencentCosConn.BaseURL.BucketURL == u {
 		return me.tencentCosConn

tencentcloud/services/cos/resource_tc_cos_bucket.go

@@ -525,6 +525,11 @@ func ResourceTencentCloudCosBucket() *schema.Resource {
 				Computed:    true,
 				Description: "Specify the access limit for converting standard layer data into low-frequency layer data in the configuration. The default value is once, which can be used in combination with the number of days to achieve the conversion effect. For example, if the parameter is set to 1 and the number of access days is 30, it means that objects with less than one visit in 30 consecutive days will be reduced from the standard layer to the low frequency layer.",
 			},
+			"cdc_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "CDC cluster ID.",
+			},
 			//computed
 			"cos_bucket_url": {
 				Type:        schema.TypeString,
@@ -548,6 +553,7 @@ func resourceTencentCloudCosBucketCreate(d *schema.ResourceData, meta interface{
 	role, roleOk := d.GetOk("replica_role")
 	rule, ruleOk := d.GetOk("replica_rules")
 	versioning := d.Get("versioning_enable").(bool)
+	cdcId := d.Get("cdc_id").(string)
 
 	if !versioning {
 		if roleOk || role.(string) != "" {
@@ -562,9 +568,9 @@ func resourceTencentCloudCosBucketCreate(d *schema.ResourceData, meta interface{
 	useCosService, createOptions := getBucketPutOptions(d)
 
 	if useCosService {
-		err = cosService.TencentCosPutBucket(ctx, bucket, createOptions)
+		err = cosService.TencentCosPutBucket(ctx, bucket, createOptions, cdcId)
 	} else {
-		err = cosService.PutBucket(ctx, bucket, acl)
+		err = cosService.PutBucket(ctx, bucket, acl, cdcId)
 	}
 	if err != nil {
 		return err

tencentcloud/services/cos/service_tencentcloud_cos.go

@@ -123,7 +123,7 @@ func (me *CosService) PutObjectAcl(ctx context.Context, bucket, key, acl string)
 }
 
 // PutBucket - base on aws s3
-func (me *CosService) PutBucket(ctx context.Context, bucket, acl string) (errRet error) {
+func (me *CosService) PutBucket(ctx context.Context, bucket, acl, cdcId string) (errRet error) {
 	logId := tccommon.GetLogId(ctx)
 
 	request := s3.CreateBucketInput{
@@ -150,7 +150,7 @@ func (me *CosService) PutBucket(ctx context.Context, bucket, acl string) (errRet
 }
 
 // TencentCosPutBucket - To support MAZ config, We use tencentcloud cos sdk instead of aws s3
-func (me *CosService) TencentCosPutBucket(ctx context.Context, bucket string, opt *cos.BucketPutOptions) (errRet error) {
+func (me *CosService) TencentCosPutBucket(ctx context.Context, bucket string, opt *cos.BucketPutOptions, cdcId string) (errRet error) {
 	logId := tccommon.GetLogId(ctx)
 
 	req, _ := json.Marshal(opt)
@@ -163,7 +163,8 @@ func (me *CosService) TencentCosPutBucket(ctx context.Context, bucket string, op
 	}()
 
 	ratelimit.Check("TencentcloudCosPutBucket")
-	response, err := me.client.UseTencentCosClient(bucket).Bucket.Put(ctx, opt)
+
+	response, err := me.client.UseTencentCosClient(bucket, cdcId).Bucket.Put(ctx, opt)
 
 	if err != nil {
 		errRet = fmt.Errorf("cos put bucket error: %s, bucket: %s", err.Error(), bucket)
@@ -173,7 +174,7 @@ func (me *CosService) TencentCosPutBucket(ctx context.Context, bucket string, op
 	resp, _ := json.Marshal(response.Response.Body)
 
 	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s], baseUrl %s\n",
-		logId, "put bucket", req, resp, me.client.UseTencentCosClient(bucket).BaseURL.BucketURL)
+		logId, "put bucket", req, resp, me.client.UseTencentCosClient(bucket, cdcId).BaseURL.BucketURL)
 
 	return nil
 }
@@ -279,7 +280,7 @@ func (me *CosService) HeadBucket(ctx context.Context, bucket string) (errRet err
 func (me *CosService) TencentcloudHeadBucket(ctx context.Context, bucket string) (code int, header http.Header, errRet error) {
 	logId := tccommon.GetLogId(ctx)
 
-	response, err := me.client.UseTencentCosClient(bucket).Bucket.Head(ctx)
+	response, err := me.client.UseTencentCosClient(bucket, "").Bucket.Head(ctx)
 
 	if response != nil {
 		code = response.StatusCode
@@ -1123,7 +1124,7 @@ func (me *CosService) GetBucketACL(ctx context.Context, bucket string) (result *
 	}()
 
 	ratelimit.Check("TencentcloudCosPutBucketACL")
-	acl, _, err := me.client.UseTencentCosClient(bucket).Bucket.GetACL(ctx)
+	acl, _, err := me.client.UseTencentCosClient(bucket, "").Bucket.GetACL(ctx)
 
 	if err != nil {
 		errRet = fmt.Errorf("cos [GetBucketACL] error: %s, bucket: %s", err.Error(), bucket)