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

master
Helene Durand 3 months ago
parent e612bfb3f9
commit 783cf25734
  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

@ -16,7 +16,7 @@ or if you prefer to run it directly (not in docker)
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.
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.

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

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

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

@ -34,7 +34,7 @@ import (
"time"
"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"
jsoniter "github.com/json-iterator/go"

@ -26,7 +26,7 @@ import (
"sync"
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"
jsoniter "github.com/json-iterator/go"
)

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

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

@ -19,7 +19,7 @@ import (
"strconv"
"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) {

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

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

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

@ -26,8 +26,8 @@ import (
"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/types"
"github.com/haproxytech/client-native/v5/configuration"
"github.com/haproxytech/client-native/v5/models"
"github.com/haproxytech/client-native/v6/configuration"
"github.com/haproxytech/client-native/v6/models"
"github.com/haproxytech/dataplaneapi/haproxy"
"github.com/haproxytech/dataplaneapi/log"

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

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

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

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

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

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

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

@ -45,7 +45,7 @@ function deprecated_auth_curl() {
# version
# >>> 10
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')"
echo "$V"
}

@ -37,6 +37,6 @@ function deprecated_auth_curl() {
}
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"
}

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

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

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

@ -6,26 +6,26 @@ echo " ---> source folder: $SPEC_DIR"
DST_DIR=$(mktemp -d)
echo " ---> generate folder: $DST_DIR"
# 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}') || ""
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}') || ""
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/v6")) | .New.Version' 2>/dev/null | awk -F"/" '{print $1}') || ""
if [ "$REMOTE_VERSION" = "null" ]; then
# 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
# 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
[ -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
suffix=$(echo $CN_VERSION | awk -F"-" '{print$NF}')
[ -z "${CN_VERSION##*"-"*}" ] && [ ${#suffix} -eq 12 ] && CN_VERSION=$suffix
echo " ---> version of client native used: $CN_VERSION"
# 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
# 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=""
if [[ $URL_PATH =~ "gitlab" ]]; then
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 \
-A "Data Plane" \
-t $DST_DIR \
--existing-models github.com/haproxytech/client-native/v5/models \
--existing-models github.com/haproxytech/client-native/v6/models \
--exclude-main \
--skip-models \
-s dataplaneapi \

@ -22,7 +22,7 @@ require (
github.com/go-openapi/validate v0.22.6
github.com/google/renameio v1.0.1
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/jessevdk/go-flags v1.5.0
github.com/json-iterator/go v1.1.12

@ -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/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
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/v5 v5.0.1-0.20231222130637-7e0743b6c661/go.mod h1:aNDQ5dhHmhRFSyySbA/Tin3wW2sWTxtvGdsIU8NmRhA=
github.com/haproxytech/client-native/v6 v6.0.0-20240129131604-79ddaf019359 h1:S/4oDe2ytpsaCWa13UfzHc48flAMpToIzdY9FWVZTOg=
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/go.mod h1:iy8nBB1eopwYbyeh3FQpjxZUxfcIDyTV9bW0F1t+cVA=
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=

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

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

@ -19,7 +19,7 @@ import (
"errors"
"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"
sc "github.com/haproxytech/dataplaneapi/discovery"

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

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

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

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

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

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

@ -19,7 +19,7 @@ import (
"errors"
"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"
"github.com/haproxytech/dataplaneapi/misc"

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

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

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

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

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

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

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

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

@ -2,7 +2,7 @@ package handlers
import (
"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/operations/health"
)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -19,7 +19,7 @@ import (
"fmt"
"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/misc"

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

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

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

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

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

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

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

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

@ -18,7 +18,7 @@ package handlers
import (
"github.com/go-openapi/runtime"
"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/operations/spoe"

@ -17,7 +17,7 @@ package handlers
import (
"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/operations/spoe"

@ -17,7 +17,7 @@ package handlers
import (
"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/operations/spoe"

@ -17,7 +17,7 @@ package handlers
import (
"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/operations/spoe"

@ -17,7 +17,7 @@ package handlers
import (
"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/operations/spoe"

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

@ -17,7 +17,7 @@ package handlers
import (
"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/operations/spoe"

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

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

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

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

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

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

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

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

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

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

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

@ -17,7 +17,7 @@ package handlers
import (
"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/operations/configuration"

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

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

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

@ -31,7 +31,7 @@ import (
"github.com/go-openapi/swag"
"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

@ -25,7 +25,7 @@ import (
"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

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

@ -25,7 +25,7 @@ import (
"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

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

Loading…
Cancel
Save