Skip to content

Commit d88be8b

Browse files
author
mikatong
committed
upgrade cos sdk
1 parent 882eb6c commit d88be8b

31 files changed

+2599
-222
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ require (
100100
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.833
101101
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792
102102
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
103-
github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f
103+
github.com/tencentyun/cos-go-sdk-v5 v0.7.50
104104
github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
105105
gopkg.in/yaml.v2 v2.4.0
106106
)

‎go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
188188
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
189189
github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU=
190190
github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c=
191+
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
191192
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
192193
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
193194
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -402,6 +403,7 @@ github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3
402403
github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A=
403404
github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M=
404405
github.com/gostaticanalysis/testutil v0.4.0 h1:nhdCmubdmDF6VEatUNjgUZBJKWRqugoISdUv3PPQgHY=
406+
github.com/grafov/m3u8 v0.12.0/go.mod h1:nqzOkfBiZJENr52zTVd/Dcl03yzphIMbJqkXGu+u080=
405407
github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
406408
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
407409
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
@@ -1076,6 +1078,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199 h1:hMBLtiJ
10761078
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199/go.mod h1:nnY91/H3j/Gu7V/oCA6Zeg8T5D3q36EUdBh4EjmHwqY=
10771079
github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f h1:yTMDoBvFuXjZat10d98DIKbPnN9FQG+drt1SbNfMW5U=
10781080
github.com/tencentyun/cos-go-sdk-v5 v0.7.42-0.20230629101357-7edd77448a0f/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao=
1081+
github.com/tencentyun/cos-go-sdk-v5 v0.7.50 h1:BTlKjAK7qOfF54cSEc8Yv2cFuJT04EHErxz+CudBLNk=
1082+
github.com/tencentyun/cos-go-sdk-v5 v0.7.50/go.mod h1:UN+VdbCl1hg+kKi5RXqZgaP+Boqfmk+D04GRc4XFk70=
1083+
github.com/tencentyun/cos-go-sdk-v5 v0.7.52 h1:gCCQBWGNs8Bgx0VSsld5vjgi2U+MiMwjbzy7sDMyKiA=
1084+
github.com/tencentyun/cos-go-sdk-v5 v0.7.52/go.mod h1:UN+VdbCl1hg+kKi5RXqZgaP+Boqfmk+D04GRc4XFk70=
10791085
github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA=
10801086
github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0=
10811087
github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag=

‎tencentcloud/services/cos/data_source_tc_cos_buckets_test.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cos_test
22

