haproxytech
diff --git a/‎embedded_spec.go‎
Lines changed: 68 additions & 0 deletions b/‎embedded_spec.go‎
Lines changed: 68 additions & 0 deletions
diff --git a/‎go.mod‎
Lines changed: 1 addition & 1 deletion b/‎go.mod‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎go.sum‎
Lines changed: 2 additions & 2 deletions b/‎go.sum‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎handlers/raw.go‎
Lines changed: 20 additions & 6 deletions b/‎handlers/raw.go‎
Lines changed: 20 additions & 6 deletions
diff --git a/‎operations/configuration/get_h_a_proxy_configuration_responses.go‎
Lines changed: 44 additions & 0 deletions b/‎operations/configuration/get_h_a_proxy_configuration_responses.go‎
Lines changed: 44 additions & 0 deletions
@@ -22,7 +22,7 @@ require (
 	github.com/go-openapi/validate v0.22.1
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.3.1
-	github.com/haproxytech/client-native/v5 v5.0.1-0.20230906085426-63ef2dfd0818
+	github.com/haproxytech/client-native/v5 v5.0.1-0.20230906104259-300451457fc6
 	github.com/haproxytech/config-parser/v5 v5.0.1-0.20230821131853-5878ad7f5340
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/json-iterator/go v1.1.12
 
@@ -132,8 +132,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/haproxytech/client-native/v5 v5.0.1-0.20230906085426-63ef2dfd0818 h1:BpjVE8HW7ugKy8cvEx2GCCN/muGGmIDU4vewpndF+98=
-github.com/haproxytech/client-native/v5 v5.0.1-0.20230906085426-63ef2dfd0818/go.mod h1:Iri39GLoJjesuqvovItlnWdUw4K2p/39YKoyRQ6ZW4Q=
+github.com/haproxytech/client-native/v5 v5.0.1-0.20230906104259-300451457fc6 h1:WPAl1+D5zlhFtF6bX4uiwTkp7f9T6hxaMhvd0/Ms3kw=
+github.com/haproxytech/client-native/v5 v5.0.1-0.20230906104259-300451457fc6/go.mod h1:Iri39GLoJjesuqvovItlnWdUw4K2p/39YKoyRQ6ZW4Q=
 github.com/haproxytech/config-parser/v5 v5.0.1-0.20230821131853-5878ad7f5340 h1:VtRnT4x7Cds0TxZCqDYFTyCnFMyJJA5FC+uRum+CUD4=
 github.com/haproxytech/config-parser/v5 v5.0.1-0.20230821131853-5878ad7f5340/go.mod h1:cGtFso7oMTY1GIixWv9JG7pKSdyyacpWqNE7XPx6+mU=
 github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
 
@@ -58,12 +58,16 @@ func (h *GetRawConfigurationHandlerImpl) Handle(params configuration.GetHAProxyC
 		return configuration.NewGetConfigurationVersionDefault(int(*e.Code)).WithPayload(e)
 	}
 
-	v, data, err := cfg.GetRawConfiguration(t, v)
+	v, clusterVersion, md5Hash, data, err := cfg.GetRawConfigurationWithClusterData(t, v)
 	if err != nil {
 		e := misc.HandleError(err)
 		return configuration.NewGetHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
 	}
-	return configuration.NewGetHAProxyConfigurationOK().WithPayload(&configuration.GetHAProxyConfigurationOKBody{Version: v, Data: &data})
+	cVersion := ""
+	if clusterVersion != 0 {
+		cVersion = strconv.FormatInt(clusterVersion, 10)
+	}
+	return configuration.NewGetHAProxyConfigurationOK().WithPayload(&configuration.GetHAProxyConfigurationOKBody{Version: v, Data: &data}).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
 }
 
 // Handle executing the request and returning a response
@@ -115,9 +119,19 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
 		return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
 	}
 
+	_, clusterVersion, md5Hash, data, err := cfg.GetRawConfigurationWithClusterData("", 0)
+	if err != nil {
+		e := misc.HandleError(err)
+		return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
+	}
+
+	cVersion := ""
+	if clusterVersion != 0 {
+		cVersion = strconv.FormatInt(clusterVersion, 10)
+	}
 	if onlyValidate {
 		// return here without reloading, since config is only validated.
-		return configuration.NewPostHAProxyConfigurationAccepted().WithPayload(params.Data)
+		return configuration.NewPostHAProxyConfigurationAccepted().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
 	}
 	if skipReload {
 		if params.XRuntimeActions != nil {
@@ -126,7 +140,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
 				return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
 			}
 		}
-		return configuration.NewPostHAProxyConfigurationCreated().WithPayload(params.Data)
+		return configuration.NewPostHAProxyConfigurationCreated().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
 	}
 	if forceReload {
 		var callbackNeeded bool
@@ -145,7 +159,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
 			e := misc.HandleError(err)
 			return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
 		}
