feat(lb): replace send_proxy_v2 by proxy_protocol (#546)

Author: Sh4d1

scaleway/helpers_lb.go

@@ -1,6 +1,7 @@
 package scaleway
 
 import (
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -236,3 +237,11 @@ func expandLbCustomCertificate(raw interface{}) *lb.CreateCertificateRequestCust
 	}
 	return config
 }
+
+func expandLbProxyProtocol(raw interface{}) lb.ProxyProtocol {
+	return lb.ProxyProtocol("proxy_protocol_" + raw.(string))
+}
+
+func flattenLbProxyProtocol(pp lb.ProxyProtocol) interface{} {
+	return strings.TrimPrefix(pp.String(), "proxy_protocol_")
+}

scaleway/resource_lb_backend_beta.go

@@ -83,8 +83,21 @@ func resourceScalewayLbBackendBeta() *schema.Resource {
 				Description: "Enables PROXY protocol version 2",
 				Optional:    true,
 				Default:     false,
+				Deprecated:  "Please use proxy_protocol instead",
+			},
+			"proxy_protocol": {
+				Type:        schema.TypeString,
+				Description: "Type of PROXY protocol to enable",
+				Optional:    true,
+				Default:     lb.ProxyProtocolProxyProtocolNone,
+				ValidateFunc: validation.StringInSlice([]string{
+					flattenLbProxyProtocol(lb.ProxyProtocolProxyProtocolNone).(string),
+					flattenLbProxyProtocol(lb.ProxyProtocolProxyProtocolV1).(string),
+					flattenLbProxyProtocol(lb.ProxyProtocolProxyProtocolV2).(string),
+					flattenLbProxyProtocol(lb.ProxyProtocolProxyProtocolV2Ssl).(string),
+					flattenLbProxyProtocol(lb.ProxyProtocolProxyProtocolV2SslCn).(string),
+				}, false),
 			},
-
 			// Timeouts
 			"timeout_server": {
 				Type:             schema.TypeString,
@@ -248,6 +261,7 @@ func resourceScalewayLbBackendBetaCreate(d *schema.ResourceData, m interface{})
 		},
 		ServerIP:           expandStrings(d.Get("server_ips")),
 		SendProxyV2:        d.Get("send_proxy_v2").(bool),
+		ProxyProtocol:      expandLbProxyProtocol(d.Get("proxy_protocol")),
 		TimeoutServer:      expandDuration(d.Get("timeout_server")),
 		TimeoutConnect:     expandDuration(d.Get("timeout_connect")),
 		TimeoutTunnel:      expandDuration(d.Get("timeout_tunnel")),
@@ -292,6 +306,7 @@ func resourceScalewayLbBackendBetaRead(d *schema.ResourceData, m interface{}) er
 	_ = d.Set("sticky_sessions_cookie_name", res.StickySessionsCookieName)
 	_ = d.Set("server_ips", res.Pool)
 	_ = d.Set("send_proxy_v2", res.SendProxyV2)
+	_ = d.Set("proxy_protocol", flattenLbProxyProtocol(res.ProxyProtocol))
 	_ = d.Set("timeout_server", flattenDuration(res.TimeoutServer))
 	_ = d.Set("timeout_connect", flattenDuration(res.TimeoutConnect))
 	_ = d.Set("timeout_tunnel", flattenDuration(res.TimeoutTunnel))
@@ -323,6 +338,7 @@ func resourceScalewayLbBackendBetaUpdate(d *schema.ResourceData, m interface{})
 		StickySessions:           expandLbStickySessionsType(d.Get("sticky_sessions")),
 		StickySessionsCookieName: d.Get("sticky_sessions_cookie_name").(string),
 		SendProxyV2:              d.Get("send_proxy_v2").(bool),
+		ProxyProtocol:            expandLbProxyProtocol(d.Get("proxy_protocol")),
 		TimeoutServer:            expandDuration(d.Get("timeout_server")),
 		TimeoutConnect:           expandDuration(d.Get("timeout_connect")),
 		TimeoutTunnel:            expandDuration(d.Get("timeout_tunnel")),

scaleway/resource_lb_backend_beta_test.go

@@ -39,7 +39,7 @@ func TestAccScalewayLbBackendBeta(t *testing.T) {
 					testAccCheckScalewayLbBackendBetaExists("scaleway_lb_backend_beta.bkd01"),
 					resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "forward_port_algorithm", "roundrobin"),
 					resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "sticky_sessions", "none"),
-					resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "send_proxy_v2", "false"),
+					resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "proxy_protocol", "none"),
 					resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "timeout_server", ""),
 					resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "on_marked_down_action", "none"),
 					resource.TestCheckResourceAttr("scaleway_lb_backend_beta.bkd01", "health_check_timeout", "30s"),
@@ -70,7 +70,7 @@ func TestAccScalewayLbBackendBeta(t *testing.T) {
 						sticky_sessions = "cookie"
 						sticky_sessions_cookie_name = "session-id"
 						server_ips = [ scaleway_instance_ip.ip02.address ]
-						send_proxy_v2 = true
+						proxy_protocol = "none"
 						timeout_server = "1s"
 						timeout_connect = "2.5s"
 						timeout_tunnel = "3s"

website/docs/r/lb_backend_beta.html.markdown

@@ -54,7 +54,8 @@ The following arguments are supported:
 - `sticky_sessions`             - (Default: `none`) Load balancing algorithm. Possible values are: `none`, `cookie` and `table`.
 - `sticky_sessions_cookie_name` - (Optional) Cookie name for for sticky sessions. Only applicable when sticky_sessions is set to `cookie`.
 - `server_ips`                  - (Optional) List of backend server IP addresses. Addresses can be either IPv4 or IPv6.
-- `send_proxy_v2`               - (Default: `false`) Enables PROXY protocol version 2.
+- `send_proxy_v2`               - DEPRECATED please use `proxy_protocol` instead - (Default: `false`) Enables PROXY protocol version 2. 
+- `proxy_protocol`              - (Default: `none`) Choose the type of PROXY protocol to enable (`none`, `v1`, `v2`, `v2_ssl`, `v2_ssl_cn`)
 - `timeout_server`              - (Optional) Maximum server connection inactivity time. (e.g.: `1s`)
 - `timeout_connect`             - (Optional) Maximum initial server connection establishment time. (e.g.: `1s`)
 - `timeout_tunnel`              - (Optional) Maximum tunnel inactivity time. (e.g.: `1s`)