Skip to content

Commit 8f19eae

Browse files
KagashinoKagashino
authored
fix: cos - testcases (#861)
* fix: cos domain testcase * fix: cos maz testcase - versioning enable * fix cos maz status ignore * fix: cos - testcases
1 parent 34cb9cf commit 8f19eae

File tree

3 files changed

+116
-31
lines changed

3 files changed

+116
-31
lines changed

‎tencentcloud/data_source_tc_cos_buckets.go‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -311,13 +311,30 @@ func dataSourceTencentCloudCosBucketsRead(d *schema.ResourceData, meta interface
311311

312312
bucketList := make([]map[string]interface{}, 0, len(buckets))
313313

314-
LOOP:
315314
for _, v := range buckets {
316315
bucket := make(map[string]interface{})
317316
if prefix != "" && !strings.HasPrefix(*v.Name, prefix) {
318317
continue
319318
}
320319

320+
respTags, err := cosService.GetBucketTags(ctx, *v.Name)
321+
if err != nil {
322+
return err
323+
}
324+
325+
var matchTags bool
326+
327+
for k, v := range tags {
328+
if respTags[k] == v {
329+
matchTags = true
330+
break
331+
}
332+
}
333+
334+
if len(tags) != 0 && !matchTags {
335+
continue
336+
}
337+
321338
bucket["bucket"] = *v.Name
322339

323340
corsRules, err := cosService.GetBucketCors(ctx, *v.Name)
@@ -355,17 +372,6 @@ LOOP:
355372
}
356373
bucket["acl_body"] = aclBody
357374

358-
respTags, err := cosService.GetBucketTags(ctx, *v.Name)
359-
if err != nil {
360-
return err
361-
}
362-
363-
for k, v := range tags {
364-
if respTags[k] != v {
365-
continue LOOP
366-
}
367-
}
368-
369375
bucket["tags"] = respTags
370376
bucket["cos_bucket_url"] = fmt.Sprintf("%s.cos.%s.myqcloud.com", *v.Name, meta.(*TencentCloudClient).apiV3Conn.Region)
371377
bucketList = append(bucketList, bucket)

‎tencentcloud/resource_tc_cos_bucket_policy_test.go‎

Lines changed: 76 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ func TestAccTencentCloudCosBucketPolicy(t *testing.T) {
1717
CheckDestroy: testAccCheckCosBucketPolicyDestroy,
1818
Steps: []resource.TestStep{
1919
{
20-
Config: testAccCosBucketPolicyBasic,
20+
Config: testAccCosBucketPolicyBasic(appid, ownerUin, ownerUin),
2121
Check: resource.ComposeTestCheckFunc(
2222
testAccCheckCosBucketPolicyExists("tencentcloud_cos_bucket_policy.foo"),
2323
resource.TestCheckResourceAttrSet("tencentcloud_cos_bucket_policy.foo", "bucket"),
2424
resource.TestCheckResourceAttrSet("tencentcloud_cos_bucket_policy.foo", "policy"),
2525
),
2626
}, {
27-
Config: testAccCosBucketPolicyUpdate,
27+
Config: testAccCosBucketPolicyUpdate(appid),
2828
Check: resource.ComposeTestCheckFunc(
2929
testAccCheckCosBucketPolicyExists("tencentcloud_cos_bucket_policy.foo"),
3030
resource.TestCheckResourceAttrSet("tencentcloud_cos_bucket_policy.foo", "bucket"),
@@ -86,16 +86,82 @@ func testAccCheckCosBucketPolicyExists(n string) resource.TestCheckFunc {
8686
}
8787
}
8888

89-
const testAccCosBucketPolicyBasic = `
89+
func testAccCosBucketPolicyBasic(id, uin, targetUin string) string {
90+
bucket := "for-terraform-policy-" + id
91+
return fmt.Sprintf(`
92+
resource "tencentcloud_cos_bucket" "bucket" {
93+
bucket = "%s"
94+
acl = "private"
95+
}
96+
9097
resource "tencentcloud_cos_bucket_policy" "foo" {
91-
bucket = "bucket-for-terraform-state-1259649581"
92-
policy = "{\"version\":\"2.0\",\"Statement\":[{\"Action\":[\"name/cos:DeleteBucket\"],\"Effect\":\"allow\",\"Resource\":[\"qcs::cos:ap-guangzhou:uid/1259649581:bucket-for-terraform-state-1259649581/*\"],\"Principal\":{\"qcs\":[\"qcs::cam::uin/100010835595:uin/100014918835\"]}}]}"
98+
bucket = tencentcloud_cos_bucket.bucket.bucket
99+
policy = <<EOF
100+
{
101+
"Statement": [
102+
{
103+
"Principal": {
104+
"service": [
105+
"cvm.cloud.tencent.com"
106+
]
107+
},
108+
"Effect": "Allow",
109+
"Action": [
110+
"name/cos:HeadBucket",
111+
"name/cos:ListMultipartUploads",
112+
"name/cos:ListParts",
113+
"name/cos:GetObject",
114+
"name/cos:HeadObject",
115+
"name/cos:OptionsObject"
116+
],
117+
"Resource": [
118+
"qcs::cos:ap-guangzhou:uid/%s:%s/*"
119+
]
120+
}
121+
],
122+
"version": "2.0"
123+
}
124+
EOF
125+
}
126+
`,
127+
bucket, id, bucket)
128+
}
129+
func testAccCosBucketPolicyUpdate(id string) string {
130+
bucket := "for-terraform-policy-" + id
131+
return fmt.Sprintf(`
132+
resource "tencentcloud_cos_bucket" "bucket" {
133+
bucket = "%s"
134+
acl = "private"
93135
}
94-
`
95136
96-
const testAccCosBucketPolicyUpdate = `
97137
resource "tencentcloud_cos_bucket_policy" "foo" {
98-
bucket = "bucket-for-terraform-state-1259649581"
99-
policy = "{\"version\":\"2.0\",\"Statement\":[{\"Action\":[\"name/cos:PutBucketACL\"],\"Effect\":\"allow\",\"Resource\":[\"qcs::cos:ap-guangzhou:uid/1259649581:bucket-for-terraform-state-1259649581/*\"],\"Principal\":{\"qcs\":[\"qcs::cam::uin/100010835595:uin/100014918835\"]}}]}"
138+
bucket = tencentcloud_cos_bucket.bucket.bucket
139+
policy = <<EOF
140+
{
141+
"Statement": [
142+
{
143+
"Principal": {
144+
"service": [
145+
"cvm.cloud.tencent.com"
146+
]
147+
},
148+
"Effect": "Deny",
149+
"Action": [
150+
"name/cos:HeadBucket",
151+
"name/cos:ListMultipartUploads",
152+
"name/cos:ListParts",
153+
"name/cos:GetObject",
154+
"name/cos:HeadObject",
155+
"name/cos:OptionsObject"
156+
],
157+
"Resource": [
158+
"qcs::cos:ap-guangzhou:uid/%s:%s/*"
159+
]
160+
}
161+
],
162+
"version": "2.0"
163+
}
164+
EOF
165+
}
166+
`, bucket, id, bucket)
100167
}
101-
`

‎tencentcloud/resource_tc_cos_bucket_test.go‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func TestAccTencentCloudCosBucket_MAZ(t *testing.T) {
283283
ResourceName: "tencentcloud_cos_bucket.bucket_maz",
284284
ImportState: true,
285285
ImportStateVerify: true,
286-
ImportStateVerifyIgnore: []string{"acl"},
286+
ImportStateVerifyIgnore: []string{"acl", "multi_az"},
287287
},
288288
},
289289
})
@@ -339,24 +339,29 @@ func TestAccTencentCloudCosBucket_originPull(t *testing.T) {
339339
})
340340
}
341341

