diff --git a/client.yml b/client.yml index a8cfebff..687398ce 100644 --- a/client.yml +++ b/client.yml @@ -15,7 +15,7 @@ info: license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - version: 0.26.8 + version: 0.26.9 host: demo.ziti.dev basePath: /edge/client/v1 paths: @@ -4277,12 +4277,22 @@ definitions: properties: arch: type: string + maxLength: 255 + domain: + type: string + maxLength: 253 + hostname: + type: string + maxLength: 253 os: type: string + maxLength: 255 osRelease: type: string + maxLength: 255 osVersion: type: string + maxLength: 255 identityAuthenticators: type: object properties: @@ -4878,16 +4888,22 @@ definitions: properties: appId: type: string + maxLength: 255 appVersion: type: string + maxLength: 255 branch: type: string + maxLength: 255 revision: type: string + maxLength: 255 type: type: string + maxLength: 255 version: type: string + maxLength: 255 serviceDetail: type: object allOf: diff --git a/go.mod b/go.mod index 3ceb29f5..0b18dcce 100644 --- a/go.mod +++ b/go.mod @@ -10,11 +10,11 @@ require ( github.com/go-openapi/spec v0.20.14 github.com/go-openapi/strfmt v0.22.0 github.com/go-openapi/swag v0.22.9 - github.com/go-openapi/validate v0.22.6 + github.com/go-openapi/validate v0.23.0 github.com/jessevdk/go-flags v1.5.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 - golang.org/x/net v0.20.0 + golang.org/x/net v0.21.0 ) require ( @@ -25,17 +25,17 @@ require ( github.com/go-openapi/analysis v0.22.2 // indirect github.com/go-openapi/jsonpointer v0.20.2 // indirect github.com/go-openapi/jsonreference v0.20.4 // indirect - github.com/google/uuid v1.5.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/oklog/ulid v1.3.1 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect - go.mongodb.org/mongo-driver v1.13.1 // indirect - go.opentelemetry.io/otel v1.21.0 // indirect - go.opentelemetry.io/otel/metric v1.21.0 // indirect - go.opentelemetry.io/otel/trace v1.21.0 // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.16.0 // indirect + go.mongodb.org/mongo-driver v1.14.0 // indirect + go.opentelemetry.io/otel v1.23.1 // indirect + go.opentelemetry.io/otel/metric v1.23.1 // indirect + go.opentelemetry.io/otel/trace v1.23.1 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.17.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 29312f28..1715b26c 100644 --- a/go.sum +++ b/go.sum @@ -30,25 +30,21 @@ github.com/go-openapi/strfmt v0.22.0 h1:Ew9PnEYc246TwrEspvBdDHS4BVKXy/AOVsfqGDgA github.com/go-openapi/strfmt v0.22.0/go.mod h1:HzJ9kokGIju3/K6ap8jL+OlGAbjpSv27135Yr9OivU4= github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE= github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE= -github.com/go-openapi/validate v0.22.6 h1:+NhuwcEYpWdO5Nm4bmvhGLW0rt1Fcc532Mu3wpypXfo= -github.com/go-openapi/validate v0.22.6/go.mod h1:eaddXSqKeTg5XpSmj1dYyFTK/95n/XHwcOY+BMxKMyM= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/go-openapi/validate v0.23.0 h1:2l7PJLzCis4YUGEoW6eoQw3WhyM65WSIcjX6SQnlfDw= +github.com/go-openapi/validate v0.23.0/go.mod h1:EeiAZ5bmpSIOJV1WLfyYF9qp/B1ZgSaEpHTJHtN5cbE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= @@ -64,57 +60,23 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= -github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= -go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= -go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= +go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= +go.opentelemetry.io/otel v1.23.1 h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY= +go.opentelemetry.io/otel v1.23.1/go.mod h1:Td0134eafDLcTS4y+zQ26GE8u3dEuRBiBCTUIRHaikA= +go.opentelemetry.io/otel/metric v1.23.1 h1:PQJmqJ9u2QaJLBOELl1cxIdPcpbwzbkjfEyelTl2rlo= +go.opentelemetry.io/otel/metric v1.23.1/go.mod h1:mpG2QPlAfnK8yNhNJAxDZruU9Y1/HubbC+KyH8FaCWI= go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= -go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= -go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +go.opentelemetry.io/otel/trace v1.23.1 h1:4LrmmEd8AU2rFvU1zegmvqW7+kWarxtNOPyeL6HmYY8= +go.opentelemetry.io/otel/trace v1.23.1/go.mod h1:4IpnpJFwr1mo/6HL8XIPJaE9y0+u1KcVmuW7dwFSVrI= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.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= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +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= 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= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/management.yml b/management.yml index f3160b8b..2bfaa7f4 100644 --- a/management.yml +++ b/management.yml @@ -15,7 +15,7 @@ info: license: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0.html - version: 0.26.8 + version: 0.26.9 host: demo.ziti.dev basePath: /edge/management/v1 paths: @@ -17276,12 +17276,22 @@ definitions: properties: arch: type: string + maxLength: 255 + domain: + type: string + maxLength: 253 + hostname: + type: string + maxLength: 253 os: type: string + maxLength: 255 osRelease: type: string + maxLength: 255 osVersion: type: string + maxLength: 255 externalIdClaim: type: object required: @@ -19246,16 +19256,22 @@ definitions: properties: appId: type: string + maxLength: 255 appVersion: type: string + maxLength: 255 branch: type: string + maxLength: 255 revision: type: string + maxLength: 255 type: type: string + maxLength: 255 version: type: string + maxLength: 255 semantic: type: string enum: diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go index 16db7f99..238bd917 100644 --- a/rest_client_api_server/doc.go +++ b/rest_client_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/client/v1 -// Version: 0.26.8 +// Version: 0.26.9 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_client_api_server/embedded_spec.go b/rest_client_api_server/embedded_spec.go index b85d51e3..f1be738b 100644 --- a/rest_client_api_server/embedded_spec.go +++ b/rest_client_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.8" + "version": "0.26.9" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -5930,16 +5930,28 @@ func init() { "type": "object", "properties": { "arch": { - "type": "string" + "type": "string", + "maxLength": 255 + }, + "domain": { + "type": "string", + "maxLength": 253 + }, + "hostname": { + "type": "string", + "maxLength": 253 }, "os": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osRelease": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osVersion": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, @@ -6834,22 +6846,28 @@ func init() { "type": "object", "properties": { "appId": { - "type": "string" + "type": "string", + "maxLength": 255 }, "appVersion": { - "type": "string" + "type": "string", + "maxLength": 255 }, "branch": { - "type": "string" + "type": "string", + "maxLength": 255 }, "revision": { - "type": "string" + "type": "string", + "maxLength": 255 }, "type": { - "type": "string" + "type": "string", + "maxLength": 255 }, "version": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, @@ -7299,7 +7317,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.8" + "version": "0.26.9" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -13248,16 +13266,28 @@ func init() { "type": "object", "properties": { "arch": { - "type": "string" + "type": "string", + "maxLength": 255 + }, + "domain": { + "type": "string", + "maxLength": 253 + }, + "hostname": { + "type": "string", + "maxLength": 253 }, "os": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osRelease": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osVersion": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, @@ -14152,22 +14182,28 @@ func init() { "type": "object", "properties": { "appId": { - "type": "string" + "type": "string", + "maxLength": 255 }, "appVersion": { - "type": "string" + "type": "string", + "maxLength": 255 }, "branch": { - "type": "string" + "type": "string", + "maxLength": 255 }, "revision": { - "type": "string" + "type": "string", + "maxLength": 255 }, "type": { - "type": "string" + "type": "string", + "maxLength": 255 }, "version": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go index 60b81c76..357b0910 100644 --- a/rest_management_api_server/doc.go +++ b/rest_management_api_server/doc.go @@ -30,7 +30,7 @@ // https // Host: demo.ziti.dev // BasePath: /edge/management/v1 -// Version: 0.26.8 +// Version: 0.26.9 // License: Apache 2.0 https://www.apache.org/licenses/LICENSE-2.0.html // Contact: OpenZiti https://openziti.discourse.group // diff --git a/rest_management_api_server/embedded_spec.go b/rest_management_api_server/embedded_spec.go index 26d77763..886e6dc9 100644 --- a/rest_management_api_server/embedded_spec.go +++ b/rest_management_api_server/embedded_spec.go @@ -64,7 +64,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.8" + "version": "0.26.9" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -23831,16 +23831,28 @@ func init() { "type": "object", "properties": { "arch": { - "type": "string" + "type": "string", + "maxLength": 255 + }, + "domain": { + "type": "string", + "maxLength": 253 + }, + "hostname": { + "type": "string", + "maxLength": 253 }, "os": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osRelease": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osVersion": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, @@ -26819,22 +26831,28 @@ func init() { "type": "object", "properties": { "appId": { - "type": "string" + "type": "string", + "maxLength": 255 }, "appVersion": { - "type": "string" + "type": "string", + "maxLength": 255 }, "branch": { - "type": "string" + "type": "string", + "maxLength": 255 }, "revision": { - "type": "string" + "type": "string", + "maxLength": 255 }, "type": { - "type": "string" + "type": "string", + "maxLength": 255 }, "version": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, @@ -27849,7 +27867,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.26.8" + "version": "0.26.9" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -51716,16 +51734,28 @@ func init() { "type": "object", "properties": { "arch": { - "type": "string" + "type": "string", + "maxLength": 255 + }, + "domain": { + "type": "string", + "maxLength": 253 + }, + "hostname": { + "type": "string", + "maxLength": 253 }, "os": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osRelease": { - "type": "string" + "type": "string", + "maxLength": 255 }, "osVersion": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, @@ -54708,22 +54738,28 @@ func init() { "type": "object", "properties": { "appId": { - "type": "string" + "type": "string", + "maxLength": 255 }, "appVersion": { - "type": "string" + "type": "string", + "maxLength": 255 }, "branch": { - "type": "string" + "type": "string", + "maxLength": 255 }, "revision": { - "type": "string" + "type": "string", + "maxLength": 255 }, "type": { - "type": "string" + "type": "string", + "maxLength": 255 }, "version": { - "type": "string" + "type": "string", + "maxLength": 255 } } }, diff --git a/rest_model/env_info.go b/rest_model/env_info.go index f7991c4c..44ed39f6 100644 --- a/rest_model/env_info.go +++ b/rest_model/env_info.go @@ -32,8 +32,10 @@ package rest_model import ( "context" + "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" + "github.com/go-openapi/validate" ) // EnvInfo Environment information an authenticating client may provide @@ -42,20 +44,133 @@ import ( type EnvInfo struct { // arch + // Max Length: 255 Arch string `json:"arch,omitempty"` + // domain + // Max Length: 253 + Domain string `json:"domain,omitempty"` + + // hostname + // Max Length: 253 + Hostname string `json:"hostname,omitempty"` + // os + // Max Length: 255 Os string `json:"os,omitempty"` // os release + // Max Length: 255 OsRelease string `json:"osRelease,omitempty"` // os version + // Max Length: 255 OsVersion string `json:"osVersion,omitempty"` } // Validate validates this env info func (m *EnvInfo) Validate(formats strfmt.Registry) error { + var res []error + + if err := m.validateArch(formats); err != nil { + res = append(res, err) + } + + if err := m.validateDomain(formats); err != nil { + res = append(res, err) + } + + if err := m.validateHostname(formats); err != nil { + res = append(res, err) + } + + if err := m.validateOs(formats); err != nil { + res = append(res, err) + } + + if err := m.validateOsRelease(formats); err != nil { + res = append(res, err) + } + + if err := m.validateOsVersion(formats); err != nil { + res = append(res, err) + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +func (m *EnvInfo) validateArch(formats strfmt.Registry) error { + if swag.IsZero(m.Arch) { // not required + return nil + } + + if err := validate.MaxLength("arch", "body", m.Arch, 255); err != nil { + return err + } + + return nil +} + +func (m *EnvInfo) validateDomain(formats strfmt.Registry) error { + if swag.IsZero(m.Domain) { // not required + return nil + } + + if err := validate.MaxLength("domain", "body", m.Domain, 253); err != nil { + return err + } + + return nil +} + +func (m *EnvInfo) validateHostname(formats strfmt.Registry) error { + if swag.IsZero(m.Hostname) { // not required + return nil + } + + if err := validate.MaxLength("hostname", "body", m.Hostname, 253); err != nil { + return err + } + + return nil +} + +func (m *EnvInfo) validateOs(formats strfmt.Registry) error { + if swag.IsZero(m.Os) { // not required + return nil + } + + if err := validate.MaxLength("os", "body", m.Os, 255); err != nil { + return err + } + + return nil +} + +func (m *EnvInfo) validateOsRelease(formats strfmt.Registry) error { + if swag.IsZero(m.OsRelease) { // not required + return nil + } + + if err := validate.MaxLength("osRelease", "body", m.OsRelease, 255); err != nil { + return err + } + + return nil +} + +func (m *EnvInfo) validateOsVersion(formats strfmt.Registry) error { + if swag.IsZero(m.OsVersion) { // not required + return nil + } + + if err := validate.MaxLength("osVersion", "body", m.OsVersion, 255); err != nil { + return err + } + return nil } diff --git a/rest_model/sdk_info.go b/rest_model/sdk_info.go index 0896b11c..f6f7fc26 100644 --- a/rest_model/sdk_info.go +++ b/rest_model/sdk_info.go @@ -32,8 +32,10 @@ package rest_model import ( "context" + "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" + "github.com/go-openapi/validate" ) // SdkInfo SDK information an authenticating client may provide @@ -42,26 +44,133 @@ import ( type SdkInfo struct { // app Id + // Max Length: 255 AppID string `json:"appId,omitempty"` // app version + // Max Length: 255 AppVersion string `json:"appVersion,omitempty"` // branch + // Max Length: 255 Branch string `json:"branch,omitempty"` // revision + // Max Length: 255 Revision string `json:"revision,omitempty"` // type + // Max Length: 255 Type string `json:"type,omitempty"` // version + // Max Length: 255 Version string `json:"version,omitempty"` } // Validate validates this sdk info func (m *SdkInfo) Validate(formats strfmt.Registry) error { + var res []error + + if err := m.validateAppID(formats); err != nil { + res = append(res, err) + } + + if err := m.validateAppVersion(formats); err != nil { + res = append(res, err) + } + + if err := m.validateBranch(formats); err != nil { + res = append(res, err) + } + + if err := m.validateRevision(formats); err != nil { + res = append(res, err) + } + + if err := m.validateType(formats); err != nil { + res = append(res, err) + } + + if err := m.validateVersion(formats); err != nil { + res = append(res, err) + } + + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +func (m *SdkInfo) validateAppID(formats strfmt.Registry) error { + if swag.IsZero(m.AppID) { // not required + return nil + } + + if err := validate.MaxLength("appId", "body", m.AppID, 255); err != nil { + return err + } + + return nil +} + +func (m *SdkInfo) validateAppVersion(formats strfmt.Registry) error { + if swag.IsZero(m.AppVersion) { // not required + return nil + } + + if err := validate.MaxLength("appVersion", "body", m.AppVersion, 255); err != nil { + return err + } + + return nil +} + +func (m *SdkInfo) validateBranch(formats strfmt.Registry) error { + if swag.IsZero(m.Branch) { // not required + return nil + } + + if err := validate.MaxLength("branch", "body", m.Branch, 255); err != nil { + return err + } + + return nil +} + +func (m *SdkInfo) validateRevision(formats strfmt.Registry) error { + if swag.IsZero(m.Revision) { // not required + return nil + } + + if err := validate.MaxLength("revision", "body", m.Revision, 255); err != nil { + return err + } + + return nil +} + +func (m *SdkInfo) validateType(formats strfmt.Registry) error { + if swag.IsZero(m.Type) { // not required + return nil + } + + if err := validate.MaxLength("type", "body", m.Type, 255); err != nil { + return err + } + + return nil +} + +func (m *SdkInfo) validateVersion(formats strfmt.Registry) error { + if swag.IsZero(m.Version) { // not required + return nil + } + + if err := validate.MaxLength("version", "body", m.Version, 255); err != nil { + return err + } + return nil } diff --git a/source/client.yml b/source/client.yml index 8de57d41..b13ca0ea 100644 --- a/source/client.yml +++ b/source/client.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.8 + version: 0.26.9 title: Ziti Edge Client description: OpenZiti Edge Client API contact: diff --git a/source/management.yml b/source/management.yml index 01b84e27..ccb8952b 100644 --- a/source/management.yml +++ b/source/management.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.26.8 + version: 0.26.9 title: Ziti Edge Management description: OpenZiti Edge Management API contact: diff --git a/source/shared/authenticate.yml b/source/shared/authenticate.yml index 9fed64e5..6edb9bc7 100644 --- a/source/shared/authenticate.yml +++ b/source/shared/authenticate.yml @@ -98,28 +98,44 @@ definitions: properties: os: type: string + maxLength: 255 arch: type: string + maxLength: 255 osRelease: type: string + maxLength: 255 osVersion: type: string + maxLength: 255 + domain: + type: string + maxLength: 253 + hostname: + type: string + maxLength: 253 type: object sdkInfo: description: SDK information an authenticating client may provide properties: type: type: string + maxLength: 255 branch: type: string + maxLength: 255 version: type: string + maxLength: 255 revision: type: string + maxLength: 255 appId: type: string + maxLength: 255 appVersion: type: string + maxLength: 255 type: object authenticate: type: object