Adding https_config options to the alicloud_cdn_domain resource #605

chanind · 2018-12-27T16:50:46Z

This PR adds the ability to set a SSL certificate and enable HTTPs on the alicloud_cdn_domain resource. Previously it was not possible to enable SSL through terraform.

This is my first time both writing Go and working on a terraform provider, so apologies if the code is strange!

Fixes https://github.com/terraform-providers/terraform-provider-alicloud/issues/591

xiaozhu36 · 2018-12-29T04:52:39Z

HI @chanind Thanks for your contribution. Can you add a testcase for this PR?

chanind · 2018-12-31T12:57:38Z

@xiaozhu36 added a test case in d41d271 and fixed up some minor issues I found in the process

xiaozhu36 · 2019-01-03T13:05:33Z

alicloud/resource_alicloud_cdn_domain.go

@@ -164,6 +164,32 @@ func resourceAlicloudCdnDomain() *schema.Resource {
 				MaxItems: 1,
 			},

+			"https_config": &schema.Schema{


I think certificate_config will be better.

no problem, I'll change that

xiaozhu36 · 2019-01-03T13:09:08Z

alicloud/resource_alicloud_cdn_domain.go

+		if d.IsNewResource() {
+			err := WaitForDomainStatus(d.Id(), Online, 360, meta)
+			if err != nil {
+				return fmt.Errorf("Timeout when Cdn Domain Online")


Please print err details before return err.

This behavior was copied from https://github.com/terraform-providers/terraform-provider-alicloud/blob/master/alicloud/resource_alicloud_cdn_domain.go#L295. Should that part of the provider also be changed?

xiaozhu36 · 2019-01-03T13:21:01Z

alicloud/resource_alicloud_cdn_domain.go

+			"server_certificate":        domain.ServerCertificate,
+			"server_certificate_status": domain.ServerCertificateStatus,
+		}
+		if oldConfig != nil && oldConfig.Len() > 0 {


I think condition if oldConfig != nil && oldConfig.Len() > 0 is redundant. private_key is sensitive and it is no need to return.

I didn't want to put private_key into the state, but I find that if I don't write it then terraform always says it changed. Is there a way to not write private_key but also not have terraform keep thinking there are new changes?

you can set private_key "Compute: true"

I tried setting Compute: true, but the same thing happens. If I don't put private_key into the state, then every run terraform thinks the private key has changed and tries to recreate the certificate. This is what is output every run if I add Compute: true and don't put private_key in the state:

@xiaozhu36 maybe it's easier if you change this PR so it works the way you suggest? You should be able to push changes. When I added Compute: true and removed private_key from the state terraform thinks the resource has changed every run. If I'm doing something wrong it's probably easier for you to push a fix since you're more experienced than I am.

xiaozhu36 · 2019-01-03T13:34:42Z

alicloud/resource_alicloud_cdn_domain.go

+		})
+		if err != nil {
+			return err
+		}


Line 788 needs set partial after ser domain config.

I used authConfigUpdate as a template, from here: https://github.com/terraform-providers/terraform-provider-alicloud/blob/master/alicloud/resource_alicloud_cdn_domain.go#L663. There is a d.SetPartial("https_config") on line 792. Why does one also need to be on line 788? It seems like in authConfigUpdate there is only 1 SetPartial. Sorry if this is a dumb question, I don't fully understand what SetPartial does.

When one config has been changed successfully by invoking API, SetPartial will write down it to state even if the next change failed.

Ok, I added it to line 788 in c14ad1c, but I'm still confused why it's only needed on line 788 and not for the other config blocks of the CDN? For example, why is it not needed here: https://github.com/terraform-providers/terraform-provider-alicloud/blob/master/alicloud/resource_alicloud_cdn_domain.go#L676 and here: https://github.com/terraform-providers/terraform-provider-alicloud/blob/master/alicloud/resource_alicloud_cdn_domain.go#L643

xiaozhu36 · 2019-01-03T13:38:33Z

alicloud/resource_alicloud_cdn_domain.go

+	if okServerCertificate {
+		err := WaitForHttpsServerCertificate(client, d.Id(), args.ServerCertificate, 360)
+		if err != nil {
+			return fmt.Errorf("Timeout waiting for Cdn server certificate")


Please print error details when returning error.

xiaozhu36 · 2019-01-03T13:38:33Z

alicloud/resource_alicloud_cdn_domain.go

+	if okServerCertificate {
+		err := WaitForHttpsServerCertificate(client, d.Id(), args.ServerCertificate, 360)
+		if err != nil {
+			return fmt.Errorf("Timeout waiting for Cdn server certificate")


Please print error details when returning error.

xiaozhu36 · 2019-01-03T13:47:31Z

alicloud/resource_alicloud_cdn_domain_test.go

+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "https_config.#", "1"),
+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "https_config.3358202545.server_certificate_status", "on"),
+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "https_config.3358202545.server_certificate", strings.Replace(testServerCertificate, `\n`, "\n", -1)),
+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "https_config.3358202545.private_key", strings.Replace(testPrivateKey, `\n`, "\n", -1)),


I think the hash code should not occur in testcase because of it always changes. If you want to check server_certificate_status and other config, you can consider to modify https_config type to TypeList.

I saw this pattern in the AWS provider, ex https://github.com/terraform-providers/terraform-provider-aws/blob/5a062fcdc5b24d82017aa15bc561fac1f152a2c6/aws/resource_aws_elb_test.go#L132. I agree it's not ideal to include the hash code in the test, but it seems like we shouldn't need to change the provider structure just to avoid dealing with hash codes in the state. The other params of alicloud_cdn_domain all use schema.TypeSet, ex auth_config, refer_config, page_404_config, and parameter_filter_config so I wanted to be consistent. Is there another helper I can use to write assertions that work on schema.TypeSet values, or is it not possible to test schema.TypeSet types?

If you can ensure same config has same hash code, the testcase can be kept. Can you run the testcase and upload the result when next submitting?

The hash shouldn't change unless we change the values contained in the config. Here is the output of the test:

=== RUN TestAccAlicloudCdnDomain_https 2019/01/04 11:32:07 [WARN] Test: Executing step 0 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypeValidate 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypePlan 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:32:07 [WARN] Test: Step plan: DIFF: CREATE: alicloud_cdn_domain.domain cdn_type: "" => "web" certificate_config.#: "0" => "1" certificate_config.3358202545.private_key: "<sensitive>" => "<sensitive>" (attribute changed) certificate_config.3358202545.server_certificate: "<sensitive>" => "<sensitive>" (attribute changed) certificate_config.3358202545.server_certificate_status: "" => "on" domain_name: "" => "tf-testacc6068554464636384429.xiaozhu.com" scope: "" => "overseas" source_port: "" => "80" source_type: "" => "oss" sources.#: "0" => "1" sources.21942838: "" => "terraformtest.aliyuncs.com" STATE: <no state> 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypeApply 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:48 [WARN] Domain id "tf-testacc6068554464636384429.xiaozhu.com" 2019/01/04 11:38:48 [INFO] terraform: building graph: GraphTypePlan 2019/01/04 11:38:48 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:48 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:38:48 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:51 [INFO] terraform: building graph: GraphTypePlan 2019/01/04 11:38:51 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:51 [WARN] Test: Running ID-only refresh check on tf-testacc6068554464636384429.xiaozhu.com 2019/01/04 11:38:51 [WARN] Test: Executing destroy step 2019/01/04 11:38:51 [INFO] terraform: building graph: GraphTypeValidate 2019/01/04 11:38:51 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:51 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:38:51 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:55 [INFO] terraform: building graph: GraphTypePlanDestroy 2019/01/04 11:38:55 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:55 [WARN] Test: Step plan: DIFF: DESTROY: alicloud_cdn_domain.domain STATE: alicloud_cdn_domain.domain: ID = tf-testacc6068554464636384429.xiaozhu.com block_ips.# = 0 cache_config.# = 0 cdn_type = web certificate_config.# = 1 certificate_config.3358202545.private_key = -----BEGIN PRIVATE KEY----- MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOdY9ITNHamP4B 3neS4bEm00oV5sNkqoNfGrwaR7qfwvGM76VXXb0VHnROeInXAn3QlYaFhLXDRVyJ CqVg6SJhbaL6LqXTXQtl6ARxAuNqK/WQPsFbGgoofkkbgd6/sjc1x4fq5lGtBS3o o/8dIFKL5s51LJO1DDM8CS2cJrsovCwrokyJUM0PUU3WmKNreDrhlZHUIic7GIkU TTzqgirWL2HBAS2pSxTnFZ9GhvyPRZ9D963PHyvQRB2qGEbp5rrFAnQnCqYrBxym HbZnd2YM/mfjwZIwEbbnzupDl0qL+ru2sy0MWYGSZnmoDZKkOP0fvW+BkOnK49D4 uueUFmVRAgMBAAECggEAGFrP2zSMsN/JXwkSS/Zpwm28WJcPR6nBs49gzyzU/BGw EvMWKxc4vewIxlT71axKkTeCVe/QzUc6YkQqPCNkVd/sEN093JAmTxAurfIsR5MF 9c0hXBDXT+2NzDvmvfBVCPgPtYsT6Xgp8T6fUp1Ef5JrmnD2v62/wX5Hrhr3ixdp FoEJ92/FJN+Dt/Duri481+RYqUUbNqiZAuEMsny/hM+aijtpQgZK8FqnVfjIOo0l p4TwfDoxtTwkj0QeJxelX/sNSD+iQ5xVmnxQ9Q1qmKMk0M1Wl8318ovcrXDTN3RZ R/Fp+lNw0aC4OLuOJDc7A13l5unHmex4Ka1kbjOZwQKBgQD8w0hJiVVmiojJ3/YX 06rG3ufGlKXu4qvRL6eXNqnDp8AnKXpjKiDV5lGz+vK0pcAyF5AhpddDN20Un+nR 4VU7NslNJdBfjQxfEKJRkGBP22C+pdlxOBDgdgouN9q7TTr9StaQC0KF+HUcF8fO sYpEp1R+27iHie+F6uS78ur0mQKBgQDRGnbv8acTDTBW8nll1wTRa0+iVR2yxglS ndC97HzYHOFb+caVmaM18QzHaaRvAhQ0bZXOjFV0QVv1nytlmHxsMlG/N6LDz5jA NLGvbrzDzki+RUk0TWJuYpvdevsnwaCxMwyY6CQ5MKhKAvwgE8AhdAq5MGcE+6U/ oAOZNyOxeQKBgQCiCB2i5mLUpSIjJ2r+wzXK3sH9zvTAOpaiNsZcbTJOto67jB9k ynDaLhdaJRjJLSgT9H700vc3o6RNgGXHoYedufU5e3AkkKrJlkQ3vTHAf4V5MaA+ sA5BlenYzv1s7IlQLlV1aYJvl2Kba7MukSlt8UZ9PCUC3i2pz3Zp9cMgoQKBgQCK GkR7bMq/1nIausJa9IwGFC3gNP8MV6dInVqEVXCO+2QL7wetPm+A7NdXzPoBJwpZ JhdO93ho89Hcg2eSDgf/HazH8eLaGH32U9cW2rhpShDZOcGDfaiI5y+yM8s1Erki z2h+hLOH4g8D8ry6ItE+RvneHY2syNb3EqPNyZEVYQKBgGeC4KiyTpW+SqmkDRU/ /FxIAlZE2vWmtJptAUkmLEVoBi0/GvJoYYJR4Jhj4gS9tJcrI860X0j05NZHvIX8 UJ/vZZeiFRiatXYUtKbD/ngoOXTF92ew2J3eCwNHH5OKwEO3aejaYwD9m0QM4kTl VLWIf79+G3NrxIeqPnqv+l3J -----END PRIVATE KEY----- certificate_config.3358202545.server_certificate = -----BEGIN CERTIFICATE----- MIICrDCCAZQCCQDApyXUTYDE+DANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA0q LnhpYW96aHUuY29tMB4XDTE4MTIzMTEwMDY1OVoXDTE5MTIzMTEwMDY1OVowGDEW MBQGA1UEAwwNKi54aWFvemh1LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC AQoCggEBAM51j0hM0dqY/gHed5LhsSbTShXmw2Sqg18avBpHup/C8YzvpVddvRUe dE54idcCfdCVhoWEtcNFXIkKpWDpImFtovoupdNdC2XoBHEC42or9ZA+wVsaCih+ SRuB3r+yNzXHh+rmUa0FLeij/x0gUovmznUsk7UMMzwJLZwmuyi8LCuiTIlQzQ9R TdaYo2t4OuGVkdQiJzsYiRRNPOqCKtYvYcEBLalLFOcVn0aG/I9Fn0P3rc8fK9BE HaoYRunmusUCdCcKpisHHKYdtmd3Zgz+Z+PBkjARtufO6kOXSov6u7azLQxZgZJm eagNkqQ4/R+9b4GQ6crj0Pi655QWZVECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA JAWcQb7942jWDWjFqW5C4eyJBuJxK8dsTsYpOa0ccpp/A2cVCTNMzV/sMCGROy2B uhrTMG4q3QawFwV+K4nQX8yJUJp57zyUfdit+yOD4hDzPyF5MOlOwzdqeg9Y9ODL Sc2O6J3tFsx2332Hb7RXFlYodEk1uFezrj4YLVrAgk1QojaBHpuFiA/O3eCmErjW c88bcil60qMvlhBhCWaZzivji6oc3y/6qWRZ3apxp9/6sjOvlm5Q+wwoLHXaU+L6 w7TZptw6upuSrAS+N4Rwqgn5TfPvbGkdRG0X0TDzE1+F+w377kE71nV8lmi8F786 bqloD1gWJER071WRz1coHQ== -----END CERTIFICATE----- certificate_config.3358202545.server_certificate_status = on domain_name = tf-testacc6068554464636384429.xiaozhu.com http_header_config.# = 0 optimize_enable = page_compress_enable = range_enable = scope = overseas source_port = 80 source_type = oss sources.# = 1 sources.21942838 = terraformtest.aliyuncs.com video_seek_enable = 2019/01/04 11:38:55 [INFO] terraform: building graph: GraphTypeApply 2019/01/04 11:38:55 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:59 [INFO] terraform: building graph: GraphTypePlanDestroy 2019/01/04 11:38:59 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:59 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:38:59 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:59 [INFO] terraform: building graph: GraphTypePlanDestroy 2019/01/04 11:38:59 [WARN] terraform: shadow graph disabled --- PASS: TestAccAlicloudCdnDomain_https (412.07s) PASS ok github.com/terraform-providers/terraform-provider-alicloud/alicloud 412.119s

OK. Please check other comments.

xiaozhu36 · 2019-01-03T13:47:42Z

website/docs/r/cdn_domain.html.markdown

 * `cache_config` - (Optional, Type: set)  Cache config of the accelerated domain. It's a set and each item's `cache_content` can not be repeated.
    * `cache_type` - (Required) Cache type of the cache config. Valid values are `suffix` and `path`.
-    * `cache_content` - (Required) Cache content of the cache config. It's value is a path string when the `cache_type` is `path`. When the `cache_type` is `suffix`, it's value is a string which contains multiple file suffixes separated by commas. 
+    * `cache_content` - (Required) Cache content of the cache config. It's value is a path string when the `cache_type` is `path`. When the `cache_type` is `suffix`, it's value is a string which contains multiple file suffixes separated by commas.
    * `ttl` - (Required, Type: int) Cache time of the cache config.
    * `weight` - (Optional, Type: int) Weight of the cache config. This parameter's value is between 1 and 99. Default value is `1`. The higher the value, the higher the priority.



Can you improve this docs by using block to arrange several configs?

I'm sorry I don't understand, what does it mean to use block to arrange configs? Is there an example in another part of the docs I can use as a reference? Sorry, I'm new to this

Please refer to: https://github.com/terraform-providers/terraform-provider-alicloud/blob/master/website/docs/r/oss_bucket.html.markdown#block-website

ok, I added the block labels in c14ad1c

xiaozhu36 · 2019-01-07T14:15:25Z

alicloud/resource_alicloud_cdn_domain.go

+			"server_certificate":        domain.ServerCertificate,
+			"server_certificate_status": domain.ServerCertificateStatus,
+		}
+		if oldConfig != nil && oldConfig.Len() > 0 {


xiaozhu36 · 2019-01-07T14:16:58Z

alicloud/resource_alicloud_cdn_domain.go

+
+	val := newConfig.List()[0].(map[string]interface{})
+	d.SetPartial("certificate_config")
+	args.ServerCertificateStatus = val["server_certificate_status"].(string)


Line 793 should be removed to line 823 that SetDomainServerCertificate success.

done in e038fe4

I think line 797 should be removed.

xiaozhu36 · 2019-01-07T14:20:28Z

alicloud/resource_alicloud_cdn_domain_test.go

+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "certificate_config.#", "1"),
+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "certificate_config.3358202545.server_certificate_status", "on"),
+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "certificate_config.3358202545.server_certificate", strings.Replace(testServerCertificate, `\n`, "\n", -1)),
+					resource.TestCheckResourceAttr("alicloud_cdn_domain.domain", "certificate_config.3358202545.private_key", strings.Replace(testPrivateKey, `\n`, "\n", -1)),