342+
// TODO this case is now disabled until domain configured
343+
/*
342344
func TestAccTencentCloudCosBucket_originDomain(t *testing.T) {
345+
343346
t.Parallel()
344347
348+
randomName := acctest.RandInt()
349+
345350
resource.Test(t, resource.TestCase{
346351
PreCheck: func() { testAccPreCheck(t) },
347352
Providers: testAccProviders,
348353
CheckDestroy: testAccCheckCosBucketDestroy,
349354
Steps: []resource.TestStep{
350355
{
351-
Config: testAccBucket_originDomain(appid),
356+
Config: testAccBucket_originDomain(appid, randomName),
352357
Check: resource.ComposeAggregateTestCheckFunc(
353358
testAccCheckCosBucketExists("tencentcloud_cos_bucket.with_domain"),
354359
resource.TestCheckResourceAttr("tencentcloud_cos_bucket.with_domain", "origin_domain_rules.0.status", "ENABLED"),
355360
resource.TestCheckResourceAttr("tencentcloud_cos_bucket.with_domain", "origin_domain_rules.0.domain", "www.example.com"),
356361
),
357362
},
358363
{
359-
Config: testAccBucket_originDomainUpdate(appid),
364+
Config: testAccBucket_originDomainUpdate(appid, randomName),
360365
Check: resource.ComposeAggregateTestCheckFunc(
361366
testAccCheckCosBucketExists("tencentcloud_cos_bucket.with_domain"),
362367
resource.TestCheckResourceAttr("tencentcloud_cos_bucket.with_domain", "origin_domain_rules.0.status", "DISABLED"),
@@ -374,6 +379,7 @@ func TestAccTencentCloudCosBucket_originDomain(t *testing.T) {
374379
},
375380
})
376381
}
382+
*/
377383

