Skip to content

Commit 783cf25

Browse files
committed
MAJOR: upgrade client-native to v6 and swagger version to /v3
1 parent e612bfb commit 783cf25

File tree

898 files changed

+990
-1007
lines changed

Some content is hidden

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

898 files changed

+990
-1007
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/v5 => ../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/v6 => ../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.

adapters/adapters.go

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

25-
clientnative "github.com/haproxytech/client-native/v5"
26-
"github.com/haproxytech/client-native/v5/configuration"
27-
"github.com/haproxytech/client-native/v5/models"
25+
clientnative "github.com/haproxytech/client-native/v6"
26+
"github.com/haproxytech/client-native/v6/configuration"
27+
"github.com/haproxytech/client-native/v6/models"
2828
"github.com/haproxytech/dataplaneapi/log"
2929
)
3030

client-native/cn.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
"sync"
88
"time"
99

10-
clientnative "github.com/haproxytech/client-native/v5"
11-
"github.com/haproxytech/client-native/v5/models"
10+
clientnative "github.com/haproxytech/client-native/v6"
11+
"github.com/haproxytech/client-native/v6/models"
1212

13-
"github.com/haproxytech/client-native/v5/configuration"
14-
configuration_options "github.com/haproxytech/client-native/v5/configuration/options"
15-
runtime_api "github.com/haproxytech/client-native/v5/runtime"
16-
runtime_options "github.com/haproxytech/client-native/v5/runtime/options"
13+
"github.com/haproxytech/client-native/v6/configuration"
14+
configuration_options "github.com/haproxytech/client-native/v6/configuration/options"
15+
runtime_api "github.com/haproxytech/client-native/v6/runtime"
16+
runtime_options "github.com/haproxytech/client-native/v6/runtime/options"
1717
parser "github.com/haproxytech/config-parser/v5"
1818
"github.com/haproxytech/config-parser/v5/types"
1919

cmd/dataplaneapi/main.go

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

30-
"github.com/haproxytech/client-native/v5/models"
31-
"github.com/haproxytech/client-native/v5/storage"
30+
"github.com/haproxytech/client-native/v6/models"
31+
"github.com/haproxytech/client-native/v6/storage"
3232
"github.com/haproxytech/dataplaneapi"
3333
"github.com/haproxytech/dataplaneapi/configuration"
3434
"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/v5"
37+
client_native "github.com/haproxytech/client-native/v6"
3838
"github.com/haproxytech/config-parser/v5/types"
3939
jsoniter "github.com/json-iterator/go"
4040

configuration/configuration.go

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

2828
petname "github.com/dustinkirkland/golang-petname"
29-
"github.com/haproxytech/client-native/v5/models"
29+
"github.com/haproxytech/client-native/v6/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
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package configuration
1717

1818
import (
19-
"github.com/haproxytech/client-native/v5/models"
19+
"github.com/haproxytech/client-native/v6/models"
2020
"github.com/jessevdk/go-flags"
2121

2222
dpapilog "github.com/haproxytech/dataplaneapi/log"

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/v5"
27-
"github.com/haproxytech/client-native/v5/models"
26+
client_native "github.com/haproxytech/client-native/v6"
27+
"github.com/haproxytech/client-native/v6/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/v5/models"
22+
"github.com/haproxytech/client-native/v6/models"
2323
)
2424

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

configuration/misc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929

3030
"github.com/go-openapi/strfmt"
3131
"github.com/google/renameio"
32-
"github.com/haproxytech/client-native/v5/misc"
33-
"github.com/haproxytech/client-native/v5/storage"
32+
"github.com/haproxytech/client-native/v6/misc"
33+
"github.com/haproxytech/client-native/v6/storage"
3434
jsoniter "github.com/json-iterator/go"
3535
)
3636

0 commit comments

Comments
 (0)