Skip to content

Commit 2eca06d

Browse files
authored
Merge pull request #473 from orangeholic/master
`tencentcloud_cdn_domain` fix incorrect setting case crash.
2 parents ef9b9c2 + 4cf01d1 commit 2eca06d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## 1.39.0 (Unreleased)
22

3+
BUG FIXES:
4+
5+
* Resource: `tencentcloud_cdn_domain` fix incorrect setting `server_certificate_config`,`client_certificate_config` caused the program to crash.
6+
37
ENHANCEMENTS:
48

59
* Data Source: `tencentcloud_images` supports list of snapshots.

tencentcloud/resource_tc_cdn_domain.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ func resourceTencentCloudCdnDomainCreate(d *schema.ResourceData, meta interface{
374374
request.Https.VerifyClient = helper.String(config["verify_client"].(string))
375375
if v := config["server_certificate_config"]; len(v.([]interface{})) > 0 {
376376
serverCerts := v.([]interface{})
377-
if len(serverCerts) > 0 {
377+
if len(serverCerts) > 0 && serverCerts[0] != nil {
378378
serverCert := serverCerts[0].(map[string]interface{})
379379
request.Https.CertInfo = &cdn.ServerCert{}
380380
if v := serverCert["certificate_id"]; v.(string) != "" {
@@ -393,7 +393,7 @@ func resourceTencentCloudCdnDomainCreate(d *schema.ResourceData, meta interface{
393393
}
394394
if v := config["client_certificate_config"]; len(v.([]interface{})) > 0 {
395395
clientCerts := v.([]interface{})
396-
if len(clientCerts) > 0 {
396+
if len(clientCerts) > 0 && clientCerts[0] != nil {
397397
clientCert := clientCerts[0].(map[string]interface{})
398398
request.Https.ClientCertInfo = &cdn.ClientCert{}
399399
if v := clientCert["certificate_content"]; v.(string) != "" {
@@ -663,7 +663,7 @@ func resourceTencentCloudCdnDomainUpdate(d *schema.ResourceData, meta interface{
663663
request.Https.VerifyClient = helper.String(config["verify_client"].(string))
664664
if v := config["server_certificate_config"]; len(v.([]interface{})) > 0 {
665665
serverCerts := v.([]interface{})
666-
if len(serverCerts) > 0 {
666+
if len(serverCerts) > 0 && serverCerts[0] != nil {
667667
serverCert := serverCerts[0].(map[string]interface{})
668668
request.Https.CertInfo = &cdn.ServerCert{}
669669
if v := serverCert["certificate_id"]; v.(string) != "" {
@@ -682,7 +682,7 @@ func resourceTencentCloudCdnDomainUpdate(d *schema.ResourceData, meta interface{
682682
}
683683
if v := config["client_certificate_config"]; len(v.([]interface{})) > 0 {
684684
clientCerts := v.([]interface{})
685-
if len(clientCerts) > 0 {
685+
if len(clientCerts) > 0 && clientCerts[0] != nil {
686686
clientCert := clientCerts[0].(map[string]interface{})
687687
request.Https.ClientCertInfo = &cdn.ClientCert{}
688688
if v := clientCert["certificate_content"]; v.(string) != "" {

0 commit comments

Comments
 (0)