fatchan
/
dataplaneapi
mirror of https://github.com/fatchan/dataplaneapi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MAJOR: upgrade client-native to v6 and swagger version to /v3

Browse Source
master
Helene Durand 4 months ago
parent e612bfb3f9
commit 783cf25734
898 changed files with 990 additions and 1007 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CONTRIBUTING.md
  2. 6
      adapters/adapters.go
  3. 12
      client-native/cn.go
  4. 4
      cmd/dataplaneapi/main.go
  5. 2
      configuration/cluster_sync.go
  6. 2
      configuration/configuration.go
  7. 2
      configuration/configuration_storage.go
  8. 4
      configuration/map_sync.go
  9. 2
      configuration/map_sync_test.go
  10. 4
      configuration/misc.go
  11. 12
      configure_data_plane.go
  12. 4
      discovery/aws_service_discovery.go
  13. 4
      discovery/aws_service_discovery_instance.go
  14. 4
      discovery/consul_service_discovery.go
  15. 4
      discovery/consul_service_discovery_instance.go
  16. 2
      discovery/service_discovery.go
  17. 2
      discovery/service_discovery_instance.go
  18. 4
      discovery/service_discovery_instance_test.go
  19. 2
      discovery/utils.go
  20. 4
      doc.go
  21. 2
      e2e/libs/version.bash
  22. 2
      e2e/libs/version_spoe.bash
  23. 2
      e2e/run.bash
  24. 24
      embedded_spec.go
  25. 2
      generate/configuration.tmpl
  26. 16
      generate/swagger/script.sh
  27. 2
      go.mod
  28. 4
      go.sum
  29. 4
      handlers/acl.go
  30. 4
      handlers/acl_runtime.go
  31. 2
      handlers/aws.go
  32. 4
      handlers/backend.go
  33. 4
      handlers/backend_switching_rule.go
  34. 4
      handlers/bind.go
  35. 4
      handlers/cache.go
  36. 4
      handlers/capture.go
  37. 4
      handlers/cluster.go
  38. 2
      handlers/consul.go
  39. 4
      handlers/defaults.go
  40. 4
      handlers/dgram_bind.go
  41. 4
      handlers/fcgi_app.go
  42. 4
      handlers/filter.go
  43. 4
      handlers/frontend.go
  44. 4
      handlers/general_storage.go
  45. 4
      handlers/global.go
  46. 4
      handlers/group.go
  47. 2
      handlers/health.go
  48. 4
      handlers/http_after_response_rule.go
  49. 4
      handlers/http_check.go
  50. 4
      handlers/http_error_rule.go
  51. 4
      handlers/http_errors.go
  52. 4
      handlers/http_request_rule.go
  53. 4
      handlers/http_response_rule.go
  54. 4
      handlers/information.go
  55. 4
      handlers/log_forward.go
  56. 4
      handlers/log_target.go
  57. 4
      handlers/mailer_entry.go
  58. 4
      handlers/mailers.go
  59. 4
      handlers/map.go
  60. 4
      handlers/map_storage.go
  61. 4
      handlers/nameserver.go
  62. 4
      handlers/peer.go
  63. 4
      handlers/peer_entry.go
  64. 4
      handlers/program.go
  65. 4
      handlers/raw.go
  66. 2
      handlers/reloads.go
  67. 4
      handlers/resolver.go
  68. 4
      handlers/ring.go
  69. 4
      handlers/runtime.go
  70. 6
      handlers/runtime_server.go
  71. 4
      handlers/server.go
  72. 4
      handlers/server_switching_rule.go
  73. 4
      handlers/server_template.go
  74. 4
      handlers/site.go
  75. 2
      handlers/spoe.go
  76. 2
      handlers/spoe_agent.go
  77. 2
      handlers/spoe_group.go
  78. 2
      handlers/spoe_message.go
  79. 2
      handlers/spoe_scope.go
  80. 4
      handlers/spoe_transaction.go
  81. 2
      handlers/spoe_version.go
  82. 4
      handlers/ssl_cert_storage.go
  83. 4
      handlers/stats.go
  84. 4
      handlers/stick_rule.go
  85. 4
      handlers/stick_table.go
  86. 4
      handlers/table.go
  87. 4
      handlers/tcp_check.go
  88. 4
      handlers/tcp_request_rule.go
  89. 4
      handlers/tcp_response_rule.go
  90. 5
      handlers/transaction.go
  91. 4
      handlers/user.go
  92. 4
      handlers/userlist.go
  93. 2
      handlers/version.go
  94. 8
      haproxy/reload_agent.go
  95. 2
      log/log.go
  96. 6
      misc/misc.go
  97. 2
      operations/acl/create_acl_parameters.go
  98. 2
      operations/acl/create_acl_responses.go
  99. 2
      operations/acl/create_acl_urlbuilder.go
  100. 2
      operations/acl/delete_acl_responses.go
  101. Some files were not shown because too many files have changed in this diff Show More

