fix: cos resource context conflict (#1272)

Author: Kagashino

tencentcloud/data_source_tc_cos_buckets_test.go

@@ -38,11 +38,10 @@ func TestAccTencentCloudCosBucketDataSource_tags(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCosBucketDataSource_tags(appid),
+				Config: testAccCosBucketDataSource_tags(),
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckCosBucketExists("tencentcloud_cos_bucket.bucket_basic"),
 					resource.TestMatchResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.#", regexp.MustCompile(`^[1-9]\d*$`)),
-					resource.TestCheckResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.0.tags.test", "test"),
+					resource.TestCheckResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.0.tags.fixed_resource", "do_not_remove"),
 				),
 			},
 		},
@@ -105,20 +104,13 @@ data "tencentcloud_cos_buckets" "bucket_list" {
 `, acctest.RandInt(), appid)
 }
 
-func testAccCosBucketDataSource_tags(appid string) string {
+func testAccCosBucketDataSource_tags() string {
 	return fmt.Sprintf(`
-resource "tencentcloud_cos_bucket" "bucket_basic" {
-  bucket = "tf-tags-%d-%s"
-
-  tags = {
-    "test" = "test"
-  }
-}
-
+%s
 data "tencentcloud_cos_buckets" "bucket_list" {
-  tags = tencentcloud_cos_bucket.bucket_basic.tags
+  tags = var.fixed_tags
 }
-`, acctest.RandInt(), appid)
+`, fixedTagVariable)
 }
 
 func testAccCosBucketDataSource_full(appid string) string {

tencentcloud/resource_tc_cos_bucket_domain_certificate_attachment_test.go

@@ -11,7 +11,6 @@ import (
 )
 
 func TestAccTencentCloudCosBucketDomainCertificate_basic(t *testing.T) {
-	t.Parallel()
 	id := new(string)
 
 	resource.Test(t, resource.TestCase{

tencentcloud/service_tencentcloud_cos.go

@@ -128,14 +128,15 @@ func (me *CosService) PutBucket(ctx context.Context, bucket, acl string) (errRet
 		}
 	}()
 	ratelimit.Check("CreateBucket")
-	response, err := me.client.UseCosClient().CreateBucket(&request)
+	client := me.client.UseCosClient()
+	response, err := client.CreateBucket(&request)
 	if err != nil {
 		errRet = fmt.Errorf("cos put bucket error: %s, bucket: %s", err.Error(), bucket)
 		return
 	}
 
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
-		logId, "put bucket", request.String(), response.String())
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s], endpoint %s\n",
+		logId, "put bucket", request.String(), response.String(), client.Endpoint)
 
 	return nil
 }
@@ -154,7 +155,8 @@ func (me *CosService) TencentCosPutBucket(ctx context.Context, bucket string, op
 	}()
 
 	ratelimit.Check("TencentcloudCosPutBucket")
-	response, err := me.client.UseTencentCosClient(bucket).Bucket.Put(ctx, opt)
+	client := me.client.UseTencentCosClient(bucket)
+	response, err := client.Bucket.Put(ctx, opt)
 
 	if err != nil {
 		errRet = fmt.Errorf("cos put bucket error: %s, bucket: %s", err.Error(), bucket)
@@ -163,8 +165,8 @@ func (me *CosService) TencentCosPutBucket(ctx context.Context, bucket string, op
 
 	resp, _ := json.Marshal(response)
 
-	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
-		logId, "put bucket", req, resp)
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s], baseUrl %s\n",
+		logId, "put bucket", req, resp, client.BaseURL.BucketURL)
 
 	return nil
 }