Can this test case pass? Can you submit the results? I don't think hard cord hash code in the testcase is a good solution.

@xiaozhu36 I put this test output in a previous comment, but pasting here too:

=== RUN TestAccAlicloudCdnDomain_https 2019/01/04 11:32:07 [WARN] Test: Executing step 0 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypeValidate 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypePlan 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:32:07 [WARN] Test: Step plan: DIFF: CREATE: alicloud_cdn_domain.domain cdn_type: "" => "web" certificate_config.#: "0" => "1" certificate_config.3358202545.private_key: "<sensitive>" => "<sensitive>" (attribute changed) certificate_config.3358202545.server_certificate: "<sensitive>" => "<sensitive>" (attribute changed) certificate_config.3358202545.server_certificate_status: "" => "on" domain_name: "" => "tf-testacc6068554464636384429.xiaozhu.com" scope: "" => "overseas" source_port: "" => "80" source_type: "" => "oss" sources.#: "0" => "1" sources.21942838: "" => "terraformtest.aliyuncs.com" STATE: <no state> 2019/01/04 11:32:07 [INFO] terraform: building graph: GraphTypeApply 2019/01/04 11:32:07 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:48 [WARN] Domain id "tf-testacc6068554464636384429.xiaozhu.com" 2019/01/04 11:38:48 [INFO] terraform: building graph: GraphTypePlan 2019/01/04 11:38:48 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:48 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:38:48 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:51 [INFO] terraform: building graph: GraphTypePlan 2019/01/04 11:38:51 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:51 [WARN] Test: Running ID-only refresh check on tf-testacc6068554464636384429.xiaozhu.com 2019/01/04 11:38:51 [WARN] Test: Executing destroy step 2019/01/04 11:38:51 [INFO] terraform: building graph: GraphTypeValidate 2019/01/04 11:38:51 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:51 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:38:51 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:55 [INFO] terraform: building graph: GraphTypePlanDestroy 2019/01/04 11:38:55 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:55 [WARN] Test: Step plan: DIFF: DESTROY: alicloud_cdn_domain.domain STATE: alicloud_cdn_domain.domain: ID = tf-testacc6068554464636384429.xiaozhu.com block_ips.# = 0 cache_config.# = 0 cdn_type = web certificate_config.# = 1 certificate_config.3358202545.private_key = -----BEGIN PRIVATE KEY----- MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOdY9ITNHamP4B 3neS4bEm00oV5sNkqoNfGrwaR7qfwvGM76VXXb0VHnROeInXAn3QlYaFhLXDRVyJ CqVg6SJhbaL6LqXTXQtl6ARxAuNqK/WQPsFbGgoofkkbgd6/sjc1x4fq5lGtBS3o o/8dIFKL5s51LJO1DDM8CS2cJrsovCwrokyJUM0PUU3WmKNreDrhlZHUIic7GIkU TTzqgirWL2HBAS2pSxTnFZ9GhvyPRZ9D963PHyvQRB2qGEbp5rrFAnQnCqYrBxym HbZnd2YM/mfjwZIwEbbnzupDl0qL+ru2sy0MWYGSZnmoDZKkOP0fvW+BkOnK49D4 uueUFmVRAgMBAAECggEAGFrP2zSMsN/JXwkSS/Zpwm28WJcPR6nBs49gzyzU/BGw EvMWKxc4vewIxlT71axKkTeCVe/QzUc6YkQqPCNkVd/sEN093JAmTxAurfIsR5MF 9c0hXBDXT+2NzDvmvfBVCPgPtYsT6Xgp8T6fUp1Ef5JrmnD2v62/wX5Hrhr3ixdp FoEJ92/FJN+Dt/Duri481+RYqUUbNqiZAuEMsny/hM+aijtpQgZK8FqnVfjIOo0l p4TwfDoxtTwkj0QeJxelX/sNSD+iQ5xVmnxQ9Q1qmKMk0M1Wl8318ovcrXDTN3RZ R/Fp+lNw0aC4OLuOJDc7A13l5unHmex4Ka1kbjOZwQKBgQD8w0hJiVVmiojJ3/YX 06rG3ufGlKXu4qvRL6eXNqnDp8AnKXpjKiDV5lGz+vK0pcAyF5AhpddDN20Un+nR 4VU7NslNJdBfjQxfEKJRkGBP22C+pdlxOBDgdgouN9q7TTr9StaQC0KF+HUcF8fO sYpEp1R+27iHie+F6uS78ur0mQKBgQDRGnbv8acTDTBW8nll1wTRa0+iVR2yxglS ndC97HzYHOFb+caVmaM18QzHaaRvAhQ0bZXOjFV0QVv1nytlmHxsMlG/N6LDz5jA NLGvbrzDzki+RUk0TWJuYpvdevsnwaCxMwyY6CQ5MKhKAvwgE8AhdAq5MGcE+6U/ oAOZNyOxeQKBgQCiCB2i5mLUpSIjJ2r+wzXK3sH9zvTAOpaiNsZcbTJOto67jB9k ynDaLhdaJRjJLSgT9H700vc3o6RNgGXHoYedufU5e3AkkKrJlkQ3vTHAf4V5MaA+ sA5BlenYzv1s7IlQLlV1aYJvl2Kba7MukSlt8UZ9PCUC3i2pz3Zp9cMgoQKBgQCK GkR7bMq/1nIausJa9IwGFC3gNP8MV6dInVqEVXCO+2QL7wetPm+A7NdXzPoBJwpZ JhdO93ho89Hcg2eSDgf/HazH8eLaGH32U9cW2rhpShDZOcGDfaiI5y+yM8s1Erki z2h+hLOH4g8D8ry6ItE+RvneHY2syNb3EqPNyZEVYQKBgGeC4KiyTpW+SqmkDRU/ /FxIAlZE2vWmtJptAUkmLEVoBi0/GvJoYYJR4Jhj4gS9tJcrI860X0j05NZHvIX8 UJ/vZZeiFRiatXYUtKbD/ngoOXTF92ew2J3eCwNHH5OKwEO3aejaYwD9m0QM4kTl VLWIf79+G3NrxIeqPnqv+l3J -----END PRIVATE KEY----- certificate_config.3358202545.server_certificate = -----BEGIN CERTIFICATE----- MIICrDCCAZQCCQDApyXUTYDE+DANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA0q LnhpYW96aHUuY29tMB4XDTE4MTIzMTEwMDY1OVoXDTE5MTIzMTEwMDY1OVowGDEW MBQGA1UEAwwNKi54aWFvemh1LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC AQoCggEBAM51j0hM0dqY/gHed5LhsSbTShXmw2Sqg18avBpHup/C8YzvpVddvRUe dE54idcCfdCVhoWEtcNFXIkKpWDpImFtovoupdNdC2XoBHEC42or9ZA+wVsaCih+ SRuB3r+yNzXHh+rmUa0FLeij/x0gUovmznUsk7UMMzwJLZwmuyi8LCuiTIlQzQ9R TdaYo2t4OuGVkdQiJzsYiRRNPOqCKtYvYcEBLalLFOcVn0aG/I9Fn0P3rc8fK9BE HaoYRunmusUCdCcKpisHHKYdtmd3Zgz+Z+PBkjARtufO6kOXSov6u7azLQxZgZJm eagNkqQ4/R+9b4GQ6crj0Pi655QWZVECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA JAWcQb7942jWDWjFqW5C4eyJBuJxK8dsTsYpOa0ccpp/A2cVCTNMzV/sMCGROy2B uhrTMG4q3QawFwV+K4nQX8yJUJp57zyUfdit+yOD4hDzPyF5MOlOwzdqeg9Y9ODL Sc2O6J3tFsx2332Hb7RXFlYodEk1uFezrj4YLVrAgk1QojaBHpuFiA/O3eCmErjW c88bcil60qMvlhBhCWaZzivji6oc3y/6qWRZ3apxp9/6sjOvlm5Q+wwoLHXaU+L6 w7TZptw6upuSrAS+N4Rwqgn5TfPvbGkdRG0X0TDzE1+F+w377kE71nV8lmi8F786 bqloD1gWJER071WRz1coHQ== -----END CERTIFICATE----- certificate_config.3358202545.server_certificate_status = on domain_name = tf-testacc6068554464636384429.xiaozhu.com http_header_config.# = 0 optimize_enable = page_compress_enable = range_enable = scope = overseas source_port = 80 source_type = oss sources.# = 1 sources.21942838 = terraformtest.aliyuncs.com video_seek_enable = 2019/01/04 11:38:55 [INFO] terraform: building graph: GraphTypeApply 2019/01/04 11:38:55 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:59 [INFO] terraform: building graph: GraphTypePlanDestroy 2019/01/04 11:38:59 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:59 [INFO] terraform: building graph: GraphTypeRefresh 2019/01/04 11:38:59 [WARN] terraform: shadow graph disabled 2019/01/04 11:38:59 [INFO] terraform: building graph: GraphTypePlanDestroy 2019/01/04 11:38:59 [WARN] terraform: shadow graph disabled --- PASS: TestAccAlicloudCdnDomain_https (412.07s) PASS ok github.com/terraform-providers/terraform-provider-alicloud/alicloud 412.119s

