Skip to content

Commit 8872c14

Browse files
oktalzmjuraga
oktalz
authored and
mjuraga
committed
MEDIUM: upgrade config-parser to v4
1 parent eaea104 commit 8872c14

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

‎configuration/cluster_sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"github.com/GehirnInc/crypt"
4040
"github.com/google/renameio"
4141
client_native "github.com/haproxytech/client-native/v2"
42-
"github.com/haproxytech/config-parser/v3/types"
42+
"github.com/haproxytech/config-parser/v4/types"
4343
log "github.com/sirupsen/logrus"
4444

4545
"github.com/haproxytech/dataplaneapi/haproxy"

‎configuration/user.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ import (
2323

2424
"github.com/GehirnInc/crypt"
2525
api_errors "github.com/go-openapi/errors"
26-
parser "github.com/haproxytech/config-parser/v3"
27-
"github.com/haproxytech/config-parser/v3/common"
28-
"github.com/haproxytech/config-parser/v3/types"
26+
parser "github.com/haproxytech/config-parser/v4"
27+
"github.com/haproxytech/config-parser/v4/common"
28+
"github.com/haproxytech/config-parser/v4/options"
29+
"github.com/haproxytech/config-parser/v4/types"
2930
log "github.com/sirupsen/logrus"
3031

3132
"github.com/haproxytech/dataplaneapi/misc"
@@ -110,14 +111,13 @@ func (u *Users) AddUser(user types.User) error {
110111
}
111112

112113
func (u *Users) getUsersFromUsersListSection(filename, userlistSection string) error {
113-
p := &parser.Parser{}
114114
// if file doesn't exists
115115
if _, err := os.Stat(filename); os.IsNotExist(err) {
116116
return fmt.Errorf("cannot read %s, file does not exist", filename)
117117
}
118-
// if file exists
119-
if err := p.LoadData(filename); err != nil {
120-
return fmt.Errorf("cannot read %s, err: %s", filename, err.Error())
118+
p, errP := parser.New(options.Path(filename))
119+
if errP != nil {
120+
return errP
121121
}
122122
data, err := p.Get(parser.UserList, userlistSection, "user")
123123
if err != nil {

‎configure_data_plane.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import (
4545
runtime_api "github.com/haproxytech/client-native/v2/runtime"
4646
"github.com/haproxytech/client-native/v2/spoe"
4747
"github.com/haproxytech/client-native/v2/storage"
48-
parser "github.com/haproxytech/config-parser/v3"
49-
"github.com/haproxytech/config-parser/v3/types"
48+
parser "github.com/haproxytech/config-parser/v4"
49+
"github.com/haproxytech/config-parser/v4/types"
5050
"github.com/haproxytech/dataplaneapi/syslog"
5151
"github.com/rs/cors"
5252
log "github.com/sirupsen/logrus"
@@ -786,7 +786,6 @@ func serverShutdown() {
786786
}
787787

788788
func configureNativeClient(cyx context.Context, haproxyOptions dataplaneapi_config.HAProxyConfiguration, mWorker bool) *client_native.HAProxyClient {
789-
790789
// Initialize HAProxy native client
791790
confClient, err := configureConfigurationClient(haproxyOptions, mWorker)
792791
if err != nil {

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/google/renameio v0.1.1-0.20200217212219-353f81969824
2727
github.com/google/uuid v1.2.0
2828
github.com/haproxytech/client-native/v2 v2.4.1
29-
github.com/haproxytech/config-parser/v3 v3.0.1-0.20210212144342-183eb1988d86
29+
github.com/haproxytech/config-parser/v4 v4.0.0-rc1.0.20210706120926-340f1b3664db
3030
github.com/hashicorp/consul/api v1.6.0
3131
github.com/hashicorp/hcl v1.0.0
3232
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
@@ -43,7 +43,7 @@ require (
4343
github.com/tebeka/strftime v0.1.5 // indirect
4444
github.com/tklauser/go-sysconf v0.3.6 // indirect
4545
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
46-
golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa
46+
golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d
4747
golang.org/x/text v0.3.5 // indirect
4848
gopkg.in/yaml.v2 v2.3.0
4949
)

‎go.sum

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
158158
github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
159159
github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
160160
github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
161+
github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY=
162+
github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
161163
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
162164
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
163165
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -176,6 +178,8 @@ github.com/haproxytech/client-native/v2 v2.4.1 h1:eg9gysLcxqQAm25ApqgKRUHtOMzPjw
176178
github.com/haproxytech/client-native/v2 v2.4.1/go.mod h1:2D+tluXw/L0DsJgaKTm9vl12ZnYCkm4TnRDuf89BKhM=
177179
github.com/haproxytech/config-parser/v3 v3.0.1-0.20210212144342-183eb1988d86 h1:hV6Lb4xNRifFIncVf9UBbVVRifDwZ25UxwQQTtqjtU4=
178180
github.com/haproxytech/config-parser/v3 v3.0.1-0.20210212144342-183eb1988d86/go.mod h1:68k+xwy1wGoufI/VKOOilrx/65M85eeQP6Atg+a29Ds=
181+
github.com/haproxytech/config-parser/v4 v4.0.0-rc1.0.20210706120926-340f1b3664db h1:rKN+rNB45FcPkkGBEUHAuN6iUWxByG0/UzRkluETca8=
182+
github.com/haproxytech/config-parser/v4 v4.0.0-rc1.0.20210706120926-340f1b3664db/go.mod h1:R2KvNW3R5pf+ucN4K0Wtdhib08U8L10rRAwP2lEDuWQ=
179183
github.com/hashicorp/consul/api v1.6.0 h1:SZB2hQW8AcTOpfDmiVblQbijxzsRuiyy0JpHfabvHio=
180184
github.com/hashicorp/consul/api v1.6.0/go.mod h1:1NSuaUUkFaJzMasbfq/11wKYWSR67Xn6r2DXKhuDNFg=
181185
github.com/hashicorp/consul/sdk v0.6.0 h1:FfhMEkwvQl57CildXJyGHnwGGM4HMODGyfjGwNM1Vdw=
@@ -231,6 +235,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
231235
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
232236
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
233237
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
238+
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
239+
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
234240
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
235241
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
236242
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -276,7 +282,6 @@ github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
276282
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
277283
github.com/nathanaelle/syslog5424/v2 v2.0.5 h1:oLVYQmKnv3nlnmvlbBWM+iWl9AONcU+tuxIL0fjko5A=
278284
github.com/nathanaelle/syslog5424/v2 v2.0.5/go.mod h1:f9MvsGkLOtYh2VzLT4Pjuwx3+Xv2EogxJNda+HLPDus=
279-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
280285
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
281286
github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc=
282287
github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68=
@@ -390,8 +395,9 @@ golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7w
390395
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
391396
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
392397
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
393-
golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa h1:ZYxPR6aca/uhfRJyaOAtflSHjJYiktO7QnJC5ut7iY4=
394398
golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
399+
golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d h1:jbzgAvDZn8aEnytae+4ou0J0GwFZoHR0hOrTg4qH8GA=
400+
golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
395401
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
396402
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
397403
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -413,8 +419,9 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
413419
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
414420
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
415421
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
416-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
417422
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
423+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
424+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
418425
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
419426
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
420427
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 commit comments

Comments
 (0)