diff --git a/embedded_spec.go b/embedded_spec.go index 4d3a50d7..da4166cc 100644 --- a/embedded_spec.go +++ b/embedded_spec.go @@ -17270,35 +17270,37 @@ func init() { }, "bind": { "description": "HAProxy frontend bind configuration", - "type": "object", "title": "Bind", "allOf": [ { "$ref": "#/definitions/bind_params" - } - ], - "properties": { - "address": { - "type": "string", - "pattern": "^[^\\s]+$", - "example": "127.0.0.1" }, - "port": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true, - "example": 80 - }, - "port-range-end": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true, - "example": 81 + { + "type": "object", + "properties": { + "address": { + "type": "string", + "pattern": "^[^\\s]+$", + "example": "127.0.0.1" + }, + "port": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true, + "example": 80 + }, + "port-range-end": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true, + "example": 81 + } + }, + "additionalProperties": false } - }, - "additionalProperties": false + ] }, "bind_params": { "type": "object", @@ -17872,6 +17874,16 @@ func init() { "compression": { "type": "object", "properties": { + "algo-req": { + "type": "string", + "enum": [ + "identity", + "gzip", + "deflate", + "raw-deflate" + ], + "x-omitempty": true + }, "algorithms": { "type": "array", "items": { @@ -17885,6 +17897,28 @@ func init() { }, "x-omitempty": true }, + "algos-res": { + "type": "array", + "items": { + "type": "string", + "enum": [ + "identity", + "gzip", + "deflate", + "raw-deflate" + ] + }, + "x-omitempty": true + }, + "direction": { + "type": "string", + "enum": [ + "request", + "response", + "both" + ], + "x-omitempty": true + }, "offload": { "type": "boolean" }, @@ -17894,6 +17928,20 @@ func init() { "type": "string" }, "x-omitempty": true + }, + "types-req": { + "type": "array", + "items": { + "type": "string" + }, + "x-omitempty": true + }, + "types-res": { + "type": "array", + "items": { + "type": "string" + }, + "x-omitempty": true } } }, @@ -18157,7 +18205,6 @@ func init() { }, "default_bind": { "description": "HAProxy default bind configuration", - "type": "object", "title": "Default Bind", "allOf": [ { @@ -18166,7 +18213,6 @@ func init() { ] }, "default_server": { - "type": "object", "title": "Default Server", "allOf": [ { @@ -20454,21 +20500,23 @@ func init() { "runtime_apis": { "type": "array", "items": { - "type": "object", - "required": [ - "address" - ], "allOf": [ { "$ref": "#/definitions/bind_params" + }, + { + "type": "object", + "required": [ + "address" + ], + "properties": { + "address": { + "type": "string", + "pattern": "^[^\\s]+$" + } + } } ], - "properties": { - "address": { - "type": "string", - "pattern": "^[^\\s]+$" - } - }, "x-go-name": "RuntimeAPI" }, "x-display-name": "Runtime APIs", @@ -21906,7 +21954,7 @@ func init() { "return_content_format": { "type": "string", "enum": [ - "default-errorfile", + "default-errorfiles", "errorfile", "errorfiles", "file", @@ -22523,7 +22571,6 @@ func init() { "type": "string", "x-dependency": { "type": { - "required": true, "value": "redirect" } }, @@ -22584,7 +22631,7 @@ func init() { "return_content_format": { "type": "string", "enum": [ - "default-errorfile", + "default-errorfiles", "errorfile", "errorfiles", "file", @@ -23411,7 +23458,7 @@ func init() { "return_content_format": { "type": "string", "enum": [ - "default-errorfile", + "default-errorfiles", "errorfile", "errorfiles", "file", @@ -24759,6 +24806,13 @@ func init() { }, "x-nullable": true }, + "last_chk": { + "type": "string", + "x-dependency": { + "type": "server" + }, + "x-nullable": true + }, "lastchg": { "type": "integer", "x-dependency": { @@ -25011,6 +25065,7 @@ func init() { "hrsp_other": 0, "iid": 0, "intercepted": 346, + "last_chk": "L4OK in 0ms", "mode": "http", "pid": 3204, "rate": 64, @@ -26264,39 +26319,41 @@ func init() { }, "server": { "description": "HAProxy backend server configuration", - "type": "object", "title": "Server", - "required": [ - "name", - "address" - ], "allOf": [ { "$ref": "#/definitions/server_params" - } - ], - "properties": { - "address": { - "type": "string", - "pattern": "^[^\\s]+$", - "x-nullable": false }, - "id": { - "type": "integer", - "x-nullable": true - }, - "name": { - "type": "string", - "pattern": "^[^\\s]+$", - "x-nullable": false - }, - "port": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true + { + "type": "object", + "required": [ + "name", + "address" + ], + "properties": { + "address": { + "type": "string", + "pattern": "^[^\\s]+$", + "x-nullable": false + }, + "id": { + "type": "integer", + "x-nullable": true + }, + "name": { + "type": "string", + "pattern": "^[^\\s]+$", + "x-nullable": false + }, + "port": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true + } + } } - }, + ], "additionalProperties": false, "example": { "address": "10.1.1.1", @@ -26912,43 +26969,45 @@ func init() { }, "server_template": { "description": "Set a template to initialize servers with shared parameters.", - "type": "object", "title": "Server template", - "required": [ - "prefix", - "num_or_range", - "fqdn" - ], "allOf": [ { "$ref": "#/definitions/server_params" - } - ], - "properties": { - "fqdn": { - "type": "string", - "x-nullable": false - }, - "id": { - "type": "integer", - "x-nullable": true - }, - "num_or_range": { - "type": "string", - "x-nullable": false }, - "port": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true - }, - "prefix": { - "type": "string", - "pattern": "^[^\\s]+$", - "x-nullable": false + { + "type": "object", + "required": [ + "prefix", + "num_or_range", + "fqdn" + ], + "properties": { + "fqdn": { + "type": "string", + "x-nullable": false + }, + "id": { + "type": "integer", + "x-nullable": true + }, + "num_or_range": { + "type": "string", + "x-nullable": false + }, + "port": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true + }, + "prefix": { + "type": "string", + "pattern": "^[^\\s]+$", + "x-nullable": false + } + } } - }, + ], "additionalProperties": false, "example": { "fqdn": "google.com", @@ -53956,21 +54015,23 @@ func init() { "x-go-name": "PresetEnv" }, "GlobalRuntimeApisItems0": { - "type": "object", - "required": [ - "address" - ], "allOf": [ { "$ref": "#/definitions/bind_params" + }, + { + "type": "object", + "required": [ + "address" + ], + "properties": { + "address": { + "type": "string", + "pattern": "^[^\\s]+$" + } + } } ], - "properties": { - "address": { - "type": "string", - "pattern": "^[^\\s]+$" - } - }, "x-go-name": "RuntimeAPI" }, "GlobalSetVarFmtItems0": { @@ -55802,35 +55863,37 @@ func init() { }, "bind": { "description": "HAProxy frontend bind configuration", - "type": "object", "title": "Bind", "allOf": [ { "$ref": "#/definitions/bind_params" - } - ], - "properties": { - "address": { - "type": "string", - "pattern": "^[^\\s]+$", - "example": "127.0.0.1" }, - "port": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true, - "example": 80 - }, - "port-range-end": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true, - "example": 81 + { + "type": "object", + "properties": { + "address": { + "type": "string", + "pattern": "^[^\\s]+$", + "example": "127.0.0.1" + }, + "port": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true, + "example": 80 + }, + "port-range-end": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true, + "example": 81 + } + }, + "additionalProperties": false } - }, - "additionalProperties": false + ] }, "bind_params": { "type": "object", @@ -56378,6 +56441,16 @@ func init() { "compression": { "type": "object", "properties": { + "algo-req": { + "type": "string", + "enum": [ + "identity", + "gzip", + "deflate", + "raw-deflate" + ], + "x-omitempty": true + }, "algorithms": { "type": "array", "items": { @@ -56391,6 +56464,28 @@ func init() { }, "x-omitempty": true }, + "algos-res": { + "type": "array", + "items": { + "type": "string", + "enum": [ + "identity", + "gzip", + "deflate", + "raw-deflate" + ] + }, + "x-omitempty": true + }, + "direction": { + "type": "string", + "enum": [ + "request", + "response", + "both" + ], + "x-omitempty": true + }, "offload": { "type": "boolean" }, @@ -56400,6 +56495,20 @@ func init() { "type": "string" }, "x-omitempty": true + }, + "types-req": { + "type": "array", + "items": { + "type": "string" + }, + "x-omitempty": true + }, + "types-res": { + "type": "array", + "items": { + "type": "string" + }, + "x-omitempty": true } } }, @@ -56649,7 +56758,6 @@ func init() { }, "default_bind": { "description": "HAProxy default bind configuration", - "type": "object", "title": "Default Bind", "allOf": [ { @@ -56658,7 +56766,6 @@ func init() { ] }, "default_server": { - "type": "object", "title": "Default Server", "allOf": [ { @@ -60241,7 +60348,7 @@ func init() { "return_content_format": { "type": "string", "enum": [ - "default-errorfile", + "default-errorfiles", "errorfile", "errorfiles", "file", @@ -60858,7 +60965,6 @@ func init() { "type": "string", "x-dependency": { "type": { - "required": true, "value": "redirect" } }, @@ -60919,7 +61025,7 @@ func init() { "return_content_format": { "type": "string", "enum": [ - "default-errorfile", + "default-errorfiles", "errorfile", "errorfiles", "file", @@ -61746,7 +61852,7 @@ func init() { "return_content_format": { "type": "string", "enum": [ - "default-errorfile", + "default-errorfiles", "errorfile", "errorfiles", "file", @@ -63095,6 +63201,13 @@ func init() { }, "x-nullable": true }, + "last_chk": { + "type": "string", + "x-dependency": { + "type": "server" + }, + "x-nullable": true + }, "lastchg": { "type": "integer", "x-dependency": { @@ -63347,6 +63460,7 @@ func init() { "hrsp_other": 0, "iid": 0, "intercepted": 346, + "last_chk": "L4OK in 0ms", "mode": "http", "pid": 3204, "rate": 64, @@ -64600,39 +64714,41 @@ func init() { }, "server": { "description": "HAProxy backend server configuration", - "type": "object", "title": "Server", - "required": [ - "name", - "address" - ], "allOf": [ { "$ref": "#/definitions/server_params" - } - ], - "properties": { - "address": { - "type": "string", - "pattern": "^[^\\s]+$", - "x-nullable": false - }, - "id": { - "type": "integer", - "x-nullable": true }, - "name": { - "type": "string", - "pattern": "^[^\\s]+$", - "x-nullable": false - }, - "port": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true + { + "type": "object", + "required": [ + "name", + "address" + ], + "properties": { + "address": { + "type": "string", + "pattern": "^[^\\s]+$", + "x-nullable": false + }, + "id": { + "type": "integer", + "x-nullable": true + }, + "name": { + "type": "string", + "pattern": "^[^\\s]+$", + "x-nullable": false + }, + "port": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true + } + } } - }, + ], "additionalProperties": false, "example": { "address": "10.1.1.1", @@ -65248,43 +65364,45 @@ func init() { }, "server_template": { "description": "Set a template to initialize servers with shared parameters.", - "type": "object", "title": "Server template", - "required": [ - "prefix", - "num_or_range", - "fqdn" - ], "allOf": [ { "$ref": "#/definitions/server_params" - } - ], - "properties": { - "fqdn": { - "type": "string", - "x-nullable": false - }, - "id": { - "type": "integer", - "x-nullable": true - }, - "num_or_range": { - "type": "string", - "x-nullable": false }, - "port": { - "type": "integer", - "maximum": 65535, - "minimum": 1, - "x-nullable": true - }, - "prefix": { - "type": "string", - "pattern": "^[^\\s]+$", - "x-nullable": false + { + "type": "object", + "required": [ + "prefix", + "num_or_range", + "fqdn" + ], + "properties": { + "fqdn": { + "type": "string", + "x-nullable": false + }, + "id": { + "type": "integer", + "x-nullable": true + }, + "num_or_range": { + "type": "string", + "x-nullable": false + }, + "port": { + "type": "integer", + "maximum": 65535, + "minimum": 1, + "x-nullable": true + }, + "prefix": { + "type": "string", + "pattern": "^[^\\s]+$", + "x-nullable": false + } + } } - }, + ], "additionalProperties": false, "example": { "fqdn": "google.com", diff --git a/go.mod b/go.mod index 9b78ee89..dfd4da4a 100644 --- a/go.mod +++ b/go.mod @@ -22,8 +22,8 @@ require ( github.com/go-openapi/validate v0.23.0 github.com/google/renameio v1.0.1 github.com/google/uuid v1.6.0 - github.com/haproxytech/client-native/v5 v5.0.3 - github.com/haproxytech/config-parser/v5 v5.0.1-0.20230913105857-585d83cb48ba + github.com/haproxytech/client-native/v5 v5.0.6 + github.com/haproxytech/config-parser/v5 v5.1.1-0.20240221073837-5b782186def2 github.com/jessevdk/go-flags v1.5.0 github.com/json-iterator/go v1.1.12 github.com/lestrrat-go/apache-logformat v0.0.0-20210106032603-24d066f940f8 @@ -34,7 +34,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.8.4 golang.org/x/net v0.21.0 - golang.org/x/sys v0.17.0 + golang.org/x/sys v0.18.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index f55f49ea..c472338f 100644 --- a/go.sum +++ b/go.sum @@ -83,10 +83,10 @@ 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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/haproxytech/client-native/v5 v5.0.3 h1:DyfIvxRDZSIW5yCNPlwXQX0i5irsv0qoO07bdkioa3I= -github.com/haproxytech/client-native/v5 v5.0.3/go.mod h1:VTNukFFM7D4lFmgh3edgLgmKUk3fyKJubAhYuVodSmg= -github.com/haproxytech/config-parser/v5 v5.0.1-0.20230913105857-585d83cb48ba h1:l4oTCSr7nrZ9vZ7VVJ5GX64BRtZLuD9ePG8B5clbjHI= -github.com/haproxytech/config-parser/v5 v5.0.1-0.20230913105857-585d83cb48ba/go.mod h1:ASOyT1KguwXaY0NfoLNjLLs0OlnYHnFgUJsdJe6NhZg= +github.com/haproxytech/client-native/v5 v5.0.6 h1:V8Meyx3VIKewhu0SJmGqPNhrshLhYHEgzW5TYtSszno= +github.com/haproxytech/client-native/v5 v5.0.6/go.mod h1:lE91DAsDHGBey6F08WtXFwsObDEE1xehb60hchTD6cI= +github.com/haproxytech/config-parser/v5 v5.1.1-0.20240221073837-5b782186def2 h1:YXI/15X8xJPrnyO8brmiNaFhOD17Ib9nszHRrlEtuIw= +github.com/haproxytech/config-parser/v5 v5.1.1-0.20240221073837-5b782186def2/go.mod h1:iy8nBB1eopwYbyeh3FQpjxZUxfcIDyTV9bW0F1t+cVA= github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE= github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM= github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= @@ -194,8 +194,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=