MINOR: reorg auxiliary config file management

ivanmatmati · oktalz · commit dc59877c734d · 2021-09-07T12:29:30.000+02:00
diff --git a/controller/controller.go b/controller/controller.go
@@ -59,6 +59,7 @@ func (c *HAProxyController) clientAPIClosure(fn func() error) (err error) {
 	if err = fn(); err != nil {
 		return err
 	}
+
 	if err = c.Client.APICommitTransaction(); err != nil {
 		return err
 	}
@@ -75,10 +76,12 @@ func (c *HAProxyController) Start() {
 	if err != nil {
 		logger.Panic(err)
 	}
+
 	c.Client, err = api.Init(c.Cfg.Env.TransactionDir, c.Cfg.Env.MainCFGFile, c.Cfg.Env.HAProxyBinary, c.Cfg.Env.RuntimeSocket)
 	if err != nil {
 		logger.Panic(err)
 	}
+
 	c.initHandlers()
 	c.haproxyStartup()
 
diff --git a/controller/haproxy/api/api.go b/controller/haproxy/api/api.go
@@ -63,6 +63,7 @@ type HAProxyClient interface {
 	ServerStateBase(value *types.StringC) error
 	SetServerAddr(backendName string, serverName string, ip string, port int) error
 	SetServerState(backendName string, serverName string, state string) error
+	SetAuxCfgFile(auxCfgFile string)
 	SyncBackendSrvs(oldEndpoints, newEndpoints *store.PortEndpoints) error
 	UserListDeleteByGroup(group string) error
 	UserListCreateByGroup(group string, userPasswordMap map[string][]byte) error
@@ -90,6 +91,7 @@ func Init(transactionDir, configFile, programPath, runtimeSocket string) (client
 		Haproxy:                   programPath,
 		ValidateConfigurationFile: true,
 	}
+
 	if transactionDir != "" {
 		confParams.TransactionDir = transactionDir
 	}
@@ -137,3 +139,11 @@ func (c *clientNative) APIDisposeTransaction() {
 	c.activeTransaction = ""
 	c.activeTransactionHasChanges = false
 }
+
+func (c *clientNative) SetAuxCfgFile(auxCfgFile string) {
+	if auxCfgFile == "" {
+		c.nativeAPI.Configuration.Transaction.ValidateConfigFilesAfter = nil
+		return
+	}
+	c.nativeAPI.Configuration.Transaction.ValidateConfigFilesAfter = []string{auxCfgFile}
+}
diff --git a/controller/monitor.go b/controller/monitor.go
@@ -181,6 +181,7 @@ func (c *HAProxyController) auxCfgUpdated() bool {
 		}
 		logger.Infof("Auxiliary HAProxy config '%s' removed", c.Cfg.Env.AuxCFGFile)
 		c.AuxCfgModTime = 0
+		c.Client.SetAuxCfgFile("")
 		return true
 	}
 	// Check modification time
@@ -190,5 +191,6 @@ func (c *HAProxyController) auxCfgUpdated() bool {
 	}
 	logger.Infof("Auxiliary HAProxy config '%s' updated", c.Cfg.Env.AuxCFGFile)
 	c.AuxCfgModTime = modifTime
+	c.Client.SetAuxCfgFile(c.Cfg.Env.AuxCFGFile)
 	return true
 }
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/google/renameio v0.1.1-0.20200217212219-353f81969824
-	github.com/haproxytech/client-native/v2 v2.2.1-0.20210202111144-7c1e53d92758
+	github.com/haproxytech/client-native/v2 v2.2.1
 	github.com/haproxytech/config-parser/v3 v3.0.0-rc1.0.20201218192213-cf1331eaac44
 	github.com/haproxytech/models/v2 v2.2.0-rc1.0.20210112080933-32de531b38f2
 	github.com/jessevdk/go-flags v1.4.0
diff --git a/go.sum b/go.sum
@@ -207,8 +207,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/haproxytech/client-native/v2 v2.2.1-0.20210202111144-7c1e53d92758 h1:0mgmRsHKSiXLmVJ/yMCihoqSvj2EF/Y9DhPnbhwUXFE=
-github.com/haproxytech/client-native/v2 v2.2.1-0.20210202111144-7c1e53d92758/go.mod h1:PwZEyFw1UlwUp+OPETx/0hpUhNPYmgdLJ/+ss/FVv2w=
+github.com/haproxytech/client-native/v2 v2.2.1 h1:ufbAxRA1s/cU6ByAxHO1A/Bhn0pg64AIVfNQDtKd4bE=
+github.com/haproxytech/client-native/v2 v2.2.1/go.mod h1:PwZEyFw1UlwUp+OPETx/0hpUhNPYmgdLJ/+ss/FVv2w=
 github.com/haproxytech/config-parser/v3 v3.0.0-rc1.0.20201218192213-cf1331eaac44 h1:lWMn14Si9rseZ3UfTI2w7nqKRjjTIUkyJc7PCHI9928=
 github.com/haproxytech/config-parser/v3 v3.0.0-rc1.0.20201218192213-cf1331eaac44/go.mod h1:68k+xwy1wGoufI/VKOOilrx/65M85eeQP6Atg+a29Ds=
 github.com/haproxytech/models/v2 v2.2.0-rc1.0.20210112080933-32de531b38f2 h1:cJfX3CNxOcZ7FW3pB88IxJfczdHBEG/dZ25A8JrQr78=

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ func (c *HAProxyController) clientAPIClosure(fn func() error) (err error) {`
`59`	`59`	`if err = fn(); err != nil {`
`60`	`60`	`return err`
`61`	`61`	`}`
	`62`	`+`
`62`	`63`	`if err = c.Client.APICommitTransaction(); err != nil {`
`63`	`64`	`return err`
`64`	`65`	`}`
`@@ -75,10 +76,12 @@ func (c *HAProxyController) Start() {`
`75`	`76`	`if err != nil {`
`76`	`77`	`logger.Panic(err)`
`77`	`78`	`}`
	`79`	`+`
`78`	`80`	`c.Client, err = api.Init(c.Cfg.Env.TransactionDir, c.Cfg.Env.MainCFGFile, c.Cfg.Env.HAProxyBinary, c.Cfg.Env.RuntimeSocket)`
`79`	`81`	`if err != nil {`
`80`	`82`	`logger.Panic(err)`
`81`	`83`	`}`
	`84`	`+`
`82`	`85`	`c.initHandlers()`
`83`	`86`	`c.haproxyStartup()`
`84`	`87`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ func (c *HAProxyController) auxCfgUpdated() bool {`
`181`	`181`	`}`
`182`	`182`	`logger.Infof("Auxiliary HAProxy config '%s' removed", c.Cfg.Env.AuxCFGFile)`
`183`	`183`	`c.AuxCfgModTime = 0`
	`184`	`+ c.Client.SetAuxCfgFile("")`
`184`	`185`	`return true`
`185`	`186`	`}`
`186`	`187`	`// Check modification time`
`@@ -190,5 +191,6 @@ func (c *HAProxyController) auxCfgUpdated() bool {`
`190`	`191`	`}`
`191`	`192`	`logger.Infof("Auxiliary HAProxy config '%s' updated", c.Cfg.Env.AuxCFGFile)`
`192`	`193`	`c.AuxCfgModTime = modifTime`
	`194`	`+ c.Client.SetAuxCfgFile(c.Cfg.Env.AuxCFGFile)`
`193`	`195`	`return true`
`194`	`196`	`}`