Skip to content

Commit f801d80

Browse files
committed
fix: optimize cos url
1 parent 622a902 commit f801d80

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

tencentcloud/services/cos/resource_tc_cos_bucket.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"fmt"
99
"io/ioutil"
1010
"log"
11+
"net/url"
1112
"strings"
1213
"time"
1314

@@ -616,9 +617,14 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
616617
_ = d.Set("multi_az", true)
617618
}
618619

620+
cosDomain := meta.(tccommon.ProviderMeta).GetAPIV3Conn().CosDomain
619621
var cosBucketUrl string
620-
if cdcId == "" {
622+
if cdcId == "" && cosDomain == "" {
621623
cosBucketUrl = fmt.Sprintf("%s.cos.%s.myqcloud.com", d.Id(), meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region)
624+
} else if cosDomain != "" {
625+
parsedURL, _ := url.Parse(cosDomain)
626+
parsedURL.Host = bucket + "." + parsedURL.Host
627+
cosBucketUrl = parsedURL.String()
622628
} else {
623629
cosBucketUrl = fmt.Sprintf("https://%s.%s.cos-cdc.%s.myqcloud.com", bucket, cdcId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region)
624630
}
@@ -656,7 +662,6 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
656662
return fmt.Errorf("setting cors_rules error: %v", err)
657663
}
658664

659-
cosDomain := meta.(tccommon.ProviderMeta).GetAPIV3Conn().CosDomain
660665
if cdcId == "" && cosDomain == "" {
661666
originPullRules, err := cosService.GetBucketPullOrigin(ctx, bucket)
662667
if err != nil {
@@ -703,7 +708,7 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
703708
if err != nil {
704709
return err
705710
}
706-
if len(website) > 0 {
711+
if len(website) > 0 && cosDomain == "" {
707712
// {bucket}.cos-website.{region}.myqcloud.com
708713
endPointUrl := fmt.Sprintf("%s.cos-website.%s.myqcloud.com", d.Id(), meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region)
709714
website[0]["endpoint"] = endPointUrl

0 commit comments

Comments
 (0)