MINOR: add integration flag for HAProxy master-worker mode

Author: aiharos

configuration/cluster_sync.go

@@ -28,6 +28,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"os"
 	"path"
 	"strings"
 	"time"
@@ -43,17 +44,18 @@ const DataplaneAPIType = "community"
 
 //Node is structure required for connection to cluster
 type Node struct {
-	Address     string `json:"address"`
-	APIBasePath string `json:"api_base_path"`
-	APIPassword string `json:"api_password"`
-	APIUser     string `json:"api_user"`
-	Certificate string `json:"certificate,omitempty"`
-	Description string `json:"description,omitempty"`
-	ID          string `json:"id,omitempty"`
-	Name        string `json:"name"`
-	Port        int64  `json:"port,omitempty"`
-	Status      string `json:"status"`
-	Type        string `json:"type"`
+	Address     string            `json:"address"`
+	APIBasePath string            `json:"api_base_path"`
+	APIPassword string            `json:"api_password"`
+	APIUser     string            `json:"api_user"`
+	Certificate string            `json:"certificate,omitempty"`
+	Description string            `json:"description,omitempty"`
+	ID          string            `json:"id,omitempty"`
+	Name        string            `json:"name"`
+	Port        int64             `json:"port,omitempty"`
+	Status      string            `json:"status"`
+	Type        string            `json:"type"`
+	Variables   map[string]string `json:"variables"`
 }
 
 //ClusterSync fetches certificates for joining cluster
@@ -281,6 +283,24 @@ func (c *ClusterSync) issueJoinRequest(url, port, basePath string, nodesPath str
 		Status:      "waiting_approval",
 		Type:        DataplaneAPIType,
 	}
+	nodeData.Variables = map[string]string{}
+
+	// report the dataplane_cmdline if started from within haproxy
+	if c.cfg.HAProxy.MasterWorkerMode || os.Getenv("HAPROXY_MWORKER") == "1" {
+		nodeData.Variables["dataplane_cmdline"] = c.cfg.Cmdline.String()
+	}
+
+	processInfos, err := c.cli.Runtime.GetInfo()
+	if err != nil || len(processInfos) < 1 {
+		log.Error("unable to fetch processInfo")
+	} else {
+		if processInfos[0].Info != nil {
+			nodeData.Variables["haproxy_version"] = processInfos[0].Info.Version
+		} else {
+			log.Error("empty process info")
+		}
+	}
+
 	bytesRepresentation, _ := json.Marshal(nodeData)
 
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(bytesRepresentation))

configuration/configuration.go

@@ -17,8 +17,11 @@ package configuration
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
+	"strings"
 
 	"math/rand"
 	"time"
@@ -51,6 +54,7 @@ type HAProxyConfiguration struct {
 	UpdateMapFiles       bool   `long:"update-map-files" description:"Flag used for syncing map files with runtime maps values"`
 	UpdateMapFilesPeriod int64  `long:"update-map-files-period" description:"Elapsed time in seconds between two maps syncing operations" default:"10"`
 	ClusterTLSCertDir    string `long:"cluster-tls-dir" description:"Path where cluster tls certificates will be stored. Defaults to same directory as dataplane configuration file"`
+	MasterWorkerMode     bool   `long:"master-worker-mode" description:"Flag to enable helpers when running within HAProxy"`
 }
 
 type APIConfiguration struct {
@@ -118,6 +122,7 @@ type Configuration struct {
 	BootstrapKey AtomicString         `yaml:"bootstrap_key"`
 	Mode         AtomicString         `yaml:"mode" default:"single"`
 	Status       AtomicString         `yaml:"status"`
+	Cmdline      AtomicString         `yaml:"-"`
 }
 
 //Get returns pointer to configuration
@@ -129,6 +134,16 @@ func Get() *Configuration {
 		cfg.Notify.CertificateRefresh = NewChanNotify()
 		cfg.Notify.Reload = NewChanNotify()
 		cfg.Notify.Shutdown = NewChanNotify()
+
+		var sb strings.Builder
+		for _, v := range os.Args {
+			if !strings.HasPrefix(v, "-") && !strings.Contains(v, `\ `) && strings.ContainsAny(v, " ") {
+				fmt.Fprintf(&sb, "\"%s\" ", v)
+			}
+			fmt.Fprintf(&sb, "%s ", v)
+		}
+
+		cfg.Cmdline.Store(sb.String())
 	}
 	return cfg
 }