Skip to content

Commit 19b6797

Browse files
mjuragamjuraga
committed
BUG/MINOR: raw: return full raw config on GET and POST responses
Also adds Configuration-Checksum and Cluster-Version response headers.
1 parent 433a48d commit 19b6797

File tree

6 files changed

+312
-26
lines changed

6 files changed

+312
-26
lines changed

‎embedded_spec.go

Lines changed: 98 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ require (
2121
github.com/go-openapi/swag v0.22.4
2222
github.com/go-openapi/validate v0.22.1
2323
github.com/google/renameio v1.0.1
24-
github.com/google/uuid v1.3.0
25-
github.com/haproxytech/client-native/v4 v4.0.6
24+
github.com/google/uuid v1.3.1
25+
github.com/haproxytech/client-native/v4 v4.0.7
2626
github.com/haproxytech/config-parser/v4 v4.1.4
2727
github.com/hashicorp/consul/api v1.22.0
2828
github.com/hashicorp/hcl v1.0.0
@@ -36,7 +36,7 @@ require (
3636
github.com/sirupsen/logrus v1.9.3
3737
github.com/stretchr/testify v1.8.4
3838
golang.org/x/net v0.14.0
39-
golang.org/x/sys v0.12.0
39+
golang.org/x/sys v0.13.0
4040
gopkg.in/yaml.v2 v2.4.0
4141
)
4242

@@ -59,7 +59,7 @@ require (
5959
github.com/go-openapi/jsonpointer v0.20.0 // indirect
6060
github.com/go-openapi/jsonreference v0.20.2 // indirect
6161
github.com/gofrs/flock v0.8.1 // indirect
62-
github.com/google/go-cmp v0.5.9 // indirect
62+
github.com/google/go-cmp v0.6.0 // indirect
6363
github.com/haproxytech/go-logger v1.1.0 // indirect
6464
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
6565
github.com/hashicorp/go-hclog v1.5.0 // indirect
@@ -87,7 +87,7 @@ require (
8787
github.com/tklauser/go-sysconf v0.3.11 // indirect
8888
github.com/tklauser/numcpus v0.6.1 // indirect
8989
github.com/yusufpapurcu/wmi v1.2.3 // indirect
90-
go.mongodb.org/mongo-driver v1.12.0 // indirect
91-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
90+
go.mongodb.org/mongo-driver v1.12.1 // indirect
91+
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
9292
gopkg.in/yaml.v3 v3.0.1 // indirect
9393
)

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,17 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
157157
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
158158
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
159159
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
160-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
161-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
160+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
161+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
162162
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
163163
github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
164164
github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
165165
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
166-
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
167-
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
166+
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
167+
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
168168
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
169-
github.com/haproxytech/client-native/v4 v4.0.6 h1:AW9rATu0+IcH6owOK4aWdzjpW9f6mIwe/krZ6L9lhwM=
170-
github.com/haproxytech/client-native/v4 v4.0.6/go.mod h1:ylluaXznylEp6uE+ro2SmKC7x+CnUWTHW4jOjLF+uVI=
169+
github.com/haproxytech/client-native/v4 v4.0.7 h1:uNx50T73UMFSvxYpAQ2HATmIQKDDeWAtktetzns5WaI=
170+
github.com/haproxytech/client-native/v4 v4.0.7/go.mod h1:bHLtsMjdazQOErwU1ehz9uYtk2ofOVkiJGBv1T3lm0c=
171171
github.com/haproxytech/config-parser/v4 v4.1.4 h1:dkLaUVqSQqIbBxaTJ1YeiQVEFV7x4T4aJ7IPixkTRkY=
172172
github.com/haproxytech/config-parser/v4 v4.1.4/go.mod h1:fhSDI1K4nlzKoYqXPWIPjZMImtKyJtJ8hD3tGUIAH9U=
173173
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
@@ -390,17 +390,17 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
390390
go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
391391
go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
392392
go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
393-
go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE=
394-
go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0=
393+
go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE=
394+
go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
395395
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
396396
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
397397
golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
398398
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
399399
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
400400
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
401401
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
402-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
403-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
402+
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 h1:Di6/M8l0O2lCLc6VVRWhgCiApHV8MnQurBnFSHsQtNY=
403+
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
404404
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
405405
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
406406
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -459,8 +459,8 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
459459
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
460460
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
461461
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
462-
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
463-
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
462+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
463+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
464464
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
465465
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
466466
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎handlers/raw.go

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,16 @@ func (h *GetRawConfigurationHandlerImpl) Handle(params configuration.GetHAProxyC
5858
return configuration.NewGetConfigurationVersionDefault(int(*e.Code)).WithPayload(e)
5959
}
6060

61-
v, data, err := cfg.GetRawConfiguration(t, v)
61+
v, clusterVersion, md5Hash, data, err := cfg.GetRawConfigurationWithClusterData(t, v)
6262
if err != nil {
6363
e := misc.HandleError(err)
6464
return configuration.NewGetHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
6565
}
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)
6771
}
6872

6973
// Handle executing the request and returning a response
@@ -115,9 +119,19 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
115119
return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
116120
}
117121

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+
}
118132
if onlyValidate {
119133
// 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)
121135
}
122136
if skipReload {
123137
if params.XRuntimeActions != nil {
@@ -126,7 +140,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
126140
return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
127141
}
128142
}
129-
return configuration.NewPostHAProxyConfigurationCreated().WithPayload(params.Data)
143+
return configuration.NewPostHAProxyConfigurationCreated().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
130144
}
131145
if forceReload {
132146
var callbackNeeded bool
@@ -145,7 +159,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
145159
e := misc.HandleError(err)
146160
return configuration.NewPostHAProxyConfigurationDefault(int(*e.Code)).WithPayload(e)
147161
}
148-
return configuration.NewPostHAProxyConfigurationCreated().WithPayload(params.Data)
162+
return configuration.NewPostHAProxyConfigurationCreated().WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
149163
}
150164
callbackNeeded, reconfigureFunc, err := cn.ReconfigureRuntime(h.Client, runtimeAPIsOld)
151165
if err != nil {
@@ -160,7 +174,7 @@ func (h *PostRawConfigurationHandlerImpl) Handle(params configuration.PostHAProx
160174
rID = h.ReloadAgent.Reload()
161175
}
162176

163-
return configuration.NewPostHAProxyConfigurationAccepted().WithReloadID(rID).WithPayload(params.Data)
177+
return configuration.NewPostHAProxyConfigurationAccepted().WithReloadID(rID).WithPayload(data).WithClusterVersion(cVersion).WithConfigurationChecksum(md5Hash)
164178
}
165179

166180
func executeRuntimeActions(actionsStr string, client client_native.HAProxyClient) error {

‎operations/configuration/get_h_a_proxy_configuration_responses.go

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)