Skip to content

Commit da9db0c

Browse files
committed
BUILD/MEDIUM: update to client-native v4
1 parent da5182e commit da9db0c

File tree

506 files changed

+616
-604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

506 files changed

+616
-604
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ or if you prefer to run it directly (not in docker)
1616
make generate-native
1717
```
1818

19-
`make generate-native` must also be used if you are using local client-native on disk (you have `replace github.com/haproxytech/client-native/v3 => ../client-native` in go.mod file)
19+
`make generate-native` must also be used if you are using local client-native on disk (you have `replace github.com/haproxytech/client-native/v4 => ../client-native` in go.mod file)
2020

2121
This command generates some of the files in this project, which are marked with // Code generated by go-swagger; DO NOT EDIT.
2222
comments at the top of the files. These are not to be edited, as they are overwritten when specification is changed and the above-mentioned command is run. If you want to change those files, please change the specification where necessary and then generate them again.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CGO_ENABLED?=0
1313
all: update clean build
1414

1515
update:
16-
go mod tidy -compat=1.17
16+
go mod tidy
1717

1818
clean:
1919
rm -rf ${DATAPLANEAPI_PATH}/build

adapters/adapters.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"strconv"
2323
"strings"
2424

25-
clientnative "github.com/haproxytech/client-native/v3"
26-
"github.com/haproxytech/client-native/v3/models"
25+
clientnative "github.com/haproxytech/client-native/v4"
26+
"github.com/haproxytech/client-native/v4/models"
2727
"github.com/haproxytech/dataplaneapi/log"
2828
)
2929

client-native/cn.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"strconv"
77
"sync"
88

9-
"github.com/haproxytech/client-native/v3/configuration"
10-
configuration_options "github.com/haproxytech/client-native/v3/configuration/options"
11-
runtime_api "github.com/haproxytech/client-native/v3/runtime"
12-
runtime_options "github.com/haproxytech/client-native/v3/runtime/options"
9+
"github.com/haproxytech/client-native/v4/configuration"
10+
configuration_options "github.com/haproxytech/client-native/v4/configuration/options"
11+
runtime_api "github.com/haproxytech/client-native/v4/runtime"
12+
runtime_options "github.com/haproxytech/client-native/v4/runtime/options"
1313
parser "github.com/haproxytech/config-parser/v4"
1414
"github.com/haproxytech/config-parser/v4/types"
1515

cmd/dataplaneapi/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/go-openapi/runtime/security"
2727
flags "github.com/jessevdk/go-flags"
2828

29-
"github.com/haproxytech/client-native/v3/models"
30-
"github.com/haproxytech/client-native/v3/storage"
29+
"github.com/haproxytech/client-native/v4/models"
30+
"github.com/haproxytech/client-native/v4/storage"
3131
"github.com/haproxytech/dataplaneapi"
3232
"github.com/haproxytech/dataplaneapi/configuration"
3333
"github.com/haproxytech/dataplaneapi/log"

configuration/cluster_sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"time"
3535

3636
"github.com/google/renameio"
37-
client_native "github.com/haproxytech/client-native/v3"
37+
client_native "github.com/haproxytech/client-native/v4"
3838
"github.com/haproxytech/config-parser/v4/types"
3939
"github.com/haproxytech/dataplaneapi/log"
4040
jsoniter "github.com/json-iterator/go"

configuration/configuration.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"time"
2727

2828
petname "github.com/dustinkirkland/golang-petname"
29-
"github.com/haproxytech/client-native/v3/models"
29+
"github.com/haproxytech/client-native/v4/models"
3030
"github.com/haproxytech/dataplaneapi/log"
3131
jsoniter "github.com/json-iterator/go"
3232
)

configuration/configuration_storage.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configuration/map_sync.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"sync"
2424
"time"
2525

26-
client_native "github.com/haproxytech/client-native/v3"
27-
"github.com/haproxytech/client-native/v3/models"
26+
client_native "github.com/haproxytech/client-native/v4"
27+
"github.com/haproxytech/client-native/v4/models"
2828
"github.com/haproxytech/dataplaneapi/log"
2929
)
3030

configuration/map_sync_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"strconv"
2020
"testing"
2121

22-
"github.com/haproxytech/client-native/v3/models"
22+
"github.com/haproxytech/client-native/v4/models"
2323
)
2424

2525
func data(differentAtIndex ...int) (fileEntries models.MapEntries, runtimeEntries models.MapEntries) {

0 commit comments

Comments
 (0)