add

Author: SevenEarth

tencentcloud/connectivity/client.go

@@ -253,6 +253,14 @@ func (me *TencentCloudClient) NewClientIntlProfile(timeout int) *intlProfile.Cli
 	return cpf
 }
 
+func (me *TencentCloudClient) UseCosClientNew(cdcId ...string) *s3.S3 {
+	if cdcId[0] == "" {
+		return me.UseCosClient()
+	} else {
+		return me.UseCosCdcClient(cdcId[0])
+	}
+}
+
 // UseCosClient returns cos client for service
 func (me *TencentCloudClient) UseCosClient() *s3.S3 {
 	if me.cosConn != nil {
@@ -279,6 +287,37 @@ func (me *TencentCloudClient) UseCosClient() *s3.S3 {
 	return s3.New(sess)
 }
 
+// UseCosClient returns cos client for service with CDC
+func (me *TencentCloudClient) UseCosCdcClient(cdcId string) *s3.S3 {
+	resolver := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
+		if service == endpoints.S3ServiceID {
+			endpointUrl := fmt.Sprintf("https://%s.cos-cdc.%s.myqcloud.com", cdcId, region)
+			return endpoints.ResolvedEndpoint{
+				URL:           endpointUrl,
+				SigningRegion: region,
+			}, nil
+		}
+		return endpoints.DefaultResolver().EndpointFor(service, region, optFns...)
+	}
+
+	creds := credentials.NewStaticCredentials(me.Credential.SecretId, me.Credential.SecretKey, me.Credential.Token)
+	sess := session.Must(session.NewSession(&aws.Config{
+		Credentials:      creds,
+		Region:           aws.String(me.Region),
+		EndpointResolver: endpoints.ResolverFunc(resolver),
+	}))
+
+	return s3.New(sess)
+}
+
+func (me *TencentCloudClient) UseTencentCosClientNew(bucket string, cdcId ...string) *cos.Client {
+	if cdcId[0] == "" {
+		return me.UseTencentCosClient(bucket)
+	} else {
+		return me.UseTencentCosCdcClient(bucket, cdcId[0])
+	}
+}
+
 // 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))
@@ -303,6 +342,31 @@ func (me *TencentCloudClient) UseTencentCosClient(bucket string) *cos.Client {
 	return me.tencentCosConn
 }
 
+// UseTencentCosClient tencent cloud own client for service instead of aws with CDC
+func (me *TencentCloudClient) UseTencentCosCdcClient(bucket string, cdcId string) *cos.Client {
+	var u *url.URL
+	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
+	}
+
+	baseUrl := &cos.BaseURL{
+		BucketURL: u,
+	}
+
+	me.tencentCosConn = cos.NewClient(baseUrl, &http.Client{
+		Timeout: 100 * time.Second,
+		Transport: &cos.AuthorizationTransport{
+			SecretID:     me.Credential.SecretId,
+			SecretKey:    me.Credential.SecretKey,
+			SessionToken: me.Credential.Token,
+		},
+	})
+
+	return me.tencentCosConn
+}
+
 // UseMysqlClient returns mysql(cdb) client for service
 func (me *TencentCloudClient) UseMysqlClient(iacExtInfo ...IacExtInfo) *cdb.Client {
 	var logRoundTripper LogRoundTripper

tencentcloud/services/cos/data_source_tc_cos_buckets.go

@@ -362,7 +362,7 @@ func dataSourceTencentCloudCosBucketsRead(d *schema.ResourceData, meta interface
 			continue
 		}
 
-		respTags, err := cosService.GetBucketTags(ctx, *v.Name)
+		respTags, err := cosService.GetBucketTags(ctx, *v.Name, "")
 		if err != nil {
 			return err
 		}
@@ -382,7 +382,7 @@ func dataSourceTencentCloudCosBucketsRead(d *schema.ResourceData, meta interface
 
 		bucket["bucket"] = *v.Name
 
-		corsRules, err := cosService.GetBucketCors(ctx, *v.Name)
+		corsRules, err := cosService.GetBucketCors(ctx, *v.Name, "")
 		if err != nil {
 			return err
 		}
@@ -394,7 +394,7 @@ func dataSourceTencentCloudCosBucketsRead(d *schema.ResourceData, meta interface
 		}
 		bucket["lifecycle_rules"] = lifecycleRules
 
-		website, err := cosService.GetBucketWebsite(ctx, *v.Name)
+		website, err := cosService.GetBucketWebsite(ctx, *v.Name, "")
 		if err != nil {
 			return err
 		}
@@ -411,7 +411,7 @@ func dataSourceTencentCloudCosBucketsRead(d *schema.ResourceData, meta interface
 			bucket["origin_domain_rules"] = domainRules
 		}
 
-		aclBody, err := cosService.GetBucketACL(ctx, *v.Name)
+		aclBody, err := cosService.GetBucketACL(ctx, *v.Name, "")
 
 		if err != nil {
 			return err