378384
func TestAccTencentCloudCosBucket_replication(t *testing.T) {
379385
t.Parallel()
@@ -627,6 +633,7 @@ resource "tencentcloud_cos_bucket" "bucket_maz" {
627633
bucket = "tf-bucket-maz-%s"
628634
acl = "public-read"
629635
multi_az = true
636+
versioning_enable = true
630637
}
631638
`, appid)
632639
}
@@ -675,23 +682,29 @@ resource "tencentcloud_cos_bucket" "with_origin" {
675682
`, appid)
676683
}
677684

678-
func testAccBucket_originDomain(appid string) string {
685+
func testAccBucket_originDomain(appid string, randomName int) string {
679686
return fmt.Sprintf(`
687+
provider "tencentcloud" {
688+
region = "ap-singapore"
689+
}
680690
resource "tencentcloud_cos_bucket" "with_domain" {
681-
bucket = "tf-bucket-domain-%s"
691+
bucket = "tf-bucket-domain-%d-%s"
682692
acl = "private"
683693
origin_domain_rules {
684694
status = "ENABLED"
685695
domain = "www.example.com"
686696
}
687697
}
688-
`, appid)
698+
`, randomName, appid)
689699
}
690700

691-
func testAccBucket_originDomainUpdate(appid string) string {
701+
func testAccBucket_originDomainUpdate(appid string, randomName int) string {
692702
return fmt.Sprintf(`
703+
provider "tencentcloud" {
704+
region = "ap-singapore"
705+
}
693706
resource "tencentcloud_cos_bucket" "with_domain" {
694-
bucket = "tf-bucket-domain-%s"
707+
bucket = "tf-bucket-domain-%d-%s"
695708
acl = "private"
696709
origin_domain_rules {
697710
status = "DISABLED"
@@ -701,7 +714,7 @@ resource "tencentcloud_cos_bucket" "with_domain" {
701714
domain = "test.example1.com"
702715
}
703716
}
704-
`, appid)
717+
`, randomName, appid)
705718
}
706719

707720
func testAccBucketReplication(appid, ownerUin, subUin string) string {

0 commit comments

Comments
 (0)