fix: support cos cdc

Author: gitmkn

tencentcloud/connectivity/client.go

@@ -118,6 +118,7 @@ type TencentCloudClient struct {
 	Region     string
 	Protocol   string
 	Domain     string
+	CosDomain  string
 
 	cosConn            *s3.S3
 	tencentCosConn     *cos.Client
@@ -266,8 +267,12 @@ func (me *TencentCloudClient) UseCosClient() *s3.S3 {
 
 	resolver := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
 		if service == endpoints.S3ServiceID {
+			cosUrl := fmt.Sprintf("https://cos.%s.myqcloud.com", region)
+			if me.CosDomain != "" {
+				cosUrl = me.CosDomain
+			}
 			return endpoints.ResolvedEndpoint{
-				URL:           fmt.Sprintf("https://cos.%s.myqcloud.com", region),
+				URL:           cosUrl,
 				SigningRegion: region,
 			}, nil
 		}
@@ -317,7 +322,14 @@ func (me *TencentCloudClient) UseTencentCosClientNew(bucket string, cdcId ...str
 
 // 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))
+	cosUrl := fmt.Sprintf("https://%s.cos.%s.myqcloud.com", bucket, me.Region)
+	if me.CosDomain != "" {
+		parsedURL, _ := url.Parse(me.CosDomain)
+		parsedURL.Host = bucket + "." + parsedURL.Host
+		cosUrl = parsedURL.String()
+	}
+
+	u, _ := url.Parse(cosUrl)
 
 	if me.tencentCosConn != nil && me.tencentCosConn.BaseURL.BucketURL == u {
 		return me.tencentCosConn
@@ -1319,7 +1331,12 @@ func (me *TencentCloudClient) UseDtsClient() *dts.Client {
 
 // UseCosBatchClient returns ci client for service
 func (me *TencentCloudClient) UseCosBatchClient(uin string) *cos.Client {
-	u, _ := url.Parse(fmt.Sprintf("https://%s.cos-control.%s.myqcloud.com", uin, me.Region))
+	cosUrl := fmt.Sprintf("https://%s.cos-control.%s.myqcloud.com", uin, me.Region)
+	if me.CosDomain != "" {
+		cosUrl = me.CosDomain
+	}
+
+	u, _ := url.Parse(cosUrl)
 
 	if me.cosBatchConn != nil && me.cosBatchConn.BaseURL.BatchURL == u {
 		return me.cosBatchConn

tencentcloud/provider.go

@@ -125,6 +125,7 @@ const (
 	PROVIDER_REGION         = "TENCENTCLOUD_REGION"
 	PROVIDER_PROTOCOL       = "TENCENTCLOUD_PROTOCOL"
 	PROVIDER_DOMAIN         = "TENCENTCLOUD_DOMAIN"
+	PROVIDER_COS_DOMAIN     = "TENCENTCLOUD_COS_DOMAIN"
 	//internal version: replace envYunti begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 	//internal version: replace envYunti end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 	PROVIDER_ASSUME_ROLE_ARN                = "TENCENTCLOUD_ASSUME_ROLE_ARN"
@@ -204,6 +205,12 @@ func Provider() *schema.Provider {
 				DefaultFunc: schema.EnvDefaultFunc(PROVIDER_DOMAIN, nil),
 				Description: "The root domain of the API request, Default is `tencentcloudapi.com`.",
 			},
+			"cos_domain": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc(PROVIDER_COS_DOMAIN, nil),
+				Description: "The cos domain of the API request, Default is `https://cos.{region}.myqcloud.com`, Other Examples: `https://cluster-123456.cos-cdc.ap-guangzhou.myqcloud.com`.",
+			},
 			//internal version: replace enableBpass begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 			//internal version: replace enableBpass end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
 			"assume_role": {
@@ -2155,6 +2162,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		region        string
 		protocol      string
 		domain        string
+		cosDomain     string
 		camRoleName   string
 	)
 
@@ -2194,6 +2202,10 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		domain = v.(string)
 	}
 
+	if v, ok := d.GetOk("cos_domain"); ok {
+		cosDomain = v.(string)
+	}
+
 	if v, ok := d.GetOk("cam_role_name"); ok {
 		camRoleName = v.(string)
 	}
@@ -2206,9 +2218,10 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 			secretKey,
 			securityToken,
 		),
-		Region:   region,
-		Protocol: protocol,
-		Domain:   domain,
+		Region:    region,
+		Protocol:  protocol,
+		Domain:    domain,
+		CosDomain: cosDomain,
 	}
 
 	// get auth from CAM role name

tencentcloud/services/cos/resource_tc_cos_batch.md

@@ -1,5 +1,7 @@
 Provides a resource to create a cos bucket batch.
 
+~> **NOTE:** The current resource does not support `cos_domain`.
+
 Example Usage
 
 ```hcl

tencentcloud/services/cos/resource_tc_cos_bucket_test.go

@@ -74,7 +74,7 @@ func testSweepCosBuckets(region string) error {
 		}
 		log.Printf("[INFO] deleting cos bucket: %s", bucket)
 
-		if err = cosService.DeleteBucket(ctx, bucket, true, true); err != nil {
+		if err = cosService.DeleteBucket(ctx, bucket, true, true, ""); err != nil {
 			log.Printf("[ERROR] delete bucket %s error: %s", bucket, err.Error())
 		}
 	}