-		return configuration.NewPostHAProxyConfigurationCreated().WithPayload(params.Data)
+		return configuration.NewPostHAProxyConfigurationCreated().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
 	}
 	callbackNeeded, reconfigureFunc, err := cn.ReconfigureRuntime(h.Client, runtimeAPIsOld)
 	if err != nil {
@@ -160,7 +174,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
 		rID = h.ReloadAgent.Reload()
 	}
 
-	return configuration.NewPostHAProxyConfigurationAccepted().WithReloadID(rID).WithPayload(params.Data)
+	return configuration.NewPostHAProxyConfigurationAccepted().WithReloadID(rID).WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
 }
 
 func executeRuntimeActions(actionsStr string, client client_native.HAProxyClient) error {
Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,16 @@ func (h *GetRawConfigurationHandlerImpl) Handle(params configuration.GetHAProxyC`
`58`	`58`	`return configuration.NewGetConfigurationVersionDefault(int(*e.Code)).WithPayload(e)`
`59`	`59`	`}`
`60`	`60`
`61`		`- v, data, err := cfg.GetRawConfiguration(t, v)`
	`61`	`+ v, clusterVersion, md5Hash, data, err := cfg.GetRawConfigurationWithClusterData(t, v)`
`62`	`62`	`if err != nil {`
`63`	`63`	`e := misc.HandleError(err)`
`64`	`64`	`return configuration.NewGetHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)`
`65`	`65`	`}`
`66`		`- return configuration.NewGetHAProxyConfigurationOK().WithPayload(&configuration.GetHAProxyConfigurationOKBody{Version: v, Data: &data})`
	`66`	`+ cVersion := ""`
	`67`	`+ if clusterVersion != 0 {`
	`68`	`+ cVersion = strconv.FormatInt(clusterVersion, 10)`
	`69`	`+ }`
	`70`	`+ return configuration.NewGetHAProxyConfigurationOK().WithPayload(&configuration.GetHAProxyConfigurationOKBody{Version: v, Data: &data}).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)`
`67`	`71`	`}`
`68`	`72`
`69`	`73`	`// Handle executing the request and returning a response`
`@@ -115,9 +119,19 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx`
`115`	`119`	`return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)`
`116`	`120`	`}`
`117`	`121`
	`122`	`+ _, clusterVersion, md5Hash, data, err := cfg.GetRawConfigurationWithClusterData("", 0)`
	`123`	`+ if err != nil {`
	`124`	`+ e := misc.HandleError(err)`
	`125`	`+ return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)`
	`126`	`+ }`
	`127`	`+`
	`128`	`+ cVersion := ""`
	`129`	`+ if clusterVersion != 0 {`
	`130`	`+ cVersion = strconv.FormatInt(clusterVersion, 10)`
	`131`	`+ }`
`118`	`132`	`if onlyValidate {`
`119`	`133`	`// return here without reloading, since config is only validated.`
`120`		`- return configuration.NewPostHAProxyConfigurationAccepted().WithPayload(params.Data)`
	`134`	`+ return configuration.NewPostHAProxyConfigurationAccepted().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)`
`121`	`135`	`}`
`122`	`136`	`if skipReload {`
`123`	`137`	`if params.XRuntimeActions != nil {`
`@@ -126,7 +140,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx`
`126`	`140`	`return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)`
`127`	`141`	`}`
`128`	`142`	`}`
`129`		`- return configuration.NewPostHAProxyConfigurationCreated().WithPayload(params.Data)`
	`143`	`+ return configuration.NewPostHAProxyConfigurationCreated().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)`
`130`	`144`	`}`
`131`	`145`	`if forceReload {`
`132`	`146`	`var callbackNeeded bool`
`@@ -145,7 +159,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx`
`145`	`159`	`e := misc.HandleError(err)`
`146`	`160`	`return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)`
`147`	`161`	`}`
`148`		`- return configuration.NewPostHAProxyConfigurationCreated().WithPayload(params.Data)`
	`162`	`+ return configuration.NewPostHAProxyConfigurationCreated().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)`
`149`	`163`	`}`
`150`	`164`	`callbackNeeded, reconfigureFunc, err := cn.ReconfigureRuntime(h.Client, runtimeAPIsOld)`
`151`	`165`	`if err != nil {`
`@@ -160,7 +174,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx`
`160`	`174`	`rID = h.ReloadAgent.Reload()`
`161`	`175`	`}`
`162`	`176`
`163`		`- return configuration.NewPostHAProxyConfigurationAccepted().WithReloadID(rID).WithPayload(params.Data)`
	`177`	`+ return configuration.NewPostHAProxyConfigurationAccepted().WithReloadID(rID).WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)`
`164`	`178`	`}`
`165`	`179`
`166`	`180`	`func executeRuntimeActions(actionsStr string, client client_native.HAProxyClient) error {`