Skip to content

Commit 848a95c

Browse files
fjaeckelmjuraga
authored andcommitted
BUG/MINOR: ssl: Add support for skip_reload parameter
This parameter is used to skip the reload after the certificate is created. We also update client-native/v6 to the latest ref. Relates to #365 and haproxytech/client-native#116
1 parent fd5a839 commit 848a95c

File tree

6 files changed

+76
-9
lines changed

6 files changed

+76
-9
lines changed

embedded_spec.go

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

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/google/go-cmp v0.7.0
2525
github.com/google/renameio v1.0.1
2626
github.com/google/uuid v1.6.0
27-
github.com/haproxytech/client-native/v6 v6.1.2
27+
github.com/haproxytech/client-native/v6 v6.1.5
2828
github.com/jessevdk/go-flags v1.6.1
2929
github.com/joho/godotenv v1.5.1
3030
github.com/json-iterator/go v1.1.12
@@ -39,7 +39,7 @@ require (
3939
github.com/stretchr/testify v1.10.0
4040
go.uber.org/automaxprocs v1.6.0
4141
golang.org/x/net v0.36.0
42-
golang.org/x/sys v0.30.0
42+
golang.org/x/sys v0.31.0
4343
gopkg.in/yaml.v2 v2.4.0
4444
)
4545

@@ -86,6 +86,6 @@ require (
8686
github.com/tklauser/numcpus v0.9.0 // indirect
8787
github.com/yusufpapurcu/wmi v1.2.4 // indirect
8888
go.mongodb.org/mongo-driver v1.17.3 // indirect
89-
golang.org/x/sync v0.11.0 // indirect
89+
golang.org/x/sync v0.12.0 // indirect
9090
gopkg.in/yaml.v3 v3.0.1 // indirect
9191
)

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
8888
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
8989
github.com/haproxytech/client-native/v5 v5.1.15 h1:oMqyDlh+vL3yRKiaapc6SESetCIir/Of3F75vtpG1Nk=
9090
github.com/haproxytech/client-native/v5 v5.1.15/go.mod h1:6eT7/KOsczPHFE/op1TDwfo0jQAsMffl7PuXkKJ+Mt0=
91-
github.com/haproxytech/client-native/v6 v6.1.2 h1:SwVfSLL8f/QgzgvUKcWR+SRGWk0DyUD82ubknTxvtCA=
92-
github.com/haproxytech/client-native/v6 v6.1.2/go.mod h1:9DfctWwuRuHPPj5T01N+eFguIqWLzukF8msykecSSOk=
91+
github.com/haproxytech/client-native/v6 v6.1.5 h1:NZhqAiqzaCXh2nKevwLkKn84KKjcgPWx0uhr3F/X76A=
92+
github.com/haproxytech/client-native/v6 v6.1.5/go.mod h1:9DfctWwuRuHPPj5T01N+eFguIqWLzukF8msykecSSOk=
9393
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
9494
github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
9595
github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=
@@ -178,13 +178,13 @@ go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
178178
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
179179
golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
180180
golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
181-
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
182-
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
181+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
182+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
183183
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
184184
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
185185
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
186-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
187-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
186+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
187+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
188188
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
189189
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
190190
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

handlers/ssl_cert_storage.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,20 @@ func (h *StorageCreateStorageSSLCertificateHandlerImpl) Handle(params storage.Cr
281281
Serial: info.Serial,
282282
}
283283

284+
skipReload := false
285+
if params.SkipReload != nil {
286+
skipReload = *params.SkipReload
287+
}
288+
284289
forceReload := false
285290
if params.ForceReload != nil {
286291
forceReload = *params.ForceReload
287292
}
288293

294+
if skipReload {
295+
return storage.NewCreateStorageSSLCertificateCreated().WithPayload(retf)
296+
}
297+
289298
if forceReload {
290299
err := h.ReloadAgent.ForceReload()
291300
if err != nil {

operations/storage/create_storage_s_s_l_certificate_parameters.go

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

operations/storage/create_storage_s_s_l_certificate_urlbuilder.go

Lines changed: 9 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)