Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/3524.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_teo_certificate_config: support `upstream_cert_info` fields
```
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.22
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.27
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161
Expand Down Expand Up @@ -90,7 +90,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.1.5
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.1.27
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.1.14
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.1.0
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.14 h1:+I+n8
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.14/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.22 h1:1unTmvNXynDN0mOZSWh9tL5Wp9Rb5paMGwFvua+HHoI=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.22/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.27 h1:FG3AiNSNW5tG+mtTSE+dBc5ZhHwlYUW0Z6oSkfAWV0A=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.27/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 Expand Up @@ -1080,6 +1082,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1203 h1:oEpdN0
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.1203/go.mod h1:/tuR/74u27UEv+a36Y1x1Zdgf2WqixNq+/1wfC0QQQc=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.1.5 h1:ZLBuFek7n9ri1RNqrwG+2UbJJ/2U/tAQUkiNhamP82o=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.1.5/go.mod h1:7tgthqW14nJik2A5huXBBQFldo27RFzPfDOVz9MarvE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.1.27 h1:vcQitUadhSZi40x1cscUvNHId4Un2xnQFIE2IxvZU70=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.1.27/go.mod h1:2+6+xYfcJa8mO8tMljGjGCvhluPGjhRhlIv1jZK6y6c=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0dVKQTD06xJ84B5asHViNJHrZmGojdAWEPIsITM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1196 h1:+Fz9UoC3II3H3+rz9UUOHeSp2ntGGmMLAnCjHTUYliU=
Expand Down
68 changes: 68 additions & 0 deletions tencentcloud/services/teo/resource_tc_teo_certificate_config.go

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

Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,55 @@ func resourceTencentCloudTeoCertificateConfigReadPostHandleResponse0(ctx context

_ = d.Set("server_cert_info", serverCertInfoList)

upstreamCertInfoMap := map[string]interface{}{}
if accelerationDomain.Certificate.UpstreamCertInfo != nil {
upstreamMutualTLSMap := map[string]interface{}{}

if accelerationDomain.Certificate.UpstreamCertInfo.UpstreamMutualTLS != nil {
if accelerationDomain.Certificate.UpstreamCertInfo.UpstreamMutualTLS.Switch != nil {
upstreamMutualTLSMap["switch"] = accelerationDomain.Certificate.UpstreamCertInfo.UpstreamMutualTLS.Switch
}

certInfosList := make([]map[string]interface{}, 0, len(accelerationDomain.Certificate.UpstreamCertInfo.UpstreamMutualTLS.CertInfos))
if accelerationDomain.Certificate.UpstreamCertInfo.UpstreamMutualTLS.CertInfos != nil {
for _, certInfos := range accelerationDomain.Certificate.UpstreamCertInfo.UpstreamMutualTLS.CertInfos {
certInfosMap := map[string]interface{}{}

if certInfos.CertId != nil {
certInfosMap["cert_id"] = certInfos.CertId
}

if certInfos.Alias != nil {
certInfosMap["alias"] = certInfos.Alias
}

if certInfos.Type != nil {
certInfosMap["type"] = certInfos.Type
}

if certInfos.ExpireTime != nil {
certInfosMap["expire_time"] = certInfos.ExpireTime
}

if certInfos.DeployTime != nil {
certInfosMap["deploy_time"] = certInfos.DeployTime
}

if certInfos.SignAlgo != nil {
certInfosMap["sign_algo"] = certInfos.SignAlgo
}

certInfosList = append(certInfosList, certInfosMap)
}

upstreamMutualTLSMap["cert_infos"] = certInfosList
}
upstreamCertInfoMap["upstream_mutual_tls"] = []interface{}{upstreamMutualTLSMap}
}

_ = d.Set("upstream_cert_info", []interface{}{upstreamCertInfoMap})
}

if certificate.Mode != nil {
_ = d.Set("mode", certificate.Mode)
}
Expand Down Expand Up @@ -155,6 +204,28 @@ func resourceTencentCloudTeoCertificateConfigUpdateOnStart(ctx context.Context)
}
}

if upstreamCertInfoMap, ok := helper.InterfacesHeadMap(d, "upstream_cert_info"); ok {
upstreamCertInfo := teo.UpstreamCertInfo{}
if upstreamMutualTLSMap, ok := helper.ConvertInterfacesHeadToMap(upstreamCertInfoMap["upstream_mutual_tls"]); ok {
mutualTLS2 := teo.MutualTLS{}
if v, ok := upstreamMutualTLSMap["switch"].(string); ok && v != "" {
mutualTLS2.Switch = helper.String(v)
}
if v, ok := upstreamMutualTLSMap["cert_infos"]; ok {
for _, item := range v.([]interface{}) {
certInfosMap := item.(map[string]interface{})
certificateInfo := teo.CertificateInfo{}
if v, ok := certInfosMap["cert_id"].(string); ok && v != "" {
certificateInfo.CertId = helper.String(v)
}
mutualTLS2.CertInfos = append(mutualTLS2.CertInfos, &certificateInfo)
}
}
upstreamCertInfo.UpstreamMutualTLS = &mutualTLS2
}
request.UpstreamCertInfo = &upstreamCertInfo
}

if v, ok := d.GetOk("mode"); ok {
request.Mode = helper.String(v.(string))
}
Expand Down

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

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

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

Loading
Loading