|
8 | 8 | "fmt"
|
9 | 9 | "io/ioutil"
|
10 | 10 | "log"
|
| 11 | + "net/url" |
11 | 12 | "strings"
|
12 | 13 | "time"
|
13 | 14 |
|
@@ -616,9 +617,14 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
|
616 | 617 | _ = d.Set("multi_az", true)
|
617 | 618 | }
|
618 | 619 |
|
| 620 | + cosDomain := meta.(tccommon.ProviderMeta).GetAPIV3Conn().CosDomain |
619 | 621 | var cosBucketUrl string
|
620 |
| - if cdcId == "" { |
| 622 | + if cdcId == "" && cosDomain == "" { |
621 | 623 | 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() |
622 | 628 | } else {
|
623 | 629 | cosBucketUrl = fmt.Sprintf("https://%s.%s.cos-cdc.%s.myqcloud.com", bucket, cdcId, meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region)
|
624 | 630 | }
|
@@ -656,7 +662,6 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
|
656 | 662 | return fmt.Errorf("setting cors_rules error: %v", err)
|
657 | 663 | }
|
658 | 664 |
|
659 |
| - cosDomain := meta.(tccommon.ProviderMeta).GetAPIV3Conn().CosDomain |
660 | 665 | if cdcId == "" && cosDomain == "" {
|
661 | 666 | originPullRules, err := cosService.GetBucketPullOrigin(ctx, bucket)
|
662 | 667 | if err != nil {
|
@@ -703,7 +708,7 @@ func resourceTencentCloudCosBucketRead(d *schema.ResourceData, meta interface{})
|
703 | 708 | if err != nil {
|
704 | 709 | return err
|
705 | 710 | }
|
706 |
| - if len(website) > 0 { |
| 711 | + if len(website) > 0 && cosDomain == "" { |
707 | 712 | // {bucket}.cos-website.{region}.myqcloud.com
|
708 | 713 | endPointUrl := fmt.Sprintf("%s.cos-website.%s.myqcloud.com", d.Id(), meta.(tccommon.ProviderMeta).GetAPIV3Conn().Region)
|
709 | 714 | website[0]["endpoint"] = endPointUrl
|
|
0 commit comments