diff --git a/client.yml b/client.yml index 9bb9146f..6e18b91e 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.25.6 + version: 0.25.9 host: demo.ziti.dev basePath: /edge/client/v1 paths: diff --git a/go.mod b/go.mod index 127f1cfd..ef2d6e2b 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-openapi/loads v0.21.2 github.com/go-openapi/runtime v0.25.0 github.com/go-openapi/spec v0.20.8 - github.com/go-openapi/strfmt v0.21.5 + github.com/go-openapi/strfmt v0.21.7 github.com/go-openapi/swag v0.22.3 github.com/go-openapi/validate v0.22.1 github.com/jessevdk/go-flags v1.5.0 @@ -18,22 +18,21 @@ require ( ) require ( - github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/google/uuid v1.3.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.11.1 // indirect - go.opentelemetry.io/otel v1.11.2 // indirect - go.opentelemetry.io/otel/trace v1.11.2 // indirect + go.mongodb.org/mongo-driver v1.11.3 // indirect + go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/otel/trace v1.14.0 // indirect golang.org/x/sys v0.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index fdfed4f9..9030ccc0 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -45,8 +45,8 @@ github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6 github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= -github.com/go-openapi/strfmt v0.21.5 h1:Z/algjpXIZpbvdN+6KbVTkpO75RuedMrqpn1GN529h4= -github.com/go-openapi/strfmt v0.21.5/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= +github.com/go-openapi/strfmt v0.21.7 h1:rspiXgNWgeUzhjo1YU01do6qsahtJNByjLVbPLNHb8k= +github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= @@ -84,7 +84,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= @@ -147,8 +146,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -160,13 +159,13 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= -go.mongodb.org/mongo-driver v1.11.1 h1:QP0znIRTuL0jf1oBQoAoM0C6ZJfBK4kx0Uumtv1A7w8= -go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8= -go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= -go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= +go.mongodb.org/mongo-driver v1.11.3 h1:Ql6K6qYHEzB6xvu4+AU0BoRoqf9vFPcc4o7MUIdPW8Y= +go.mongodb.org/mongo-driver v1.11.3/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= +go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= +go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= -go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= -go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= +go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= +go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= diff --git a/management.yml b/management.yml index c1129940..7e9ad11a 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.25.7 + version: 0.25.9 host: demo.ziti.dev basePath: /edge/management/v1 paths: @@ -655,7 +655,7 @@ paths: post: security: [] description: | - Allowed authentication methods include "password", "cert", and "ext-jwt" + Allows authentication Methods include "password" and "cert" tags: - Authentication summary: Authenticate via a method supplied via a query string parameter diff --git a/rest_client_api_server/doc.go b/rest_client_api_server/doc.go index 32847ede..7b31db83 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.25.6 +// Version: 0.25.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 b51041c5..546df9e2 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.25.6" + "version": "0.25.9" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", @@ -5988,7 +5988,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.25.6" + "version": "0.25.9" }, "host": "demo.ziti.dev", "basePath": "/edge/client/v1", diff --git a/rest_management_api_server/doc.go b/rest_management_api_server/doc.go index c6ca7dc7..9150a2b8 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.25.6 +// Version: 0.25.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 9320ce15..585606d9 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.25.6" + "version": "0.25.9" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", @@ -23288,7 +23288,7 @@ func init() { "name": "Apache 2.0", "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version": "0.25.6" + "version": "0.25.9" }, "host": "demo.ziti.dev", "basePath": "/edge/management/v1", diff --git a/rest_model/dial_bind.go b/rest_model/dial_bind.go index a43bc710..a85232bd 100644 --- a/rest_model/dial_bind.go +++ b/rest_model/dial_bind.go @@ -44,8 +44,12 @@ import ( type DialBind string func NewDialBind(value DialBind) *DialBind { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated DialBind. +func (m DialBind) Pointer() *DialBind { + return &m } const ( diff --git a/rest_model/identity_type.go b/rest_model/identity_type.go index e24bc28a..345bb2b6 100644 --- a/rest_model/identity_type.go +++ b/rest_model/identity_type.go @@ -44,8 +44,12 @@ import ( type IdentityType string func NewIdentityType(value IdentityType) *IdentityType { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated IdentityType. +func (m IdentityType) Pointer() *IdentityType { + return &m } const ( diff --git a/rest_model/links.go b/rest_model/links.go index e6a7bb18..a8cf8110 100644 --- a/rest_model/links.go +++ b/rest_model/links.go @@ -53,6 +53,11 @@ func (m Links) Validate(formats strfmt.Registry) error { } if val, ok := m[k]; ok { if err := val.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName(k) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName(k) + } return err } } diff --git a/rest_model/list_protocols.go b/rest_model/list_protocols.go index a87be8f9..e1dc3a25 100644 --- a/rest_model/list_protocols.go +++ b/rest_model/list_protocols.go @@ -53,6 +53,11 @@ func (m ListProtocols) Validate(formats strfmt.Registry) error { } if val, ok := m[k]; ok { if err := val.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName(k) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName(k) + } return err } } diff --git a/rest_model/mfa_formats.go b/rest_model/mfa_formats.go index b5c3be7d..e83310b5 100644 --- a/rest_model/mfa_formats.go +++ b/rest_model/mfa_formats.go @@ -44,8 +44,12 @@ import ( type MfaFormats string func NewMfaFormats(value MfaFormats) *MfaFormats { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated MfaFormats. +func (m MfaFormats) Pointer() *MfaFormats { + return &m } const ( diff --git a/rest_model/mfa_providers.go b/rest_model/mfa_providers.go index 3db9d81e..3a4f4b99 100644 --- a/rest_model/mfa_providers.go +++ b/rest_model/mfa_providers.go @@ -44,8 +44,12 @@ import ( type MfaProviders string func NewMfaProviders(value MfaProviders) *MfaProviders { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated MfaProviders. +func (m MfaProviders) Pointer() *MfaProviders { + return &m } const ( diff --git a/rest_model/os_type.go b/rest_model/os_type.go index 31928cb1..cbb05fd9 100644 --- a/rest_model/os_type.go +++ b/rest_model/os_type.go @@ -44,8 +44,12 @@ import ( type OsType string func NewOsType(value OsType) *OsType { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated OsType. +func (m OsType) Pointer() *OsType { + return &m } const ( diff --git a/rest_model/posture_check_type.go b/rest_model/posture_check_type.go index f219a3ea..6b7e8491 100644 --- a/rest_model/posture_check_type.go +++ b/rest_model/posture_check_type.go @@ -44,8 +44,12 @@ import ( type PostureCheckType string func NewPostureCheckType(value PostureCheckType) *PostureCheckType { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated PostureCheckType. +func (m PostureCheckType) Pointer() *PostureCheckType { + return &m } const ( diff --git a/rest_model/posture_data.go b/rest_model/posture_data.go index 15a2d299..58fb8e7e 100644 --- a/rest_model/posture_data.go +++ b/rest_model/posture_data.go @@ -108,6 +108,11 @@ func (m *PostureData) validateAPISessionPostureData(formats strfmt.Registry) err } if val, ok := m.APISessionPostureData[k]; ok { if err := val.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("apiSessionPostureData" + "." + k) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("apiSessionPostureData" + "." + k) + } return err } } diff --git a/rest_model/semantic.go b/rest_model/semantic.go index 7720469e..9cd608f5 100644 --- a/rest_model/semantic.go +++ b/rest_model/semantic.go @@ -44,8 +44,12 @@ import ( type Semantic string func NewSemantic(value Semantic) *Semantic { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated Semantic. +func (m Semantic) Pointer() *Semantic { + return &m } const ( diff --git a/rest_model/terminator_cost_map.go b/rest_model/terminator_cost_map.go index 9a8c43d4..adc6f023 100644 --- a/rest_model/terminator_cost_map.go +++ b/rest_model/terminator_cost_map.go @@ -53,6 +53,11 @@ func (m TerminatorCostMap) Validate(formats strfmt.Registry) error { } if val, ok := m[k]; ok { if err := val.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName(k) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName(k) + } return err } } diff --git a/rest_model/terminator_precedence.go b/rest_model/terminator_precedence.go index eee6defd..0159ecfe 100644 --- a/rest_model/terminator_precedence.go +++ b/rest_model/terminator_precedence.go @@ -44,8 +44,12 @@ import ( type TerminatorPrecedence string func NewTerminatorPrecedence(value TerminatorPrecedence) *TerminatorPrecedence { - v := value - return &v + return &value +} + +// Pointer returns a pointer to a freshly-allocated TerminatorPrecedence. +func (m TerminatorPrecedence) Pointer() *TerminatorPrecedence { + return &m } const ( diff --git a/rest_model/terminator_precedence_map.go b/rest_model/terminator_precedence_map.go index 88bc7474..b782c9f9 100644 --- a/rest_model/terminator_precedence_map.go +++ b/rest_model/terminator_precedence_map.go @@ -49,6 +49,11 @@ func (m TerminatorPrecedenceMap) Validate(formats strfmt.Registry) error { if val, ok := m[k]; ok { if err := val.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName(k) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName(k) + } return err } } diff --git a/rest_model/version.go b/rest_model/version.go index 7a444407..79985ccf 100644 --- a/rest_model/version.go +++ b/rest_model/version.go @@ -91,6 +91,11 @@ func (m *Version) validateAPIVersions(formats strfmt.Registry) error { } if val, ok := m.APIVersions[k][kk]; ok { if err := val.Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("apiVersions" + "." + k + "." + kk) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("apiVersions" + "." + k + "." + kk) + } return err } } diff --git a/source/client.yml b/source/client.yml index f4f273ff..a8f92b33 100644 --- a/source/client.yml +++ b/source/client.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.25.6 + version: 0.25.9 title: Ziti Edge Client description: OpenZiti Edge Client API contact: diff --git a/source/management.yml b/source/management.yml index e8aa9d93..249a3036 100644 --- a/source/management.yml +++ b/source/management.yml @@ -1,7 +1,7 @@ --- swagger: '2.0' info: - version: 0.25.6 + version: 0.25.9 title: Ziti Edge Management description: OpenZiti Edge Management API contact: