feat: cdn - support force_redirect.carry_headers (#1394)

* feat: cdn - support force_redirect.carry_headers

* changelog 1394

* fix: temp switch err cdn domain

Author: Kagashino

.changelog/1394.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_cdn_domain: feat: cdn - support force_redirect.carry_headers
+```

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.520
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.493
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.409
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.466
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.403
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445

go.sum

@@ -470,6 +470,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.409 h1:fKFSxvM
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.409/go.mod h1:q89YBv3T1bzENpcovtwnjxfVn9vx9pCYAssp0HPuivU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.466 h1:64xA7zyG0jrtBE63cqjALXiRRzAQIE719kZUsp79018=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.466/go.mod h1:mESUvfIm3Ze/Ov8C45E3yh2EtjudAxvprGaxNjWUliA=
+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/cfs v1.0.199 h1:VyOKZOlgTXW0szboWhI1N35khPsaHE4CyH9pf42o7P8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.199/go.mod h1:9ldm0D1ToaztnlD2bFC5yjMMqvQfVeAMhvcoCCVnZb8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.403 h1:rD9H4dQkULnRpq1BiD2KuDKsd9VEKHun2gMT+V6DNOE=

tencentcloud/resource_tc_cdn_domain.go

@@ -410,6 +410,11 @@ func resourceTencentCloudCdnDomain() *schema.Resource {
 										Description: "Forced redirect status code. Valid values are `301` and `302`. " +
 											"When `switch` setting `off`, this property does not need to be set or set to `302`. Default value is `302`.",
 									},
+									"carry_headers": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										Description: "Whether to return the newly added header during force redirection. Values: `on`, `off`.",
+									},
 								},
 							},
 						},
@@ -1856,6 +1861,9 @@ func resourceTencentCloudCdnDomainCreate(d *schema.ResourceData, meta interface{
 					if rsc := redirectMap["redirect_status_code"]; rsc.(int) != 0 {
 						redirect.RedirectStatusCode = helper.Int64(int64(rsc.(int)))
 					}
+					if ch := redirectMap["carry_headers"]; ch.(string) != "" {
+						redirect.CarryHeaders = helper.String(ch.(string))
+					}
 					request.ForceRedirect = &redirect
 				}
 			}
@@ -2522,6 +2530,7 @@ func resourceTencentCloudCdnDomainRead(d *schema.ResourceData, meta interface{})
 				"switch":               domainConfig.ForceRedirect.Switch,
 				"redirect_type":        domainConfig.ForceRedirect.RedirectType,
 				"redirect_status_code": domainConfig.ForceRedirect.RedirectStatusCode,
+				"carry_headers":        domainConfig.ForceRedirect.CarryHeaders,
 			},
 		}
 	}
@@ -3102,6 +3111,9 @@ func resourceTencentCloudCdnDomainUpdate(d *schema.ResourceData, meta interface{
 					if rsc := redirectMap["redirect_status_code"]; rsc.(int) != 0 {
 						redirect.RedirectStatusCode = helper.Int64(int64(rsc.(int)))
 					}
+					if ch := redirectMap["carry_headers"]; ch.(string) != "" {
+						redirect.CarryHeaders = helper.String(ch.(string))
+					}
 					request.ForceRedirect = &redirect
 				}
 			}

tencentcloud/resource_tc_cdn_domain_test.go

@@ -71,7 +71,7 @@ func TestAccTencentCloudCdnDomainResource(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheckCommon(t, ACCOUNT_TYPE_PREPAY)
-			if err := testAccCdnDomainVerify("www"); err != nil {
+			if err := testAccCdnDomainVerify("www2"); err != nil {
 				log.Printf("[TestAccTencentCloudCdnDomainResource] Domain Verify failed: %s", err)
 				t.Fatalf("[TestAccTencentCloudCdnDomainResource] Domain Verify failed: %s", err)
 			}
@@ -519,7 +519,7 @@ locals {
 const testAccCdnDomainBasic = testAccDomainCosForCDN + `
 
 resource "tencentcloud_cdn_domain" "foo" {
-  domain = "www.${local.domain}"
+  domain = "www2.${local.domain}"
   service_type = "web"
   area = "overseas"
   origin {
@@ -556,7 +556,7 @@ resource "tencentcloud_cdn_domain" "foo" {
 const testAccCdnDomainBasicUpdate = testAccDomainCosForCDN + `
 
 resource "tencentcloud_cdn_domain" "foo" {
-  domain = "www.${local.domain}"
+  domain = "www2.${local.domain}"
   service_type = "web"
   area = "overseas"
   origin {