MAJOR: update to new client native interfaces

Author: oktalz

adapters/adapters.go

@@ -125,18 +125,19 @@ func ApacheLogMiddleware(logger *log.ACLLogger) Adapter {
 	}
 }
 
-func ConfigVersionMiddleware(client *clientnative.HAProxyClient) Adapter {
+func ConfigVersionMiddleware(client clientnative.HAProxyClient) Adapter {
 	return func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			qs := r.URL.Query()
 			tID := qs.Get("transaction_id")
-			tr, _ := client.Configuration.Transaction.GetTransaction(tID)
+			configuration := client.Configuration()
+			tr, _ := configuration.GetTransaction(tID)
 			var v int64
 			var err error
 			if tr != nil && tr.Status == models.TransactionStatusInProgress {
-				v, err = client.Configuration.GetConfigurationVersion(tr.ID)
+				v, err = configuration.GetConfigurationVersion(tr.ID)
 			} else {
-				v, err = client.Configuration.GetConfigurationVersion("")
+				v, err = configuration.GetConfigurationVersion("")
 			}
 			if err == nil {
 				configVersion = strconv.FormatInt(v, 10)

configuration/cluster_sync.go

@@ -66,7 +66,7 @@ type Node struct {
 type ClusterSync struct {
 	cfg         *Configuration
 	certFetch   chan struct{}
-	cli         *client_native.HAProxyClient
+	cli         client_native.HAProxyClient
 	Context     context.Context
 	ReloadAgent haproxy.IReloadAgent
 }
@@ -76,7 +76,7 @@ var expectedResponseCodes = map[string]int{
 	"PUT":  200,
 }
 
-func (c *ClusterSync) Monitor(cfg *Configuration, cli *client_native.HAProxyClient) {
+func (c *ClusterSync) Monitor(cfg *Configuration, cli client_native.HAProxyClient) {
 	c.cfg = cfg
 	c.cli = cli
 
@@ -144,7 +144,7 @@ func (c *ClusterSync) issueRefreshRequest(url, port, basePath string, nodesPath
 		Status:      cfg.Status.Load(),
 		Type:        DataplaneAPIType,
 	}
-	var json = jsoniter.ConfigCompatibleWithStandardLibrary
+	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	bytesRepresentation, _ := json.Marshal(nodeData)
 
 	req, err := http.NewRequest("PATCH", url, bytes.NewBuffer(bytesRepresentation))
@@ -344,7 +344,7 @@ func (c *ClusterSync) issueJoinRequest(url, port, basePath string, registerPath
 	}
 	nodeData.Facts = c.getNodeFacts()
 
-	var json = jsoniter.ConfigCompatibleWithStandardLibrary
+	json := jsoniter.ConfigCompatibleWithStandardLibrary
 	bytesRepresentation, _ := json.Marshal(nodeData)
 
 	req, err := http.NewRequest(registerMethod, url, bytes.NewBuffer(bytesRepresentation))
@@ -375,22 +375,23 @@ func (c *ClusterSync) issueJoinRequest(url, port, basePath string, registerPath
 		return err
 	}
 	if c.cfg.HAProxy.NodeIDFile != "" {
+		configuration := c.cli.Configuration()
 		// write id to file
 		errFID := ioutil.WriteFile(c.cfg.HAProxy.NodeIDFile, []byte(responseData.ID), 0644) // nolint:gosec
 		if errFID != nil {
 			return errFID
 		}
-		version, errVersion := c.cli.Configuration.GetVersion("")
+		version, errVersion := configuration.GetVersion("")
 		if errVersion != nil || version < 1 {
 			// silently fallback to 1
 			version = 1
 		}
-		t, err1 := c.cli.Configuration.StartTransaction(version)
+		t, err1 := configuration.StartTransaction(version)
 		if err1 != nil {
 			return err1
 		}
 		// write id to peers
-		_, peerSections, errorGet := c.cli.Configuration.GetPeerSections(t.ID)
+		_, peerSections, errorGet := configuration.GetPeerSections(t.ID)
 		if errorGet != nil {
 			return errorGet
 		}
@@ -400,27 +401,27 @@ func (c *ClusterSync) issueJoinRequest(url, port, basePath string, registerPath
 			dataplaneID = "localhost"
 		}
 		for _, section := range peerSections {
-			_, peerEntries, err1 := c.cli.Configuration.GetPeerEntries(section.Name, t.ID)
+			_, peerEntries, err1 := configuration.GetPeerEntries(section.Name, t.ID)
 			if err1 != nil {
 				return err1
 			}
 			for _, peer := range peerEntries {
 				if peer.Name == dataplaneID {
 					peerFound = true
 					peer.Name = responseData.ID
-					errEdit := c.cli.Configuration.EditPeerEntry(dataplaneID, section.Name, peer, t.ID, 0)
+					errEdit := configuration.EditPeerEntry(dataplaneID, section.Name, peer, t.ID, 0)
 					if errEdit != nil {
-						_ = c.cli.Configuration.DeleteTransaction(t.ID)
+						_ = configuration.DeleteTransaction(t.ID)
 						return err
 					}
 				}
 			}
 		}
 		if !peerFound {
-			_ = c.cli.Configuration.DeleteTransaction(t.ID)
+			_ = configuration.DeleteTransaction(t.ID)
 			return fmt.Errorf("peer [%s] not found in HAProxy config", dataplaneID)
 		}
-		_, err = c.cli.Configuration.CommitTransaction(t.ID)
+		_, err = configuration.CommitTransaction(t.ID)
 		if err != nil {
 			return err
 		}
@@ -520,7 +521,7 @@ func (c *ClusterSync) fetchCert() {
 					break
 				}
 				var responseData Node
-				var json = jsoniter.ConfigCompatibleWithStandardLibrary
+				json := jsoniter.ConfigCompatibleWithStandardLibrary
 				err = json.Unmarshal(body, &responseData)
 				if err != nil {
 					c.activateFetchCert(err)

configuration/cluster_sync_helpers.go

@@ -29,7 +29,7 @@ func (c *ClusterSync) getNodeFacts() map[string]string {
 		facts["dataplane_cmdline"] = c.cfg.Cmdline.String()
 	}
 
-	processInfos, err := c.cli.Runtime.GetInfo()
+	processInfos, err := c.cli.Runtime().GetInfo()
 	if err != nil || len(processInfos) < 1 {
 		log.Error("unable to fetch processInfo")
 	} else {

configuration/map_sync.go

@@ -46,7 +46,7 @@ func (ms *MapSync) Stop() {
 
 // SyncAll sync maps file entries with runtime maps entries for all configured files.
 // Missing runtime entries are appended to the map file
-func (ms *MapSync) SyncAll(client client_native.IHAProxyClient) {
+func (ms *MapSync) SyncAll(client client_native.HAProxyClient) {
 	haproxyOptions := Get().HAProxy
 
 	d := time.Duration(haproxyOptions.UpdateMapFilesPeriod)
@@ -55,7 +55,7 @@ func (ms *MapSync) SyncAll(client client_native.IHAProxyClient) {
 	for {
 		select {
 		case <-ticker.C:
-			maps, err := client.GetRuntime().ShowMaps()
+			maps, err := client.Runtime().ShowMaps()
 			if err != nil {
 				log.Warning("show maps sync error: ", err.Error())
 				continue
@@ -75,20 +75,20 @@ func (ms *MapSync) SyncAll(client client_native.IHAProxyClient) {
 }
 
 // Sync syncs one map file to runtime entries
-func (ms *MapSync) Sync(mp *models.Map, client client_native.IHAProxyClient) (bool, error) {
+func (ms *MapSync) Sync(mp *models.Map, client client_native.HAProxyClient) (bool, error) {
 	ms.mu.Lock()
 	defer ms.mu.Unlock()
 
 	rawFile, err := os.Open(mp.File)
 	if err != nil {
 		return false, fmt.Errorf("error reading map file: %s %s", mp.File, err.Error())
 	}
-	fileEntries := client.GetRuntime().ParseMapEntriesFromFile(rawFile, false)
+	fileEntries := client.Runtime().ParseMapEntriesFromFile(rawFile, false)
 	sort.Slice(fileEntries, func(i, j int) bool { return fileEntries[i].Key < fileEntries[j].Key })
 
 	// runtime map entries
 	id := fmt.Sprintf("#%s", mp.ID)
-	runtimeEntries, err := client.GetRuntime().ShowMapEntries(id)
+	runtimeEntries, err := client.Runtime().ShowMapEntries(id)
 	if err != nil {
 		return false, fmt.Errorf("getting runtime entries error: id: %s %s", id, err.Error())
 	}