chanind · 2019-01-08T14:24:50Z

@xiaozhu36 I updated the PR and changed to use TypeList instead of TypeSet like you suggested, so the test doesn't have a hash anymore. Here's the updated test results:

=== RUN   TestAccAlicloudCdnDomain_https
2019/01/08 14:14:20 [WARN] Test: Executing step 0
2019/01/08 14:14:20 [INFO] terraform: building graph: GraphTypeValidate
2019/01/08 14:14:20 [WARN] terraform: shadow graph disabled
2019/01/08 14:14:20 [INFO] terraform: building graph: GraphTypeRefresh
2019/01/08 14:14:20 [WARN] terraform: shadow graph disabled
2019/01/08 14:14:20 [INFO] terraform: building graph: GraphTypePlan
2019/01/08 14:14:20 [WARN] terraform: shadow graph disabled
2019/01/08 14:14:20 [WARN] Test: Step plan: DIFF:

CREATE: alicloud_cdn_domain.domain
  cdn_type:                                       "" => "web"
  certificate_config.#:                           "0" => "1"
  certificate_config.0.private_key:               "<sensitive>" => "<sensitive>" (attribute changed)
  certificate_config.0.server_certificate:        "<sensitive>" => "<sensitive>" (attribute changed)
  certificate_config.0.server_certificate_status: "" => "on"
  domain_name:                                    "" => "tf-testacc5760878342779004972.xiaozhu.com"
  scope:                                          "" => "overseas"
  source_port:                                    "" => "80"
  source_type:                                    "" => "oss"
  sources.#:                                      "0" => "1"
  sources.21942838:                               "" => "terraformtest.aliyuncs.com"

