Skip to content

cdn support https force redirect #553

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 3 commits into from
Nov 20, 2020
Merged

cdn support https force redirect #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e23fbd2
fix cdn support https force redirect
Nov 19, 2020
a1e97fb
change read retry time
Nov 19, 2020
aba30e1
fix cdn force redirect
Nov 20, 2020
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: 4 additions & 0 deletions examples/tencentcloud-cdn/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ resource "tencentcloud_cdn_domain" "foo" {
ocsp_stapling_switch = "off"
spdy_switch = "off"
verify_client = "off"

force_redirect {
switch = "on"
}
}

tags = {
Expand Down
5 changes: 5 additions & 0 deletions tencentcloud/extension_cdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ var CDN_ORIGIN_PULL_PROTOCOL = []string{
CDN_ORIGIN_PULL_PROTOCOL_FOLLOW,
}

var CDN_FORCE_REDIRECT_TYPE = []string{
CDN_ORIGIN_PULL_PROTOCOL_HTTP,
CDN_ORIGIN_PULL_PROTOCOL_HTTPS,
}

var CDN_AREA = []string{
CDN_AREA_MAINLAND,
CDN_AREA_OVERSEAS,
Expand Down
85 changes: 84 additions & 1 deletion tencentcloud/resource_tc_cdn_domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ resource "tencentcloud_cdn_domain" "foo" {
ocsp_stapling_switch = "off"
spdy_switch = "off"
verify_client = "off"

force_redirect {
switch = "on"
redirect_type = "http"
redirect_status_code = 302
}
}

tags = {
Expand Down Expand Up @@ -304,6 +310,40 @@ func resourceTencentCloudCdnDomain() *schema.Resource {
},
},
},
"force_redirect": {
Type: schema.TypeList,
Optional: true,
Computed: true,
MaxItems: 1,
Description: "Access protocol mandatory jump configuration. It's a list and consist of at most one item.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"switch": {
Type: schema.TypeString,
Optional: true,
Default: CDN_SWITCH_OFF,
ValidateFunc: validateAllowedStringValue(CDN_SWITCH),
Description: "Access forced jump configuration switch. Valid values are `on` and `off`. Default value is `off`.",
},
"redirect_type": {
Type: schema.TypeString,
Optional: true,
Default: CDN_ORIGIN_PULL_PROTOCOL_HTTP,
ValidateFunc: validateAllowedStringValue(CDN_FORCE_REDIRECT_TYPE),
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,
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`. Default value is `302`.",
},
},
},
},
},
},
},
Expand Down Expand Up @@ -435,6 +475,23 @@ func resourceTencentCloudCdnDomainCreate(d *schema.ResourceData, meta interface{
}
}
}
if v, ok := config["force_redirect"]; ok {
forceRedirect := v.([]interface{})
if len(forceRedirect) > 0 {
Copy link
Contributor

@gailwang gailwang Nov 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

上面不是判断了么

var redirect cdn.ForceRedirect
redirectMap := forceRedirect[0].(map[string]interface{})
if sw := redirectMap["switch"]; sw.(string) != "" {
redirect.Switch = helper.String(sw.(string))
}
if rt := redirectMap["redirect_type"]; rt.(string) != "" {
redirect.RedirectType = helper.String(rt.(string))
}
if rsc := redirectMap["redirect_status_code"]; rsc.(int) != 0 {
redirect.RedirectStatusCode = helper.Int64(int64(rsc.(int)))
}
request.ForceRedirect = &redirect
}
}
}
}

Expand Down Expand Up @@ -542,7 +599,7 @@ func resourceTencentCloudCdnDomainRead(d *schema.ResourceData, meta interface{})
_ = d.Set("origin", origins)

httpsConfigs := make([]map[string]interface{}, 0, 1)
httpsConfig := make(map[string]interface{}, 7)
httpsConfig := make(map[string]interface{}, 8)
httpsConfig["https_switch"] = domainConfig.Https.Switch
httpsConfig["http2_switch"] = domainConfig.Https.Http2
httpsConfig["ocsp_stapling_switch"] = domainConfig.Https.OcspStapling
Expand Down Expand Up @@ -597,6 +654,15 @@ func resourceTencentCloudCdnDomainRead(d *schema.ResourceData, meta interface{})
clientCertConfigs = append(clientCertConfigs, clientCertConfig)
httpsConfig["client_certificate_config"] = clientCertConfigs
}
if domainConfig.ForceRedirect != nil {
httpsConfig["force_redirect"] = []map[string]interface{}{
{
"switch": domainConfig.ForceRedirect.Switch,
"redirect_type": domainConfig.ForceRedirect.RedirectType,
"redirect_status_code": domainConfig.ForceRedirect.RedirectStatusCode,
},
}
}
httpsConfigs = append(httpsConfigs, httpsConfig)
_ = d.Set("https_config", httpsConfigs)

Expand Down Expand Up @@ -724,6 +790,23 @@ func resourceTencentCloudCdnDomainUpdate(d *schema.ResourceData, meta interface{
}
}
}
if v, ok := config["force_redirect"]; ok {
forceRedirect := v.([]interface{})
if len(forceRedirect) > 0 {
Copy link
Contributor

@gailwang gailwang Nov 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同上

var redirect cdn.ForceRedirect
redirectMap := forceRedirect[0].(map[string]interface{})
if sw := redirectMap["switch"]; sw.(string) != "" {
redirect.Switch = helper.String(sw.(string))
}
if rt := redirectMap["redirect_type"]; rt.(string) != "" {
redirect.RedirectType = helper.String(rt.(string))
}
if rsc := redirectMap["redirect_status_code"]; rsc.(int) != 0 {
redirect.RedirectStatusCode = helper.Int64(int64(rsc.(int)))
}
request.ForceRedirect = &redirect
}
}
}
}

Expand Down
160 changes: 150 additions & 10 deletions tencentcloud/resource_tc_cdn_domain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,22 @@ func TestAccTencentCloudCdnDomain(t *testing.T) {
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "origin.0.origin_list.#", "1"),
),
},
{
ResourceName: "tencentcloud_cdn_domain.foo",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"https_config"},
},
},
})
}

func TestAccTencentCloudCdnDomainWithHTTPs(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckCdnDomainDestroy,
Steps: []resource.TestStep{
{
Config: testAccCdnDomainFull,
Check: resource.ComposeTestCheckFunc(
Expand All @@ -48,6 +64,34 @@ func TestAccTencentCloudCdnDomain(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.redirect_status_code", "302"),
),
},
{
Config: testAccCdnDomainFullUpdate,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "domain", "test.zhaoshaona.com"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "service_type", "web"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "area", "mainland"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "full_url_cache", "false"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "origin.0.origin_type", "ip"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "origin.0.origin_list.#", "1"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "origin.0.server_name", "test.zhaoshaona.com"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "origin.0.origin_pull_protocol", "follow"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.https_switch", "on"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.http2_switch", "on"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.ocsp_stapling_switch", "on"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.spdy_switch", "on"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.verify_client", "off"),
resource.TestCheckResourceAttr("tencentcloud_cdn_domain.foo", "https_config.0.server_certificate_config.0.message", "test"),
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.redirect_status_code", "302"),
),
},
{
Expand Down Expand Up @@ -140,24 +184,30 @@ resource "tencentcloud_cdn_domain" "foo" {

const testAccCdnDomainFull = `
resource "tencentcloud_cdn_domain" "foo" {
domain = "test.zhaoshaona.com"
service_type = "web"
area = "mainland"
domain = "test.zhaoshaona.com"
service_type = "web"
area = "mainland"
full_url_cache = false

origin {
origin_type = "ip"
origin_list = ["139.199.199.140"]
server_name = "test.zhaoshaona.com"
origin_type = "ip"
origin_list = ["139.199.199.140"]
server_name = "test.zhaoshaona.com"
origin_pull_protocol = "follow"
}

https_config {
https_switch = "on"
http2_switch = "on"
https_switch = "on"
http2_switch = "on"
ocsp_stapling_switch = "on"
spdy_switch = "on"
verify_client = "off"
spdy_switch = "on"
verify_client = "off"

force_redirect {
switch = "on"
redirect_type = "https"
redirect_status_code = 302
}

server_certificate_config {
certificate_content = <<EOT
Expand Down Expand Up @@ -216,7 +266,97 @@ KKcVGqvwVh2r8ocP7OnrQPVK9ZW7BcoYiqM2DjdKyl7AtQKnvWfPMai++oXKzo0y
EOT
message = "test"
}
}

tags = {
hello = "world"
}
}
`

const testAccCdnDomainFullUpdate = `
resource "tencentcloud_cdn_domain" "foo" {
domain = "test.zhaoshaona.com"
service_type = "web"
area = "mainland"
full_url_cache = false

origin {
origin_type = "ip"
origin_list = ["139.199.199.140"]
server_name = "test.zhaoshaona.com"
origin_pull_protocol = "follow"
}

https_config {
https_switch = "on"
http2_switch = "on"
ocsp_stapling_switch = "on"
spdy_switch = "on"
verify_client = "off"

force_redirect {
switch = "off"
}

server_certificate_config {
certificate_content = <<EOT
-----BEGIN CERTIFICATE-----
MIIDuDCCAqACCQDJd98Shn/cJTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
Q04xEDAOBgNVBAgMB1RpYW5qaW4xEDAOBgNVBAcMB1RpYW5qaW4xDjAMBgNVBAoM
BU1vY2hhMRcwFQYDVQQLDA5Nb2NoYSBTb2Z0d2FyZTEcMBoGA1UEAwwTdGVzdC56
aGFvc2hhb25hLmNvbTEjMCEGCSqGSIb3DQEJARYUeWFsaW5wZWlAdGVuY2VudC5j
b20wHhcNMjAwNTIwMDcyNDQyWhcNMzAwNTE4MDcyNDQyWjCBnTELMAkGA1UEBhMC
Q04xEDAOBgNVBAgMB1RpYW5qaW4xEDAOBgNVBAcMB1RpYW5qaW4xDjAMBgNVBAoM
BU1vY2hhMRcwFQYDVQQLDA5Nb2NoYSBTb2Z0d2FyZTEcMBoGA1UEAwwTdGVzdC56
aGFvc2hhb25hLmNvbTEjMCEGCSqGSIb3DQEJARYUeWFsaW5wZWlAdGVuY2VudC5j
b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgndm2xEWL7CaVQ/lb
TO6Gj4EqEp1tWygjdfqkUXADfsgMGPukYaZY+klV6AJzLcj8VD5iWgKa+V4kLHtf
yh66c45nZrdUVoF9CFTw2+B/LTa/UzsvbLTVOnEjVBjI1V5kVzliF5cK5OlQ258d
w6yFaccOgXqSkp9i57Y9pT1FIb691hsf2VHiVLizPYy3vvLQeN8RnXS3vK56BcQk
o+49H11TAsrIh0C5maF0jp/7poSQkrX0kjfX4+gK/mC4Dn3PgK464Ko5OR45IGji
D368/klCK1bqIshlv4owEfgzAEQMPUQ0CfuvXTX85aojM48RiYiDmYveaICtYnSR
04MTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHWUpfePVt3LjZVDS3OmQ7rTG8zc
zwZgJfxP0f4ZNo/9t53SNsQ0UM/+7sqnBKOjsWfgyFqSh9cfN0Bnsn3gmvPXmD5R
nCa9qr9IO+FP9Ke4KKn0Ndx1sWJN3B6D8bUTnvFIkJoRsvsqNi24o2uKrUdcAYHL
5BVtrVe8E55i0A5WosC8KWv4ZJxTacvuxVjfyroKzxsLwOQvCqBNSuZLg1HYUeG6
XIj0/acmysb8S82Lxm39E82DbPdUO3Z0TlGL7umlAV947/6eGvPhszjnhBlxVo3p
tmHdyqfHxWbkTW4bnO/Gu+Sll6a3n1uyQ/onXuXH3pBZoXLp3Jj+CV1+N6E=
-----END CERTIFICATE-----
EOT

private_key = <<EOT
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAoJ3ZtsRFi+wmlUP5W0zuho+BKhKdbVsoI3X6pFFwA37IDBj7
pGGmWPpJVegCcy3I/FQ+YloCmvleJCx7X8oeunOOZ2a3VFaBfQhU8Nvgfy02v1M7
L2y01TpxI1QYyNVeZFc5YheXCuTpUNufHcOshWnHDoF6kpKfYue2PaU9RSG+vdYb
H9lR4lS4sz2Mt77y0HjfEZ10t7yuegXEJKPuPR9dUwLKyIdAuZmhdI6f+6aEkJK1
9JI31+PoCv5guA59z4CuOuCqOTkeOSBo4g9+vP5JQitW6iLIZb+KMBH4MwBEDD1E
NAn7r101/OWqIzOPEYmIg5mL3miArWJ0kdODEwIDAQABAoIBAQCW2uuLX9k6THkI
pSlleWJm/A4C6Cz4cy/F7p+VCfA9OCzIQAbKI/VLiPisORdj+tLVPILDeWsNB75G
F4lhNMObt8E+mRkDm6RPPS4ac0nt6ReMp63lIyLNSvDMj8Yfi1f2wn3hBesVjl8d
VMmj+Q7m16zgkPgBBrmw+ZUPXU2oyUW4+0RvGYvuWnVUdtm/34PD1LC0NKBKaX9T
MDHrSIns0WpQ7P4vNVQyHW7MGgEl81uzIitSWuT/k+zH6YxBlxd7d66vmhNoxz9c
aeEf7DE3wAb4819UYWt0/ciMJwSLPkBOaTeAsktKUHVsrMLVELWcWqSIS+PYbSX8
g3tY1DlxAoGBANSiDKNjfr1rZRtpZvxnVkssLY/586UaHs+dFfyFyd0unr/rAPf/
GO/BIO0NbBdRb3XORMuiLQN3xf+qgKfoS0kXYglDMGKbEAC/5o6ZMV6E2E/aFrxh
xmgKTZxCBVnOxlAy33UFs+qR8tpOnR4auAc0pNPA9QB4I7q17vGJRMyHAoGBAMFf
7nF2aJ/k0Fcl53Cabs/FIaAwL/GBvok6Ny8wWLwiMZCtsGUUywnUdN/qbfr2GwC5
g0w2iaxGqQPI+qw2qn0utAIfZ0Tz2VAH+P3aUTuG+M4XWHObHVXxBUqO61X9zgV2
sXRXcbDOx3HgZeDCjk0otcGVJoC3zgzaaEZi5mQVAoGAQer+2gQ1PUm27XmOmL78
bI+EjHbjhpKDbL95GnDrdKtIQZz8DuXBeEo6B+M6WDxBvpa0kyByrfmKo0jbW7JS
7JTYKqDuthL2MhVLx3dMa83pNVAZ7kqtdIGFL+TzvbSxnBk5VxDuhtC6Jd1rLfMA
jBNQ6eiOy5dzFCXkrnJspq8CgYAO4ISFsihmdMIakk31+cugrHfjzRFDMUopYJMy
TDPndXH+wX4aqLjeLrw3JeAEOL7nFV6mlGOPH3iNU/8FFMeVDezHZQca5O/JGnPr
g8pQHBg0MtOZQUvGet5/V/N/ECGzhegtHTUf9yic+DieTBmKkiE5nXHy4TE3B+6R
y7YR6QKBgQDUoNAFOnMZB4BQMeCb/pQQnzNkNTG+Y02eMKjo5eZZDfyusqIui29l
KKcVGqvwVh2r8ocP7OnrQPVK9ZW7BcoYiqM2DjdKyl7AtQKnvWfPMai++oXKzo0y
8sg7m1Ic26sKO9W9t87cfZtFKcbKVcImLWucd9R7Ny4M4r6xlRKWpA==
-----END RSA PRIVATE KEY-----
EOT
message = "test"
}
}

tags = {
hello = "world"
Expand Down
13 changes: 13 additions & 0 deletions website/docs/r/cdn_domain.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ resource "tencentcloud_cdn_domain" "foo" {
ocsp_stapling_switch = "off"
spdy_switch = "off"
verify_client = "off"

force_redirect {
switch = "on"
redirect_type = "http"
redirect_status_code = 302
}
}

tags = {
Expand Down Expand Up @@ -91,10 +97,17 @@ The `client_certificate_config` object supports the following:

* `certificate_content` - (Required) Client Certificate PEM format, requires Base64 encoding.

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`. 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:

* `https_switch` - (Required) HTTPS configuration switch. Valid values are `on` and `off`.
* `client_certificate_config` - (Optional) Client certificate configuration information.
* `force_redirect` - (Optional) Access protocol mandatory jump configuration. It's a list and consist of at most one item.
* `http2_switch` - (Optional) HTTP2 configuration switch. Valid values are `on` and `off`. and default value is `off`.
* `ocsp_stapling_switch` - (Optional) OCSP configuration switch. Valid values are `on` and `off`. and default value is `off`.
* `server_certificate_config` - (Optional) Server certificate configuration information.
Expand Down