Skip to content

Commit cf3d28d

Browse files
oliwermjuraga
oliwer
authored and
mjuraga
committed
BUG/MEDIUM: change some storage api types to work with gorm
Adapt to the new types defined in the client-native spec.
1 parent 8e2ba9d commit cf3d28d

File tree

7 files changed

+173
-68
lines changed

7 files changed

+173
-68
lines changed

‎embedded_spec.go‎

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

‎go.mod‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ 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/v5 v5.0.1-0.20230801141958-2081a288d108
26-
github.com/haproxytech/config-parser/v5 v5.0.1-0.20230621085204-83b68fc565ef
24+
github.com/google/uuid v1.3.1
25+
github.com/haproxytech/client-native/v5 v5.0.1-0.20230829105339-6137ed6c405c
26+
github.com/haproxytech/config-parser/v5 v5.0.1-0.20230821131853-5878ad7f5340
2727
github.com/jessevdk/go-flags v1.5.0
2828
github.com/json-iterator/go v1.1.12
2929
github.com/lestrrat-go/apache-logformat v0.0.0-20210106032603-24d066f940f8
3030
github.com/nathanaelle/syslog5424/v2 v2.0.5
3131
github.com/rs/cors v1.9.0
3232
github.com/shirou/gopsutil v3.21.11+incompatible
3333
github.com/sirupsen/logrus v1.9.3
34-
github.com/stretchr/testify v1.8.2
34+
github.com/stretchr/testify v1.8.4
3535
golang.org/x/net v0.12.0
36-
golang.org/x/sys v0.10.0
36+
golang.org/x/sys v0.11.0
3737
gopkg.in/yaml.v2 v2.4.0
3838
)
3939

