add static_request_headers & static_headers options (#85)

Co-authored-by: Vitaly Velikodny <[email protected]>

Author: vvelikodny

gcore/resource_gcore_cdn_resource.go

@@ -293,6 +293,46 @@ var (
 						},
 					},
 				},
+				"static_request_headers": {
+					Type:        schema.TypeList,
+					MaxItems:    1,
+					Optional:    true,
+					Description: "",
+					Elem: &schema.Resource{
+						Schema: map[string]*schema.Schema{
+							"enabled": {
+								Type:     schema.TypeBool,
+								Optional: true,
+								Default:  true,
+							},
+							"value": {
+								Type:     schema.TypeMap,
+								Elem:     &schema.Schema{Type: schema.TypeString},
+								Required: true,
+							},
+						},
+					},
+				},
+				"static_headers": {
+					Type:        schema.TypeList,
+					MaxItems:    1,
+					Optional:    true,
+					Description: "",
+					Elem: &schema.Resource{
+						Schema: map[string]*schema.Schema{
+							"enabled": {
+								Type:     schema.TypeBool,
+								Optional: true,
+								Default:  true,
+							},
+							"value": {
+								Type:     schema.TypeMap,
+								Elem:     &schema.Schema{Type: schema.TypeString},
+								Required: true,
+							},
+						},
+					},
+				},
 			},
 		},
 	}
@@ -361,7 +401,6 @@ func resourceCDNResource() *schema.Resource {
 				RequiredWith: []string{"ssl_enabled"},
 				Description:  "Specify the SSL Certificate ID which should be used for the CDN Resource.",
 			},
-			"options": optionsSchema,
 			"active": {
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -373,6 +412,7 @@ func resourceCDNResource() *schema.Resource {
 				Computed:    true,
 				Description: "Status of a CDN resource content availability. Possible values are: Active, Suspended, Processed.",
 			},
+			"options": optionsSchema,
 		},
 		CreateContext: resourceCDNResourceCreate,
 		ReadContext:   resourceCDNResourceRead,
@@ -637,6 +677,32 @@ func listToOptions(l []interface{}) *gcdn.Options {
 			opts.QueryParamsBlacklist.Value = append(opts.QueryParamsBlacklist.Value, v.(string))
 		}
 	}
+	if opt, ok := getOptByName(fields, "static_request_headers"); ok {
+		enabled := true
+		if _, ok := opt["enabled"]; ok {
+			enabled = opt["enabled"].(bool)
+		}
+		opts.StaticRequestHeaders = &gcdn.StaticRequestHeaders{
+			Enabled: enabled,
+			Value:   map[string]string{},
+		}
+		for k, v := range opt["value"].(map[string]interface{}) {
+			opts.StaticRequestHeaders.Value[k] = v.(string)
+		}
+	}
+	if opt, ok := getOptByName(fields, "static_headers"); ok {
+		enabled := true
+		if _, ok := opt["enabled"]; ok {
+			enabled = opt["enabled"].(bool)
+		}
+		opts.StaticHeaders = &gcdn.StaticHeaders{
+			Enabled: enabled,
+			Value:   map[string]string{},
+		}
+		for k, v := range opt["value"].(map[string]interface{}) {
+			opts.StaticHeaders.Value[k] = v.(string)
+		}
+	}
 	return &opts
 }
 
@@ -712,6 +778,14 @@ func optionsToList(options *gcdn.Options) []interface{} {
 		m := structToMap(options.QueryParamsBlacklist)
 		result["query_params_blacklist"] = []interface{}{m}
 	}
+	if options.StaticRequestHeaders != nil {
+		m := structToMap(options.StaticRequestHeaders)
+		result["static_request_headers"] = []interface{}{m}
+	}
+	if options.StaticHeaders != nil {
+		m := structToMap(options.StaticHeaders)
+		result["static_headers"] = []interface{}{m}
+	}
 	return []interface{}{result}
 }
 

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/AlekSi/pointer v1.2.0
 	github.com/G-Core/g-dns-sdk-go v0.1.2
 	github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9
-	github.com/G-Core/gcorelabscdn-go v0.1.16
+	github.com/G-Core/gcorelabscdn-go v0.1.18
 	github.com/G-Core/gcorelabscloud-go v0.4.43
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1

go.sum

@@ -53,6 +53,10 @@ github.com/G-Core/gcorelabscdn-go v0.1.15 h1:3T8xbxKr3773RR7oE06W9T3BjEOw5Zekfls
 github.com/G-Core/gcorelabscdn-go v0.1.15/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
 github.com/G-Core/gcorelabscdn-go v0.1.16 h1:AwO7ixX9bEEFespAR4ZcCOSDBgylGRqhglzoYeuRJ6g=
 github.com/G-Core/gcorelabscdn-go v0.1.16/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
+github.com/G-Core/gcorelabscdn-go v0.1.17 h1:N/zud06Ixnr2a70dfAw7ixjPFnasQ0UlsyYMTdGmICg=
+github.com/G-Core/gcorelabscdn-go v0.1.17/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
+github.com/G-Core/gcorelabscdn-go v0.1.18 h1:ISDvMA0EFw6PJnQKTnJ5lAJ5mm1MVRbjMZoZkClA42I=
+github.com/G-Core/gcorelabscdn-go v0.1.18/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
 github.com/G-Core/gcorelabscloud-go v0.4.43 h1:e4D1iJSoPKye3YyOXS7vER2ZYitu51cpAK68n1c3sGM=
 github.com/G-Core/gcorelabscloud-go v0.4.43/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=