STATE:

<no state>
2019/01/08 14:14:20 [INFO] terraform: building graph: GraphTypeApply
2019/01/08 14:14:20 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:05 [WARN] Domain id "tf-testacc5760878342779004972.xiaozhu.com"
2019/01/08 14:21:05 [INFO] terraform: building graph: GraphTypePlan
2019/01/08 14:21:05 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:05 [INFO] terraform: building graph: GraphTypeRefresh
2019/01/08 14:21:05 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:13 [INFO] terraform: building graph: GraphTypePlan
2019/01/08 14:21:13 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:13 [WARN] Test: Running ID-only refresh check on tf-testacc5760878342779004972.xiaozhu.com
2019/01/08 14:21:13 [WARN] Test: Executing destroy step
2019/01/08 14:21:13 [INFO] terraform: building graph: GraphTypeValidate
2019/01/08 14:21:13 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:13 [INFO] terraform: building graph: GraphTypeRefresh
2019/01/08 14:21:13 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:19 [INFO] terraform: building graph: GraphTypePlanDestroy
2019/01/08 14:21:19 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:19 [WARN] Test: Step plan: DIFF:

DESTROY: alicloud_cdn_domain.domain

STATE:

alicloud_cdn_domain.domain:
  ID = tf-testacc5760878342779004972.xiaozhu.com
  block_ips.# = 0
  cache_config.# = 0
  cdn_type = web
  certificate_config.# = 1
  certificate_config.0.private_key = -----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOdY9ITNHamP4B