2
CONTRIBUTING.md
Unescape View File

@ -16,7 +16,7 @@ or if you prefer to run it directly (not in docker)
make generate-native make generate-native
``` ```
`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) `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)
This command generates some of the files in this project, which are marked with // Code generated by go-swagger; DO NOT EDIT. This command generates some of the files in this project, which are marked with // Code generated by go-swagger; DO NOT EDIT.
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. 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.

6
adapters/adapters.go
Unescape View File

@ -22,9 +22,9 @@ import (
"strconv" "strconv"
"strings" "strings"
clientnative "github.com/haproxytech/client-native/v5" clientnative "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
) )

12
client-native/cn.go
Unescape View File

@ -7,13 +7,13 @@ import (
"sync" "sync"
"time" "time"
clientnative "github.com/haproxytech/client-native/v5" clientnative "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
configuration_options "github.com/haproxytech/client-native/v5/configuration/options" configuration_options "github.com/haproxytech/client-native/v6/configuration/options"
runtime_api "github.com/haproxytech/client-native/v5/runtime" runtime_api "github.com/haproxytech/client-native/v6/runtime"
runtime_options "github.com/haproxytech/client-native/v5/runtime/options" runtime_options "github.com/haproxytech/client-native/v6/runtime/options"
parser "github.com/haproxytech/config-parser/v5" parser "github.com/haproxytech/config-parser/v5"
"github.com/haproxytech/config-parser/v5/types" "github.com/haproxytech/config-parser/v5/types"

4
cmd/dataplaneapi/main.go
Unescape View File

@ -27,8 +27,8 @@ import (
"github.com/go-openapi/runtime/security" "github.com/go-openapi/runtime/security"
flags "github.com/jessevdk/go-flags" flags "github.com/jessevdk/go-flags"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/client-native/v5/storage" "github.com/haproxytech/client-native/v6/storage"
"github.com/haproxytech/dataplaneapi" "github.com/haproxytech/dataplaneapi"
"github.com/haproxytech/dataplaneapi/configuration" "github.com/haproxytech/dataplaneapi/configuration"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"

2
configuration/cluster_sync.go
Unescape View File

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

2
configuration/configuration.go
Unescape View File

@ -26,7 +26,7 @@ import (
"sync" "sync"
petname "github.com/dustinkirkland/golang-petname" petname "github.com/dustinkirkland/golang-petname"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
) )

2
configuration/configuration_storage.go
Unescape View File

@ -16,7 +16,7 @@
package configuration package configuration
import ( import (
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
dpapilog "github.com/haproxytech/dataplaneapi/log" dpapilog "github.com/haproxytech/dataplaneapi/log"

4
configuration/map_sync.go
Unescape View File

@ -23,8 +23,8 @@ import (
"sync" "sync"
"time" "time"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
) )

2
configuration/map_sync_test.go
Unescape View File

@ -19,7 +19,7 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
) )
func data(differentAtIndex ...int) (fileEntries models.MapEntries, runtimeEntries models.MapEntries) { func data(differentAtIndex ...int) (fileEntries models.MapEntries, runtimeEntries models.MapEntries) {

4
configuration/misc.go
Unescape View File

@ -29,8 +29,8 @@ import (
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/google/renameio" "github.com/google/renameio"
"github.com/haproxytech/client-native/v5/misc" "github.com/haproxytech/client-native/v6/misc"
"github.com/haproxytech/client-native/v5/storage" "github.com/haproxytech/client-native/v6/storage"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
) )

12
configure_data_plane.go
Unescape View File

@ -36,12 +36,12 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/swag" "github.com/go-openapi/swag"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/client-native/v5/options" "github.com/haproxytech/client-native/v6/options"
cn_runtime "github.com/haproxytech/client-native/v5/runtime" cn_runtime "github.com/haproxytech/client-native/v6/runtime"
"github.com/haproxytech/client-native/v5/spoe" "github.com/haproxytech/client-native/v6/spoe"
"github.com/haproxytech/client-native/v5/storage" "github.com/haproxytech/client-native/v6/storage"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"github.com/rs/cors" "github.com/rs/cors"

4
discovery/aws_service_discovery.go
Unescape View File

@ -19,8 +19,8 @@ import (
"context" "context"
"errors" "errors"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
) )

