Skip to content

Commit b37d0ef

Browse files
mjuragamjuraga
committed
MAJOR: client_native: upgrade client-native to v3 and go to 1.17
1 parent 058e756 commit b37d0ef

File tree

431 files changed

+553
-530
lines changed

Some content is hidden

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

431 files changed

+553
-530
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99

10-
- name: Set up Go 1.16
10+
- name: Set up Go 1.17
1111
uses: actions/setup-go@v1
1212
with:
13-
go-version: 1.16
13+
go-version: 1.17
1414
id: go
1515

1616
- name: Check out code into the Go module directory

‎.github/workflows/e2e.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
uses: actions/checkout@v2
1313
- name: Downloading required packages
1414
run: sudo apt-get install bats
15-
- name: Set up Go 1.16
15+
- name: Set up Go 1.17
1616
uses: actions/setup-go@v1
1717
with:
18-
go-version: 1.16
18+
go-version: 1.17
1919
- run: make e2e
2020
env:
2121
HAPROXY_VERSION: ${{ matrix.haproxy_version }}

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ build:
6262
paths:
6363
- build
6464
image:
65-
name: $CI_REGISTRY_GO/golang:1.16
65+
name: $CI_REGISTRY_GO/golang:1.17
6666
entrypoint: [ "" ]
6767
tags:
6868
- go

‎.goreleaser.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
before:
33
hooks:
44
- go mod download
5-
- go mod tidy
5+
- go mod tidy -compat=1.17
66
- make clean
77
- mkdir build/
88
builds:
@@ -19,7 +19,7 @@ builds:
1919
- freebsd
2020
- darwin
2121
goarch:
22-
- 386
22+
- "386"
2323
- amd64
2424
- arm
2525
- arm64

‎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/v2 => ../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/v3 => ../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 get -v
16+
go mod tidy -compat=1.17
1717

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

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
## Building the Data Plane API
1111

12-
In order to build the Data Plane API you need go 1.16 installed on your system with go modules support enabled, and execute the following steps:
12+
In order to build the Data Plane API you need go 1.17 installed on your system with go modules support enabled, and execute the following steps:
1313

1414
1\. Clone dataplaneapi repository
1515

‎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/v2"
26-
"github.com/haproxytech/client-native/v2/models"
25+
clientnative "github.com/haproxytech/client-native/v3"
26+
"github.com/haproxytech/client-native/v3/models"
2727
"github.com/haproxytech/dataplaneapi/log"
2828
)
2929

‎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/v2/models"
30-
"github.com/haproxytech/client-native/v2/storage"
29+
"github.com/haproxytech/client-native/v3/models"
30+
"github.com/haproxytech/client-native/v3/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
@@ -36,7 +36,7 @@ import (
3636

3737
"github.com/GehirnInc/crypt"
3838
"github.com/google/renameio"
39-
client_native "github.com/haproxytech/client-native/v2"
39+
client_native "github.com/haproxytech/client-native/v3"
4040
"github.com/haproxytech/config-parser/v4/types"
4141
"github.com/haproxytech/dataplaneapi/log"
4242

0 commit comments

Comments
 (0)