@@ -51,7 +51,7 @@ require (
5151
github.com/davecgh/go-spew v1.1.1 // indirect
5252
github.com/go-ole/go-ole v1.2.6 // indirect
5353
github.com/go-openapi/analysis v0.21.4 // indirect
54-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
54+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
5555
github.com/go-openapi/jsonreference v0.20.2 // indirect
5656
github.com/gofrs/flock v0.8.1 // indirect
5757
github.com/google/go-cmp v0.5.9 // indirect
@@ -74,7 +74,6 @@ require (
7474
github.com/tklauser/go-sysconf v0.3.11 // indirect
7575
github.com/tklauser/numcpus v0.6.1 // indirect
7676
github.com/yusufpapurcu/wmi v1.2.3 // indirect
77-
go.mongodb.org/mongo-driver v1.12.0 // indirect
78-
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 // indirect
77+
go.mongodb.org/mongo-driver v1.12.1 // indirect
7978
gopkg.in/yaml.v3 v3.0.1 // indirect
8079
)

‎go.sum‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.19.2 h1:XFJ2Z6sNUUcAz9poj+245DMkrHE4
3434
github.com/aws/aws-sdk-go-v2/service/sts v1.19.2/go.mod h1:dp0yLPsLBOi++WTxzCjA/oZqi6NPIhoR+uF7GeMU9eg=
3535
github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8=
3636
github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
37+
github.com/brianvoe/gofakeit/v6 v6.23.1 h1:k2gX0hQpJStvixDbbw8oJOvPBg0XmHJWbSOF5JkiUHw=
38+
github.com/brianvoe/gofakeit/v6 v6.23.1/go.mod h1:Ow6qC71xtwm79anlwKRlWZW6zVq9D2XHE4QSSMP/rU8=
3739
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3840
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3941
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -60,8 +62,9 @@ github.com/go-openapi/errors v0.20.4 h1:unTcVm6PispJsMECE3zWgvG4xTiKda1LIR5rCRWL
6062
github.com/go-openapi/errors v0.20.4/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
6163
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
6264
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
63-
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
6465
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
66+
github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ=
67+
github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA=
6568
github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
6669
github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
6770
github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
@@ -126,13 +129,13 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
126129
github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU=
127130
github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
128131
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
129-
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
130-
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
132+
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
133+
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
131134
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
132-
github.com/haproxytech/client-native/v5 v5.0.1-0.20230801141958-2081a288d108 h1:sy3iSLEcXmfFdH4fs82uFmtXDbK0zQCrMTS68pXr900=
133-
github.com/haproxytech/client-native/v5 v5.0.1-0.20230801141958-2081a288d108/go.mod h1:IWu0kV+P/MU0eIfUPLdCaHWGOBhPCeKrdrEyPOAKBXo=
134-
github.com/haproxytech/config-parser/v5 v5.0.1-0.20230621085204-83b68fc565ef h1:IXxc+Mxwj1FMrnvqN/FmP+x5Uc7AaWX6Nwirft/qfcI=
135-
github.com/haproxytech/config-parser/v5 v5.0.1-0.20230621085204-83b68fc565ef/go.mod h1:7JxHGhCD6WRRc+++7QRBMjoUZMYEP+JRQmp/nBGI9zo=
135+
github.com/haproxytech/client-native/v5 v5.0.1-0.20230829105339-6137ed6c405c h1:i/PnxPT4G9Mg0slOGTg/3JZLB6FrMUZ/bP/GVM+kpm4=
136+
github.com/haproxytech/client-native/v5 v5.0.1-0.20230829105339-6137ed6c405c/go.mod h1:8dAhfR8ZzBHAwckQjJgxx8VYxPsa1RMYpN4yBmQ56KY=
137+
github.com/haproxytech/config-parser/v5 v5.0.1-0.20230821131853-5878ad7f5340 h1:VtRnT4x7Cds0TxZCqDYFTyCnFMyJJA5FC+uRum+CUD4=
138+
github.com/haproxytech/config-parser/v5 v5.0.1-0.20230821131853-5878ad7f5340/go.mod h1:cGtFso7oMTY1GIixWv9JG7pKSdyyacpWqNE7XPx6+mU=
136139
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
137140
github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
138141
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -233,8 +236,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
233236
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
234237
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
235238
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
236-
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
237-
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
239+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
240+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
238241
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
239242
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
240243
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
@@ -259,16 +262,14 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
259262
go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
260263
go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
261264
go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
262-
go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE=
263-
go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0=
265+
go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE=
266+
go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ=
264267
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
265268
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
266269
golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
267270
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
268271
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
269272
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
270-
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 h1:Di6/M8l0O2lCLc6VVRWhgCiApHV8MnQurBnFSHsQtNY=
271-
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
272273
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
273274
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
274275
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -304,8 +305,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
304305
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
305306
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
306307
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
307-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
308-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
308+
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
309+
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
309310
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
310311
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
311312
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎handlers/general_storage.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (h *StorageCreateStorageGeneralFileHandlerImpl) Handle(params storage.Creat
5959
Description: "managed general use file",
6060
File: filename,
6161
StorageName: filepath.Base(filename),
62-
Size: size,
62+
Size: &size,
6363
}
6464

6565
return storage.NewCreateStorageGeneralFileCreated().WithPayload(me)

‎handlers/map_storage.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (h *StorageCreateStorageMapFileHandlerImpl) Handle(params storage.CreateSto
5959
Description: "managed but not loaded map file (no runtime ID)",
6060
File: filename,
6161
StorageName: filepath.Base(filename),
62-
Size: size,
62+
Size: &size,
6363
}
6464
// no reload or force reload since this is just a file upload,
6565
// haproxy configuration has not been changed

‎handlers/ssl_cert_storage.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ func (h *StorageGetOneStorageSSLCertificateHandlerImpl) Handle(params storage.Ge
9191
File: filename,
9292
Description: "managed SSL file",
9393
StorageName: filepath.Base(filename),
94-
Size: size,
95-
NotAfter: strfmt.Date(info.NotAfter),
96-
NotBefore: strfmt.Date(info.NotBefore),
94+
Size: &size,
95+
NotAfter: (*strfmt.DateTime)(info.NotAfter),
96+
NotBefore: (*strfmt.DateTime)(info.NotBefore),
9797
Issuers: info.Issuers,
9898
Domains: info.DNS,
9999
IPAddresses: info.IPs,
@@ -202,9 +202,9 @@ func (h *StorageReplaceStorageSSLCertificateHandlerImpl) Handle(params storage.R
202202
File: filename,
203203
Description: "managed SSL file",
204204
StorageName: filepath.Base(filename),
205-
Size: int64(len(params.Data)),
206-
NotAfter: strfmt.Date(info.NotAfter),
207-
NotBefore: strfmt.Date(info.NotBefore),
205+
Size: misc.Int64P(len(params.Data)),
206+
NotAfter: (*strfmt.DateTime)(info.NotAfter),
207+
NotBefore: (*strfmt.DateTime)(info.NotBefore),
208208
Issuers: info.Issuers,
209209
Domains: info.DNS,
210210
IPAddresses: info.IPs,
@@ -267,9 +267,9 @@ func (h *StorageCreateStorageSSLCertificateHandlerImpl) Handle(params storage.Cr
267267
File: filename,
268268
Description: "managed SSL file",
269269
StorageName: filepath.Base(filename),
270-
Size: size,
271-
NotAfter: strfmt.Date(info.NotAfter),
272-
NotBefore: strfmt.Date(info.NotBefore),
270+
Size: &size,
271+
NotAfter: (*strfmt.DateTime)(info.NotAfter),
272+
NotBefore: (*strfmt.DateTime)(info.NotBefore),
273273
Issuers: info.Issuers,
274274
Domains: info.DNS,
275275
IPAddresses: info.IPs,

0 commit comments

Comments
 (0)