added support for ssl certs and several options (#28)

Author: ivishnevs

docs/resources/gcore_cdn_resource.md

@@ -40,14 +40,47 @@ resource "gcore_cdn_resource" "cdn_example_com" {
 
 - **active** (Boolean) The setting allows to enable or disable a CDN Resource
 - **id** (String) The ID of this resource.
+- **options** (Block List, Max: 1) Each option in CDN resource settings. Each option added to CDN resource settings should have the following mandatory request fields: enabled, value. (see [below for nested schema](#nestedblock--options))
 - **origin** (String) A domain name or IP of your origin source. Specify a port if custom. You can use either 'origin' parameter or 'originGroup' in the resource definition.
 - **origin_group** (Number) ID of the Origins Group. Use one of your Origins Group or create a new one. You can use either 'origin' parameter or 'originGroup' in the resource definition.
 - **origin_protocol** (String) This option defines the protocol that will be used by CDN servers to request content from an origin source. If not specified, we will use HTTP to connect to an origin server. Possible values are: HTTPS, HTTP, MATCH.
 - **secondary_hostnames** (Set of String) List of additional CNAMEs.
+- **ssl_data** (Number)
+- **ssl_enabled** (Boolean)
 
 ### Read-Only
 
 - **last_updated** (String)
 - **status** (String) Status of a CDN resource content availability. Possible values are: Active, Suspended, Processed.
 
+<a id="nestedblock--options"></a>
+### Nested Schema for `options`
+
+Optional:
+
+- **edge_cache_settings** (Block List, Max: 1) The cache expiration time for CDN servers. (see [below for nested schema](#nestedblock--options--edge_cache_settings))
+- **host_header** (Block List, Max: 1) Specify the Host header that CDN servers use when request content from an origin server. Your server must be able to process requests with the chosen header. If the option is in NULL state Host Header value is taken from the CNAME field. (see [below for nested schema](#nestedblock--options--host_header))
+
+<a id="nestedblock--options--edge_cache_settings"></a>
+### Nested Schema for `options.edge_cache_settings`
+
+Required:
+
+- **enabled** (Boolean)
+
+Optional:
+
+- **custom_values** (Map of String) Caching time for a response with specific codes. These settings have a higher priority than the value field. Response code ('304', '404' for example). Use 'any' to specify caching time for all response codes. Caching time in seconds ('0s', '600s' for example). Use '0s' to disable caching for a specific response code.
+- **default** (String) Content will be cached according to origin cache settings. The value applies for a response with codes 200, 201, 204, 206, 301, 302, 303, 304, 307, 308 if an origin server does not have caching HTTP headers. Responses with other codes will not be cached.
+- **value** (String) Caching time for a response with codes 200, 206, 301, 302. Responses with codes 4xx, 5xx will not be cached. Use '0s' disable to caching. Use custom_values field to specify a custom caching time for a response with specific codes.
+
+
+<a id="nestedblock--options--host_header"></a>
+### Nested Schema for `options.host_header`
+
+Required:
+
+- **enabled** (Boolean)
+- **value** (String)
+
 

docs/resources/gcore_cdn_rule.md

@@ -69,5 +69,36 @@ resource "gcore_cdn_rule" "cdn_example_com_rule_2" {
 ### Optional
 
 - **id** (String) The ID of this resource.
+- **options** (Block List, Max: 1) Each option in CDN resource settings. Each option added to CDN resource settings should have the following mandatory request fields: enabled, value. (see [below for nested schema](#nestedblock--options))
+
+<a id="nestedblock--options"></a>
+### Nested Schema for `options`
+
+Optional:
+
+- **edge_cache_settings** (Block List, Max: 1) The cache expiration time for CDN servers. (see [below for nested schema](#nestedblock--options--edge_cache_settings))
+- **host_header** (Block List, Max: 1) Specify the Host header that CDN servers use when request content from an origin server. Your server must be able to process requests with the chosen header. If the option is in NULL state Host Header value is taken from the CNAME field. (see [below for nested schema](#nestedblock--options--host_header))
+
+<a id="nestedblock--options--edge_cache_settings"></a>
+### Nested Schema for `options.edge_cache_settings`
+
+Required:
+
+- **enabled** (Boolean)
+
+Optional:
+
+- **custom_values** (Map of String) Caching time for a response with specific codes. These settings have a higher priority than the value field. Response code ('304', '404' for example). Use 'any' to specify caching time for all response codes. Caching time in seconds ('0s', '600s' for example). Use '0s' to disable caching for a specific response code.
+- **default** (String) Content will be cached according to origin cache settings. The value applies for a response with codes 200, 201, 204, 206, 301, 302, 303, 304, 307, 308 if an origin server does not have caching HTTP headers. Responses with other codes will not be cached.
+- **value** (String) Caching time for a response with codes 200, 206, 301, 302. Responses with codes 4xx, 5xx will not be cached. Use '0s' disable to caching. Use custom_values field to specify a custom caching time for a response with specific codes.
+
+
+<a id="nestedblock--options--host_header"></a>
+### Nested Schema for `options.host_header`
+
+Required:
+
+- **enabled** (Boolean)
+- **value** (String)
 
 

docs/resources/gcore_cdn_sslcert.md

@@ -0,0 +1,58 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "gcore_cdn_sslcert Resource - terraform-provider-gcorelabs"
+subcategory: ""
+description: |-
+  
+---
+
+# gcore_cdn_sslcert (Resource)
+
+
+
+## Example Usage
+
+```terraform
+provider gcore {
+  user_name = "test"
+  password = "test"
+  gcore_platform = "https://api.gcdn.co"
+  gcore_cdn_api = "https://api.gcdn.co"
+}
+
+variable "cert" {
+  type = string
+  sensitive = true
+}
+
+variable "private_key" {
+  type = string
+  sensitive = true
+}
+
+resource "gcore_cdn_sslcert" "cdnopt_cert" {
+  name = "Test cert for cdnopt_bookatest_by"
+  cert = var.cert
+  private_key = var.private_key
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- **cert** (String, Sensitive) The public part of the SSL certificate. All chain of the SSL certificate should be added.
+- **name** (String) Name of the SSL certificate. Must be unique.
+- **private_key** (String, Sensitive) The private key of the SSL certificate.
+
+### Optional
+
+- **id** (String) The ID of this resource.
+
+### Read-Only
+
+- **automated** (Boolean) The way SSL certificate was issued.
+- **has_related_resources** (Boolean) It shows if the SSL certificate is used by a CDN resource.
+
+

examples/resources/gcore_cdn_sslcert/resource.tf

@@ -0,0 +1,23 @@
+provider gcore {
+  user_name = "test"
+  password = "test"
+  gcore_platform = "https://api.gcdn.co"
+  gcore_cdn_api = "https://api.gcdn.co"
+}
+
+variable "cert" {
+  type = string
+  sensitive = true
+}
+
+variable "private_key" {
+  type = string
+  sensitive = true
+}
+
+resource "gcore_cdn_sslcert" "cdnopt_cert" {
+  name = "Test cert for cdnopt_bookatest_by"
+  cert = var.cert
+  private_key = var.private_key
+}
+

gcore/provider.go

@@ -70,6 +70,7 @@ func Provider() *schema.Provider {
 			"gcore_cdn_resource":    resourceCDNResource(),
 			"gcore_cdn_origingroup": resourceCDNOriginGroup(),
 			"gcore_cdn_rule":        resourceCDNRule(),
+			"gcore_cdn_sslcert":     resourceCDNCert(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"gcore_project":         dataSourceProject(),

gcore/resource_gcore_cdn_resource.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"reflect"
 	"strconv"
 
+	gcdn "github.com/G-Core/gcorelabscdn-go/gcore"
 	"github.com/G-Core/gcorelabscdn-go/resources"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -51,6 +53,75 @@ func resourceCDNResource() *schema.Resource {
 				Elem:        &schema.Schema{Type: schema.TypeString},
 				Description: "List of additional CNAMEs.",
 			},
+			"ssl_enabled": {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			"ssl_data": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				RequiredWith: []string{"ssl_enabled"},
+			},
+			"options": {
+				Type:        schema.TypeList,
+				MaxItems:    1,
+				Optional:    true,
+				Computed:    true,
+				Description: "Each option in CDN resource settings. Each option added to CDN resource settings should have the following mandatory request fields: enabled, value.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"edge_cache_settings": {
+							Type:        schema.TypeList,
+							MaxItems:    1,
+							Optional:    true,
+							Computed:    true,
+							Description: "The cache expiration time for CDN servers.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"enabled": {
+										Type:     schema.TypeBool,
+										Required: true,
+									},
+									"value": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										Description: "Caching time for a response with codes 200, 206, 301, 302. Responses with codes 4xx, 5xx will not be cached. Use '0s' disable to caching. Use custom_values field to specify a custom caching time for a response with specific codes.",
+									},
+									"default": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										Description: "Content will be cached according to origin cache settings. The value applies for a response with codes 200, 201, 204, 206, 301, 302, 303, 304, 307, 308 if an origin server does not have caching HTTP headers. Responses with other codes will not be cached.",
+									},
+									"custom_values": {
+										Type:        schema.TypeMap,
+										Optional:    true,
+										Elem:        schema.TypeString,
+										Description: "Caching time for a response with specific codes. These settings have a higher priority than the value field. Response code ('304', '404' for example). Use 'any' to specify caching time for all response codes. Caching time in seconds ('0s', '600s' for example). Use '0s' to disable caching for a specific response code.",
+									},
+								},
+							},
+						},
+						"host_header": {
+							Type:        schema.TypeList,
+							MaxItems:    1,
+							Optional:    true,
+							Description: "Specify the Host header that CDN servers use when request content from an origin server. Your server must be able to process requests with the chosen header. If the option is in NULL state Host Header value is taken from the CNAME field.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"enabled": {
+										Type:     schema.TypeBool,
+										Required: true,
+									},
+									"value": {
+										Type:     schema.TypeString,
+										Required: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 			"active": {
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -121,8 +192,13 @@ func resourceCDNResourceRead(ctx context.Context, d *schema.ResourceData, m inte
 	d.Set("origin_group", result.OriginGroup)
 	d.Set("origin_protocol", result.OriginProtocol)
 	d.Set("secondary_hostnames", result.SecondaryHostnames)
+	d.Set("ssl_enabled", result.SSlEnabled)
+	d.Set("ssl_data", result.SSLData)
 	d.Set("status", result.Status)
 	d.Set("active", result.Active)
+	if err := d.Set("options", optionsToList(result.Options)); err != nil {
+		return diag.FromErr(err)
+	}
 
 	log.Println("[DEBUG] Finish CDN Resource reading")
 	return nil
@@ -141,8 +217,11 @@ func resourceCDNResourceUpdate(ctx context.Context, d *schema.ResourceData, m in
 
 	var req resources.UpdateRequest
 	req.Active = d.Get("active").(bool)
+	req.SSlEnabled = d.Get("ssl_enabled").(bool)
+	req.SSLData = d.Get("ssl_data").(int)
 	req.OriginGroup = d.Get("origin_group").(int)
 	req.OriginProtocol = resources.Protocol(d.Get("origin_protocol").(string))
+	req.Options = listToOptions(d.Get("options").([]interface{}))
 	for _, hostname := range d.Get("secondary_hostnames").(*schema.Set).List() {
 		req.SecondaryHostnames = append(req.SecondaryHostnames, hostname.(string))
 	}
@@ -178,3 +257,96 @@ func resourceCDNRresourceDelete(ctx context.Context, d *schema.ResourceData, m i
 	log.Println("[DEBUG] Finish CDN Resource deleting")
 	return nil
 }
+
+func listToOptions(l []interface{}) *gcdn.Options {
+	if len(l) == 0 {
+		return nil
+	}
+
+	var opts gcdn.Options
+	fields := l[0].(map[string]interface{})
+	if opt, ok := getOptByName(fields, "edge_cache_settings"); ok {
+		rawCustomVals := opt["custom_values"].(map[string]interface{})
+		customVals := make(map[string]string, len(rawCustomVals))
+		for key, value := range rawCustomVals {
+			customVals[key] = value.(string)
+		}
+
+		opts.EdgeCacheSettings = &gcdn.EdgeCacheSettings{
+			Enabled:      opt["enabled"].(bool),
+			Value:        opt["value"].(string),
+			CustomValues: customVals,
+			Default:      opt["default"].(string),
+		}
+	}
+	if opt, ok := getOptByName(fields, "host_header"); ok {
+		opts.HostHeader = &gcdn.HostHeader{
+			Enabled: opt["enabled"].(bool),
+			Value:   opt["value"].(string),
+		}
+	}
+
+	return &opts
+}
+
+func getOptByName(fields map[string]interface{}, name string) (map[string]interface{}, bool) {
+	if _, ok := fields[name]; !ok {
+		return nil, false
+	}
+
+	container, ok := fields[name].([]interface{})
+	if !ok {
+		return nil, false
+	}
+
+	if len(container) == 0 {
+		return nil, false
+	}
+
+	opt, ok := container[0].(map[string]interface{})
+	if !ok {
+		return nil, false
+	}
+
+	return opt, true
+}
+
+func optionsToList(options *gcdn.Options) []interface{} {
+	result := make(map[string][]interface{})
+	if options.EdgeCacheSettings != nil {
+		m := structToMap(options.EdgeCacheSettings)
+		result["edge_cache_settings"] = []interface{}{m}
+	}
+	if options.HostHeader != nil {
+		m := structToMap(options.HostHeader)
+		result["host_header"] = []interface{}{m}
+	}
+	return []interface{}{result}
+}
+
+func structToMap(item interface{}) map[string]interface{} {
+
+	res := map[string]interface{}{}
+	if item == nil {
+		return res
+	}
+	v := reflect.TypeOf(item)
+	reflectValue := reflect.ValueOf(item)
+	reflectValue = reflect.Indirect(reflectValue)
+
+	if v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+	for i := 0; i < v.NumField(); i++ {
+		tag := v.Field(i).Tag.Get("json")
+		field := reflectValue.Field(i).Interface()
+		if tag != "" && tag != "-" {
+			if v.Field(i).Type.Kind() == reflect.Struct {
+				res[tag] = structToMap(field)
+			} else {
+				res[tag] = field
+			}
+		}
+	}
+	return res
+}