BUILD/MEDIUM: config-parser: use the latest from client-native

Author: mjuraga

.golangci.yml

@@ -79,7 +79,7 @@ issues:
     # bugs of typecheck linter
     - "undeclared name: `shellquote`"
     - 'github.com/kballard/go-shellquote" imported but not used'
-    - 'github.com/haproxytech/config-parser/v5/types" imported but not used'
+    - 'github.com/haproxytech/client-native/v5/config-parser/types" imported but not used'
   exclude-rules:
     - linters:
         - staticcheck

client-native/cn.go

@@ -10,12 +10,12 @@ import (
 	clientnative "github.com/haproxytech/client-native/v5"
 	"github.com/haproxytech/client-native/v5/models"
 
+	parser "github.com/haproxytech/client-native/v5/config-parser"
+	"github.com/haproxytech/client-native/v5/config-parser/types"
 	"github.com/haproxytech/client-native/v5/configuration"
 	configuration_options "github.com/haproxytech/client-native/v5/configuration/options"
 	runtime_api "github.com/haproxytech/client-native/v5/runtime"
 	runtime_options "github.com/haproxytech/client-native/v5/runtime/options"
-	parser "github.com/haproxytech/config-parser/v5"
-	"github.com/haproxytech/config-parser/v5/types"
 
 	dataplaneapi_config "github.com/haproxytech/dataplaneapi/configuration"
 	"github.com/haproxytech/dataplaneapi/log"

configuration/cluster_sync.go

@@ -36,7 +36,7 @@ import (
 
 	"github.com/google/renameio"
 	client_native "github.com/haproxytech/client-native/v5"
-	"github.com/haproxytech/config-parser/v5/types"
+	"github.com/haproxytech/client-native/v5/config-parser/types"
 	jsoniter "github.com/json-iterator/go"
 
 	"github.com/haproxytech/dataplaneapi/log"

configuration/user.go

@@ -25,10 +25,10 @@ import (
 
 	"github.com/GehirnInc/crypt"
 	api_errors "github.com/go-openapi/errors"
-	parser "github.com/haproxytech/config-parser/v5"
-	"github.com/haproxytech/config-parser/v5/common"
-	"github.com/haproxytech/config-parser/v5/options"
-	"github.com/haproxytech/config-parser/v5/types"
+	parser "github.com/haproxytech/client-native/v5/config-parser"
+	"github.com/haproxytech/client-native/v5/config-parser/common"
+	"github.com/haproxytech/client-native/v5/config-parser/options"
+	"github.com/haproxytech/client-native/v5/config-parser/types"
 
 	"github.com/haproxytech/dataplaneapi/misc"
 )

go.mod

@@ -25,7 +25,6 @@ require (
 	github.com/google/renameio v1.0.1
 	github.com/google/uuid v1.6.0
 	github.com/haproxytech/client-native/v5 v5.1.14
-	github.com/haproxytech/config-parser/v5 v5.1.6
 	github.com/jessevdk/go-flags v1.6.1
 	github.com/json-iterator/go v1.1.12
 	github.com/kr/pretty v0.3.1

go.sum

@@ -87,8 +87,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/haproxytech/client-native/v5 v5.1.14 h1:Q7G32YJQlHugIUb1fFTm+jsBUbS0EGCjW4UyAKtTKBU=
 github.com/haproxytech/client-native/v5 v5.1.14/go.mod h1:dhwpFkOsWxJRtwNs+LTJtsUTf9pX3uWHKKip9loIK3c=
-github.com/haproxytech/config-parser/v5 v5.1.6 h1:64KHffpOGoyjFuMmq9dLOvcRCEzg/2GAnPwhmue1uVY=
-github.com/haproxytech/config-parser/v5 v5.1.6/go.mod h1:16+1AbS+AvMZkDScIhergz2dqecQuEmjwV4Xt5ncS9s=
 github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
 github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
 github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=

misc/misc.go

@@ -28,10 +28,10 @@ import (
 	"strings"
 
 	"github.com/GehirnInc/crypt"
+	"github.com/haproxytech/client-native/v5/config-parser/types"
 	"github.com/haproxytech/client-native/v5/configuration"
 	client_errors "github.com/haproxytech/client-native/v5/errors"
 	"github.com/haproxytech/client-native/v5/models"
-	"github.com/haproxytech/config-parser/v5/types"
 	jsoniter "github.com/json-iterator/go"
 
 	"github.com/haproxytech/dataplaneapi/haproxy"