3neS4bEm00oV5sNkqoNfGrwaR7qfwvGM76VXXb0VHnROeInXAn3QlYaFhLXDRVyJ
CqVg6SJhbaL6LqXTXQtl6ARxAuNqK/WQPsFbGgoofkkbgd6/sjc1x4fq5lGtBS3o
o/8dIFKL5s51LJO1DDM8CS2cJrsovCwrokyJUM0PUU3WmKNreDrhlZHUIic7GIkU
TTzqgirWL2HBAS2pSxTnFZ9GhvyPRZ9D963PHyvQRB2qGEbp5rrFAnQnCqYrBxym
HbZnd2YM/mfjwZIwEbbnzupDl0qL+ru2sy0MWYGSZnmoDZKkOP0fvW+BkOnK49D4
uueUFmVRAgMBAAECggEAGFrP2zSMsN/JXwkSS/Zpwm28WJcPR6nBs49gzyzU/BGw
EvMWKxc4vewIxlT71axKkTeCVe/QzUc6YkQqPCNkVd/sEN093JAmTxAurfIsR5MF
9c0hXBDXT+2NzDvmvfBVCPgPtYsT6Xgp8T6fUp1Ef5JrmnD2v62/wX5Hrhr3ixdp
FoEJ92/FJN+Dt/Duri481+RYqUUbNqiZAuEMsny/hM+aijtpQgZK8FqnVfjIOo0l
p4TwfDoxtTwkj0QeJxelX/sNSD+iQ5xVmnxQ9Q1qmKMk0M1Wl8318ovcrXDTN3RZ
R/Fp+lNw0aC4OLuOJDc7A13l5unHmex4Ka1kbjOZwQKBgQD8w0hJiVVmiojJ3/YX
06rG3ufGlKXu4qvRL6eXNqnDp8AnKXpjKiDV5lGz+vK0pcAyF5AhpddDN20Un+nR
4VU7NslNJdBfjQxfEKJRkGBP22C+pdlxOBDgdgouN9q7TTr9StaQC0KF+HUcF8fO
sYpEp1R+27iHie+F6uS78ur0mQKBgQDRGnbv8acTDTBW8nll1wTRa0+iVR2yxglS
ndC97HzYHOFb+caVmaM18QzHaaRvAhQ0bZXOjFV0QVv1nytlmHxsMlG/N6LDz5jA
NLGvbrzDzki+RUk0TWJuYpvdevsnwaCxMwyY6CQ5MKhKAvwgE8AhdAq5MGcE+6U/
oAOZNyOxeQKBgQCiCB2i5mLUpSIjJ2r+wzXK3sH9zvTAOpaiNsZcbTJOto67jB9k
ynDaLhdaJRjJLSgT9H700vc3o6RNgGXHoYedufU5e3AkkKrJlkQ3vTHAf4V5MaA+
sA5BlenYzv1s7IlQLlV1aYJvl2Kba7MukSlt8UZ9PCUC3i2pz3Zp9cMgoQKBgQCK
GkR7bMq/1nIausJa9IwGFC3gNP8MV6dInVqEVXCO+2QL7wetPm+A7NdXzPoBJwpZ
JhdO93ho89Hcg2eSDgf/HazH8eLaGH32U9cW2rhpShDZOcGDfaiI5y+yM8s1Erki
z2h+hLOH4g8D8ry6ItE+RvneHY2syNb3EqPNyZEVYQKBgGeC4KiyTpW+SqmkDRU/
/FxIAlZE2vWmtJptAUkmLEVoBi0/GvJoYYJR4Jhj4gS9tJcrI860X0j05NZHvIX8
UJ/vZZeiFRiatXYUtKbD/ngoOXTF92ew2J3eCwNHH5OKwEO3aejaYwD9m0QM4kTl
VLWIf79+G3NrxIeqPnqv+l3J
-----END PRIVATE KEY-----
  certificate_config.0.server_certificate = -----BEGIN CERTIFICATE-----
