fix cdn force redirect

Author: ttomzhou

tencentcloud/resource_tc_cdn_domain.go

@@ -24,7 +24,9 @@ resource "tencentcloud_cdn_domain" "foo" {
     verify_client        = "off"
 
 	force_redirect {
-      switch = "on"
+      switch               = "on"
+      redirect_type        = "http"
+      redirect_status_code = 302
     }
   }
 
@@ -326,18 +328,18 @@ func resourceTencentCloudCdnDomain() *schema.Resource {
 									"redirect_type": {
 										Type:         schema.TypeString,
 										Optional:     true,
-										Computed:     true,
+										Default:      CDN_ORIGIN_PULL_PROTOCOL_HTTP,
 										ValidateFunc: validateAllowedStringValue(CDN_FORCE_REDIRECT_TYPE),
-										Description: "Access forced jump type. Valid values are `http` and `https`. " +
-											"When `switch` setting `off`, this property does not need to be set or set to `http`.",
+										Description: "Access forced jump type. Valid values are `http` and `https`. `http` means force http redirect, `https` means force http redirect. " +
+											"When `switch` setting `off`, this property does not need to be set or set to `http`. Default value is `http`.",
 									},
 									"redirect_status_code": {
 										Type:         schema.TypeInt,
 										Optional:     true,
-										Computed:     true,
+										Default:      302,
 										ValidateFunc: validateAllowedIntValue([]int{301, 302}),
 										Description: "Access forced jump code. Valid values are `301` and `302`. " +
-											"When `switch` setting `off`, this property does not need to be set or set to `302`.",
+											"When `switch` setting `off`, this property does not need to be set or set to `302`. Default value is `302`.",
 									},
 								},
 							},
@@ -473,7 +475,7 @@ func resourceTencentCloudCdnDomainCreate(d *schema.ResourceData, meta interface{
 					}
 				}
 			}
-			if v := config["force_redirect"]; len(v.([]interface{})) > 0 {
+			if v, ok := config["force_redirect"]; ok {
 				forceRedirect := v.([]interface{})
 				if len(forceRedirect) > 0 {
 					var redirect cdn.ForceRedirect
@@ -788,7 +790,7 @@ func resourceTencentCloudCdnDomainUpdate(d *schema.ResourceData, meta interface{
 					}
 				}
 			}
-			if v := config["force_redirect"]; len(v.([]interface{})) > 0 {
+			if v, ok := config["force_redirect"]; ok {
 				forceRedirect := v.([]interface{})
 				if len(forceRedirect) > 0 {
 					var redirect cdn.ForceRedirect

tencentcloud/resource_tc_cdn_domain_test.go

@@ -64,8 +64,8 @@ func TestAccTencentCloudCdnDomainWithHTTPs(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_cdn_domain.foo", "https_config.0.server_certificate_config.0.deploy_time"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cdn_domain.foo", "https_config.0.server_certificate_config.0.expire_time"),
 					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "tags.hello", "world"),
-					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.switch", "off"),
-					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.redirect_type", "http"),
+					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.switch", "on"),
+					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.redirect_type", "https"),
 					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.redirect_status_code", "302"),
 				),
 			},
@@ -89,8 +89,8 @@ func TestAccTencentCloudCdnDomainWithHTTPs(t *testing.T) {
 					resource.TestCheckResourceAttrSet("tencentcloud_cdn_domain.foo", "https_config.0.server_certificate_config.0.deploy_time"),
 					resource.TestCheckResourceAttrSet("tencentcloud_cdn_domain.foo", "https_config.0.server_certificate_config.0.expire_time"),
 					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "tags.hello", "world"),
-					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.switch", "on"),
-					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.redirect_type", "https"),
+					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.switch", "off"),
+					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.redirect_type", "http"),
 					resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.force_redirect.0.redirect_status_code", "302"),
 				),
 			},
@@ -203,6 +203,12 @@ resource "tencentcloud_cdn_domain" "foo" {
     spdy_switch          = "on"
 	verify_client        = "off"
 
+    force_redirect {
+        switch               = "on"
+        redirect_type        = "https"
+        redirect_status_code = 302
+    }
+
 	server_certificate_config {
       certificate_content = <<EOT
 -----BEGIN CERTIFICATE-----
@@ -290,9 +296,7 @@ resource "tencentcloud_cdn_domain" "foo" {
 	verify_client        = "off"
 
     force_redirect {
-        switch               = "on"
-        redirect_type        = "https"
-        redirect_status_code = 302
+        switch               = "off"
     }
 
 	server_certificate_config {

website/docs/r/cdn_domain.html.markdown

@@ -34,7 +34,9 @@ resource "tencentcloud_cdn_domain" "foo" {
     verify_client        = "off"
 
     force_redirect {
-      switch = "on"
+      switch               = "on"
+      redirect_type        = "http"
+      redirect_status_code = 302
     }
   }
 
@@ -97,8 +99,8 @@ The `client_certificate_config` object supports the following:
 
 The `force_redirect` object supports the following:
 
-* `redirect_status_code` - (Optional) Access forced jump code. Valid values are `301` and `302`. When `switch` setting `off`, this property does not need to be set or set to `302`.
-* `redirect_type` - (Optional) Access forced jump type. Valid values are `http` and `https`. When `switch` setting `off`, this property does not need to be set or set to `http`.
+* `redirect_status_code` - (Optional) Access forced jump 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`.
+* `redirect_type` - (Optional) Access forced jump type. Valid values are `http` and `https`. `http` means force http redirect, `https` means force http redirect. When `switch` setting `off`, this property does not need to be set or set to `http`. Default value is `http`.
 * `switch` - (Optional) Access forced jump configuration switch. Valid values are `on` and `off`. Default value is `off`.
 
 The `https_config` object supports the following: