diff --git a/client/devices/get_devices_id_statistics_responses.go b/client/devices/get_devices_id_statistics_responses.go index 920472b..8864412 100644 --- a/client/devices/get_devices_id_statistics_responses.go +++ b/client/devices/get_devices_id_statistics_responses.go @@ -60,7 +60,7 @@ func (o *GetDevicesIDStatisticsReader) ReadResponse(response runtime.ClientRespo } return nil, result default: - return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code()) + return nil, runtime.NewAPIError("[GET /devices/{id}/statistics] getDevicesIdStatistics", response, response.Code()) } } diff --git a/client/devices/get_devices_responses.go b/client/devices/get_devices_responses.go index 1c0ced8..906c84b 100644 --- a/client/devices/get_devices_responses.go +++ b/client/devices/get_devices_responses.go @@ -54,7 +54,7 @@ func (o *GetDevicesReader) ReadResponse(response runtime.ClientResponse, consume } return nil, result default: - return nil, runtime.NewAPIError("response status code does not match any response statuses defined for this endpoint in the swagger spec", response, response.Code()) + return nil, runtime.NewAPIError("[GET /devices] getDevices", response, response.Code()) } } diff --git a/go.mod b/go.mod index f0f4d70..1b04983 100644 --- a/go.mod +++ b/go.mod @@ -8,12 +8,12 @@ require ( github.com/go-openapi/strfmt v0.21.10 github.com/go-openapi/swag v0.22.6 github.com/go-openapi/validate v0.22.6 - github.com/go-swagger/go-swagger v0.30.4 + github.com/go-swagger/go-swagger v0.30.5 github.com/kelseyhightower/envconfig v1.4.0 github.com/prometheus/client_golang v1.17.0 github.com/sirupsen/logrus v1.9.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.15.0 + github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 ) diff --git a/go.sum b/go.sum index b858c40..7f79cac 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,8 @@ github.com/go-openapi/swag v0.22.6 h1:dnqg1XfHXL9aBxSbktBqFR5CxVyVI+7fYWhAf1JOeT github.com/go-openapi/swag v0.22.6/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0= 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/go-swagger/go-swagger v0.30.4 h1:cPrWLSXY6ZdcgfRicOj0lANg72TkTHz6uv/OlUdzO5U= -github.com/go-swagger/go-swagger v0.30.4/go.mod h1:YM5D5kR9c1ft3ynMXvDk2uo/7UZHKFEqKXcAL9f4Phc= +github.com/go-swagger/go-swagger v0.30.5 h1:SQ2+xSonWjjoEMOV5tcOnZJVlfyUfCBhGQGArS1b9+U= +github.com/go-swagger/go-swagger v0.30.5/go.mod h1:cWUhSyCNqV7J1wkkxfr5QmbcnCewetCdvEXqgPvbc/Q= github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l9rI6sNaZgNC0LnF3MiE+qTmyBA/tZAg1rtyrGbUMK0= github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -133,8 +133,8 @@ github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmq github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= diff --git a/models/device_firmware.go b/models/device_firmware.go index b4fb118..6cf288c 100644 --- a/models/device_firmware.go +++ b/models/device_firmware.go @@ -124,6 +124,11 @@ func (m *DeviceFirmware) ContextValidate(ctx context.Context, formats strfmt.Reg func (m *DeviceFirmware) contextValidateSemver(ctx context.Context, formats strfmt.Registry) error { if m.Semver != nil { + + if swag.IsZero(m.Semver) { // not required + return nil + } + if err := m.Semver.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("semver") diff --git a/models/device_identification.go b/models/device_identification.go index a34cf7b..6410006 100644 --- a/models/device_identification.go +++ b/models/device_identification.go @@ -403,6 +403,11 @@ func (m *DeviceIdentification) ContextValidate(ctx context.Context, formats strf func (m *DeviceIdentification) contextValidateSite(ctx context.Context, formats strfmt.Registry) error { if m.Site != nil { + + if swag.IsZero(m.Site) { // not required + return nil + } + if err := m.Site.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("site") diff --git a/models/device_interface_schema.go b/models/device_interface_schema.go index 98005b4..fcd1020 100644 --- a/models/device_interface_schema.go +++ b/models/device_interface_schema.go @@ -164,6 +164,7 @@ func (m *DeviceInterfaceSchema) ContextValidate(ctx context.Context, formats str func (m *DeviceInterfaceSchema) contextValidateIdentification(ctx context.Context, formats strfmt.Registry) error { if m.Identification != nil { + if err := m.Identification.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("identification") @@ -180,6 +181,11 @@ func (m *DeviceInterfaceSchema) contextValidateIdentification(ctx context.Contex func (m *DeviceInterfaceSchema) contextValidateStatistics(ctx context.Context, formats strfmt.Registry) error { if m.Statistics != nil { + + if swag.IsZero(m.Statistics) { // not required + return nil + } + if err := m.Statistics.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("statistics") @@ -196,6 +202,11 @@ func (m *DeviceInterfaceSchema) contextValidateStatistics(ctx context.Context, f func (m *DeviceInterfaceSchema) contextValidateStatus(ctx context.Context, formats strfmt.Registry) error { if m.Status != nil { + + if swag.IsZero(m.Status) { // not required + return nil + } + if err := m.Status.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("status") diff --git a/models/device_status_overview.go b/models/device_status_overview.go index 01bc6b5..eb12c23 100644 --- a/models/device_status_overview.go +++ b/models/device_status_overview.go @@ -299,6 +299,11 @@ func (m *DeviceStatusOverview) ContextValidate(ctx context.Context, formats strf func (m *DeviceStatusOverview) contextValidateFirmware(ctx context.Context, formats strfmt.Registry) error { if m.Firmware != nil { + + if swag.IsZero(m.Firmware) { // not required + return nil + } + if err := m.Firmware.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("firmware") @@ -315,6 +320,11 @@ func (m *DeviceStatusOverview) contextValidateFirmware(ctx context.Context, form func (m *DeviceStatusOverview) contextValidateIdentification(ctx context.Context, formats strfmt.Registry) error { if m.Identification != nil { + + if swag.IsZero(m.Identification) { // not required + return nil + } + if err := m.Identification.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("identification") @@ -333,6 +343,11 @@ func (m *DeviceStatusOverview) contextValidateInterfaces(ctx context.Context, fo for i := 0; i < len(m.Interfaces); i++ { if m.Interfaces[i] != nil { + + if swag.IsZero(m.Interfaces[i]) { // not required + return nil + } + if err := m.Interfaces[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("interfaces" + "." + strconv.Itoa(i)) @@ -351,6 +366,11 @@ func (m *DeviceStatusOverview) contextValidateInterfaces(ctx context.Context, fo func (m *DeviceStatusOverview) contextValidateLatestBackup(ctx context.Context, formats strfmt.Registry) error { if m.LatestBackup != nil { + + if swag.IsZero(m.LatestBackup) { // not required + return nil + } + if err := m.LatestBackup.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("latestBackup") @@ -367,6 +387,11 @@ func (m *DeviceStatusOverview) contextValidateLatestBackup(ctx context.Context, func (m *DeviceStatusOverview) contextValidateMeta(ctx context.Context, formats strfmt.Registry) error { if m.Meta != nil { + + if swag.IsZero(m.Meta) { // not required + return nil + } + if err := m.Meta.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("meta") @@ -383,6 +408,11 @@ func (m *DeviceStatusOverview) contextValidateMeta(ctx context.Context, formats func (m *DeviceStatusOverview) contextValidateOverview(ctx context.Context, formats strfmt.Registry) error { if m.Overview != nil { + + if swag.IsZero(m.Overview) { // not required + return nil + } + if err := m.Overview.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("overview") @@ -399,6 +429,11 @@ func (m *DeviceStatusOverview) contextValidateOverview(ctx context.Context, form func (m *DeviceStatusOverview) contextValidateUpgrade(ctx context.Context, formats strfmt.Registry) error { if m.Upgrade != nil { + + if swag.IsZero(m.Upgrade) { // not required + return nil + } + if err := m.Upgrade.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("upgrade") diff --git a/models/device_upgrade.go b/models/device_upgrade.go index fef7957..fcb218e 100644 --- a/models/device_upgrade.go +++ b/models/device_upgrade.go @@ -109,6 +109,7 @@ func (m *DeviceUpgrade) ContextValidate(ctx context.Context, formats strfmt.Regi func (m *DeviceUpgrade) contextValidateFirmware(ctx context.Context, formats strfmt.Registry) error { if m.Firmware != nil { + if err := m.Firmware.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("firmware") diff --git a/models/list_of_coordinates.go b/models/list_of_coordinates.go index bda39bb..fc6a7a9 100644 --- a/models/list_of_coordinates.go +++ b/models/list_of_coordinates.go @@ -54,6 +54,11 @@ func (m ListOfCoordinates) ContextValidate(ctx context.Context, formats strfmt.R for i := 0; i < len(m); i++ { if m[i] != nil { + + if swag.IsZero(m[i]) { // not required + return nil + } + if err := m[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName(strconv.Itoa(i)) diff --git a/models/semver.go b/models/semver.go index 0c2aa3f..346af9a 100644 --- a/models/semver.go +++ b/models/semver.go @@ -107,6 +107,7 @@ func (m *Semver) ContextValidate(ctx context.Context, formats strfmt.Registry) e func (m *Semver) contextValidateCurrent(ctx context.Context, formats strfmt.Registry) error { if m.Current != nil { + if err := m.Current.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("current") @@ -123,6 +124,7 @@ func (m *Semver) contextValidateCurrent(ctx context.Context, formats strfmt.Regi func (m *Semver) contextValidateLatest(ctx context.Context, formats strfmt.Registry) error { if m.Latest != nil { + if err := m.Latest.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("latest") diff --git a/models/site.go b/models/site.go index 20e4cc0..de1ad7f 100644 --- a/models/site.go +++ b/models/site.go @@ -205,6 +205,11 @@ func (m *Site) ContextValidate(ctx context.Context, formats strfmt.Registry) err func (m *Site) contextValidateParent(ctx context.Context, formats strfmt.Registry) error { if m.Parent != nil { + + if swag.IsZero(m.Parent) { // not required + return nil + } + if err := m.Parent.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("parent")