MIICrDCCAZQCCQDApyXUTYDE+DANBgkqhkiG9w0BAQsFADAYMRYwFAYDVQQDDA0q
LnhpYW96aHUuY29tMB4XDTE4MTIzMTEwMDY1OVoXDTE5MTIzMTEwMDY1OVowGDEW
MBQGA1UEAwwNKi54aWFvemh1LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
AQoCggEBAM51j0hM0dqY/gHed5LhsSbTShXmw2Sqg18avBpHup/C8YzvpVddvRUe
dE54idcCfdCVhoWEtcNFXIkKpWDpImFtovoupdNdC2XoBHEC42or9ZA+wVsaCih+
SRuB3r+yNzXHh+rmUa0FLeij/x0gUovmznUsk7UMMzwJLZwmuyi8LCuiTIlQzQ9R
TdaYo2t4OuGVkdQiJzsYiRRNPOqCKtYvYcEBLalLFOcVn0aG/I9Fn0P3rc8fK9BE
HaoYRunmusUCdCcKpisHHKYdtmd3Zgz+Z+PBkjARtufO6kOXSov6u7azLQxZgZJm
eagNkqQ4/R+9b4GQ6crj0Pi655QWZVECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
JAWcQb7942jWDWjFqW5C4eyJBuJxK8dsTsYpOa0ccpp/A2cVCTNMzV/sMCGROy2B
uhrTMG4q3QawFwV+K4nQX8yJUJp57zyUfdit+yOD4hDzPyF5MOlOwzdqeg9Y9ODL
Sc2O6J3tFsx2332Hb7RXFlYodEk1uFezrj4YLVrAgk1QojaBHpuFiA/O3eCmErjW
c88bcil60qMvlhBhCWaZzivji6oc3y/6qWRZ3apxp9/6sjOvlm5Q+wwoLHXaU+L6
w7TZptw6upuSrAS+N4Rwqgn5TfPvbGkdRG0X0TDzE1+F+w377kE71nV8lmi8F786
bqloD1gWJER071WRz1coHQ==
-----END CERTIFICATE-----

  certificate_config.0.server_certificate_status = on
  domain_name = tf-testacc5760878342779004972.xiaozhu.com
  http_header_config.# = 0
  optimize_enable = 
  page_compress_enable = 
  range_enable = 
  scope = overseas
  source_port = 80
  source_type = oss
  sources.# = 1
  sources.21942838 = terraformtest.aliyuncs.com
  video_seek_enable =