4
discovery/aws_service_discovery_instance.go
Unescape View File

@ -26,8 +26,8 @@ import (
"github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/credentials"
"github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/ec2/types" "github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"

4
discovery/consul_service_discovery.go
Unescape View File

@ -21,8 +21,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
) )

4
discovery/consul_service_discovery_instance.go
Unescape View File

@ -25,8 +25,8 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
) )

2
discovery/service_discovery.go
Unescape View File

@ -19,7 +19,7 @@ import (
"context" "context"
"errors" "errors"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
) )

2
discovery/service_discovery_instance.go
Unescape View File

@ -18,7 +18,7 @@ package discovery
import ( import (
"sync" "sync"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"

4
discovery/service_discovery_instance_test.go
Unescape View File

@ -33,8 +33,8 @@ import (
"github.com/aws/aws-sdk-go-v2/service/autoscaling/types" "github.com/aws/aws-sdk-go-v2/service/autoscaling/types"
"github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/haproxytech/client-native/v5/configuration" "github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"

2
discovery/utils.go
Unescape View File

@ -20,7 +20,7 @@ import (
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
) )

4
doc.go
Unescape View File

@ -23,8 +23,8 @@
// http // http
// https // https
// Host: localhost // Host: localhost
// BasePath: /v2 // BasePath: /v3
// Version: 2.9 // Version: 3.0
// Contact: HAProxy Support<support@haproxy.com> https://my.haproxy.com/portal/cust/login // Contact: HAProxy Support<support@haproxy.com> https://my.haproxy.com/portal/cust/login
// //
// Consumes: // Consumes:

2
e2e/libs/version.bash
Unescape View File

@ -45,7 +45,7 @@ function deprecated_auth_curl() {
# version # version
# >>> 10 # >>> 10
function version() { function version() {
read -r SC RES < <(deprecated_auth_curl GET "/v2/services/haproxy/configuration/global") read -r SC RES < <(deprecated_auth_curl GET "/v3/services/haproxy/configuration/global")
V="$(RES=${RES} jq -n 'env.RES | fromjson | ._version')" V="$(RES=${RES} jq -n 'env.RES | fromjson | ._version')"
echo "$V" echo "$V"
} }

2
e2e/libs/version_spoe.bash
Unescape View File

@ -37,6 +37,6 @@ function deprecated_auth_curl() {
} }
function version() { function version() {
read -r SC RES < <(deprecated_auth_curl GET "/v2/services/haproxy/spoe/version?spoe=$SPOE_FILE") read -r SC RES < <(deprecated_auth_curl GET "/v3/services/haproxy/spoe/version?spoe=$SPOE_FILE")
echo "$RES" echo "$RES"
} }

2
e2e/run.bash
Unescape View File

@ -16,7 +16,7 @@
# #
set -eo pipefail set -eo pipefail
export BASE_PATH="/v2" export BASE_PATH="/v3"
HAPROXY_VERSION=${HAPROXY_VERSION:-2.9} HAPROXY_VERSION=${HAPROXY_VERSION:-2.9}
DOCKER_BASE_IMAGE="${DOCKER_BASE_IMAGE:-haproxytech/haproxy-debian}:${HAPROXY_VERSION}" DOCKER_BASE_IMAGE="${DOCKER_BASE_IMAGE:-haproxytech/haproxy-debian}:${HAPROXY_VERSION}"

24
embedded_spec.go
Unescape View File

@ -52,9 +52,9 @@ func init() {
"url": "https://my.haproxy.com/portal/cust/login", "url": "https://my.haproxy.com/portal/cust/login",
"email": "support@haproxy.com" "email": "support@haproxy.com"
}, },
"version": "2.9" "version": "3.0"
}, },
"basePath": "/v2", "basePath": "/v3",
"paths": { "paths": {
"/": { "/": {
"get": { "get": {
@ -20287,14 +20287,6 @@ func init() {
"limited_quic": { "limited_quic": {
"type": "boolean" "type": "boolean"
}, },
"load_server_state_from_file": {
"type": "string",
"enum": [
"global",
"local",
"none"
]
},
"localpeer": { "localpeer": {
"type": "string", "type": "string",
"pattern": "^[^\\s]+$", "pattern": "^[^\\s]+$",
@ -30128,9 +30120,9 @@ func init() {
"url": "https://my.haproxy.com/portal/cust/login", "url": "https://my.haproxy.com/portal/cust/login",
"email": "support@haproxy.com" "email": "support@haproxy.com"
}, },
"version": "2.9" "version": "3.0"
}, },
"basePath": "/v2", "basePath": "/v3",
"paths": { "paths": {
"/": { "/": {
"get": { "get": {
@ -59185,14 +59177,6 @@ func init() {
"limited_quic": { "limited_quic": {
"type": "boolean" "type": "boolean"
}, },
"load_server_state_from_file": {
"type": "string",
"enum": [
"global",
"local",
"none"
]
},
"localpeer": { "localpeer": {
"type": "string", "type": "string",
"pattern": "^[^\\s]+$", "pattern": "^[^\\s]+$",

2
generate/configuration.tmpl
Unescape View File

@ -18,7 +18,7 @@ package configuration
import ( import (
"github.com/jessevdk/go-flags" "github.com/jessevdk/go-flags"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
dpapilog "github.com/haproxytech/dataplaneapi/log" dpapilog "github.com/haproxytech/dataplaneapi/log"

16
generate/swagger/script.sh
Unescape View File

@ -6,26 +6,26 @@ echo " ---> source folder: $SPEC_DIR"
DST_DIR=$(mktemp -d) DST_DIR=$(mktemp -d)
echo " ---> generate folder: $DST_DIR" echo " ---> generate folder: $DST_DIR"
# see if we have a replace directive # see if we have a replace directive
CN_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v5")) | .New.Version' 2>/dev/null | awk -F"-" '{print $NF}') || "" CN_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v6")) | .New.Version' 2>/dev/null | awk -F"-" '{print $NF}') || ""
REMOTE_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v5")) | .New.Version' 2>/dev/null | awk -F"/" '{print $1}') || "" REMOTE_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v6")) | .New.Version' 2>/dev/null | awk -F"/" '{print $1}') || ""
if [ "$REMOTE_VERSION" = "null" ]; then if [ "$REMOTE_VERSION" = "null" ]; then
# we have a local version of CN # we have a local version of CN
CN_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v5")) | .New.Path' 2>/dev/null) || "" CN_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v6")) | .New.Path' 2>/dev/null) || ""
fi fi
# if hash is to short take all of it (example v1.0.0-dev1) # if hash is to short take all of it (example v1.0.0-dev1)
[ "${#CN_VERSION}" -gt 0 ] && [ "${#CN_VERSION}" -lt 6 ] && CN_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v5")) | .New.Version') [ "${#CN_VERSION}" -gt 0 ] && [ "${#CN_VERSION}" -lt 6 ] && CN_VERSION=$(go mod edit -json | jq -c -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v6")) | .New.Version')
# check if version is there, if not, use one from require # check if version is there, if not, use one from require
[ -z "$CN_VERSION" ] && CN_VERSION=$(go mod edit -json | jq -c -r '.Require | .[] | select(.Path | contains("github.com/haproxytech/client-native/v5")) | .Version' 2>/dev/null) [ -z "$CN_VERSION" ] && CN_VERSION=$(go mod edit -json | jq -c -r '.Require | .[] | select(.Path | contains("github.com/haproxytech/client-native/v6")) | .Version' 2>/dev/null)
# check if version contains '-' and if it is a 12 char commit hash then use it, if not use the whole tag # check if version contains '-' and if it is a 12 char commit hash then use it, if not use the whole tag
suffix=$(echo $CN_VERSION | awk -F"-" '{print$NF}') suffix=$(echo $CN_VERSION | awk -F"-" '{print$NF}')
[ -z "${CN_VERSION##*"-"*}" ] && [ ${#suffix} -eq 12 ] && CN_VERSION=$suffix [ -z "${CN_VERSION##*"-"*}" ] && [ ${#suffix} -eq 12 ] && CN_VERSION=$suffix
echo " ---> version of client native used: $CN_VERSION" echo " ---> version of client native used: $CN_VERSION"
# extract repository # extract repository
REPO_PATH=$(go mod edit -json | jq -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v5")) | .New.Path' 2>/dev/null | awk -F"/" '{print $2 "/" $3}') || "" REPO_PATH=$(go mod edit -json | jq -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v6")) | .New.Path' 2>/dev/null | awk -F"/" '{print $2 "/" $3}') || ""
[ -z "$REPO_PATH" ] && REPO_PATH=haproxytech/client-native [ -z "$REPO_PATH" ] && REPO_PATH=haproxytech/client-native
# extract url, gitlab and github have different urls to raw content # extract url, gitlab and github have different urls to raw content
URL_PATH=$(go mod edit -json | jq -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v5")) | .New.Path' 2>/dev/null | awk -F"/" '{print $1}') || "" URL_PATH=$(go mod edit -json | jq -r '.Replace | .[] | select(.Old.Path | contains("github.com/haproxytech/client-native/v6")) | .New.Path' 2>/dev/null | awk -F"/" '{print $1}') || ""
EXTRA_PATH="" EXTRA_PATH=""
if [[ $URL_PATH =~ "gitlab" ]]; then if [[ $URL_PATH =~ "gitlab" ]]; then
EXTRA_PATH="-/raw/" EXTRA_PATH="-/raw/"
@ -59,7 +59,7 @@ cp configure_data_plane.go $DST_DIR/dataplaneapi/configure_data_plane.go
swagger generate server -f $SPEC_DIR/haproxy_spec.yaml \ swagger generate server -f $SPEC_DIR/haproxy_spec.yaml \
-A "Data Plane" \ -A "Data Plane" \
-t $DST_DIR \ -t $DST_DIR \
--existing-models github.com/haproxytech/client-native/v5/models \ --existing-models github.com/haproxytech/client-native/v6/models \
--exclude-main \ --exclude-main \
--skip-models \ --skip-models \
-s dataplaneapi \ -s dataplaneapi \

2
go.mod
Unescape View File

@ -22,7 +22,7 @@ require (
github.com/go-openapi/validate v0.22.6 github.com/go-openapi/validate v0.22.6
github.com/google/renameio v1.0.1 github.com/google/renameio v1.0.1
github.com/google/uuid v1.5.0 github.com/google/uuid v1.5.0
github.com/haproxytech/client-native/v5 v5.0.1-0.20231222130637-7e0743b6c661 github.com/haproxytech/client-native/v6 v6.0.0-20240129131604-79ddaf019359
github.com/haproxytech/config-parser/v5 v5.1.0 github.com/haproxytech/config-parser/v5 v5.1.0
github.com/jessevdk/go-flags v1.5.0 github.com/jessevdk/go-flags v1.5.0
github.com/json-iterator/go v1.1.12 github.com/json-iterator/go v1.1.12

4
go.sum
Unescape View File

@ -85,8 +85,8 @@ github.com/google/renameio v1.0.1 h1:Lh/jXZmvZxb0BBeSY5VKEfidcbcbenKjZFzM/q0fSeU
github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk= github.com/google/renameio v1.0.1/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/haproxytech/client-native/v5 v5.0.1-0.20231222130637-7e0743b6c661 h1:DFqpRGRTSkZuDCUAD8A7p9QUZnboMTfCmLVyvUbR2Io= github.com/haproxytech/client-native/v6 v6.0.0-20240129131604-79ddaf019359 h1:S/4oDe2ytpsaCWa13UfzHc48flAMpToIzdY9FWVZTOg=
github.com/haproxytech/client-native/v5 v5.0.1-0.20231222130637-7e0743b6c661/go.mod h1:aNDQ5dhHmhRFSyySbA/Tin3wW2sWTxtvGdsIU8NmRhA= github.com/haproxytech/client-native/v6 v6.0.0-20240129131604-79ddaf019359/go.mod h1:yacqwliknErGd3IbmzQbRsw4RPcBKAjzKCiUibiPWvg=
github.com/haproxytech/config-parser/v5 v5.1.0 h1:gdifNXscsx4x++GQWw9Oj3JDpJMgSLtCiXgdQqxsYQU= github.com/haproxytech/config-parser/v5 v5.1.0 h1:gdifNXscsx4x++GQWw9Oj3JDpJMgSLtCiXgdQqxsYQU=
github.com/haproxytech/config-parser/v5 v5.1.0/go.mod h1:iy8nBB1eopwYbyeh3FQpjxZUxfcIDyTV9bW0F1t+cVA= github.com/haproxytech/config-parser/v5 v5.1.0/go.mod h1:iy8nBB1eopwYbyeh3FQpjxZUxfcIDyTV9bW0F1t+cVA=
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE= github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=

4
handlers/acl.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/acl_runtime.go
Unescape View File

@ -2,8 +2,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/acl_runtime" "github.com/haproxytech/dataplaneapi/operations/acl_runtime"
) )

2
handlers/aws.go
Unescape View File

@ -19,7 +19,7 @@ import (
"errors" "errors"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
sc "github.com/haproxytech/dataplaneapi/discovery" sc "github.com/haproxytech/dataplaneapi/discovery"

4
handlers/backend.go
Unescape View File

@ -19,8 +19,8 @@ import (
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/backend_switching_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/bind.go
Unescape View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/cache.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/capture.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/cluster.go
Unescape View File

@ -24,8 +24,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/configuration" "github.com/haproxytech/dataplaneapi/configuration"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"

2
handlers/consul.go
Unescape View File

@ -19,7 +19,7 @@ import (
"errors" "errors"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
sc "github.com/haproxytech/dataplaneapi/discovery" sc "github.com/haproxytech/dataplaneapi/discovery"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/defaults.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/dgram_bind.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/fcgi_app.go
Unescape View File

@ -16,8 +16,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/filter.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/frontend.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/general_storage.go
Unescape View File

@ -24,8 +24,8 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
models "github.com/haproxytech/client-native/v5/models" models "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/global.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
cn "github.com/haproxytech/dataplaneapi/client-native" cn "github.com/haproxytech/dataplaneapi/client-native"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/group.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

2
handlers/health.go
Unescape View File

@ -2,7 +2,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/operations/health" "github.com/haproxytech/dataplaneapi/operations/health"
) )

4
handlers/http_after_response_rule.go
Unescape View File

@ -2,8 +2,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/http_check.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/http_error_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/http_errors.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/http_errors" "github.com/haproxytech/dataplaneapi/operations/http_errors"

4
handlers/http_request_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/http_response_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/information.go
Unescape View File

@ -26,8 +26,8 @@ import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/shirou/gopsutil/host" "github.com/shirou/gopsutil/host"
"github.com/shirou/gopsutil/mem" "github.com/shirou/gopsutil/mem"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

4
handlers/log_forward.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/log_target.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/mailer_entry.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/mailer_entry" "github.com/haproxytech/dataplaneapi/operations/mailer_entry"

4
handlers/mailers.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/mailers" "github.com/haproxytech/dataplaneapi/operations/mailers"

4
handlers/map.go
Unescape View File

@ -20,8 +20,8 @@ import (
"strings" "strings"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
config "github.com/haproxytech/dataplaneapi/configuration" config "github.com/haproxytech/dataplaneapi/configuration"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/map_storage.go
Unescape View File

@ -24,8 +24,8 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
models "github.com/haproxytech/client-native/v5/models" models "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/nameserver.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/peer.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/peer_entry.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/program.go
Unescape View File

@ -16,8 +16,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/process_manager" "github.com/haproxytech/dataplaneapi/operations/process_manager"

4
handlers/raw.go
Unescape View File

@ -21,8 +21,8 @@ import (
"strings" "strings"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
cn "github.com/haproxytech/dataplaneapi/client-native" cn "github.com/haproxytech/dataplaneapi/client-native"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

2
handlers/reloads.go
Unescape View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/resolver.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/ring.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/runtime.go
Unescape View File

@ -19,8 +19,8 @@ import (
"reflect" "reflect"
"strconv" "strconv"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
) )

6
handlers/runtime_server.go
Unescape View File

@ -20,9 +20,9 @@ import (
"strings" "strings"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
native_errors "github.com/haproxytech/client-native/v5/errors" native_errors "github.com/haproxytech/client-native/v6/errors"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/server" "github.com/haproxytech/dataplaneapi/operations/server"

4
handlers/server.go
Unescape View File

@ -19,8 +19,8 @@ import (
"fmt" "fmt"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"

4
handlers/server_switching_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/server_template.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/site.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

2
handlers/spoe.go
Unescape View File

@ -18,7 +18,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/spoe" "github.com/haproxytech/dataplaneapi/operations/spoe"

2
handlers/spoe_agent.go
Unescape View File

@ -17,7 +17,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/spoe" "github.com/haproxytech/dataplaneapi/operations/spoe"

2
handlers/spoe_group.go
Unescape View File

@ -17,7 +17,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/spoe" "github.com/haproxytech/dataplaneapi/operations/spoe"

2
handlers/spoe_message.go
Unescape View File

@ -17,7 +17,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/spoe" "github.com/haproxytech/dataplaneapi/operations/spoe"

2
handlers/spoe_scope.go
Unescape View File

@ -17,7 +17,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/spoe" "github.com/haproxytech/dataplaneapi/operations/spoe"

4
handlers/spoe_transaction.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

2
handlers/spoe_version.go
Unescape View File

@ -17,7 +17,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/spoe" "github.com/haproxytech/dataplaneapi/operations/spoe"

4
handlers/ssl_cert_storage.go
Unescape View File

@ -24,8 +24,8 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
models "github.com/haproxytech/client-native/v5/models" models "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/stats.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/stats" "github.com/haproxytech/dataplaneapi/operations/stats"

4
handlers/stick_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/stick_table.go
Unescape View File

@ -20,8 +20,8 @@ import (
"strings" "strings"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/stick_table" "github.com/haproxytech/dataplaneapi/operations/stick_table"

4
handlers/table.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/tcp_check.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/tcp_request_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/tcp_response_rule.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

5
handlers/transaction.go
Unescape View File

@ -20,8 +20,8 @@ import (
"sync" "sync"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
cn "github.com/haproxytech/dataplaneapi/client-native" cn "github.com/haproxytech/dataplaneapi/client-native"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
@ -86,7 +86,6 @@ func (h *DeleteTransactionHandlerImpl) Handle(params transactions.DeleteTransact
return transactions.NewDeleteTransactionDefault(int(*e.Code)).WithPayload(e) return transactions.NewDeleteTransactionDefault(int(*e.Code)).WithPayload(e)
} }
err = configuration.DeleteTransaction(params.ID) err = configuration.DeleteTransaction(params.ID)
if err != nil { if err != nil {
e := misc.HandleError(err) e := misc.HandleError(err)
if strings.HasSuffix(*e.Message, "does not exist") { if strings.HasSuffix(*e.Message, "does not exist") {

4
handlers/user.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

4
handlers/userlist.go
Unescape View File

@ -17,8 +17,8 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy" "github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"

2
handlers/version.go
Unescape View File

@ -17,7 +17,7 @@ package handlers
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/dataplaneapi/misc" "github.com/haproxytech/dataplaneapi/misc"
"github.com/haproxytech/dataplaneapi/operations/configuration" "github.com/haproxytech/dataplaneapi/operations/configuration"

8
haproxy/reload_agent.go
Unescape View File

@ -29,10 +29,10 @@ import (
"time" "time"
"github.com/google/renameio" "github.com/google/renameio"
client_native "github.com/haproxytech/client-native/v5" client_native "github.com/haproxytech/client-native/v6"
"github.com/haproxytech/client-native/v5/misc" "github.com/haproxytech/client-native/v6/misc"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/client-native/v5/runtime" "github.com/haproxytech/client-native/v6/runtime"
"github.com/haproxytech/dataplaneapi/log" "github.com/haproxytech/dataplaneapi/log"
) )

2
log/log.go
Unescape View File

@ -7,7 +7,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
apache_log "github.com/lestrrat-go/apache-logformat" apache_log "github.com/lestrrat-go/apache-logformat"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

6
misc/misc.go
Unescape View File

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

2
operations/acl/create_acl_parameters.go
Unescape View File

@ -31,7 +31,7 @@ import (
"github.com/go-openapi/swag" "github.com/go-openapi/swag"
"github.com/go-openapi/validate" "github.com/go-openapi/validate"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
) )
// NewCreateACLParams creates a new CreateACLParams object // NewCreateACLParams creates a new CreateACLParams object

2
operations/acl/create_acl_responses.go
Unescape View File

@ -25,7 +25,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
) )
// CreateACLCreatedCode is the HTTP code returned for type CreateACLCreated // CreateACLCreatedCode is the HTTP code returned for type CreateACLCreated

2
operations/acl/create_acl_urlbuilder.go
Unescape View File

@ -64,7 +64,7 @@ func (o *CreateACLURL) Build() (*url.URL, error) {
_basePath := o._basePath _basePath := o._basePath
if _basePath == "" { if _basePath == "" {
_basePath = "/v2" _basePath = "/v3"
} }
_result.Path = golangswaggerpaths.Join(_basePath, _path) _result.Path = golangswaggerpaths.Join(_basePath, _path)

2
operations/acl/delete_acl_responses.go
Unescape View File

@ -25,7 +25,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/haproxytech/client-native/v5/models" "github.com/haproxytech/client-native/v6/models"
) )
// DeleteACLAcceptedCode is the HTTP code returned for type DeleteACLAccepted // DeleteACLAcceptedCode is the HTTP code returned for type DeleteACLAccepted

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save