diff --git a/embedded_spec.go b/embedded_spec.go index 4efc10b1..74e27b65 100644 --- a/embedded_spec.go +++ b/embedded_spec.go @@ -20312,6 +20312,9 @@ func init() { "pattern": "^[^\\s]+$", "x-display-name": "Group" }, + "h1_accept_payload_with_any_method": { + "type": "boolean" + }, "h1_case_adjust": { "type": "array", "items": { @@ -20336,6 +20339,9 @@ func init() { "h1_case_adjust_file": { "type": "string" }, + "h1_do_not_close_on_insecure_transfer_encoding": { + "type": "boolean" + }, "h2_workaround_bogus_websocket_clients": { "type": "boolean" }, @@ -22983,6 +22989,18 @@ func init() { "x-display-name": "Return Error Code", "x-nullable": true }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_expr": { "type": "string", "x-dependency": { @@ -23812,6 +23830,18 @@ func init() { "x-display-name": "Return Error Code", "x-nullable": true }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_expr": { "type": "string", "x-dependency": { @@ -25132,6 +25162,13 @@ func init() { }, "x-nullable": true }, + "last_agt": { + "type": "string", + "x-dependency": { + "type": "server" + }, + "x-nullable": true + }, "last_chk": { "type": "string", "x-dependency": { @@ -28855,19 +28892,20 @@ func init() { "sc-inc-gpc1", "sc-set-gpt", "sc-set-gpt0", + "send-spoe-group", "set-bandwidth-limit", "set-dst-port", "set-dst", "set-log-level", "set-mark", "set-nice", - "set-priority", + "set-priority-class", + "set-priority-offset", "set-src", "set-src-port", "set-tos", "set-var", "set-var-fmt", - "send-spoe-group", "silent-drop", "switch-mode", "track-sc0", @@ -29008,7 +29046,8 @@ func init() { "do-resolve", "set-dst", "set-dst-port", - "set-priority", + "set-priority-class", + "set-priority-offset", "set-src", "set-src-port", "set-var" @@ -29134,24 +29173,6 @@ func init() { "x-display-name": "Nice Value", "x-nullable": false }, - "priority_type": { - "type": "string", - "enum": [ - "class", - "offset" - ], - "x-dependency": { - "action": { - "required": true, - "value": "set-priority" - }, - "type": { - "value": [ - "content" - ] - } - } - }, "resolve_protocol": { "type": "string", "enum": [ @@ -29204,6 +29225,18 @@ func init() { }, "x-display-name": "Variable name" }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_idx": { "type": "string", "x-dependency": { @@ -29544,6 +29577,8 @@ func init() { "set-mark", "set-nice", "set-tos", + "set-var", + "set-var-fmt", "silent-drop", "unset-var" ], @@ -29720,6 +29755,18 @@ func init() { "x-display-name": "Nice Value", "x-nullable": false }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_expr": { "type": "string", "x-dependency": { @@ -29848,6 +29895,19 @@ func init() { ], "x-nullable": false }, + "var_format": { + "type": "string", + "x-dependency": { + "action": { + "required": true, + "value": "set-var-fmt" + }, + "type": { + "value": "content" + } + }, + "x-display-name": "Var Format" + }, "var_name": { "type": "string", "pattern": "^[^\\s]+$", @@ -59389,6 +59449,9 @@ func init() { "pattern": "^[^\\s]+$", "x-display-name": "Group" }, + "h1_accept_payload_with_any_method": { + "type": "boolean" + }, "h1_case_adjust": { "type": "array", "items": { @@ -59400,6 +59463,9 @@ func init() { "h1_case_adjust_file": { "type": "string" }, + "h1_do_not_close_on_insecure_transfer_encoding": { + "type": "boolean" + }, "h2_workaround_bogus_websocket_clients": { "type": "boolean" }, @@ -61915,6 +61981,18 @@ func init() { "x-display-name": "Return Error Code", "x-nullable": true }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_expr": { "type": "string", "x-dependency": { @@ -62744,6 +62822,18 @@ func init() { "x-display-name": "Return Error Code", "x-nullable": true }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_expr": { "type": "string", "x-dependency": { @@ -64065,6 +64155,13 @@ func init() { }, "x-nullable": true }, + "last_agt": { + "type": "string", + "x-dependency": { + "type": "server" + }, + "x-nullable": true + }, "last_chk": { "type": "string", "x-dependency": { @@ -67682,19 +67779,20 @@ func init() { "sc-inc-gpc1", "sc-set-gpt", "sc-set-gpt0", + "send-spoe-group", "set-bandwidth-limit", "set-dst-port", "set-dst", "set-log-level", "set-mark", "set-nice", - "set-priority", + "set-priority-class", + "set-priority-offset", "set-src", "set-src-port", "set-tos", "set-var", "set-var-fmt", - "send-spoe-group", "silent-drop", "switch-mode", "track-sc0", @@ -67835,7 +67933,8 @@ func init() { "do-resolve", "set-dst", "set-dst-port", - "set-priority", + "set-priority-class", + "set-priority-offset", "set-src", "set-src-port", "set-var" @@ -67961,24 +68060,6 @@ func init() { "x-display-name": "Nice Value", "x-nullable": false }, - "priority_type": { - "type": "string", - "enum": [ - "class", - "offset" - ], - "x-dependency": { - "action": { - "required": true, - "value": "set-priority" - }, - "type": { - "value": [ - "content" - ] - } - } - }, "resolve_protocol": { "type": "string", "enum": [ @@ -68031,6 +68112,18 @@ func init() { }, "x-display-name": "Variable name" }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_idx": { "type": "string", "x-dependency": { @@ -68371,6 +68464,8 @@ func init() { "set-mark", "set-nice", "set-tos", + "set-var", + "set-var-fmt", "silent-drop", "unset-var" ], @@ -68547,6 +68642,18 @@ func init() { "x-display-name": "Nice Value", "x-nullable": false }, + "rst_ttl": { + "type": "integer", + "x-dependency": { + "type": { + "required": true, + "value": [ + "silent-drop" + ] + } + }, + "x-display-name": "RST TTL" + }, "sc_expr": { "type": "string", "x-dependency": { @@ -68675,6 +68782,19 @@ func init() { ], "x-nullable": false }, + "var_format": { + "type": "string", + "x-dependency": { + "action": { + "required": true, + "value": "set-var-fmt" + }, + "type": { + "value": "content" + } + }, + "x-display-name": "Var Format" + }, "var_name": { "type": "string", "pattern": "^[^\\s]+$", diff --git a/go.mod b/go.mod index 28ac4529..f1373cf4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/haproxytech/dataplaneapi -go 1.22 +go 1.22.0 + +toolchain go1.23.1 require ( github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 @@ -22,8 +24,8 @@ require ( github.com/go-openapi/validate v0.24.0 github.com/google/renameio v1.0.1 github.com/google/uuid v1.6.0 - github.com/haproxytech/client-native/v5 v5.1.9 - github.com/haproxytech/config-parser/v5 v5.1.4 + github.com/haproxytech/client-native/v5 v5.1.13 + github.com/haproxytech/config-parser/v5 v5.1.6 github.com/jessevdk/go-flags v1.6.1 github.com/json-iterator/go v1.1.12 github.com/kr/pretty v0.3.1 @@ -36,7 +38,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 golang.org/x/net v0.26.0 - golang.org/x/sys v0.22.0 + golang.org/x/sys v0.25.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -59,7 +61,7 @@ require ( github.com/go-openapi/analysis v0.23.0 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect - github.com/gofrs/flock v0.12.0 // indirect + github.com/gofrs/flock v0.12.1 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/haproxytech/go-logger v1.1.0 // indirect github.com/invopop/yaml v0.3.1 // indirect @@ -82,7 +84,7 @@ require ( github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.8.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.mongodb.org/mongo-driver v1.16.0 // indirect - golang.org/x/sync v0.7.0 // indirect + go.mongodb.org/mongo-driver v1.16.1 // indirect + golang.org/x/sync v0.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 78739232..f8ed4590 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/getkin/kin-openapi v0.125.0 h1:jyQCyf2qXS1qvs2U00xQzkGCqYPhEhZDmSmVt65fXno= github.com/getkin/kin-openapi v0.125.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= -github.com/go-faker/faker/v4 v4.4.2 h1:96WeU9QKEqRUVYdjHquY2/5bAqmVM0IfGKHV5mbfqmQ= -github.com/go-faker/faker/v4 v4.4.2/go.mod h1:4K3v4AbKXYNHMQNaREMc9/kRB9j5JJzpFo6KHRvrcIw= +github.com/go-faker/faker/v4 v4.5.0 h1:ARzAY2XoOL9tOUK+KSecUQzyXQsUaZHefjyF8x6YFHc= +github.com/go-faker/faker/v4 v4.5.0/go.mod h1:p3oq1GRjG2PZ7yqeFFfQI20Xm61DoBDlCA8RiSyZ48M= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= @@ -75,8 +75,8 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= -github.com/gofrs/flock v0.12.0 h1:xHW8t8GPAiGtqz7KxiSqfOEXwpOaqhpYZrTE2MQBgXY= -github.com/gofrs/flock v0.12.0/go.mod h1:FirDy1Ing0mI2+kB6wk+vyyAH+e6xiE+EYA0jnzV9jc= +github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= +github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -85,10 +85,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.1.9 h1:D+JvMsRHCewn+r+FJpzf3QUu2yHwGuV+s6IuJlajxYE= -github.com/haproxytech/client-native/v5 v5.1.9/go.mod h1:rSJ7gT0vpZqNYdZQwzttLC4doOyoTL+B68F7cDjELNQ= -github.com/haproxytech/config-parser/v5 v5.1.4 h1:TArFSuRpYlmTanZjt3nVe7lNcPw+pXmth8tLW72ENeM= -github.com/haproxytech/config-parser/v5 v5.1.4/go.mod h1:16+1AbS+AvMZkDScIhergz2dqecQuEmjwV4Xt5ncS9s= +github.com/haproxytech/client-native/v5 v5.1.13 h1:b02aR2IHih8lHGrjWMB3cSWb2T25dZ8MNk3WFV2vMgE= +github.com/haproxytech/client-native/v5 v5.1.13/go.mod h1:gEFlDMylylNCZ0FUO//UeCbrAt4a18Y1buPlw1UGnIg= +github.com/haproxytech/config-parser/v5 v5.1.6 h1:64KHffpOGoyjFuMmq9dLOvcRCEzg/2GAnPwhmue1uVY= +github.com/haproxytech/config-parser/v5 v5.1.6/go.mod h1:16+1AbS+AvMZkDScIhergz2dqecQuEmjwV4Xt5ncS9s= 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.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso= @@ -170,22 +170,22 @@ github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4BQ4= -go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= +go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8= +go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw= golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=