2019/01/08 14:21:19 [INFO] terraform: building graph: GraphTypeApply
2019/01/08 14:21:19 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:24 [INFO] terraform: building graph: GraphTypePlanDestroy
2019/01/08 14:21:24 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:24 [INFO] terraform: building graph: GraphTypeRefresh
2019/01/08 14:21:24 [WARN] terraform: shadow graph disabled
2019/01/08 14:21:24 [INFO] terraform: building graph: GraphTypePlanDestroy
2019/01/08 14:21:24 [WARN] terraform: shadow graph disabled
--- PASS: TestAccAlicloudCdnDomain_https (424.22s)
PASS
ok  	github.com/terraform-providers/terraform-provider-alicloud/alicloud	424.274s

xiaozhu36 · 2019-01-09T09:29:06Z

alicloud/resource_alicloud_cdn_domain.go

+
+	val := newConfig.List()[0].(map[string]interface{})
+	d.SetPartial("certificate_config")
+	args.ServerCertificateStatus = val["server_certificate_status"].(string)


I think line 797 should be removed.

xiaozhu36 · 2019-01-09T09:31:34Z

Hi @chanind Can you rebase this PR before the next submitting?

chanind · 2019-01-09T10:01:25Z

@xiaozhu36 I deleted line 797 and rebased / squashed