33
import (
44
"fmt"
5-
"regexp"
65
"testing"
76

87
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
@@ -42,7 +41,7 @@ func TestAccTencentCloudCosBucketDataSource_tags(t *testing.T) {
4241
{
4342
Config: testAccCosBucketDataSource_tags(),
4443
Check: resource.ComposeAggregateTestCheckFunc(
45-
resource.TestMatchResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.#", regexp.MustCompile(`^[1-9]\d*$`)),
44+
resource.TestCheckResourceAttrSet("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.#"),
4645
resource.TestCheckResourceAttr("data.tencentcloud_cos_buckets.bucket_list", "bucket_list.0.tags.fixed_resource", "do_not_remove"),
4746
),
4847
},
@@ -113,10 +112,16 @@ data "tencentcloud_cos_buckets" "bucket_list" {
113112
func testAccCosBucketDataSource_tags() string {
114113
return fmt.Sprintf(`
115114
%s
115+
%s
116+
resource "tencentcloud_cos_bucket" "bucket_tags" {
117+
bucket = "tf-datasource-tags-${local.app_id}"
118+
tags = var.fixed_tags
119+
}
116120
data "tencentcloud_cos_buckets" "bucket_list" {
117121
tags = var.fixed_tags
122+
depends_on = [tencentcloud_cos_bucket.bucket_tags]
118123
}
119-
`, tcacctest.FixedTagVariable)
124+
`, tcacctest.FixedTagVariable, tcacctest.UserInfoData)
120125
}
121126

122127
func testAccCosBucketDataSource_full(appid string) string {

‎tencentcloud/services/cos/resource_tc_cos_bucket.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,9 +1511,7 @@ func resourceTencentCloudCosBucketOriginPullUpdate(ctx context.Context, service
15111511
HttpHeader: &cos.BucketOriginHttpHeader{},
15121512
},
15131513
OriginInfo: &cos.BucketOriginInfo{
1514-
FileInfo: &cos.BucketOriginFileInfo{
1515-
PrefixDirective: false,
1516-
},
1514+
FileInfo: &cos.BucketOriginFileInfo{},
15171515
},
15181516
}
15191517
)
@@ -1534,7 +1532,9 @@ func resourceTencentCloudCosBucketOriginPullUpdate(ctx context.Context, service
15341532
item.OriginParameter.Protocol = v.(string)
15351533
}
15361534
if v, ok := dMap["host"]; ok {
1537-
item.OriginInfo.HostInfo = v.(string)
1535+
item.OriginInfo.HostInfo = &cos.BucketOriginHostInfo{
1536+
HostName: v.(string),
1537+
}
15381538
}
15391539
if v, ok := dMap["follow_query_string"]; ok {
15401540
item.OriginParameter.FollowQueryString = v.(bool)
@@ -1545,20 +1545,20 @@ func resourceTencentCloudCosBucketOriginPullUpdate(ctx context.Context, service
15451545
//if v, ok := dMap["copy_origin_data"]; ok {
15461546
// item.OriginParameter.CopyOriginData = v.(bool)
15471547
//}
1548+
fileInfo := &cos.BucketOriginFileInfo{}
15481549
if v, ok := dMap["redirect_prefix"]; ok {
15491550
value := v.(string)
1550-
if value != "" {
1551-
item.OriginInfo.FileInfo.PrefixDirective = true
1551+
fileInfo.PrefixConfiguration = &cos.OriginPrefixConfiguration{
1552+
Prefix: value,
15521553
}
1553-
item.OriginInfo.FileInfo.Prefix = value
15541554
}
15551555
if v, ok := dMap["redirect_suffix"]; ok {
15561556
value := v.(string)
1557-
if value != "" {
1558-
item.OriginInfo.FileInfo.PrefixDirective = true
1557+
fileInfo.SuffixConfiguration = &cos.OriginSuffixConfiguration{
1558+
Suffix: value,
15591559
}
1560-
item.OriginInfo.FileInfo.Suffix = value
15611560
}
1561+
item.OriginInfo.FileInfo = fileInfo
15621562
if v, ok := dMap["custom_http_headers"]; ok {
15631563
var customHeaders []cos.OriginHttpHeader
15641564
for key, val := range v.(map[string]interface{}) {

‎tencentcloud/services/cos/service_tencentcloud_cos.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,9 @@ func (me *CosService) GetBucketPullOrigin(ctx context.Context, bucket string) (r
12031203
for _, rule := range originConfig.Rule {
12041204
item := make(map[string]interface{})
12051205
item["priority"] = helper.Int(rule.RulePriority)
1206-
item["host"] = helper.String(rule.OriginInfo.HostInfo)
1206+
if rule.OriginInfo != nil && rule.OriginInfo.HostInfo != nil {
1207+
item["host"] = helper.String(rule.OriginInfo.HostInfo.HostName)
1208+
}
12071209

12081210
if rule.OriginCondition != nil {
12091211
item["prefix"] = helper.String(rule.OriginCondition.Prefix)
@@ -1241,10 +1243,8 @@ func (me *CosService) GetBucketPullOrigin(ctx context.Context, bucket string) (r
12411243
item["follow_query_string"] = helper.Bool(rule.OriginParameter.FollowQueryString)
12421244
}
12431245

1244-
if rule.OriginInfo.FileInfo != nil {
1245-
item["host"] = helper.String(rule.OriginInfo.HostInfo)
1246-
//item["redirect_prefix"] = helper.String(rule.OriginInfo.FileInfo.Prefix)
1247-
//item["redirect_suffix"] = helper.String(rule.OriginInfo.FileInfo.Suffix)
1246+
if rule.OriginInfo != nil && rule.OriginInfo.HostInfo != nil {
1247+
item["host"] = helper.String(rule.OriginInfo.HostInfo.HostName)
12481248
}
12491249

12501250
rules = append(rules, item)

‎vendor/github.com/tencentyun/cos-go-sdk-v5/.gitignore

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)