Skip to content

fix(cos): [121727154] tencentcloud_cos_bucket update website param #3088

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 3 commits into from
Jan 20, 2025
Merged

fix(cos): [121727154] tencentcloud_cos_bucket update website param #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a463d7
add
SevenEarth Jan 20, 2025
5ebd920
add
SevenEarth Jan 20, 2025
7968bbb
add
SevenEarth Jan 20, 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
3 changes: 3 additions & 0 deletions .changelog/3088.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_cos_bucket: update website param
```
32 changes: 11 additions & 21 deletions 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 @@ -1425,42 +1425,32 @@ func resourceTencentCloudCosBucketWebsiteUpdate(ctx context.Context, meta interf
w = make(map[string]interface{})
}

websiteConfiguration := &s3.WebsiteConfiguration{}
endPointUrl := fmt.Sprintf("%s.cos-website.%s.myqcloud.com", d.Id(), meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region)
var redirectAllRequestsTo = "http"
websiteConfiguration := cos.BucketPutWebsiteOptions{}
if v, ok := w["index_document"].(string); ok && v != "" {
websiteConfiguration.IndexDocument = &s3.IndexDocument{
Suffix: aws.String(v),
}
websiteConfiguration.Index = v
}

if v, ok := w["error_document"].(string); ok && v != "" {
websiteConfiguration.ErrorDocument = &s3.ErrorDocument{
Key: aws.String(v),
websiteConfiguration.Error = &cos.ErrorDocument{
Key: v,
}
}

if v, ok := w["redirect_all_requests_to"].(string); ok && v != "" {
websiteConfiguration.RedirectAllRequestsTo = &s3.RedirectAllRequestsTo{
HostName: aws.String(endPointUrl),
Protocol: aws.String(redirectAllRequestsTo),
websiteConfiguration.RedirectProtocol = &cos.RedirectRequestsProtocol{
Protocol: v,
}
}

request := s3.PutBucketWebsiteInput{
Bucket: aws.String(bucket),
WebsiteConfiguration: websiteConfiguration,
}

response, err := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCosClientNew(cdcId).PutBucketWebsite(&request)
request := websiteConfiguration
response, err := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTencentCosClientNew(bucket, cdcId).Bucket.PutWebsite(ctx, &request)
if err != nil {
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
logId, "put bucket website", request.String(), err.Error())
return fmt.Errorf("cos put bucket website error: %s, bucket: %s", err.Error(), bucket)
}

log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
logId, "put bucket website", request.String(), response.String())
reqBytes, _ := json.Marshal(request)
respBytes, _ := json.Marshal(response.Response.Body)
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, "put bucket website", string(reqBytes), string(respBytes))
}

return nil
Expand Down
Loading