Skip to content

Commit c346f34

Browse files
mjuragamjuraga
committed
BUILD/MAJOR: client-native: upgrade client-native to v5
1 parent 1f986da commit c346f34

File tree

588 files changed

+808
-690
lines changed

Some content is hidden

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

588 files changed

+808
-690
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/v4 => ../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/v5 => ../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/v4"
26-
"github.com/haproxytech/client-native/v4/configuration"
27-
"github.com/haproxytech/client-native/v4/models"
25+
clientnative "github.com/haproxytech/client-native/v5"
26+
"github.com/haproxytech/client-native/v5/configuration"
27+
"github.com/haproxytech/client-native/v5/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
@@ -6,12 +6,12 @@ import (
66
"strconv"
77
"sync"
88

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"
13-
parser "github.com/haproxytech/config-parser/v4"
14-
"github.com/haproxytech/config-parser/v4/types"
9+
"github.com/haproxytech/client-native/v5/configuration"
10+
configuration_options "github.com/haproxytech/client-native/v5/configuration/options"
11+
runtime_api "github.com/haproxytech/client-native/v5/runtime"
12+
runtime_options "github.com/haproxytech/client-native/v5/runtime/options"
13+
parser "github.com/haproxytech/config-parser/v5"
14+
"github.com/haproxytech/config-parser/v5/types"
1515

1616
dataplaneapi_config "github.com/haproxytech/dataplaneapi/configuration"
1717
"github.com/haproxytech/dataplaneapi/log"

‎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/v4/models"
30-
"github.com/haproxytech/client-native/v4/storage"
29+
"github.com/haproxytech/client-native/v5/models"
30+
"github.com/haproxytech/client-native/v5/storage"
3131
"github.com/haproxytech/dataplaneapi"
3232
"github.com/haproxytech/dataplaneapi/configuration"
3333
"github.com/haproxytech/dataplaneapi/log"

‎configuration/cluster_sync.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"time"
3535

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

4141
"github.com/haproxytech/dataplaneapi/log"

‎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/v4/models"
29+
"github.com/haproxytech/client-native/v5/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/v4/models"
19+
"github.com/haproxytech/client-native/v5/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/v4"
27-
"github.com/haproxytech/client-native/v4/models"
26+
client_native "github.com/haproxytech/client-native/v5"
27+
"github.com/haproxytech/client-native/v5/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/v4/models"
22+
"github.com/haproxytech/client-native/v5/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/v4/misc"
33-
"github.com/haproxytech/client-native/v4/storage"
32+
"github.com/haproxytech/client-native/v5/misc"
33+
"github.com/haproxytech/client-native/v5/storage"
3434
jsoniter "github.com/json-iterator/go"
3535
)
3636

‎configuration/user.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525

2626
"github.com/GehirnInc/crypt"
2727
api_errors "github.com/go-openapi/errors"
28-
parser "github.com/haproxytech/config-parser/v4"
29-
"github.com/haproxytech/config-parser/v4/common"
30-
"github.com/haproxytech/config-parser/v4/options"
31-
"github.com/haproxytech/config-parser/v4/types"
28+
parser "github.com/haproxytech/config-parser/v5"
29+
"github.com/haproxytech/config-parser/v5/common"
30+
"github.com/haproxytech/config-parser/v5/options"
31+
"github.com/haproxytech/config-parser/v5/types"
3232

3333
"github.com/haproxytech/dataplaneapi/misc"
3434
)