xiaozhu36 · 2019-01-09T11:45:47Z

website/docs/r/cdn_domain.html.markdown

-    * `ttl` - (Required, Type: int) Cache time of the cache config.
-    * `weight` - (Optional, Type: int) Weight of the cache config. This parameter's value is between 1 and 99. Default value is `1`. The higher the value, the higher the priority.
+### Block parameter_filter_config
+`parameter_filter_config` - (Optional, Type: set) Parameter filter config of the accelerated domain. It's a set and consists of at most one item.


Please add a blank line between line 98 and 99

xiaozhu36 · 2019-01-09T11:46:02Z

website/docs/r/cdn_domain.html.markdown

+* `hash_key_args` - (Optional, Type: list) Reserved parameters of `parameter_filter_config`. It's a list of string and consists of at most 10 items.
+
+### Block page_404_config
+`page_404_config` - (Optional, Type: set) Error Page config of the accelerated domain. It's a set and consists of at most one item.


Please add a blank line between line 103 and 104

xiaozhu36 · 2019-01-09T11:46:13Z

website/docs/r/cdn_domain.html.markdown

+* `custom_page_url` - (Optional) Custom page url of the error page. It must be the full path under the accelerated domain name. It's value must be `http://promotion.alicdn.com/help/oss/error.html` when `page_type` value is `charity` and It can not be set when `page_type` value is `default`.
+
+### Block refer_config
+`refer_config` - (Optional, Type: set) Refer anti-theft chain config of the accelerated domain. It's a set and consists of at most 1 item.


Please add a blank line between line 108 and 109

xiaozhu36 · 2019-01-09T11:46:23Z

website/docs/r/cdn_domain.html.markdown

+
+### Block auth_config
+`auth_config` - (Optional, Type: set)  Auth config of the accelerated domain. It's a set and consist of at most 1 item.
+* `auth_type` - (Optional) Auth type of the auth config. Valid values are  `no_auth`, `type_a`, `type_b` and `type_c`. Default value is `no_auth`.


Please add a blank line between line 114 and 115

xiaozhu36 · 2019-01-09T11:46:34Z

website/docs/r/cdn_domain.html.markdown

+* `timeout` - (Optional, Type: int)  Authentication cache time of the auth config. Default value is `1800`. It's value is valid only when the `auth_type` is `type_b` or `type_c`.
+
+### Block certificate_config
+`certificate_config` - (Optional, Type: set)  Certificate config of the accelerated domain. It's a set and consist of at most 1 item.


Please add a blank line between line 121 and 122

xiaozhu36 · 2019-01-09T11:46:50Z

website/docs/r/cdn_domain.html.markdown

+* `private_key` - (Optional) The SSL private key. This is required if `server_certificate_status` is `on`
+
+### Block http_header_config
+`http_header_config` - (Optional, Type: set) Http header config of the accelerated domain. It's a set and consist of at most 8 items. The `header_key` for each item can not be repeated.


Please add a blank line between line 127 and128

xiaozhu36 · 2019-01-09T11:47:06Z

website/docs/r/cdn_domain.html.markdown

+* `header_value` - (Required) Header value of the http header.
+
+### Block cache_config
+`cache_config` - (Optional, Type: set)  Cache config of the accelerated domain. It's a set and each item's `cache_content` can not be repeated.


Please add a blank line between line 132 and 133

chanind · 2019-01-09T16:53:55Z

@xiaozhu36 blank lines have been added in bbe7514

ghost added size/M documentation labels Dec 27, 2018

ghost added size/L and removed size/M labels Dec 31, 2018

xiaozhu36 requested changes Jan 3, 2019

View reviewed changes

xiaozhu36 requested changes Jan 7, 2019

View reviewed changes

xiaozhu36 requested changes Jan 9, 2019

View reviewed changes

chanind force-pushed the add_cdn_https_config branch from 2a677ce to f2c935e Compare January 9, 2019 09:58

adding https_config options to cdn

2b5cfa8

chanind force-pushed the add_cdn_https_config branch from f2c935e to 2b5cfa8 Compare January 9, 2019 10:00

xiaozhu36 requested changes Jan 9, 2019

View reviewed changes

adding blank lines in docs

bbe7514

xiaozhu36 approved these changes Jan 10, 2019

View reviewed changes

xiaozhu36 merged commit 3cb4845 into aliyun:master Jan 10, 2019

xiaozhu36 mentioned this pull request Jan 10, 2019

Does alicloud_cdn_domain support https/cert config? alibaba/terraform-provider#769

Closed

bitzip mentioned this pull request Jan 10, 2019

Feature Request: more CDN HTTPS configuration #647

Closed

timclu mentioned this pull request Jul 4, 2019

Feature Request: upload ssl certificate of cdn resource #1395

Closed

Adding https_config options to the alicloud_cdn_domain resource #605

Adding https_config options to the alicloud_cdn_domain resource #605

Conversation

chanind commented Dec 27, 2018

xiaozhu36 commented Dec 29, 2018

chanind commented Dec 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chanind Jan 4, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chanind Jan 3, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chanind commented Jan 8, 2019

Choose a reason for hiding this comment

xiaozhu36 commented Jan 9, 2019

chanind commented Jan 9, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chanind commented Jan 9, 2019

chanind Jan 4, 2019 •

edited

chanind Jan 3, 2019 •

edited