Merge pull request #40 from Edge-Center/updated_cdn_sdk_and_some_fixes

Updated cdn sdk and some fixes

docs/data-sources/floatingip.md

@@ -71,5 +71,3 @@ Read-Only:
 - `key` (String)
 - `read_only` (Boolean)
 - `value` (String)
-
-

docs/data-sources/image.md

@@ -71,5 +71,3 @@ Read-Only:
 - `key` (String)
 - `read_only` (Boolean)
 - `value` (String)
-
-

docs/data-sources/instance.md

@@ -116,5 +116,3 @@ Read-Only:
 
 - `delete_on_termination` (Boolean)
 - `volume_id` (String)
-
-

docs/data-sources/k8s.md

@@ -82,5 +82,3 @@ Read-Only:
 - `node_count` (Number)
 - `stack_id` (String)
 - `uuid` (String)
-
-

docs/data-sources/k8s_client_config.md

@@ -43,5 +43,3 @@ data "edgecenter_k8s_client_config" "cfg" {
 - `client_certificate_data` (String) The client_certificate_data field from k8s config.
 - `client_key_data` (String) The client_key_data field from k8s config.
 - `id` (String) The ID of this resource.
-
-

docs/data-sources/k8s_pool.md

@@ -55,5 +55,3 @@ data "edgecenter_k8s_pool" "pool" {
 - `node_count` (Number) The current number of nodes in the pool.
 - `node_names` (List of String) A list of names of nodes within the pool.
 - `stack_id` (String) The identifier of the underlying infrastructure stack used by this pool.
-
-

docs/data-sources/lblistener.md

@@ -61,5 +61,3 @@ output "view" {
 - `protocol` (String) Available values is 'HTTP', 'HTTPS', 'TCP', 'UDP'
 - `protocol_port` (Number) The port on which the protocol is bound.
 - `provisioning_status` (String) The current provisioning status of the load balancer.
-
-

docs/data-sources/lbpool.md

@@ -87,5 +87,3 @@ Read-Only:
 - `persistence_granularity` (String)
 - `persistence_timeout` (Number)
 - `type` (String)
-
-

docs/data-sources/loadbalancer.md

@@ -79,5 +79,3 @@ Read-Only:
 - `key` (String)
 - `read_only` (Boolean)
 - `value` (String)
-
-

docs/data-sources/loadbalancerv2.md

@@ -67,5 +67,3 @@ Read-Only:
 - `key` (String)
 - `read_only` (Boolean)
 - `value` (String)
-
-

docs/data-sources/network.md

@@ -96,5 +96,3 @@ Read-Only:
 
 - `destination` (String)
 - `nexthop` (String)
-
-

docs/data-sources/project.md

@@ -32,5 +32,3 @@ data "edgecenter_project" "pr" {
 ### Read-Only
 
 - `id` (String) The ID of this resource.
-
-

docs/data-sources/region.md

@@ -32,5 +32,3 @@ data "edgecenter_region" "rg" {
 ### Read-Only
 
 - `id` (String) The ID of this resource.
-
-

docs/data-sources/reservedfixedip.md

@@ -67,5 +67,3 @@ Read-Only:
 
 - `ip_address` (String)
 - `mac_address` (String)
-
-

docs/data-sources/router.md

@@ -97,5 +97,3 @@ Read-Only:
 
 - `destination` (String)
 - `nexthop` (String)
-
-

docs/data-sources/secret.md

@@ -60,5 +60,3 @@ output "view" {
 - `id` (String) The ID of this resource.
 - `mode` (String) The mode of the encryption algorithm.
 - `status` (String) The current status of the secret.
-
-

docs/data-sources/securitygroup.md

@@ -84,5 +84,3 @@ Read-Only:
 - `protocol` (String)
 - `remote_ip_prefix` (String)
 - `updated_at` (String)
-
-

docs/data-sources/servergroup.md

@@ -63,5 +63,3 @@ Read-Only:
 
 - `instance_id` (String)
 - `instance_name` (String)
-
-

docs/data-sources/storage_s3.md

@@ -38,5 +38,3 @@ data "edgecenter_storage_s3" "example_s3" {
 - `generated_s3_endpoint` (String) A s3 endpoint for new storage resource.
 - `id` (String) The ID of this resource.
 - `location` (String) A location of new storage resource. One of (s-dt2)
-
-

docs/data-sources/storage_s3_bucket.md

@@ -34,5 +34,3 @@ data "edgecenter_storage_s3_bucket" "example_s3_bucket" {
 ### Read-Only
 
 - `id` (String) The ID of this resource.
-
-

docs/data-sources/subnet.md

@@ -81,5 +81,3 @@ Read-Only:
 - `key` (String)
 - `read_only` (Boolean)
 - `value` (String)
-
-

docs/data-sources/volume.md

@@ -69,5 +69,3 @@ Read-Only:
 - `key` (String)
 - `read_only` (Boolean)
 - `value` (String)
-
-

docs/resources/cdn_origingroup.md

@@ -60,5 +60,3 @@ Optional:
 Read-Only:
 
 - `id` (Number) The ID of this resource.
-
-

docs/resources/cdn_resource.md

@@ -84,6 +84,7 @@ resource "edgecenter_cdn_resource" "cdn_example_com" {
 ### Read-Only
 
 - `id` (String) The ID of this resource.
+- `ssl_le_enabled` (Boolean)
 - `status` (String) Status of a CDN resource content availability. Possible values are: Active, Suspended, Processed.
 
 <a id="nestedblock--options"></a>
@@ -247,6 +248,7 @@ Required:
 Optional:
 
 - `enabled` (Boolean)
+- `use_host` (Boolean)
 
 
 <a id="nestedblock--options--force_return"></a>
@@ -618,5 +620,3 @@ Required:
 Optional:
 
 - `enabled` (Boolean)
-
-

docs/resources/cdn_rule.md

@@ -272,6 +272,7 @@ Required:
 Optional:
 
 - `enabled` (Boolean)
+- `use_host` (Boolean)
 
 
 <a id="nestedblock--options--force_return"></a>
@@ -607,5 +608,3 @@ Required:
 Optional:
 
 - `enabled` (Boolean)
-
-

docs/resources/cdn_sslcert.md

@@ -48,5 +48,3 @@ resource "edgecenter_cdn_sslcert" "cdnopt_cert" {
 - `automated` (Boolean) The way SSL certificate was issued.
 - `has_related_resources` (Boolean) It shows if the SSL certificate is used by a CDN resource.
 - `id` (String) The ID of this resource.
-
-

docs/resources/keypair.md

@@ -46,5 +46,3 @@ output "kp" {
 - `fingerprint` (String) A fingerprint of the SSH public key, used to verify the integrity of the key.
 - `id` (String) The ID of this resource.
 - `sshkey_id` (String) The unique identifier assigned by the provider to the SSH key pair.
-
-

docs/resources/storage_s3.md

@@ -44,5 +44,3 @@ resource "edgecenter_storage_s3" "example_s3" {
 ### Read-Only
 
 - `id` (String) The ID of this resource.
-
-

docs/resources/storage_s3_bucket.md

@@ -34,5 +34,3 @@ resource "edgecenter_storage_s3_bucket" "example_s3_bucket" {
 ### Read-Only
 
 - `id` (String) The ID of this resource.
-
-

edgecenter/resource_edgecenter_cdn_resource.go

@@ -253,6 +253,11 @@ var resourceOptionsSchema = &schema.Schema{
 							Required:    true,
 							Description: "",
 						},
+						"use_host": {
+							Type:     schema.TypeBool,
+							Computed: true,
+							Optional: true,
+						},
 					},
 				},
 			},
@@ -996,6 +1001,7 @@ func resourceCDNResource() *schema.Resource {
 			"ssl_automated": {
 				Type:        schema.TypeBool,
 				Optional:    true,
+				Computed:    true,
 				Description: "generate LE certificate automatically.",
 			},
 			"issue_le_cert": {
@@ -1015,6 +1021,11 @@ func resourceCDNResource() *schema.Resource {
 				Computed:    true,
 				Description: "Status of a CDN resource content availability. Possible values are: Active, Suspended, Processed.",
 			},
+			"ssl_le_enabled": {
+				Type:        schema.TypeBool,
+				Computed:    true,
+				Description: "",
+			},
 			"options": resourceOptionsSchema,
 		},
 		CreateContext: resourceCDNResourceCreate,
@@ -1089,6 +1100,7 @@ func resourceCDNResourceRead(ctx context.Context, d *schema.ResourceData, m inte
 	d.Set("ssl_automated", result.SSLAutomated)
 	d.Set("status", result.Status)
 	d.Set("active", result.Active)
+	d.Set("ssl_le_enabled", result.SSLLEEnabled)
 	if err := d.Set("options", resourceOptionsToList(result.Options)); err != nil {
 		return diag.FromErr(err)
 	}
@@ -1237,6 +1249,7 @@ func listToResourceOptions(l []interface{}) *cdn.ResourceOptions {
 	if opt, ok := getOptByName(fields, "follow_origin_redirect"); ok {
 		opts.FollowOriginRedirect = &cdn.FollowOriginRedirect{
 			Enabled: opt["enabled"].(bool),
+			UseHost: opt["use_host"].(bool),
 		}
 		for _, v := range opt["codes"].(*schema.Set).List() {
 			opts.FollowOriginRedirect.Codes = append(opts.FollowOriginRedirect.Codes, v.(int))

edgecenter/resource_edgecenter_cdn_rule.go

@@ -253,6 +253,11 @@ var locationOptionsSchema = &schema.Schema{
 							Required:    true,
 							Description: "",
 						},
+						"use_host": {
+							Type:     schema.TypeBool,
+							Computed: true,
+							Optional: true,
+						},
 					},
 				},
 			},
@@ -1148,6 +1153,7 @@ func listToLocationOptions(l []interface{}) *cdn.LocationOptions {
 	if opt, ok := getOptByName(fields, "follow_origin_redirect"); ok {
 		opts.FollowOriginRedirect = &cdn.FollowOriginRedirect{
 			Enabled: opt["enabled"].(bool),
+			UseHost: opt["use_host"].(bool),
 		}
 		for _, v := range opt["codes"].(*schema.Set).List() {
 			opts.FollowOriginRedirect.Codes = append(opts.FollowOriginRedirect.Codes, v.(int))

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/AlekSi/pointer v1.2.0
 	github.com/Edge-Center/edgecenter-dns-sdk-go v0.1.0
 	github.com/Edge-Center/edgecenter-storage-sdk-go v0.2.0
-	github.com/Edge-Center/edgecentercdn-go v0.1.4
+	github.com/Edge-Center/edgecentercdn-go v0.1.5
 	github.com/Edge-Center/edgecentercloud-go v0.1.11
 	github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0

go.sum

@@ -6,8 +6,8 @@ github.com/Edge-Center/edgecenter-dns-sdk-go v0.1.0 h1:MDQr/60IhD1x7f5Bs20ljTQXG
 github.com/Edge-Center/edgecenter-dns-sdk-go v0.1.0/go.mod h1:xWN2LYVokamADMRz1cPhOrYX/NlxiDJp9tjBumHU5G8=
 github.com/Edge-Center/edgecenter-storage-sdk-go v0.2.0 h1:1aPDpywWbaF7VEjP/GjVoSgcipxWTTzEPPZv5kOWE8A=
 github.com/Edge-Center/edgecenter-storage-sdk-go v0.2.0/go.mod h1:TcWO0BPvDsE6AGlPBqpKCZhoQ70rRlqmm85J32qcL8I=
-github.com/Edge-Center/edgecentercdn-go v0.1.4 h1:Jt8f+CSriwVQ/KAb+a+v1dDNChtHjlpilgJOX8mOSx0=
-github.com/Edge-Center/edgecentercdn-go v0.1.4/go.mod h1:RwEyxwPAmxor1mZKUTa2bIU2p5qM6kcAofUkaE4O1V4=
+github.com/Edge-Center/edgecentercdn-go v0.1.5 h1:142aCMrAngvrlLSHyyPM4ZCztcvdRt4xC/Y3//AG+RA=
+github.com/Edge-Center/edgecentercdn-go v0.1.5/go.mod h1:RwEyxwPAmxor1mZKUTa2bIU2p5qM6kcAofUkaE4O1V4=
 github.com/Edge-Center/edgecentercloud-go v0.1.11 h1:00h5o/71lEoSdU1B4AWmviuOfO28P6nsRP+afjIsW80=
 github.com/Edge-Center/edgecentercloud-go v0.1.11/go.mod h1:kmXGtx0lL1ib+SPfJe/uIAyDHamquAvqiftoLSyhxF8=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=