fix override origin protocol for rule create/update (#79)

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

Author: vvelikodny

gcore/resource_gcore_cdn_rule.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"strconv"
 
+	"github.com/AlekSi/pointer"
 	"github.com/G-Core/gcorelabscdn-go/rules"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -36,10 +37,9 @@ func resourceCDNRule() *schema.Resource {
 				Required:    true,
 				Description: "Type of rule. The rule is applied if the requested URI matches the rule pattern. It has two possible values: Type 0 — RegEx. Must start with '^/' or '/'. Type 1 — RegEx. Legacy type. Note that for this rule type we automatically add / to each rule pattern before your regular expression. Please use Type 0.",
 			},
-			"origin_protocol": {
+			"override_origin_protocol": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Computed:    true,
 				Description: "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.",
 			},
 			"options": optionsSchema,
@@ -61,7 +61,10 @@ func resourceCDNRuleCreate(ctx context.Context, d *schema.ResourceData, m interf
 	req.Name = d.Get("name").(string)
 	req.Rule = d.Get("rule").(string)
 	req.RuleType = d.Get("rule_type").(int)
-	req.OverrideOriginProtocol = d.Get("origin_protocol").(string)
+
+	if d.Get("override_origin_protocol") != nil && d.Get("override_origin_protocol") != "" {
+		req.OverrideOriginProtocol = pointer.ToString(d.Get("override_origin_protocol").(string))
+	}
 
 	resourceID := d.Get("resource_id").(int)
 
@@ -100,7 +103,7 @@ func resourceCDNRuleRead(ctx context.Context, d *schema.ResourceData, m interfac
 	d.Set("name", result.Name)
 	d.Set("rule", result.Pattern)
 	d.Set("rule_type", result.Type)
-	d.Set("origin_protocol", result.OriginProtocol)
+	d.Set("override_origin_protocol", result.OverrideOriginProtocol)
 	if err := d.Set("options", optionsToList(result.Options)); err != nil {
 		return diag.FromErr(err)
 	}
@@ -124,7 +127,10 @@ func resourceCDNRuleUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	req.Name = d.Get("name").(string)
 	req.Rule = d.Get("rule").(string)
 	req.RuleType = d.Get("rule_type").(int)
-	req.OverrideOriginProtocol = d.Get("origin_protocol").(string)
+
+	if d.Get("override_origin_protocol") != nil && d.Get("override_origin_protocol") != "" {
+		req.OverrideOriginProtocol = pointer.ToString(d.Get("override_origin_protocol").(string))
+	}
 
 	req.Options = listToOptions(d.Get("options").([]interface{}))
 

go.mod

@@ -3,9 +3,10 @@ module github.com/terraform-providers/terraform-provider-gcorelabs
 go 1.16
 
 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.9
+	github.com/G-Core/gcorelabscdn-go v0.1.12
 	github.com/G-Core/gcorelabscloud-go v0.4.42
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-exec v0.15.0 // indirect

go.sum

@@ -32,6 +32,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
+github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
 github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
@@ -47,6 +49,12 @@ github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9 h1:6uyKbknI8Q2pIJApPBf6JA0CN5O
 github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9/go.mod h1:BZef79y4G28n8ic3x6iQWbW+mtpHPSUyJRfIRSkeAJw=
 github.com/G-Core/gcorelabscdn-go v0.1.9 h1:ysx/MPSVlfsPvWMorxVxZW7Ow7uM6WNkA3voHw5Sd54=
 github.com/G-Core/gcorelabscdn-go v0.1.9/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
+github.com/G-Core/gcorelabscdn-go v0.1.10 h1:FEl6mQK++P8fr17hmVg0fSMOfR67f9g/gP4ptxeBzZY=
+github.com/G-Core/gcorelabscdn-go v0.1.10/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
+github.com/G-Core/gcorelabscdn-go v0.1.11 h1:xta0D7QYBvo9PzZiHbn0n33rxIghs56UkWByi+Rf/3M=
+github.com/G-Core/gcorelabscdn-go v0.1.11/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
+github.com/G-Core/gcorelabscdn-go v0.1.12 h1:+iDaJfhbZAX/OnveTqtFlcE3gbt5CftgDl8sxjxxh2E=
+github.com/G-Core/gcorelabscdn-go v0.1.12/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
 github.com/G-Core/gcorelabscloud-go v0.4.42 h1:LBH4GnH82eQ5L/Lfnzm8KJovbIHPzt2KMitVN1V9kDQ=
 github.com/G-Core/gcorelabscloud-go v0.4.42/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
 github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=