Skip to content

fix(cos): [122565511] update cos sdk #3238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 16, 2025
Merged

fix(cos): [122565511] update cos sdk #3238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bb63c8
add
SevenEarth Mar 25, 2025
a171cb9
add
SevenEarth Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1037
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
github.com/tencentyun/cos-go-sdk-v5 v0.7.43-0.20250323165138-7caf1417f17b
github.com/tencentyun/cos-go-sdk-v5 v0.7.64
github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
gopkg.in/yaml.v2 v2.4.0
)
Expand Down
5 changes: 5 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14j
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
Expand Down Expand Up @@ -1065,6 +1066,10 @@ github.com/tencentyun/cos-go-sdk-v5 v0.7.42 h1:Up1704BJjI5orycXKjpVpvuOInt9GC5pq
github.com/tencentyun/cos-go-sdk-v5 v0.7.42/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao=
github.com/tencentyun/cos-go-sdk-v5 v0.7.43-0.20250323165138-7caf1417f17b h1:cyj7Mh5Df+I3YqFupRPgGKPyZGbhO6oCGVpKBuVWy+I=
github.com/tencentyun/cos-go-sdk-v5 v0.7.43-0.20250323165138-7caf1417f17b/go.mod h1:LUFnaqRmGk6pEHOaRmdn2dCZR2j0cSsM5xowWFPTPao=
github.com/tencentyun/cos-go-sdk-v5 v0.7.64-0.20250324024831-9ab072216e10 h1:0YEuMhhNao4YV+odWB8e0/a3npBDp23DSBSGoe9AAso=
github.com/tencentyun/cos-go-sdk-v5 v0.7.64-0.20250324024831-9ab072216e10/go.mod h1:8+hG+mQMuRP/OIS9d83syAvXvrMj9HhkND6Q1fLghw0=
github.com/tencentyun/cos-go-sdk-v5 v0.7.64 h1:2ADzzr+hcWl4Fw44DwXe0btlVzAYkdvHQ4glUyR0+mM=
github.com/tencentyun/cos-go-sdk-v5 v0.7.64/go.mod h1:8+hG+mQMuRP/OIS9d83syAvXvrMj9HhkND6Q1fLghw0=
github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA=
github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0=
github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag=
Expand Down
4 changes: 3 additions & 1 deletion tencentcloud/services/cos/resource_tc_cos_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,7 +1681,9 @@ func resourceTencentCloudCosBucketOriginPullUpdate(ctx context.Context, service
item.OriginParameter.Protocol = v.(string)
}
if v, ok := dMap["host"]; ok {
item.OriginInfo.HostInfo = v.(string)
tmpHost := cos.BucketOriginHostInfo{}
tmpHost.HostName = v.(string)
item.OriginInfo.HostInfo = &tmpHost
}
if v, ok := dMap["follow_query_string"]; ok {
item.OriginParameter.FollowQueryString = v.(bool)
Expand Down
9 changes: 7 additions & 2 deletions tencentcloud/services/cos/service_tencentcloud_cos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,9 @@ func (me *CosService) GetBucketPullOrigin(ctx context.Context, bucket string) (r
for _, rule := range originConfig.Rule {
item := make(map[string]interface{})
item["priority"] = helper.Int(rule.RulePriority)
item["host"] = helper.String(rule.OriginInfo.HostInfo)
if rule.OriginInfo.HostInfo != nil {
item["host"] = helper.String(rule.OriginInfo.HostInfo.HostName)
}

if rule.OriginCondition != nil {
item["prefix"] = helper.String(rule.OriginCondition.Prefix)
Expand Down Expand Up @@ -1348,8 +1350,11 @@ func (me *CosService) GetBucketPullOrigin(ctx context.Context, bucket string) (r
item["follow_query_string"] = helper.Bool(rule.OriginParameter.FollowQueryString)
}

if rule.OriginInfo.HostInfo != nil {
item["host"] = helper.String(rule.OriginInfo.HostInfo.HostName)
}

if rule.OriginInfo.FileInfo != nil {
item["host"] = helper.String(rule.OriginInfo.HostInfo)
//item["redirect_prefix"] = helper.String(rule.OriginInfo.FileInfo.Prefix)
//item["redirect_suffix"] = helper.String(rule.OriginInfo.FileInfo.Suffix)
}
Expand Down
8 changes: 7 additions & 1 deletion vendor/github.com/tencentyun/cos-go-sdk-v5/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

512 changes: 463 additions & 49 deletions vendor/github.com/tencentyun/cos-go-sdk-v5/CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading