Skip to content

fix(cdn): [119721652] supprot cdn domin other bucket #2843

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 1 commit into from
Sep 25, 2024
Merged

fix(cdn): [119721652] supprot cdn domin other bucket #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.825
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.944
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1010
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwch v1.0.843
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw v1.0.841
Expand All @@ -46,7 +46,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.984
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.970
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1010
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.692
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc v1.0.970 h1:0A6PwOa
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc v1.0.970/go.mod h1:H4k8QCKds731GA9pmSOfHJ99ZOZhy+gKvX1/N2DOsQQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539 h1:0L6nZhT2bToTc/n1z3HOpNgdu5VX5ulmqIuPY+8UozA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539/go.mod h1:6Syk7W5fdDf0BLvX+RXL5obQ6unkt3Id4aN2QqVrV6U=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1010 h1:sO0vW6E09xFQ5+I8mfvAyIlRZvWBWPf6ilZU5LI4lmE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.1010/go.mod h1:/UDEkf2UhUud19VVMGMTpyiI7HoE3U/c23uoAqDgIWA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwch v1.0.843 h1:3Xr3UPscUfi5jAzCtwQjDfDf4TPsbUxsCrDdHo6xIRI=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwch v1.0.843/go.mod h1:XTZXr3hF0pPTd3jD/vm90FhJEOvILL3d2u43Q52xZX8=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwdoris v1.0.993 h1:b4EFXmAFslKvrFLogWXNQCAVDKG1/IZsR/L4sDmEbr8=
Expand Down Expand Up @@ -932,6 +934,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1006 h1:WX1
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1006/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008 h1:BQJUiwOi2d368bF1qmdCjHjUMEt24vM6d68r9S+OrQM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1010 h1:HwhKTg+VcQd5M9AyaEZaqKmpKuWxbf5kni23g1KRmOk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1010/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
Expand Down
82 changes: 82 additions & 0 deletions tencentcloud/services/cdn/resource_tc_cdn_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,43 @@ func ResourceTencentCloudCdnDomain() *schema.Resource {
},
},
},
"others_private_access": {
Type: schema.TypeList,
MaxItems: 1,
Optional: true,
Description: "Object storage back-to-source authentication of other vendors.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"switch": {
Type: schema.TypeString,
Required: true,
Description: "Configuration switch, available values: `on`, `off` (default).",
},
"access_key": {
Type: schema.TypeString,
Optional: true,
Description: "Access ID.",
Sensitive: true,
},
"secret_key": {
Type: schema.TypeString,
Optional: true,
Description: "Key.",
Sensitive: true,
},
"region": {
Type: schema.TypeString,
Optional: true,
Description: "Region.",
},
"bucket": {
Type: schema.TypeString,
Optional: true,
Description: "Bucket.",
},
},
},
},
"tags": {
Type: schema.TypeMap,
Optional: true,
Expand Down Expand Up @@ -2389,6 +2426,24 @@ func resourceTencentCloudCdnDomainCreate(d *schema.ResourceData, meta interface{
request.QnPrivateAccess.SecretKey = &v
}
}
if v, ok := helper.InterfacesHeadMap(d, "others_private_access"); ok {
vSwitch := v["switch"].(string)
request.OthersPrivateAccess = &cdn.OthersPrivateAccess{
Switch: &vSwitch,
}
if v, ok := v["access_key"].(string); ok && v != "" {
request.OthersPrivateAccess.AccessKey = &v
}
if v, ok := v["secret_key"].(string); ok && v != "" {
request.OthersPrivateAccess.SecretKey = &v
}
if v, ok := v["region"].(string); ok && v != "" {
request.OthersPrivateAccess.Region = &v
}
if v, ok := v["bucket"].(string); ok && v != "" {
request.OthersPrivateAccess.Bucket = &v
}
}

if v := d.Get("explicit_using_dry_run").(bool); v {
d.SetId(domain)
Expand Down Expand Up @@ -3027,6 +3082,15 @@ func resourceTencentCloudCdnDomainRead(d *schema.ResourceData, meta interface{})
"secret_key": dc.QnPrivateAccess.SecretKey,
})
}
if ok := checkCdnInfoWritable(d, "others_private_access", dc.OthersPrivateAccess); ok {
_ = helper.SetMapInterfaces(d, "others_private_access", map[string]interface{}{
"switch": dc.OthersPrivateAccess.Switch,
"access_key": dc.OthersPrivateAccess.AccessKey,
"secret_key": dc.OthersPrivateAccess.SecretKey,
"bucket": dc.OthersPrivateAccess.Bucket,
"region": dc.OthersPrivateAccess.Region,
})
}

tags, errRet := tagService.DescribeResourceTags(ctx, CDN_SERVICE_NAME, CDN_RESOURCE_NAME_DOMAIN, region, domain)
if errRet != nil {
Expand Down Expand Up @@ -3883,6 +3947,24 @@ func resourceTencentCloudCdnDomainUpdate(d *schema.ResourceData, meta interface{
request.QnPrivateAccess.SecretKey = &v
}
}
if v, ok, hasChanged := checkCdnHeadMapOkAndChanged(d, "others_private_access"); ok && hasChanged {
vSwitch := v["switch"].(string)
request.OthersPrivateAccess = &cdn.OthersPrivateAccess{
Switch: &vSwitch,
}
if v, ok := v["access_key"].(string); ok && v != "" {
request.OthersPrivateAccess.AccessKey = &v
}
if v, ok := v["secret_key"].(string); ok && v != "" {
request.OthersPrivateAccess.SecretKey = &v
}
if v, ok := v["region"].(string); ok && v != "" {
request.OthersPrivateAccess.Region = &v
}
if v, ok := v["bucket"].(string); ok && v != "" {
request.OthersPrivateAccess.Bucket = &v
}
}

if v := d.Get("explicit_using_dry_run").(bool); v {
_ = d.Set("dry_run_update_result", request.ToJsonString())
Expand Down
Loading
Loading