Merge pull request #163 from Charliekenney23/feat/nodebal-proxy-protocol

add proxy_protocol support for NodeBalancerConfigs

Author: 0xch4z

Makefile

@@ -1,6 +1,9 @@
 -include .env
 BIN_DIR := $(GOPATH)/bin
 
+INTEGRATION_DIR := ./test/integration
+FIXTURES_DIR    := $(INTEGRATION_DIR)/fixtures
+
 GOLANGCILINT      := golangci-lint
 GOLANGCILINT_IMG  := golangci/golangci-lint:v1.23-alpine
 GOLANGCILINT_ARGS := run
@@ -43,15 +46,16 @@ refresh-fixtures: clean-fixtures fixtures
 
 run_fixtures:
 	@echo "* Running fixtures"
-	@LINODE_FIXTURE_MODE="record" \
+	cd $(INTEGRATION_DIR) && \
+	LINODE_FIXTURE_MODE="record" \
 	LINODE_TOKEN=$(LINODE_TOKEN) \
 	LINODE_API_VERSION="v4beta" \
 	GO111MODULE="on" \
-	go test -timeout=60m -v ./test/integration $(ARGS)
+	go test -timeout=60m -v $(ARGS)
 
 sanitize:
 	@echo "* Sanitizing fixtures"
-	@for yaml in test/integration/fixtures/*yaml; do \
+	@for yaml in $(FIXTURES_DIR)/*yaml; do \
 		sed -E -i.bak \
 			-e 's_stats/20[0-9]{2}/[1-9][0-2]?_stats/2018/1_g' \
 			-e 's/20[0-9]{2}-[01][0-9]-[0-3][0-9]T[0-2][0-9]:[0-9]{2}:[0-9]{2}/2018-01-02T03:04:05/g' \
@@ -61,7 +65,7 @@ sanitize:
 			-e 's/(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/1234::5678/g' \
 			$$yaml; \
 	done
-	@find test/integration/fixtures -name *yaml.bak -exec rm {} \;
+	@find $(FIXTURES_DIR) -name *yaml.bak -exec rm {} \;
 
 fixtures: run_fixtures sanitize
 

nodebalancer_configs.go

@@ -11,6 +11,7 @@ type NodeBalancerConfig struct {
 	ID             int                     `json:"id"`
 	Port           int                     `json:"port"`
 	Protocol       ConfigProtocol          `json:"protocol"`
+	ProxyProtocol  ConfigProxyProtocol     `json:"proxy_protocol"`
 	Algorithm      ConfigAlgorithm         `json:"algorithm"`
 	Stickiness     ConfigStickiness        `json:"stickiness"`
 	Check          ConfigCheck             `json:"check"`
@@ -70,6 +71,16 @@ const (
 	ProtocolTCP   ConfigProtocol = "tcp"
 )
 
+// ConfigProxyProtocol constants start with ProxyProtocol and include Linode API NodeBalancer Config proxy protocol versions
+type ConfigProxyProtocol string
+
+// ConfigProxyProtocol constatns reflect the proxy protocol version used by a NodeBalancer Config
+const (
+	ProxyProtocolNone ConfigProxyProtocol = "none"
+	ProxyProtocolV1   ConfigProxyProtocol = "v1"
+	ProxyProtocolV2   ConfigProxyProtocol = "v2"
+)
+
 // ConfigCipher constants start with Cipher and include Linode API NodeBalancer Config Cipher values
 type ConfigCipher string
 
@@ -89,6 +100,7 @@ type NodeBalancerNodeStatus struct {
 type NodeBalancerConfigCreateOptions struct {
 	Port          int                             `json:"port"`
 	Protocol      ConfigProtocol                  `json:"protocol,omitempty"`
+	ProxyProtocol ConfigProxyProtocol             `json:"proxy_protocol,omitempty"`
 	Algorithm     ConfigAlgorithm                 `json:"algorithm,omitempty"`
 	Stickiness    ConfigStickiness                `json:"stickiness,omitempty"`
 	Check         ConfigCheck                     `json:"check,omitempty"`
@@ -108,6 +120,7 @@ type NodeBalancerConfigCreateOptions struct {
 type NodeBalancerConfigRebuildOptions struct {
 	Port          int                             `json:"port"`
 	Protocol      ConfigProtocol                  `json:"protocol,omitempty"`
+	ProxyProtocol ConfigProxyProtocol             `json:"proxy_protocol,omitempty"`
 	Algorithm     ConfigAlgorithm                 `json:"algorithm,omitempty"`
 	Stickiness    ConfigStickiness                `json:"stickiness,omitempty"`
 	Check         ConfigCheck                     `json:"check,omitempty"`
@@ -131,6 +144,7 @@ func (i NodeBalancerConfig) GetCreateOptions() NodeBalancerConfigCreateOptions {
 	return NodeBalancerConfigCreateOptions{
 		Port:          i.Port,
 		Protocol:      i.Protocol,
+		ProxyProtocol: i.ProxyProtocol,
 		Algorithm:     i.Algorithm,
 		Stickiness:    i.Stickiness,
 		Check:         i.Check,
@@ -151,6 +165,7 @@ func (i NodeBalancerConfig) GetUpdateOptions() NodeBalancerConfigUpdateOptions {
 	return NodeBalancerConfigUpdateOptions{
 		Port:          i.Port,
 		Protocol:      i.Protocol,
+		ProxyProtocol: i.ProxyProtocol,
 		Algorithm:     i.Algorithm,
 		Stickiness:    i.Stickiness,
 		Check:         i.Check,
@@ -171,6 +186,7 @@ func (i NodeBalancerConfig) GetRebuildOptions() NodeBalancerConfigRebuildOptions
 	return NodeBalancerConfigRebuildOptions{
 		Port:          i.Port,
 		Protocol:      i.Protocol,
+		ProxyProtocol: i.ProxyProtocol,
 		Algorithm:     i.Algorithm,
 		Stickiness:    i.Stickiness,
 		Check:         i.Check,