‎configure_data_plane.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import (
3636
"github.com/go-openapi/runtime"
3737
"github.com/go-openapi/runtime/middleware"
3838
"github.com/go-openapi/swag"
39-
client_native "github.com/haproxytech/client-native/v4"
40-
"github.com/haproxytech/client-native/v4/models"
41-
"github.com/haproxytech/client-native/v4/options"
42-
cn_runtime "github.com/haproxytech/client-native/v4/runtime"
43-
"github.com/haproxytech/client-native/v4/spoe"
44-
"github.com/haproxytech/client-native/v4/storage"
39+
client_native "github.com/haproxytech/client-native/v5"
40+
"github.com/haproxytech/client-native/v5/models"
41+
"github.com/haproxytech/client-native/v5/options"
42+
cn_runtime "github.com/haproxytech/client-native/v5/runtime"
43+
"github.com/haproxytech/client-native/v5/spoe"
44+
"github.com/haproxytech/client-native/v5/storage"
4545
"github.com/haproxytech/dataplaneapi/log"
4646
jsoniter "github.com/json-iterator/go"
4747
"github.com/rs/cors"

‎discovery/aws_service_discovery.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"context"
2020
"errors"
2121

22-
"github.com/haproxytech/client-native/v4/configuration"
23-
"github.com/haproxytech/client-native/v4/models"
22+
"github.com/haproxytech/client-native/v5/configuration"
23+
"github.com/haproxytech/client-native/v5/models"
2424
"github.com/haproxytech/dataplaneapi/haproxy"
2525
)
2626

‎discovery/aws_service_discovery_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/aws/aws-sdk-go-v2/credentials"
2727
"github.com/aws/aws-sdk-go-v2/service/ec2"
2828
"github.com/aws/aws-sdk-go-v2/service/ec2/types"
29-
"github.com/haproxytech/client-native/v4/configuration"
30-
"github.com/haproxytech/client-native/v4/models"
29+
"github.com/haproxytech/client-native/v5/configuration"
30+
"github.com/haproxytech/client-native/v5/models"
3131
"github.com/haproxytech/dataplaneapi/haproxy"
3232
"github.com/haproxytech/dataplaneapi/log"
3333
)

‎discovery/consul_service_discovery.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"fmt"
2222
"time"
2323

24-
"github.com/haproxytech/client-native/v4/configuration"
25-
"github.com/haproxytech/client-native/v4/models"
24+
"github.com/haproxytech/client-native/v5/configuration"
25+
"github.com/haproxytech/client-native/v5/models"
2626
"github.com/haproxytech/dataplaneapi/haproxy"
2727
)
2828

‎discovery/consul_service_discovery_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strconv"
2626
"time"
2727

28-
"github.com/haproxytech/client-native/v4/configuration"
29-
"github.com/haproxytech/client-native/v4/models"
28+
"github.com/haproxytech/client-native/v5/configuration"
29+
"github.com/haproxytech/client-native/v5/models"
3030
"github.com/haproxytech/dataplaneapi/log"
3131
jsoniter "github.com/json-iterator/go"
3232
)

‎discovery/service_discovery.go

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

22-
"github.com/haproxytech/client-native/v4/configuration"
22+
"github.com/haproxytech/client-native/v5/configuration"
2323
"github.com/haproxytech/dataplaneapi/haproxy"
2424
)
2525

‎discovery/service_discovery_instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package discovery
1818
import (
1919
"sync"
2020

21-
"github.com/haproxytech/client-native/v4/configuration"
21+
"github.com/haproxytech/client-native/v5/configuration"
2222

2323
"github.com/haproxytech/dataplaneapi/haproxy"
2424
"github.com/haproxytech/dataplaneapi/log"

‎discovery/service_discovery_instance_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333
"github.com/aws/aws-sdk-go-v2/service/autoscaling/types"
3434
"github.com/aws/aws-sdk-go-v2/service/ec2"
3535
"github.com/google/uuid"
36-
"github.com/haproxytech/client-native/v4/configuration"
37-
"github.com/haproxytech/client-native/v4/models"
36+
"github.com/haproxytech/client-native/v5/configuration"
37+
"github.com/haproxytech/client-native/v5/models"
3838
"github.com/stretchr/testify/assert"
3939

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

‎discovery/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/go-openapi/strfmt"
2222
"github.com/google/uuid"
23-
"github.com/haproxytech/client-native/v4/models"
23+
"github.com/haproxytech/client-native/v5/models"
2424
"github.com/haproxytech/dataplaneapi/misc"
2525
)
2626

0 commit comments

Comments
 (0)