diff --git a/Makefile b/Makefile index c966cc84..6fe51654 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PROJECT_PATH=${PWD} DOCKER_HAPROXY_VERSION?=3.2 -SWAGGER_VERSION=v0.31.0 +SWAGGER_VERSION=v0.30.2 GO_VERSION:=${shell go mod edit -json | jq -r .Go} GOLANGCI_LINT_VERSION=1.64.5 CHECK_COMMIT=5.2.0 diff --git a/models/acl_files.go b/models/acl_files.go index ce8cca49..e31edb5b 100644 --- a/models/acl_files.go +++ b/models/acl_files.go @@ -71,11 +71,6 @@ func (m ACLFiles) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/acl_files_entries.go b/models/acl_files_entries.go index 233cb0e8..5a1a3263 100644 --- a/models/acl_files_entries.go +++ b/models/acl_files_entries.go @@ -71,11 +71,6 @@ func (m ACLFilesEntries) ContextValidate(ctx context.Context, formats strfmt.Reg 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/acls.go b/models/acls.go index b5d1e122..c2449673 100644 --- a/models/acls.go +++ b/models/acls.go @@ -71,11 +71,6 @@ func (m Acls) ContextValidate(ctx context.Context, formats strfmt.Registry) erro 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/acme_provider.go b/models/acme_provider.go index 402c8ce6..62bc3a90 100644 --- a/models/acme_provider.go +++ b/models/acme_provider.go @@ -46,8 +46,8 @@ type AcmeProvider struct { Bits *int64 `json:"bits,omitempty"` // ACME challenge type. Only http-01 and dns-01 are supported. - // Enum: ["http-01","dns-01"] - // +kubebuilder:validation:Enum=http-01;dns-01; + // Enum: [http-01 dns-01] + // +kubebuilder:validation:Enum=http-01 dns-01; Challenge string `json:"challenge,omitempty"` // Contact email for the ACME account @@ -65,8 +65,8 @@ type AcmeProvider struct { Directory string `json:"directory"` // Type of key to generate - // Enum: ["RSA","ECDSA"] - // +kubebuilder:validation:Enum=RSA;ECDSA; + // Enum: [RSA ECDSA] + // +kubebuilder:validation:Enum=RSA ECDSA; Keytype string `json:"keytype,omitempty"` // The map which will be used to store the ACME token (key) and thumbprint diff --git a/models/acme_providers.go b/models/acme_providers.go index adc658d1..532c74ad 100644 --- a/models/acme_providers.go +++ b/models/acme_providers.go @@ -69,11 +69,6 @@ func (m AcmeProviders) ContextValidate(ctx context.Context, formats strfmt.Regis 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/acme_status.go b/models/acme_status.go index 01f74eb0..64d85912 100644 --- a/models/acme_status.go +++ b/models/acme_status.go @@ -71,11 +71,6 @@ func (m AcmeStatus) ContextValidate(ctx context.Context, formats strfmt.Registry 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/aws_region.go b/models/aws_region.go index 7597cf8b..7459481e 100644 --- a/models/aws_region.go +++ b/models/aws_region.go @@ -63,8 +63,8 @@ type AwsRegion struct { // Select which IPv4 address the Service Discovery has to use for the backend server entry // Required: true - // Enum: ["private","public"] - // +kubebuilder:validation:Enum=private;public; + // Enum: [private public] + // +kubebuilder:validation:Enum=private public; IPV4Address *string `json:"ipv4_address"` // name @@ -91,8 +91,8 @@ type AwsRegion struct { ServerSlotsGrowthIncrement int64 `json:"server_slots_growth_increment,omitempty"` // server slots growth type - // Enum: ["linear","exponential"] - // +kubebuilder:validation:Enum=linear;exponential; + // Enum: [linear exponential] + // +kubebuilder:validation:Enum=linear exponential; ServerSlotsGrowthType *string `json:"server_slots_growth_type,omitempty"` } @@ -358,11 +358,6 @@ func (m *AwsRegion) contextValidateAllowlist(ctx context.Context, formats strfmt for i := 0; i < len(m.Allowlist); i++ { if m.Allowlist[i] != nil { - - if swag.IsZero(m.Allowlist[i]) { // not required - return nil - } - if err := m.Allowlist[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("allowlist" + "." + strconv.Itoa(i)) @@ -383,11 +378,6 @@ func (m *AwsRegion) contextValidateDenylist(ctx context.Context, formats strfmt. for i := 0; i < len(m.Denylist); i++ { if m.Denylist[i] != nil { - - if swag.IsZero(m.Denylist[i]) { // not required - return nil - } - if err := m.Denylist[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("denylist" + "." + strconv.Itoa(i)) diff --git a/models/aws_regions.go b/models/aws_regions.go index 490a2244..bf1df8b3 100644 --- a/models/aws_regions.go +++ b/models/aws_regions.go @@ -71,11 +71,6 @@ func (m AwsRegions) ContextValidate(ctx context.Context, formats strfmt.Registry 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/backend_base.go b/models/backend_base.go index b6472351..babce8a6 100644 --- a/models/backend_base.go +++ b/models/backend_base.go @@ -52,28 +52,28 @@ type BackendBase struct { IgnorePersistList []*IgnorePersist `json:"ignore_persist_list,omitempty"` // abortonclose - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Abortonclose string `json:"abortonclose,omitempty"` // accept invalid http response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptInvalidHTTPResponse string `json:"accept_invalid_http_response,omitempty"` // accept unsafe violations in http response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptUnsafeViolationsInHTTPResponse string `json:"accept_unsafe_violations_in_http_response,omitempty"` // adv check - // Enum: ["httpchk","ldap-check","mysql-check","pgsql-check","redis-check","smtpchk","ssl-hello-chk","tcp-check"] - // +kubebuilder:validation:Enum=httpchk;ldap-check;mysql-check;pgsql-check;redis-check;smtpchk;ssl-hello-chk;tcp-check; + // Enum: [httpchk ldap-check mysql-check pgsql-check redis-check smtpchk ssl-hello-chk tcp-check] + // +kubebuilder:validation:Enum=httpchk ldap-check mysql-check pgsql-check redis-check smtpchk ssl-hello-chk tcp-check; AdvCheck string `json:"adv_check,omitempty"` // allbackups - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Allbackups string `json:"allbackups,omitempty"` // balance @@ -83,8 +83,8 @@ type BackendBase struct { CheckTimeout *int64 `json:"check_timeout,omitempty"` // checkcache - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Checkcache string `json:"checkcache,omitempty"` // compression @@ -125,8 +125,8 @@ type BackendBase struct { Errorloc303 *Errorloc `json:"errorloc303,omitempty"` // external check - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ExternalCheck string `json:"external_check,omitempty"` // external check command @@ -159,46 +159,46 @@ type BackendBase struct { GUID string `json:"guid,omitempty"` // h1 case adjust bogus server - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; H1CaseAdjustBogusServer string `json:"h1_case_adjust_bogus_server,omitempty"` // hash balance factor HashBalanceFactor *int64 `json:"hash_balance_factor,omitempty"` // hash preserve affinity - // Enum: ["always","maxconn","maxqueue"] - // +kubebuilder:validation:Enum=always;maxconn;maxqueue; + // Enum: [always maxconn maxqueue] + // +kubebuilder:validation:Enum=always maxconn maxqueue; HashPreserveAffinity string `json:"hash_preserve_affinity,omitempty"` // hash type HashType *HashType `json:"hash_type,omitempty"` // http buffer request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPBufferRequest string `json:"http-buffer-request,omitempty"` // http drop request trailers - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPDropRequestTrailers string `json:"http-drop-request-trailers,omitempty"` // http no delay - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPNoDelay string `json:"http-no-delay,omitempty"` // http use htx // Pattern: ^[^\s]+$ - // Enum: ["enabled","disabled"] + // Enum: [enabled disabled] // +kubebuilder:validation:Pattern=`^[^\s]+$` - // +kubebuilder:validation:Enum=enabled;disabled; + // +kubebuilder:validation:Enum=enabled disabled; HTTPUseHtx string `json:"http-use-htx,omitempty"` // http connection mode - // Enum: ["httpclose","http-server-close","http-keep-alive"] - // +kubebuilder:validation:Enum=httpclose;http-server-close;http-keep-alive; + // Enum: [httpclose http-server-close http-keep-alive] + // +kubebuilder:validation:Enum=httpclose http-server-close http-keep-alive; HTTPConnectionMode string `json:"http_connection_mode,omitempty"` // http keep alive timeout @@ -207,13 +207,13 @@ type BackendBase struct { HTTPKeepAliveTimeout *int64 `json:"http_keep_alive_timeout,omitempty"` // http pretend keepalive - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPPretendKeepalive string `json:"http_pretend_keepalive,omitempty"` // http proxy - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPProxy string `json:"http_proxy,omitempty"` // http request timeout @@ -222,13 +222,13 @@ type BackendBase struct { HTTPRequestTimeout *int64 `json:"http_request_timeout,omitempty"` // http restrict req hdr names - // Enum: ["preserve","delete","reject"] - // +kubebuilder:validation:Enum=preserve;delete;reject; + // Enum: [preserve delete reject] + // +kubebuilder:validation:Enum=preserve delete reject; HTTPRestrictReqHdrNames string `json:"http_restrict_req_hdr_names,omitempty"` // http reuse - // Enum: ["aggressive","always","never","safe"] - // +kubebuilder:validation:Enum=aggressive;always;never;safe; + // Enum: [aggressive always never safe] + // +kubebuilder:validation:Enum=aggressive always never safe; HTTPReuse string `json:"http_reuse,omitempty"` // http send name header @@ -244,18 +244,18 @@ type BackendBase struct { IgnorePersist *BackendIgnorePersist `json:"ignore_persist,omitempty"` // independent streams - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; IndependentStreams string `json:"independent_streams,omitempty"` // load server state from file - // Enum: ["global","local","none"] - // +kubebuilder:validation:Enum=global;local;none; + // Enum: [global local none] + // +kubebuilder:validation:Enum=global local none; LoadServerStateFromFile string `json:"load_server_state_from_file,omitempty"` // log health checks - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; LogHealthChecks string `json:"log_health_checks,omitempty"` // log tag @@ -271,8 +271,8 @@ type BackendBase struct { Metadata map[string]interface{} `json:"metadata,omitempty"` // mode - // Enum: ["http","tcp","log"] - // +kubebuilder:validation:Enum=http;tcp;log; + // Enum: [http tcp log] + // +kubebuilder:validation:Enum=http tcp log; Mode string `json:"mode,omitempty"` // mysql check params @@ -285,16 +285,16 @@ type BackendBase struct { Name string `json:"name"` // nolinger - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Nolinger string `json:"nolinger,omitempty"` // originalto Originalto *Originalto `json:"originalto,omitempty"` // persist - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Persist string `json:"persist,omitempty"` // persist rule @@ -304,8 +304,8 @@ type BackendBase struct { PgsqlCheckParams *PgsqlCheckParams `json:"pgsql_check_params,omitempty"` // prefer last server - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; PreferLastServer string `json:"prefer_last_server,omitempty"` // queue timeout @@ -342,28 +342,28 @@ type BackendBase struct { Source *Source `json:"source,omitempty"` // splice auto - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceAuto string `json:"splice_auto,omitempty"` // splice request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceRequest string `json:"splice_request,omitempty"` // splice response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceResponse string `json:"splice_response,omitempty"` // spop check - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpopCheck string `json:"spop_check,omitempty"` // srvtcpka - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Srvtcpka string `json:"srvtcpka,omitempty"` // srvtcpka cnt @@ -387,18 +387,18 @@ type BackendBase struct { TarpitTimeout *int64 `json:"tarpit_timeout,omitempty"` // tcp smart connect - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TCPSmartConnect string `json:"tcp_smart_connect,omitempty"` // tcpka - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tcpka string `json:"tcpka,omitempty"` // transparent - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Transparent string `json:"transparent,omitempty"` // tunnel timeout @@ -2940,11 +2940,6 @@ func (m *BackendBase) contextValidateErrorFiles(ctx context.Context, formats str for i := 0; i < len(m.ErrorFiles); i++ { if m.ErrorFiles[i] != nil { - - if swag.IsZero(m.ErrorFiles[i]) { // not required - return nil - } - if err := m.ErrorFiles[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("error_files" + "." + strconv.Itoa(i)) @@ -2965,11 +2960,6 @@ func (m *BackendBase) contextValidateErrorFilesFromHTTPErrors(ctx context.Contex for i := 0; i < len(m.ErrorFilesFromHTTPErrors); i++ { if m.ErrorFilesFromHTTPErrors[i] != nil { - - if swag.IsZero(m.ErrorFilesFromHTTPErrors[i]) { // not required - return nil - } - if err := m.ErrorFilesFromHTTPErrors[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorfiles_from_http_errors" + "." + strconv.Itoa(i)) @@ -2990,11 +2980,6 @@ func (m *BackendBase) contextValidateForcePersistList(ctx context.Context, forma for i := 0; i < len(m.ForcePersistList); i++ { if m.ForcePersistList[i] != nil { - - if swag.IsZero(m.ForcePersistList[i]) { // not required - return nil - } - if err := m.ForcePersistList[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("force_persist_list" + "." + strconv.Itoa(i)) @@ -3015,11 +3000,6 @@ func (m *BackendBase) contextValidateIgnorePersistList(ctx context.Context, form for i := 0; i < len(m.IgnorePersistList); i++ { if m.IgnorePersistList[i] != nil { - - if swag.IsZero(m.IgnorePersistList[i]) { // not required - return nil - } - if err := m.IgnorePersistList[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("ignore_persist_list" + "." + strconv.Itoa(i)) @@ -3038,11 +3018,6 @@ func (m *BackendBase) contextValidateIgnorePersistList(ctx context.Context, form func (m *BackendBase) contextValidateBalance(ctx context.Context, formats strfmt.Registry) error { if m.Balance != nil { - - if swag.IsZero(m.Balance) { // not required - return nil - } - if err := m.Balance.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("balance") @@ -3059,11 +3034,6 @@ func (m *BackendBase) contextValidateBalance(ctx context.Context, formats strfmt func (m *BackendBase) contextValidateCompression(ctx context.Context, formats strfmt.Registry) error { if m.Compression != nil { - - if swag.IsZero(m.Compression) { // not required - return nil - } - if err := m.Compression.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("compression") @@ -3080,11 +3050,6 @@ func (m *BackendBase) contextValidateCompression(ctx context.Context, formats st func (m *BackendBase) contextValidateCookie(ctx context.Context, formats strfmt.Registry) error { if m.Cookie != nil { - - if swag.IsZero(m.Cookie) { // not required - return nil - } - if err := m.Cookie.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("cookie") @@ -3101,11 +3066,6 @@ func (m *BackendBase) contextValidateCookie(ctx context.Context, formats strfmt. func (m *BackendBase) contextValidateDefaultServer(ctx context.Context, formats strfmt.Registry) error { if m.DefaultServer != nil { - - if swag.IsZero(m.DefaultServer) { // not required - return nil - } - if err := m.DefaultServer.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("default_server") @@ -3122,11 +3082,6 @@ func (m *BackendBase) contextValidateDefaultServer(ctx context.Context, formats func (m *BackendBase) contextValidateEmailAlert(ctx context.Context, formats strfmt.Registry) error { if m.EmailAlert != nil { - - if swag.IsZero(m.EmailAlert) { // not required - return nil - } - if err := m.EmailAlert.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("email_alert") @@ -3143,11 +3098,6 @@ func (m *BackendBase) contextValidateEmailAlert(ctx context.Context, formats str func (m *BackendBase) contextValidateErrorloc302(ctx context.Context, formats strfmt.Registry) error { if m.Errorloc302 != nil { - - if swag.IsZero(m.Errorloc302) { // not required - return nil - } - if err := m.Errorloc302.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorloc302") @@ -3164,11 +3114,6 @@ func (m *BackendBase) contextValidateErrorloc302(ctx context.Context, formats st func (m *BackendBase) contextValidateErrorloc303(ctx context.Context, formats strfmt.Registry) error { if m.Errorloc303 != nil { - - if swag.IsZero(m.Errorloc303) { // not required - return nil - } - if err := m.Errorloc303.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorloc303") @@ -3185,11 +3130,6 @@ func (m *BackendBase) contextValidateErrorloc303(ctx context.Context, formats st func (m *BackendBase) contextValidateForcePersist(ctx context.Context, formats strfmt.Registry) error { if m.ForcePersist != nil { - - if swag.IsZero(m.ForcePersist) { // not required - return nil - } - if err := m.ForcePersist.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("force_persist") @@ -3206,11 +3146,6 @@ func (m *BackendBase) contextValidateForcePersist(ctx context.Context, formats s func (m *BackendBase) contextValidateForwardfor(ctx context.Context, formats strfmt.Registry) error { if m.Forwardfor != nil { - - if swag.IsZero(m.Forwardfor) { // not required - return nil - } - if err := m.Forwardfor.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("forwardfor") @@ -3227,11 +3162,6 @@ func (m *BackendBase) contextValidateForwardfor(ctx context.Context, formats str func (m *BackendBase) contextValidateHashType(ctx context.Context, formats strfmt.Registry) error { if m.HashType != nil { - - if swag.IsZero(m.HashType) { // not required - return nil - } - if err := m.HashType.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("hash_type") @@ -3248,11 +3178,6 @@ func (m *BackendBase) contextValidateHashType(ctx context.Context, formats strfm func (m *BackendBase) contextValidateHttpchkParams(ctx context.Context, formats strfmt.Registry) error { if m.HttpchkParams != nil { - - if swag.IsZero(m.HttpchkParams) { // not required - return nil - } - if err := m.HttpchkParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("httpchk_params") @@ -3269,11 +3194,6 @@ func (m *BackendBase) contextValidateHttpchkParams(ctx context.Context, formats func (m *BackendBase) contextValidateIgnorePersist(ctx context.Context, formats strfmt.Registry) error { if m.IgnorePersist != nil { - - if swag.IsZero(m.IgnorePersist) { // not required - return nil - } - if err := m.IgnorePersist.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("ignore_persist") @@ -3290,11 +3210,6 @@ func (m *BackendBase) contextValidateIgnorePersist(ctx context.Context, formats func (m *BackendBase) contextValidateMysqlCheckParams(ctx context.Context, formats strfmt.Registry) error { if m.MysqlCheckParams != nil { - - if swag.IsZero(m.MysqlCheckParams) { // not required - return nil - } - if err := m.MysqlCheckParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("mysql_check_params") @@ -3311,11 +3226,6 @@ func (m *BackendBase) contextValidateMysqlCheckParams(ctx context.Context, forma func (m *BackendBase) contextValidateOriginalto(ctx context.Context, formats strfmt.Registry) error { if m.Originalto != nil { - - if swag.IsZero(m.Originalto) { // not required - return nil - } - if err := m.Originalto.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("originalto") @@ -3332,11 +3242,6 @@ func (m *BackendBase) contextValidateOriginalto(ctx context.Context, formats str func (m *BackendBase) contextValidatePersistRule(ctx context.Context, formats strfmt.Registry) error { if m.PersistRule != nil { - - if swag.IsZero(m.PersistRule) { // not required - return nil - } - if err := m.PersistRule.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("persist_rule") @@ -3353,11 +3258,6 @@ func (m *BackendBase) contextValidatePersistRule(ctx context.Context, formats st func (m *BackendBase) contextValidatePgsqlCheckParams(ctx context.Context, formats strfmt.Registry) error { if m.PgsqlCheckParams != nil { - - if swag.IsZero(m.PgsqlCheckParams) { // not required - return nil - } - if err := m.PgsqlCheckParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("pgsql_check_params") @@ -3374,11 +3274,6 @@ func (m *BackendBase) contextValidatePgsqlCheckParams(ctx context.Context, forma func (m *BackendBase) contextValidateRedispatch(ctx context.Context, formats strfmt.Registry) error { if m.Redispatch != nil { - - if swag.IsZero(m.Redispatch) { // not required - return nil - } - if err := m.Redispatch.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("redispatch") @@ -3395,11 +3290,6 @@ func (m *BackendBase) contextValidateRedispatch(ctx context.Context, formats str func (m *BackendBase) contextValidateSmtpchkParams(ctx context.Context, formats strfmt.Registry) error { if m.SmtpchkParams != nil { - - if swag.IsZero(m.SmtpchkParams) { // not required - return nil - } - if err := m.SmtpchkParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("smtpchk_params") @@ -3416,11 +3306,6 @@ func (m *BackendBase) contextValidateSmtpchkParams(ctx context.Context, formats func (m *BackendBase) contextValidateSource(ctx context.Context, formats strfmt.Registry) error { if m.Source != nil { - - if swag.IsZero(m.Source) { // not required - return nil - } - if err := m.Source.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("source") @@ -3437,11 +3322,6 @@ func (m *BackendBase) contextValidateSource(ctx context.Context, formats strfmt. func (m *BackendBase) contextValidateStatsOptions(ctx context.Context, formats strfmt.Registry) error { if m.StatsOptions != nil { - - if swag.IsZero(m.StatsOptions) { // not required - return nil - } - if err := m.StatsOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stats_options") @@ -3458,11 +3338,6 @@ func (m *BackendBase) contextValidateStatsOptions(ctx context.Context, formats s func (m *BackendBase) contextValidateStickTable(ctx context.Context, formats strfmt.Registry) error { if m.StickTable != nil { - - if swag.IsZero(m.StickTable) { // not required - return nil - } - if err := m.StickTable.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stick_table") @@ -3500,8 +3375,8 @@ func (m *BackendBase) UnmarshalBinary(b []byte) error { type BackendForcePersist struct { // cond // Required: true - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond *string `json:"cond"` // cond test @@ -3608,8 +3483,8 @@ func (m *BackendForcePersist) UnmarshalBinary(b []byte) error { type ForcePersist struct { // cond // Required: true - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond *string `json:"cond"` // cond test @@ -3716,8 +3591,8 @@ func (m *ForcePersist) UnmarshalBinary(b []byte) error { type BackendIgnorePersist struct { // cond // Required: true - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond *string `json:"cond"` // cond test @@ -3824,8 +3699,8 @@ func (m *BackendIgnorePersist) UnmarshalBinary(b []byte) error { type IgnorePersist struct { // cond // Required: true - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond *string `json:"cond"` // cond test diff --git a/models/backend_switching_rule.go b/models/backend_switching_rule.go index 301f7ded..ccb6df52 100644 --- a/models/backend_switching_rule.go +++ b/models/backend_switching_rule.go @@ -38,8 +38,8 @@ import ( // swagger:model backend_switching_rule type BackendSwitchingRule struct { // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test diff --git a/models/backend_switching_rules.go b/models/backend_switching_rules.go index f42c59be..d9d7e832 100644 --- a/models/backend_switching_rules.go +++ b/models/backend_switching_rules.go @@ -71,11 +71,6 @@ func (m BackendSwitchingRules) ContextValidate(ctx context.Context, formats strf 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/backends.go b/models/backends.go index 8c530270..2a5677d8 100644 --- a/models/backends.go +++ b/models/backends.go @@ -71,11 +71,6 @@ func (m Backends) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/balance.go b/models/balance.go index 4387bb4c..ea7be7ce 100644 --- a/models/balance.go +++ b/models/balance.go @@ -36,8 +36,8 @@ import ( type Balance struct { // algorithm // Required: true - // Enum: ["first","hash","hdr","leastconn","random","rdp-cookie","roundrobin","source","static-rr","uri","url_param"] - // +kubebuilder:validation:Enum=first;hash;hdr;leastconn;random;rdp-cookie;roundrobin;source;static-rr;uri;url_param; + // Enum: [first hash hdr leastconn random rdp-cookie roundrobin source static-rr uri url_param] + // +kubebuilder:validation:Enum=first hash hdr leastconn random rdp-cookie roundrobin source static-rr uri url_param; Algorithm *string `json:"algorithm"` // hash expression diff --git a/models/bind_params.go b/models/bind_params.go index fa78ae84..671e323f 100644 --- a/models/bind_params.go +++ b/models/bind_params.go @@ -102,8 +102,8 @@ type BindParams struct { ForceSslv3 bool `json:"force_sslv3,omitempty"` // force strict sni - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceStrictSni string `json:"force_strict_sni,omitempty"` // This field is deprecated in favor of tlsv10, and will be removed in a future release @@ -148,8 +148,8 @@ type BindParams struct { // level // Example: user - // Enum: ["user","operator","admin"] - // +kubebuilder:validation:Enum=user;operator;admin; + // Enum: [user operator admin] + // +kubebuilder:validation:Enum=user operator admin; Level string `json:"level,omitempty"` // maxconn @@ -215,16 +215,16 @@ type BindParams struct { Proto string `json:"proto,omitempty"` // quic cc algo - // Enum: ["cubic","newreno","bbr","nocc"] - // +kubebuilder:validation:Enum=cubic;newreno;bbr;nocc; + // Enum: [cubic newreno bbr nocc] + // +kubebuilder:validation:Enum=cubic newreno bbr nocc; QuicCcAlgo string `json:"quic-cc-algo,omitempty"` // quic force retry QuicForceRetry bool `json:"quic-force-retry,omitempty"` // quic socket - // Enum: ["connection","listener"] - // +kubebuilder:validation:Enum=connection;listener; + // Enum: [connection listener] + // +kubebuilder:validation:Enum=connection listener; QuicSocket string `json:"quic-socket,omitempty"` // quic cc algo burst size @@ -243,8 +243,8 @@ type BindParams struct { // severity output // Example: none - // Enum: ["none","number","string"] - // +kubebuilder:validation:Enum=none;number;string; + // Enum: [none number string] + // +kubebuilder:validation:Enum=none number string; SeverityOutput string `json:"severity_output,omitempty"` // sigalgs @@ -264,18 +264,18 @@ type BindParams struct { SslCertificate string `json:"ssl_certificate,omitempty"` // ssl max ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMaxVer string `json:"ssl_max_ver,omitempty"` // ssl min ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMinVer string `json:"ssl_min_ver,omitempty"` // sslv3 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Sslv3 string `json:"sslv3,omitempty"` // strict sni @@ -294,28 +294,28 @@ type BindParams struct { TLSTicketKeys string `json:"tls_ticket_keys,omitempty"` // tls tickets - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TLSTickets string `json:"tls_tickets,omitempty"` // tlsv10 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv10 string `json:"tlsv10,omitempty"` // tlsv11 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv11 string `json:"tlsv11,omitempty"` // tlsv12 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv12 string `json:"tlsv12,omitempty"` // tlsv13 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv13 string `json:"tlsv13,omitempty"` // transparent @@ -335,8 +335,8 @@ type BindParams struct { // verify // Example: none - // Enum: ["none","optional","required"] - // +kubebuilder:validation:Enum=none;optional;required; + // Enum: [none optional required] + // +kubebuilder:validation:Enum=none optional required; Verify string `json:"verify,omitempty"` } diff --git a/models/binds.go b/models/binds.go index ebf923aa..f063d8a5 100644 --- a/models/binds.go +++ b/models/binds.go @@ -71,11 +71,6 @@ func (m Binds) ContextValidate(ctx context.Context, formats strfmt.Registry) err 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/caches.go b/models/caches.go index aaa8aec6..b8f4051d 100644 --- a/models/caches.go +++ b/models/caches.go @@ -71,11 +71,6 @@ func (m Caches) ContextValidate(ctx context.Context, formats strfmt.Registry) er 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/capture.go b/models/capture.go index a918229c..7bb8d76c 100644 --- a/models/capture.go +++ b/models/capture.go @@ -45,8 +45,8 @@ type Capture struct { // type // Required: true - // Enum: ["request","response"] - // +kubebuilder:validation:Enum=request;response; + // Enum: [request response] + // +kubebuilder:validation:Enum=request response; Type string `json:"type"` } diff --git a/models/captures.go b/models/captures.go index 0fe12741..78c70589 100644 --- a/models/captures.go +++ b/models/captures.go @@ -69,11 +69,6 @@ func (m Captures) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/cluster_settings.go b/models/cluster_settings.go index c5e7b896..e5a852e0 100644 --- a/models/cluster_settings.go +++ b/models/cluster_settings.go @@ -45,14 +45,14 @@ type ClusterSettings struct { Cluster *ClusterSettingsCluster `json:"cluster,omitempty"` // mode - // Enum: ["single","cluster"] - // +kubebuilder:validation:Enum=single;cluster; + // Enum: [single cluster] + // +kubebuilder:validation:Enum=single cluster; Mode string `json:"mode,omitempty"` // status // Read Only: true - // Enum: ["active","unreachable","waiting_approval"] - // +kubebuilder:validation:Enum=active;unreachable;waiting_approval; + // Enum: [active unreachable waiting_approval] + // +kubebuilder:validation:Enum=active unreachable waiting_approval; Status string `json:"status,omitempty"` } @@ -205,11 +205,6 @@ func (m *ClusterSettings) ContextValidate(ctx context.Context, formats strfmt.Re func (m *ClusterSettings) contextValidateCluster(ctx context.Context, formats strfmt.Registry) error { if m.Cluster != nil { - - if swag.IsZero(m.Cluster) { // not required - return nil - } - if err := m.Cluster.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("cluster") @@ -403,11 +398,6 @@ func (m *ClusterSettingsCluster) contextValidateClusterLogTargets(ctx context.Co for i := 0; i < len(m.ClusterLogTargets); i++ { if m.ClusterLogTargets[i] != nil { - - if swag.IsZero(m.ClusterLogTargets[i]) { // not required - return nil - } - if err := m.ClusterLogTargets[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("cluster" + "." + "log_targets" + "." + strconv.Itoa(i)) @@ -508,8 +498,8 @@ type ClusterLogTarget struct { // protocol // Required: true - // Enum: ["tcp","udp"] - // +kubebuilder:validation:Enum=tcp;udp; + // Enum: [tcp udp] + // +kubebuilder:validation:Enum=tcp udp; Protocol *string `json:"protocol"` } diff --git a/models/compression.go b/models/compression.go index 04621c55..f0b03de7 100644 --- a/models/compression.go +++ b/models/compression.go @@ -36,8 +36,8 @@ import ( // swagger:model compression type Compression struct { // algo req - // Enum: ["identity","gzip","deflate","raw-deflate"] - // +kubebuilder:validation:Enum=identity;gzip;deflate;raw-deflate; + // Enum: [identity gzip deflate raw-deflate] + // +kubebuilder:validation:Enum=identity gzip deflate raw-deflate; AlgoReq string `json:"algo-req,omitempty"` // algorithms @@ -47,8 +47,8 @@ type Compression struct { AlgosRes []string `json:"algos-res,omitempty"` // direction - // Enum: ["request","response","both"] - // +kubebuilder:validation:Enum=request;response;both; + // Enum: [request response both] + // +kubebuilder:validation:Enum=request response both; Direction string `json:"direction,omitempty"` // minsize req diff --git a/models/config_stick_table.go b/models/config_stick_table.go index fee3ca5c..eafc9b47 100644 --- a/models/config_stick_table.go +++ b/models/config_stick_table.go @@ -63,8 +63,8 @@ type ConfigStickTable struct { Size *int64 `json:"size,omitempty"` // srvkey - // Enum: ["addr","name"] - // +kubebuilder:validation:Enum=addr;name; + // Enum: [addr name] + // +kubebuilder:validation:Enum=addr name; Srvkey *string `json:"srvkey,omitempty"` // store @@ -73,8 +73,8 @@ type ConfigStickTable struct { Store string `json:"store,omitempty"` // type - // Enum: ["ip","ipv6","integer","string","binary"] - // +kubebuilder:validation:Enum=ip;ipv6;integer;string;binary; + // Enum: [ip ipv6 integer string binary] + // +kubebuilder:validation:Enum=ip ipv6 integer string binary; Type string `json:"type,omitempty"` // write to diff --git a/models/consul.go b/models/consul.go index 7a79e2c6..c2ac2d9b 100644 --- a/models/consul.go +++ b/models/consul.go @@ -60,8 +60,8 @@ type Consul struct { // all: a node is considered valid if all health checks are 'passing' // min: a node is considered valid if the number of 'passing' checks is greater or equal to the 'health_check_policy_min' value. // If the node has less health checks configured then 'health_check_policy_min' it is considered invalid. - // Enum: ["none","any","all","min"] - // +kubebuilder:validation:Enum=none;any;all;min; + // Enum: [none any all min] + // +kubebuilder:validation:Enum=none any all min; HealthCheckPolicy *string `json:"health_check_policy,omitempty"` // health check policy min @@ -73,8 +73,8 @@ type Consul struct { ID *string `json:"id,omitempty"` // mode - // Enum: ["http","https"] - // +kubebuilder:validation:Enum=http;https; + // Enum: [http https] + // +kubebuilder:validation:Enum=http https; Mode *string `json:"mode,omitempty"` // name @@ -104,8 +104,8 @@ type Consul struct { ServerSlotsGrowthIncrement int64 `json:"server_slots_growth_increment,omitempty"` // server slots growth type - // Enum: ["linear","exponential"] - // +kubebuilder:validation:Enum=linear;exponential; + // Enum: [linear exponential] + // +kubebuilder:validation:Enum=linear exponential; ServerSlotsGrowthType *string `json:"server_slots_growth_type,omitempty"` // service allowlist diff --git a/models/consuls.go b/models/consuls.go index ebe3b71d..9426ef85 100644 --- a/models/consuls.go +++ b/models/consuls.go @@ -71,11 +71,6 @@ func (m Consuls) ContextValidate(ctx context.Context, formats strfmt.Registry) e 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/cookie.go b/models/cookie.go index 4f7407a3..55977112 100644 --- a/models/cookie.go +++ b/models/cookie.go @@ -76,8 +76,8 @@ type Cookie struct { Secure bool `json:"secure,omitempty"` // type - // Enum: ["rewrite","insert","prefix"] - // +kubebuilder:validation:Enum=rewrite;insert;prefix; + // Enum: [rewrite insert prefix] + // +kubebuilder:validation:Enum=rewrite insert prefix; Type string `json:"type,omitempty"` } @@ -240,11 +240,6 @@ func (m *Cookie) contextValidateAttrs(ctx context.Context, formats strfmt.Regist for i := 0; i < len(m.Attrs); i++ { if m.Attrs[i] != nil { - - if swag.IsZero(m.Attrs[i]) { // not required - return nil - } - if err := m.Attrs[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("attr" + "." + strconv.Itoa(i)) @@ -265,11 +260,6 @@ func (m *Cookie) contextValidateDomains(ctx context.Context, formats strfmt.Regi for i := 0; i < len(m.Domains); i++ { if m.Domains[i] != nil { - - if swag.IsZero(m.Domains[i]) { // not required - return nil - } - if err := m.Domains[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("domain" + "." + strconv.Itoa(i)) diff --git a/models/crt_load.go b/models/crt_load.go index 49ab7914..5fb147c4 100644 --- a/models/crt_load.go +++ b/models/crt_load.go @@ -64,8 +64,8 @@ type CrtLoad struct { Ocsp string `json:"ocsp,omitempty"` // Automatic OCSP response update - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; OcspUpdate string `json:"ocsp_update,omitempty"` // Signed Certificate Timestamp List filename diff --git a/models/crt_loads.go b/models/crt_loads.go index fb758b7e..705f00d8 100644 --- a/models/crt_loads.go +++ b/models/crt_loads.go @@ -69,11 +69,6 @@ func (m CrtLoads) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/crt_stores.go b/models/crt_stores.go index 793f12de..cc6c3e0d 100644 --- a/models/crt_stores.go +++ b/models/crt_stores.go @@ -69,11 +69,6 @@ func (m CrtStores) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/defaults_base.go b/models/defaults_base.go index 0f1b711f..7057f038 100644 --- a/models/defaults_base.go +++ b/models/defaults_base.go @@ -48,38 +48,38 @@ type DefaultsBase struct { LogSteps []string `json:"log_steps,omitempty"` // abortonclose - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Abortonclose string `json:"abortonclose,omitempty"` // accept invalid http request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptInvalidHTTPRequest string `json:"accept_invalid_http_request,omitempty"` // accept invalid http response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptInvalidHTTPResponse string `json:"accept_invalid_http_response,omitempty"` // accept unsafe violations in http request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptUnsafeViolationsInHTTPRequest string `json:"accept_unsafe_violations_in_http_request,omitempty"` // accept unsafe violations in http response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptUnsafeViolationsInHTTPResponse string `json:"accept_unsafe_violations_in_http_response,omitempty"` // adv check - // Enum: ["httpchk","ldap-check","mysql-check","pgsql-check","redis-check","smtpchk","ssl-hello-chk","tcp-check"] - // +kubebuilder:validation:Enum=httpchk;ldap-check;mysql-check;pgsql-check;redis-check;smtpchk;ssl-hello-chk;tcp-check; + // Enum: [httpchk ldap-check mysql-check pgsql-check redis-check smtpchk ssl-hello-chk tcp-check] + // +kubebuilder:validation:Enum=httpchk ldap-check mysql-check pgsql-check redis-check smtpchk ssl-hello-chk tcp-check; AdvCheck string `json:"adv_check,omitempty"` // allbackups - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Allbackups string `json:"allbackups,omitempty"` // backlog @@ -92,8 +92,8 @@ type DefaultsBase struct { CheckTimeout *int64 `json:"check_timeout,omitempty"` // checkcache - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Checkcache string `json:"checkcache,omitempty"` // clflog @@ -110,8 +110,8 @@ type DefaultsBase struct { ClientTimeout *int64 `json:"client_timeout,omitempty"` // clitcpka - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Clitcpka string `json:"clitcpka,omitempty"` // clitcpka cnt @@ -132,7 +132,7 @@ type DefaultsBase struct { ConnectTimeout *int64 `json:"connect_timeout,omitempty"` // contstats - // Enum: ["enabled"] + // Enum: [enabled] // +kubebuilder:validation:Enum=enabled; Contstats string `json:"contstats,omitempty"` @@ -148,21 +148,21 @@ type DefaultsBase struct { DefaultServer *DefaultServer `json:"default_server,omitempty"` // disable h2 upgrade - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; DisableH2Upgrade string `json:"disable_h2_upgrade,omitempty"` // disabled Disabled bool `json:"disabled,omitempty"` // dontlog normal - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; DontlogNormal string `json:"dontlog_normal,omitempty"` // dontlognull - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Dontlognull string `json:"dontlognull,omitempty"` // dynamic cookie key @@ -186,8 +186,8 @@ type DefaultsBase struct { Errorloc303 *Errorloc `json:"errorloc303,omitempty"` // external check - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ExternalCheck string `json:"external_check,omitempty"` // external check command @@ -212,54 +212,54 @@ type DefaultsBase struct { Fullconn *int64 `json:"fullconn,omitempty"` // h1 case adjust bogus client - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; H1CaseAdjustBogusClient string `json:"h1_case_adjust_bogus_client,omitempty"` // h1 case adjust bogus server - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; H1CaseAdjustBogusServer string `json:"h1_case_adjust_bogus_server,omitempty"` // hash balance factor HashBalanceFactor *int64 `json:"hash_balance_factor,omitempty"` // hash preserve affinity - // Enum: ["always","maxconn","maxqueue"] - // +kubebuilder:validation:Enum=always;maxconn;maxqueue; + // Enum: [always maxconn maxqueue] + // +kubebuilder:validation:Enum=always maxconn maxqueue; HashPreserveAffinity string `json:"hash_preserve_affinity,omitempty"` // hash type HashType *HashType `json:"hash_type,omitempty"` // http buffer request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPBufferRequest string `json:"http-buffer-request,omitempty"` // http drop request trailers - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPDropRequestTrailers string `json:"http-drop-request-trailers,omitempty"` // http drop response trailers - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPDropResponseTrailers string `json:"http-drop-response-trailers,omitempty"` // http use htx - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPUseHtx string `json:"http-use-htx,omitempty"` // http connection mode - // Enum: ["httpclose","http-server-close","http-keep-alive"] - // +kubebuilder:validation:Enum=httpclose;http-server-close;http-keep-alive; + // Enum: [httpclose http-server-close http-keep-alive] + // +kubebuilder:validation:Enum=httpclose http-server-close http-keep-alive; HTTPConnectionMode string `json:"http_connection_mode,omitempty"` // http ignore probes - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPIgnoreProbes string `json:"http_ignore_probes,omitempty"` // http keep alive timeout @@ -268,13 +268,13 @@ type DefaultsBase struct { HTTPKeepAliveTimeout *int64 `json:"http_keep_alive_timeout,omitempty"` // http no delay - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPNoDelay string `json:"http_no_delay,omitempty"` // http pretend keepalive - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPPretendKeepalive string `json:"http_pretend_keepalive,omitempty"` // http request timeout @@ -283,21 +283,21 @@ type DefaultsBase struct { HTTPRequestTimeout *int64 `json:"http_request_timeout,omitempty"` // http restrict req hdr names - // Enum: ["preserve","delete","reject"] - // +kubebuilder:validation:Enum=preserve;delete;reject; + // Enum: [preserve delete reject] + // +kubebuilder:validation:Enum=preserve delete reject; HTTPRestrictReqHdrNames string `json:"http_restrict_req_hdr_names,omitempty"` // http reuse - // Enum: ["aggressive","always","never","safe"] - // +kubebuilder:validation:Enum=aggressive;always;never;safe; + // Enum: [aggressive always never safe] + // +kubebuilder:validation:Enum=aggressive always never safe; HTTPReuse string `json:"http_reuse,omitempty"` // http send name header HTTPSendNameHeader *string `json:"http_send_name_header,omitempty"` // http use proxy header - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPUseProxyHeader string `json:"http_use_proxy_header,omitempty"` // httpchk params @@ -307,23 +307,23 @@ type DefaultsBase struct { Httplog bool `json:"httplog,omitempty"` // httpslog - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Httpslog string `json:"httpslog,omitempty"` // idle close on response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; IdleCloseOnResponse string `json:"idle_close_on_response,omitempty"` // independent streams - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; IndependentStreams string `json:"independent_streams,omitempty"` // load server state from file - // Enum: ["global","local","none"] - // +kubebuilder:validation:Enum=global;local;none; + // Enum: [global local none] + // +kubebuilder:validation:Enum=global local none; LoadServerStateFromFile string `json:"load_server_state_from_file,omitempty"` // log format @@ -333,13 +333,13 @@ type DefaultsBase struct { LogFormatSd string `json:"log_format_sd,omitempty"` // log health checks - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; LogHealthChecks string `json:"log_health_checks,omitempty"` // log separate errors - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; LogSeparateErrors string `json:"log_separate_errors,omitempty"` // log tag @@ -348,8 +348,8 @@ type DefaultsBase struct { LogTag string `json:"log_tag,omitempty"` // logasap - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Logasap string `json:"logasap,omitempty"` // max keep alive queue @@ -363,8 +363,8 @@ type DefaultsBase struct { Metadata map[string]interface{} `json:"metadata,omitempty"` // mode - // Enum: ["tcp","http","log"] - // +kubebuilder:validation:Enum=tcp;http;log; + // Enum: [tcp http log] + // +kubebuilder:validation:Enum=tcp http log; Mode string `json:"mode,omitempty"` // monitor uri @@ -379,16 +379,16 @@ type DefaultsBase struct { Name string `json:"name,omitempty"` // nolinger - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Nolinger string `json:"nolinger,omitempty"` // originalto Originalto *Originalto `json:"originalto,omitempty"` // persist - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Persist string `json:"persist,omitempty"` // persist rule @@ -398,8 +398,8 @@ type DefaultsBase struct { PgsqlCheckParams *PgsqlCheckParams `json:"pgsql_check_params,omitempty"` // prefer last server - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; PreferLastServer string `json:"prefer_last_server,omitempty"` // queue timeout @@ -430,31 +430,31 @@ type DefaultsBase struct { SmtpchkParams *SmtpchkParams `json:"smtpchk_params,omitempty"` // socket stats - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SocketStats string `json:"socket_stats,omitempty"` // source Source *Source `json:"source,omitempty"` // splice auto - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceAuto string `json:"splice_auto,omitempty"` // splice request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceRequest string `json:"splice_request,omitempty"` // splice response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceResponse string `json:"splice_response,omitempty"` // srvtcpka - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Srvtcpka string `json:"srvtcpka,omitempty"` // srvtcpka cnt @@ -475,26 +475,26 @@ type DefaultsBase struct { TarpitTimeout *int64 `json:"tarpit_timeout,omitempty"` // tcp smart accept - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TCPSmartAccept string `json:"tcp_smart_accept,omitempty"` // tcp smart connect - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TCPSmartConnect string `json:"tcp_smart_connect,omitempty"` // tcpka - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tcpka string `json:"tcpka,omitempty"` // tcplog Tcplog bool `json:"tcplog,omitempty"` // transparent - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Transparent string `json:"transparent,omitempty"` // tunnel timeout @@ -3669,11 +3669,6 @@ func (m *DefaultsBase) contextValidateErrorFiles(ctx context.Context, formats st for i := 0; i < len(m.ErrorFiles); i++ { if m.ErrorFiles[i] != nil { - - if swag.IsZero(m.ErrorFiles[i]) { // not required - return nil - } - if err := m.ErrorFiles[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("error_files" + "." + strconv.Itoa(i)) @@ -3694,11 +3689,6 @@ func (m *DefaultsBase) contextValidateErrorFilesFromHTTPErrors(ctx context.Conte for i := 0; i < len(m.ErrorFilesFromHTTPErrors); i++ { if m.ErrorFilesFromHTTPErrors[i] != nil { - - if swag.IsZero(m.ErrorFilesFromHTTPErrors[i]) { // not required - return nil - } - if err := m.ErrorFilesFromHTTPErrors[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorfiles_from_http_errors" + "." + strconv.Itoa(i)) @@ -3717,11 +3707,6 @@ func (m *DefaultsBase) contextValidateErrorFilesFromHTTPErrors(ctx context.Conte func (m *DefaultsBase) contextValidateBalance(ctx context.Context, formats strfmt.Registry) error { if m.Balance != nil { - - if swag.IsZero(m.Balance) { // not required - return nil - } - if err := m.Balance.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("balance") @@ -3738,11 +3723,6 @@ func (m *DefaultsBase) contextValidateBalance(ctx context.Context, formats strfm func (m *DefaultsBase) contextValidateCompression(ctx context.Context, formats strfmt.Registry) error { if m.Compression != nil { - - if swag.IsZero(m.Compression) { // not required - return nil - } - if err := m.Compression.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("compression") @@ -3759,11 +3739,6 @@ func (m *DefaultsBase) contextValidateCompression(ctx context.Context, formats s func (m *DefaultsBase) contextValidateCookie(ctx context.Context, formats strfmt.Registry) error { if m.Cookie != nil { - - if swag.IsZero(m.Cookie) { // not required - return nil - } - if err := m.Cookie.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("cookie") @@ -3780,11 +3755,6 @@ func (m *DefaultsBase) contextValidateCookie(ctx context.Context, formats strfmt func (m *DefaultsBase) contextValidateDefaultServer(ctx context.Context, formats strfmt.Registry) error { if m.DefaultServer != nil { - - if swag.IsZero(m.DefaultServer) { // not required - return nil - } - if err := m.DefaultServer.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("default_server") @@ -3801,11 +3771,6 @@ func (m *DefaultsBase) contextValidateDefaultServer(ctx context.Context, formats func (m *DefaultsBase) contextValidateEmailAlert(ctx context.Context, formats strfmt.Registry) error { if m.EmailAlert != nil { - - if swag.IsZero(m.EmailAlert) { // not required - return nil - } - if err := m.EmailAlert.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("email_alert") @@ -3822,11 +3787,6 @@ func (m *DefaultsBase) contextValidateEmailAlert(ctx context.Context, formats st func (m *DefaultsBase) contextValidateErrorloc302(ctx context.Context, formats strfmt.Registry) error { if m.Errorloc302 != nil { - - if swag.IsZero(m.Errorloc302) { // not required - return nil - } - if err := m.Errorloc302.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorloc302") @@ -3843,11 +3803,6 @@ func (m *DefaultsBase) contextValidateErrorloc302(ctx context.Context, formats s func (m *DefaultsBase) contextValidateErrorloc303(ctx context.Context, formats strfmt.Registry) error { if m.Errorloc303 != nil { - - if swag.IsZero(m.Errorloc303) { // not required - return nil - } - if err := m.Errorloc303.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorloc303") @@ -3864,11 +3819,6 @@ func (m *DefaultsBase) contextValidateErrorloc303(ctx context.Context, formats s func (m *DefaultsBase) contextValidateForwardfor(ctx context.Context, formats strfmt.Registry) error { if m.Forwardfor != nil { - - if swag.IsZero(m.Forwardfor) { // not required - return nil - } - if err := m.Forwardfor.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("forwardfor") @@ -3885,11 +3835,6 @@ func (m *DefaultsBase) contextValidateForwardfor(ctx context.Context, formats st func (m *DefaultsBase) contextValidateHashType(ctx context.Context, formats strfmt.Registry) error { if m.HashType != nil { - - if swag.IsZero(m.HashType) { // not required - return nil - } - if err := m.HashType.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("hash_type") @@ -3906,11 +3851,6 @@ func (m *DefaultsBase) contextValidateHashType(ctx context.Context, formats strf func (m *DefaultsBase) contextValidateHttpchkParams(ctx context.Context, formats strfmt.Registry) error { if m.HttpchkParams != nil { - - if swag.IsZero(m.HttpchkParams) { // not required - return nil - } - if err := m.HttpchkParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("httpchk_params") @@ -3926,10 +3866,6 @@ func (m *DefaultsBase) contextValidateHttpchkParams(ctx context.Context, formats func (m *DefaultsBase) contextValidateMonitorURI(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.MonitorURI) { // not required - return nil - } - if err := m.MonitorURI.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("monitor_uri") @@ -3945,11 +3881,6 @@ func (m *DefaultsBase) contextValidateMonitorURI(ctx context.Context, formats st func (m *DefaultsBase) contextValidateMysqlCheckParams(ctx context.Context, formats strfmt.Registry) error { if m.MysqlCheckParams != nil { - - if swag.IsZero(m.MysqlCheckParams) { // not required - return nil - } - if err := m.MysqlCheckParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("mysql_check_params") @@ -3966,11 +3897,6 @@ func (m *DefaultsBase) contextValidateMysqlCheckParams(ctx context.Context, form func (m *DefaultsBase) contextValidateOriginalto(ctx context.Context, formats strfmt.Registry) error { if m.Originalto != nil { - - if swag.IsZero(m.Originalto) { // not required - return nil - } - if err := m.Originalto.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("originalto") @@ -3987,11 +3913,6 @@ func (m *DefaultsBase) contextValidateOriginalto(ctx context.Context, formats st func (m *DefaultsBase) contextValidatePersistRule(ctx context.Context, formats strfmt.Registry) error { if m.PersistRule != nil { - - if swag.IsZero(m.PersistRule) { // not required - return nil - } - if err := m.PersistRule.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("persist_rule") @@ -4008,11 +3929,6 @@ func (m *DefaultsBase) contextValidatePersistRule(ctx context.Context, formats s func (m *DefaultsBase) contextValidatePgsqlCheckParams(ctx context.Context, formats strfmt.Registry) error { if m.PgsqlCheckParams != nil { - - if swag.IsZero(m.PgsqlCheckParams) { // not required - return nil - } - if err := m.PgsqlCheckParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("pgsql_check_params") @@ -4029,11 +3945,6 @@ func (m *DefaultsBase) contextValidatePgsqlCheckParams(ctx context.Context, form func (m *DefaultsBase) contextValidateRedispatch(ctx context.Context, formats strfmt.Registry) error { if m.Redispatch != nil { - - if swag.IsZero(m.Redispatch) { // not required - return nil - } - if err := m.Redispatch.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("redispatch") @@ -4050,11 +3961,6 @@ func (m *DefaultsBase) contextValidateRedispatch(ctx context.Context, formats st func (m *DefaultsBase) contextValidateSmtpchkParams(ctx context.Context, formats strfmt.Registry) error { if m.SmtpchkParams != nil { - - if swag.IsZero(m.SmtpchkParams) { // not required - return nil - } - if err := m.SmtpchkParams.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("smtpchk_params") @@ -4071,11 +3977,6 @@ func (m *DefaultsBase) contextValidateSmtpchkParams(ctx context.Context, formats func (m *DefaultsBase) contextValidateSource(ctx context.Context, formats strfmt.Registry) error { if m.Source != nil { - - if swag.IsZero(m.Source) { // not required - return nil - } - if err := m.Source.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("source") @@ -4092,11 +3993,6 @@ func (m *DefaultsBase) contextValidateSource(ctx context.Context, formats strfmt func (m *DefaultsBase) contextValidateStatsOptions(ctx context.Context, formats strfmt.Registry) error { if m.StatsOptions != nil { - - if swag.IsZero(m.StatsOptions) { // not required - return nil - } - if err := m.StatsOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stats_options") diff --git a/models/defaults_sections.go b/models/defaults_sections.go index 93d14e66..48231a77 100644 --- a/models/defaults_sections.go +++ b/models/defaults_sections.go @@ -71,11 +71,6 @@ func (m DefaultsSections) ContextValidate(ctx context.Context, formats strfmt.Re 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/dgram_binds.go b/models/dgram_binds.go index 4a4a038e..f7583b2b 100644 --- a/models/dgram_binds.go +++ b/models/dgram_binds.go @@ -71,11 +71,6 @@ func (m DgramBinds) ContextValidate(ctx context.Context, formats strfmt.Registry 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/email_alert.go b/models/email_alert.go index 26b00644..ec2d7937 100644 --- a/models/email_alert.go +++ b/models/email_alert.go @@ -43,8 +43,8 @@ type EmailAlert struct { From *string `json:"from"` // level - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug; + // Enum: [emerg alert crit err warning notice info debug] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug; Level string `json:"level,omitempty"` // mailers diff --git a/models/email_alerts.go b/models/email_alerts.go index 0fa6c8cc..cea6f428 100644 --- a/models/email_alerts.go +++ b/models/email_alerts.go @@ -71,11 +71,6 @@ func (m EmailAlerts) ContextValidate(ctx context.Context, formats strfmt.Registr 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/endpoints.go b/models/endpoints.go index 78586959..f648ef6c 100644 --- a/models/endpoints.go +++ b/models/endpoints.go @@ -71,11 +71,6 @@ func (m Endpoints) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/environment_options.go b/models/environment_options.go index 3a2377eb..e910817c 100644 --- a/models/environment_options.go +++ b/models/environment_options.go @@ -141,11 +141,6 @@ func (m *EnvironmentOptions) contextValidatePresetEnvs(ctx context.Context, form for i := 0; i < len(m.PresetEnvs); i++ { if m.PresetEnvs[i] != nil { - - if swag.IsZero(m.PresetEnvs[i]) { // not required - return nil - } - if err := m.PresetEnvs[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("presetenv" + "." + strconv.Itoa(i)) @@ -166,11 +161,6 @@ func (m *EnvironmentOptions) contextValidateSetEnvs(ctx context.Context, formats for i := 0; i < len(m.SetEnvs); i++ { if m.SetEnvs[i] != nil { - - if swag.IsZero(m.SetEnvs[i]) { // not required - return nil - } - if err := m.SetEnvs[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("setenv" + "." + strconv.Itoa(i)) diff --git a/models/errorfile.go b/models/errorfile.go index 24840562..11755eff 100644 --- a/models/errorfile.go +++ b/models/errorfile.go @@ -35,8 +35,8 @@ import ( // swagger:model errorfile type Errorfile struct { // code - // Enum: [200,400,401,403,404,405,407,408,410,413,425,429,500,501,502,503,504] - // +kubebuilder:validation:Enum=200;400;401;403;404;405;407;408;410;413;425;429;500;501;502;503;504; + // Enum: [200 400 401 403 404 405 407 408 410 413 425 429 500 501 502 503 504] + // +kubebuilder:validation:Enum=200 400 401 403 404 405 407 408 410 413 425 429 500 501 502 503 504; Code int64 `json:"code,omitempty"` // file diff --git a/models/errorloc.go b/models/errorloc.go index 3d1dd0b8..7c61366d 100644 --- a/models/errorloc.go +++ b/models/errorloc.go @@ -36,8 +36,8 @@ import ( type Errorloc struct { // code // Required: true - // Enum: [200,400,401,403,404,405,407,408,410,413,425,429,500,501,502,503,504] - // +kubebuilder:validation:Enum=200;400;401;403;404;405;407;408;410;413;425;429;500;501;502;503;504; + // Enum: [200 400 401 403 404 405 407 408 410 413 425 429 500 501 502 503 504] + // +kubebuilder:validation:Enum=200 400 401 403 404 405 407 408 410 413 425 429 500 501 502 503 504; Code *int64 `json:"code"` // +kubebuilder:pruning:PreserveUnknownFields diff --git a/models/fcgi_app_base.go b/models/fcgi_app_base.go index 8479dba5..91aefbec 100644 --- a/models/fcgi_app_base.go +++ b/models/fcgi_app_base.go @@ -43,16 +43,16 @@ type FCGIAppBase struct { Docroot *string `json:"docroot"` // Enables or disables the retrieval of variables related to connection management. - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; GetValues string `json:"get_values,omitempty"` // Defines the script name to append after a URI that ends with a slash ("/") to set the default value for the FastCGI parameter SCRIPT_NAME. It is an optional setting. Index string `json:"index,omitempty"` // Tells the FastCGI application whether or not to keep the connection open after it sends a response. If disabled, the FastCGI application closes the connection after responding to this request. - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; KeepConn string `json:"keep_conn,omitempty"` // log stderrs @@ -68,8 +68,8 @@ type FCGIAppBase struct { Metadata map[string]interface{} `json:"metadata,omitempty"` // Enables or disables the support of connection multiplexing. If the FastCGI application retrieves the variable FCGI_MPXS_CONNS during connection establishment, it can override this option. - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; MpxsConns string `json:"mpxs_conns,omitempty"` // Declares a FastCGI application @@ -401,11 +401,6 @@ func (m *FCGIAppBase) contextValidateLogStderrs(ctx context.Context, formats str for i := 0; i < len(m.LogStderrs); i++ { if m.LogStderrs[i] != nil { - - if swag.IsZero(m.LogStderrs[i]) { // not required - return nil - } - if err := m.LogStderrs[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("log_stderrs" + "." + strconv.Itoa(i)) @@ -426,11 +421,6 @@ func (m *FCGIAppBase) contextValidatePassHeaders(ctx context.Context, formats st for i := 0; i < len(m.PassHeaders); i++ { if m.PassHeaders[i] != nil { - - if swag.IsZero(m.PassHeaders[i]) { // not required - return nil - } - if err := m.PassHeaders[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("pass_headers" + "." + strconv.Itoa(i)) @@ -451,11 +441,6 @@ func (m *FCGIAppBase) contextValidateSetParams(ctx context.Context, formats strf for i := 0; i < len(m.SetParams); i++ { if m.SetParams[i] != nil { - - if swag.IsZero(m.SetParams[i]) { // not required - return nil - } - if err := m.SetParams[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("set_params" + "." + strconv.Itoa(i)) diff --git a/models/fcgi_apps.go b/models/fcgi_apps.go index 0b757e6b..051fd552 100644 --- a/models/fcgi_apps.go +++ b/models/fcgi_apps.go @@ -69,11 +69,6 @@ func (m FCGIApps) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/fcgi_log_stderr.go b/models/fcgi_log_stderr.go index f8bf6f47..573fea93 100644 --- a/models/fcgi_log_stderr.go +++ b/models/fcgi_log_stderr.go @@ -110,11 +110,6 @@ func (m *FCGILogStderr) ContextValidate(ctx context.Context, formats strfmt.Regi func (m *FCGILogStderr) contextValidateSample(ctx context.Context, formats strfmt.Registry) error { if m.Sample != nil { - - if swag.IsZero(m.Sample) { // not required - return nil - } - if err := m.Sample.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("sample") diff --git a/models/fcgi_pass_header.go b/models/fcgi_pass_header.go index 109d5dd1..9aa02c64 100644 --- a/models/fcgi_pass_header.go +++ b/models/fcgi_pass_header.go @@ -40,8 +40,8 @@ import ( // swagger:model fcgiPassHeader type FCGIPassHeader struct { // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test diff --git a/models/fcgi_set_param.go b/models/fcgi_set_param.go index 253076fc..e52bf39a 100644 --- a/models/fcgi_set_param.go +++ b/models/fcgi_set_param.go @@ -37,8 +37,8 @@ import ( // swagger:model fcgiSetParam type FCGISetParam struct { // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test diff --git a/models/filter.go b/models/filter.go index 062621f9..1274f312 100644 --- a/models/filter.go +++ b/models/filter.go @@ -111,8 +111,8 @@ type Filter struct { // type // Required: true - // Enum: ["bwlim-in","bwlim-out","cache","compression","fcgi-app","spoe","trace"] - // +kubebuilder:validation:Enum=bwlim-in;bwlim-out;cache;compression;fcgi-app;spoe;trace; + // Enum: [bwlim-in bwlim-out cache compression fcgi-app spoe trace] + // +kubebuilder:validation:Enum=bwlim-in bwlim-out cache compression fcgi-app spoe trace; Type string `json:"type"` } diff --git a/models/filters.go b/models/filters.go index 870c98d5..46145ecc 100644 --- a/models/filters.go +++ b/models/filters.go @@ -71,11 +71,6 @@ func (m Filters) ContextValidate(ctx context.Context, formats strfmt.Registry) e 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/forwardfor.go b/models/forwardfor.go index 68da0124..fa25c05d 100644 --- a/models/forwardfor.go +++ b/models/forwardfor.go @@ -36,7 +36,7 @@ import ( type Forwardfor struct { // enabled // Required: true - // Enum: ["enabled"] + // Enum: [enabled] // +kubebuilder:validation:Enum=enabled; Enabled *string `json:"enabled"` diff --git a/models/frontend_base.go b/models/frontend_base.go index fdbdb9fc..102ccb53 100644 --- a/models/frontend_base.go +++ b/models/frontend_base.go @@ -49,13 +49,13 @@ type FrontendBase struct { LogSteps []string `json:"log_steps,omitempty"` // accept invalid http request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptInvalidHTTPRequest string `json:"accept_invalid_http_request,omitempty"` // accept unsafe violations in http request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AcceptUnsafeViolationsInHTTPRequest string `json:"accept_unsafe_violations_in_http_request,omitempty"` // backlog @@ -75,8 +75,8 @@ type FrontendBase struct { ClientTimeout *int64 `json:"client_timeout,omitempty"` // clitcpka - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Clitcpka string `json:"clitcpka,omitempty"` // clitcpka cnt @@ -92,7 +92,7 @@ type FrontendBase struct { Compression *Compression `json:"compression,omitempty"` // contstats - // Enum: ["enabled"] + // Enum: [enabled] // +kubebuilder:validation:Enum=enabled; Contstats string `json:"contstats,omitempty"` @@ -105,21 +105,21 @@ type FrontendBase struct { Description string `json:"description,omitempty"` // disable h2 upgrade - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; DisableH2Upgrade string `json:"disable_h2_upgrade,omitempty"` // disabled Disabled bool `json:"disabled,omitempty"` // dontlog normal - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; DontlogNormal string `json:"dontlog_normal,omitempty"` // dontlognull - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Dontlognull string `json:"dontlognull,omitempty"` // email alert @@ -151,33 +151,33 @@ type FrontendBase struct { GUID string `json:"guid,omitempty"` // h1 case adjust bogus client - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; H1CaseAdjustBogusClient string `json:"h1_case_adjust_bogus_client,omitempty"` // http buffer request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPBufferRequest string `json:"http-buffer-request,omitempty"` // http drop response trailers - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPDropResponseTrailers string `json:"http-drop-response-trailers,omitempty"` // http use htx - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPUseHtx string `json:"http-use-htx,omitempty"` // http connection mode - // Enum: ["httpclose","http-server-close","http-keep-alive"] - // +kubebuilder:validation:Enum=httpclose;http-server-close;http-keep-alive; + // Enum: [httpclose http-server-close http-keep-alive] + // +kubebuilder:validation:Enum=httpclose http-server-close http-keep-alive; HTTPConnectionMode string `json:"http_connection_mode,omitempty"` // http ignore probes - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPIgnoreProbes string `json:"http_ignore_probes,omitempty"` // http keep alive timeout @@ -186,8 +186,8 @@ type FrontendBase struct { HTTPKeepAliveTimeout *int64 `json:"http_keep_alive_timeout,omitempty"` // http no delay - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPNoDelay string `json:"http_no_delay,omitempty"` // http request timeout @@ -196,34 +196,34 @@ type FrontendBase struct { HTTPRequestTimeout *int64 `json:"http_request_timeout,omitempty"` // http restrict req hdr names - // Enum: ["preserve","delete","reject"] - // +kubebuilder:validation:Enum=preserve;delete;reject; + // Enum: [preserve delete reject] + // +kubebuilder:validation:Enum=preserve delete reject; HTTPRestrictReqHdrNames string `json:"http_restrict_req_hdr_names,omitempty"` // http use proxy header - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; HTTPUseProxyHeader string `json:"http_use_proxy_header,omitempty"` // httplog Httplog bool `json:"httplog,omitempty"` // httpslog - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Httpslog string `json:"httpslog,omitempty"` // id ID *int64 `json:"id,omitempty"` // idle close on response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; IdleCloseOnResponse string `json:"idle_close_on_response,omitempty"` // independent streams - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; IndependentStreams string `json:"independent_streams,omitempty"` // log format @@ -233,8 +233,8 @@ type FrontendBase struct { LogFormatSd string `json:"log_format_sd,omitempty"` // log separate errors - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; LogSeparateErrors string `json:"log_separate_errors,omitempty"` // log tag @@ -243,8 +243,8 @@ type FrontendBase struct { LogTag string `json:"log_tag,omitempty"` // logasap - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Logasap string `json:"logasap,omitempty"` // maxconn @@ -255,8 +255,8 @@ type FrontendBase struct { Metadata map[string]interface{} `json:"metadata,omitempty"` // mode - // Enum: ["http","tcp"] - // +kubebuilder:validation:Enum=http;tcp; + // Enum: [http tcp] + // +kubebuilder:validation:Enum=http tcp; Mode string `json:"mode,omitempty"` // monitor fail @@ -272,31 +272,31 @@ type FrontendBase struct { Name string `json:"name"` // nolinger - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Nolinger string `json:"nolinger,omitempty"` // originalto Originalto *Originalto `json:"originalto,omitempty"` // socket stats - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SocketStats string `json:"socket_stats,omitempty"` // splice auto - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceAuto string `json:"splice_auto,omitempty"` // splice request - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceRequest string `json:"splice_request,omitempty"` // splice response - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SpliceResponse string `json:"splice_response,omitempty"` // stats options @@ -311,13 +311,13 @@ type FrontendBase struct { TarpitTimeout *int64 `json:"tarpit_timeout,omitempty"` // tcp smart accept - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TCPSmartAccept string `json:"tcp_smart_accept,omitempty"` // tcpka - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tcpka string `json:"tcpka,omitempty"` // tcplog @@ -2229,11 +2229,6 @@ func (m *FrontendBase) contextValidateErrorFiles(ctx context.Context, formats st for i := 0; i < len(m.ErrorFiles); i++ { if m.ErrorFiles[i] != nil { - - if swag.IsZero(m.ErrorFiles[i]) { // not required - return nil - } - if err := m.ErrorFiles[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("error_files" + "." + strconv.Itoa(i)) @@ -2254,11 +2249,6 @@ func (m *FrontendBase) contextValidateErrorFilesFromHTTPErrors(ctx context.Conte for i := 0; i < len(m.ErrorFilesFromHTTPErrors); i++ { if m.ErrorFilesFromHTTPErrors[i] != nil { - - if swag.IsZero(m.ErrorFilesFromHTTPErrors[i]) { // not required - return nil - } - if err := m.ErrorFilesFromHTTPErrors[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorfiles_from_http_errors" + "." + strconv.Itoa(i)) @@ -2277,11 +2267,6 @@ func (m *FrontendBase) contextValidateErrorFilesFromHTTPErrors(ctx context.Conte func (m *FrontendBase) contextValidateCompression(ctx context.Context, formats strfmt.Registry) error { if m.Compression != nil { - - if swag.IsZero(m.Compression) { // not required - return nil - } - if err := m.Compression.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("compression") @@ -2298,11 +2283,6 @@ func (m *FrontendBase) contextValidateCompression(ctx context.Context, formats s func (m *FrontendBase) contextValidateEmailAlert(ctx context.Context, formats strfmt.Registry) error { if m.EmailAlert != nil { - - if swag.IsZero(m.EmailAlert) { // not required - return nil - } - if err := m.EmailAlert.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("email_alert") @@ -2319,11 +2299,6 @@ func (m *FrontendBase) contextValidateEmailAlert(ctx context.Context, formats st func (m *FrontendBase) contextValidateErrorloc302(ctx context.Context, formats strfmt.Registry) error { if m.Errorloc302 != nil { - - if swag.IsZero(m.Errorloc302) { // not required - return nil - } - if err := m.Errorloc302.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorloc302") @@ -2340,11 +2315,6 @@ func (m *FrontendBase) contextValidateErrorloc302(ctx context.Context, formats s func (m *FrontendBase) contextValidateErrorloc303(ctx context.Context, formats strfmt.Registry) error { if m.Errorloc303 != nil { - - if swag.IsZero(m.Errorloc303) { // not required - return nil - } - if err := m.Errorloc303.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("errorloc303") @@ -2361,11 +2331,6 @@ func (m *FrontendBase) contextValidateErrorloc303(ctx context.Context, formats s func (m *FrontendBase) contextValidateForwardfor(ctx context.Context, formats strfmt.Registry) error { if m.Forwardfor != nil { - - if swag.IsZero(m.Forwardfor) { // not required - return nil - } - if err := m.Forwardfor.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("forwardfor") @@ -2382,11 +2347,6 @@ func (m *FrontendBase) contextValidateForwardfor(ctx context.Context, formats st func (m *FrontendBase) contextValidateMonitorFail(ctx context.Context, formats strfmt.Registry) error { if m.MonitorFail != nil { - - if swag.IsZero(m.MonitorFail) { // not required - return nil - } - if err := m.MonitorFail.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("monitor_fail") @@ -2402,10 +2362,6 @@ func (m *FrontendBase) contextValidateMonitorFail(ctx context.Context, formats s func (m *FrontendBase) contextValidateMonitorURI(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.MonitorURI) { // not required - return nil - } - if err := m.MonitorURI.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("monitor_uri") @@ -2421,11 +2377,6 @@ func (m *FrontendBase) contextValidateMonitorURI(ctx context.Context, formats st func (m *FrontendBase) contextValidateOriginalto(ctx context.Context, formats strfmt.Registry) error { if m.Originalto != nil { - - if swag.IsZero(m.Originalto) { // not required - return nil - } - if err := m.Originalto.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("originalto") @@ -2442,11 +2393,6 @@ func (m *FrontendBase) contextValidateOriginalto(ctx context.Context, formats st func (m *FrontendBase) contextValidateStatsOptions(ctx context.Context, formats strfmt.Registry) error { if m.StatsOptions != nil { - - if swag.IsZero(m.StatsOptions) { // not required - return nil - } - if err := m.StatsOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stats_options") @@ -2463,11 +2409,6 @@ func (m *FrontendBase) contextValidateStatsOptions(ctx context.Context, formats func (m *FrontendBase) contextValidateStickTable(ctx context.Context, formats strfmt.Registry) error { if m.StickTable != nil { - - if swag.IsZero(m.StickTable) { // not required - return nil - } - if err := m.StickTable.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stick_table") diff --git a/models/frontends.go b/models/frontends.go index 8dade53c..70481e10 100644 --- a/models/frontends.go +++ b/models/frontends.go @@ -71,11 +71,6 @@ func (m Frontends) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/general_files.go b/models/general_files.go index 87ba33fd..9ecd3b06 100644 --- a/models/general_files.go +++ b/models/general_files.go @@ -71,11 +71,6 @@ func (m GeneralFiles) ContextValidate(ctx context.Context, formats strfmt.Regist 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/global_base.go b/models/global_base.go index f409be86..09f1de39 100644 --- a/models/global_base.go +++ b/models/global_base.go @@ -73,8 +73,8 @@ type GlobalBase struct { ClusterSecret string `json:"cluster_secret,omitempty"` // cpu policy - // Enum: ["none","efficiency","first-usable-node","group-by-2-ccx","group-by-2-clusters","group-by-3-ccx","group-by-3-clusters","group-by-4-ccx","group-by-4-cluster","group-by-ccx","group-by-cluster","performance","resource"] - // +kubebuilder:validation:Enum=none;efficiency;first-usable-node;group-by-2-ccx;group-by-2-clusters;group-by-3-ccx;group-by-3-clusters;group-by-4-ccx;group-by-4-cluster;group-by-ccx;group-by-cluster;performance;resource; + // Enum: [none efficiency first-usable-node group-by-2-ccx group-by-2-clusters group-by-3-ccx group-by-3-clusters group-by-4-ccx group-by-4-cluster group-by-ccx group-by-cluster performance resource] + // +kubebuilder:validation:Enum=none efficiency first-usable-node group-by-2-ccx group-by-2-clusters group-by-3-ccx group-by-3-clusters group-by-4-ccx group-by-4-cluster group-by-ccx group-by-cluster performance resource; CPUPolicy string `json:"cpu_policy,omitempty"` // daemon @@ -201,8 +201,8 @@ type GlobalBase struct { Node string `json:"node,omitempty"` // numa cpu mapping - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NumaCPUMapping string `json:"numa_cpu_mapping,omitempty"` // ocsp update options @@ -1493,11 +1493,6 @@ func (m *GlobalBase) contextValidateCPUMaps(ctx context.Context, formats strfmt. for i := 0; i < len(m.CPUMaps); i++ { if m.CPUMaps[i] != nil { - - if swag.IsZero(m.CPUMaps[i]) { // not required - return nil - } - if err := m.CPUMaps[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("cpu_maps" + "." + strconv.Itoa(i)) @@ -1518,11 +1513,6 @@ func (m *GlobalBase) contextValidateCPUSets(ctx context.Context, formats strfmt. for i := 0; i < len(m.CPUSets); i++ { if m.CPUSets[i] != nil { - - if swag.IsZero(m.CPUSets[i]) { // not required - return nil - } - if err := m.CPUSets[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("cpu_set" + "." + strconv.Itoa(i)) @@ -1543,11 +1533,6 @@ func (m *GlobalBase) contextValidateH1CaseAdjusts(ctx context.Context, formats s for i := 0; i < len(m.H1CaseAdjusts); i++ { if m.H1CaseAdjusts[i] != nil { - - if swag.IsZero(m.H1CaseAdjusts[i]) { // not required - return nil - } - if err := m.H1CaseAdjusts[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("h1_case_adjust" + "." + strconv.Itoa(i)) @@ -1568,11 +1553,6 @@ func (m *GlobalBase) contextValidateRuntimeAPIs(ctx context.Context, formats str for i := 0; i < len(m.RuntimeAPIs); i++ { if m.RuntimeAPIs[i] != nil { - - if swag.IsZero(m.RuntimeAPIs[i]) { // not required - return nil - } - if err := m.RuntimeAPIs[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("runtime_apis" + "." + strconv.Itoa(i)) @@ -1593,11 +1573,6 @@ func (m *GlobalBase) contextValidateSetVarFmts(ctx context.Context, formats strf for i := 0; i < len(m.SetVarFmts); i++ { if m.SetVarFmts[i] != nil { - - if swag.IsZero(m.SetVarFmts[i]) { // not required - return nil - } - if err := m.SetVarFmts[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("set_var_fmt" + "." + strconv.Itoa(i)) @@ -1618,11 +1593,6 @@ func (m *GlobalBase) contextValidateSetVars(ctx context.Context, formats strfmt. for i := 0; i < len(m.SetVars); i++ { if m.SetVars[i] != nil { - - if swag.IsZero(m.SetVars[i]) { // not required - return nil - } - if err := m.SetVars[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("set_var" + "." + strconv.Itoa(i)) @@ -1643,11 +1613,6 @@ func (m *GlobalBase) contextValidateThreadGroupLines(ctx context.Context, format for i := 0; i < len(m.ThreadGroupLines); i++ { if m.ThreadGroupLines[i] != nil { - - if swag.IsZero(m.ThreadGroupLines[i]) { // not required - return nil - } - if err := m.ThreadGroupLines[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("thread_group_lines" + "." + strconv.Itoa(i)) @@ -1666,11 +1631,6 @@ func (m *GlobalBase) contextValidateThreadGroupLines(ctx context.Context, format func (m *GlobalBase) contextValidateDebugOptions(ctx context.Context, formats strfmt.Registry) error { if m.DebugOptions != nil { - - if swag.IsZero(m.DebugOptions) { // not required - return nil - } - if err := m.DebugOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("debug_options") @@ -1687,11 +1647,6 @@ func (m *GlobalBase) contextValidateDebugOptions(ctx context.Context, formats st func (m *GlobalBase) contextValidateDefaultPath(ctx context.Context, formats strfmt.Registry) error { if m.DefaultPath != nil { - - if swag.IsZero(m.DefaultPath) { // not required - return nil - } - if err := m.DefaultPath.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("default_path") @@ -1708,11 +1663,6 @@ func (m *GlobalBase) contextValidateDefaultPath(ctx context.Context, formats str func (m *GlobalBase) contextValidateDeviceAtlasOptions(ctx context.Context, formats strfmt.Registry) error { if m.DeviceAtlasOptions != nil { - - if swag.IsZero(m.DeviceAtlasOptions) { // not required - return nil - } - if err := m.DeviceAtlasOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("device_atlas_options") @@ -1729,11 +1679,6 @@ func (m *GlobalBase) contextValidateDeviceAtlasOptions(ctx context.Context, form func (m *GlobalBase) contextValidateEnvironmentOptions(ctx context.Context, formats strfmt.Registry) error { if m.EnvironmentOptions != nil { - - if swag.IsZero(m.EnvironmentOptions) { // not required - return nil - } - if err := m.EnvironmentOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("environment_options") @@ -1750,11 +1695,6 @@ func (m *GlobalBase) contextValidateEnvironmentOptions(ctx context.Context, form func (m *GlobalBase) contextValidateFiftyOneDegreesOptions(ctx context.Context, formats strfmt.Registry) error { if m.FiftyOneDegreesOptions != nil { - - if swag.IsZero(m.FiftyOneDegreesOptions) { // not required - return nil - } - if err := m.FiftyOneDegreesOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("fifty_one_degrees_options") @@ -1771,11 +1711,6 @@ func (m *GlobalBase) contextValidateFiftyOneDegreesOptions(ctx context.Context, func (m *GlobalBase) contextValidateHarden(ctx context.Context, formats strfmt.Registry) error { if m.Harden != nil { - - if swag.IsZero(m.Harden) { // not required - return nil - } - if err := m.Harden.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("harden") @@ -1792,11 +1727,6 @@ func (m *GlobalBase) contextValidateHarden(ctx context.Context, formats strfmt.R func (m *GlobalBase) contextValidateHTTPClientOptions(ctx context.Context, formats strfmt.Registry) error { if m.HTTPClientOptions != nil { - - if swag.IsZero(m.HTTPClientOptions) { // not required - return nil - } - if err := m.HTTPClientOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("http_client_options") @@ -1815,11 +1745,6 @@ func (m *GlobalBase) contextValidateHTTPErrCodes(ctx context.Context, formats st for i := 0; i < len(m.HTTPErrCodes); i++ { if m.HTTPErrCodes[i] != nil { - - if swag.IsZero(m.HTTPErrCodes[i]) { // not required - return nil - } - if err := m.HTTPErrCodes[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("http_err_codes" + "." + strconv.Itoa(i)) @@ -1840,11 +1765,6 @@ func (m *GlobalBase) contextValidateHTTPFailCodes(ctx context.Context, formats s for i := 0; i < len(m.HTTPFailCodes); i++ { if m.HTTPFailCodes[i] != nil { - - if swag.IsZero(m.HTTPFailCodes[i]) { // not required - return nil - } - if err := m.HTTPFailCodes[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("http_fail_codes" + "." + strconv.Itoa(i)) @@ -1863,11 +1783,6 @@ func (m *GlobalBase) contextValidateHTTPFailCodes(ctx context.Context, formats s func (m *GlobalBase) contextValidateLogSendHostname(ctx context.Context, formats strfmt.Registry) error { if m.LogSendHostname != nil { - - if swag.IsZero(m.LogSendHostname) { // not required - return nil - } - if err := m.LogSendHostname.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("log_send_hostname") @@ -1884,11 +1799,6 @@ func (m *GlobalBase) contextValidateLogSendHostname(ctx context.Context, formats func (m *GlobalBase) contextValidateLuaOptions(ctx context.Context, formats strfmt.Registry) error { if m.LuaOptions != nil { - - if swag.IsZero(m.LuaOptions) { // not required - return nil - } - if err := m.LuaOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("lua_options") @@ -1905,11 +1815,6 @@ func (m *GlobalBase) contextValidateLuaOptions(ctx context.Context, formats strf func (m *GlobalBase) contextValidateOcspUpdateOptions(ctx context.Context, formats strfmt.Registry) error { if m.OcspUpdateOptions != nil { - - if swag.IsZero(m.OcspUpdateOptions) { // not required - return nil - } - if err := m.OcspUpdateOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("ocsp_update_options") @@ -1926,11 +1831,6 @@ func (m *GlobalBase) contextValidateOcspUpdateOptions(ctx context.Context, forma func (m *GlobalBase) contextValidatePerformanceOptions(ctx context.Context, formats strfmt.Registry) error { if m.PerformanceOptions != nil { - - if swag.IsZero(m.PerformanceOptions) { // not required - return nil - } - if err := m.PerformanceOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("performance_options") @@ -1947,11 +1847,6 @@ func (m *GlobalBase) contextValidatePerformanceOptions(ctx context.Context, form func (m *GlobalBase) contextValidateSslOptions(ctx context.Context, formats strfmt.Registry) error { if m.SslOptions != nil { - - if swag.IsZero(m.SslOptions) { // not required - return nil - } - if err := m.SslOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("ssl_options") @@ -1968,11 +1863,6 @@ func (m *GlobalBase) contextValidateSslOptions(ctx context.Context, formats strf func (m *GlobalBase) contextValidateTuneBufferOptions(ctx context.Context, formats strfmt.Registry) error { if m.TuneBufferOptions != nil { - - if swag.IsZero(m.TuneBufferOptions) { // not required - return nil - } - if err := m.TuneBufferOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("tune_buffer_options") @@ -1989,11 +1879,6 @@ func (m *GlobalBase) contextValidateTuneBufferOptions(ctx context.Context, forma func (m *GlobalBase) contextValidateTuneLuaOptions(ctx context.Context, formats strfmt.Registry) error { if m.TuneLuaOptions != nil { - - if swag.IsZero(m.TuneLuaOptions) { // not required - return nil - } - if err := m.TuneLuaOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("tune_lua_options") @@ -2010,11 +1895,6 @@ func (m *GlobalBase) contextValidateTuneLuaOptions(ctx context.Context, formats func (m *GlobalBase) contextValidateTuneOptions(ctx context.Context, formats strfmt.Registry) error { if m.TuneOptions != nil { - - if swag.IsZero(m.TuneOptions) { // not required - return nil - } - if err := m.TuneOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("tune_options") @@ -2031,11 +1911,6 @@ func (m *GlobalBase) contextValidateTuneOptions(ctx context.Context, formats str func (m *GlobalBase) contextValidateTuneQuicOptions(ctx context.Context, formats strfmt.Registry) error { if m.TuneQuicOptions != nil { - - if swag.IsZero(m.TuneQuicOptions) { // not required - return nil - } - if err := m.TuneQuicOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("tune_quic_options") @@ -2052,11 +1927,6 @@ func (m *GlobalBase) contextValidateTuneQuicOptions(ctx context.Context, formats func (m *GlobalBase) contextValidateTuneSslOptions(ctx context.Context, formats strfmt.Registry) error { if m.TuneSslOptions != nil { - - if swag.IsZero(m.TuneSslOptions) { // not required - return nil - } - if err := m.TuneSslOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("tune_ssl_options") @@ -2073,11 +1943,6 @@ func (m *GlobalBase) contextValidateTuneSslOptions(ctx context.Context, formats func (m *GlobalBase) contextValidateTuneVarsOptions(ctx context.Context, formats strfmt.Registry) error { if m.TuneVarsOptions != nil { - - if swag.IsZero(m.TuneVarsOptions) { // not required - return nil - } - if err := m.TuneVarsOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("tune_vars_options") @@ -2094,11 +1959,6 @@ func (m *GlobalBase) contextValidateTuneVarsOptions(ctx context.Context, formats func (m *GlobalBase) contextValidateTuneZlibOptions(ctx context.Context, formats strfmt.Registry) error { if m.TuneZlibOptions != nil { - - if swag.IsZero(m.TuneZlibOptions) { // not required - return nil - } - if err := m.TuneZlibOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("tune_zlib_options") @@ -2115,11 +1975,6 @@ func (m *GlobalBase) contextValidateTuneZlibOptions(ctx context.Context, formats func (m *GlobalBase) contextValidateWurflOptions(ctx context.Context, formats strfmt.Registry) error { if m.WurflOptions != nil { - - if swag.IsZero(m.WurflOptions) { // not required - return nil - } - if err := m.WurflOptions.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("wurfl_options") @@ -2230,8 +2085,8 @@ func (m *CPUMap) UnmarshalBinary(b []byte) error { type CPUSet struct { // directive // Required: true - // Enum: ["reset","drop-cpu","only-cpu","drop-node","only-node","drop-cluster","only-cluster","drop-core","only-core","drop-thread","only-thread"] - // +kubebuilder:validation:Enum=reset;drop-cpu;only-cpu;drop-node;only-node;drop-cluster;only-cluster;drop-core;only-core;drop-thread;only-thread; + // Enum: [reset drop-cpu only-cpu drop-node only-node drop-cluster only-cluster drop-core only-core drop-thread only-thread] + // +kubebuilder:validation:Enum=reset drop-cpu only-cpu drop-node only-node drop-cluster only-cluster drop-core only-core drop-thread only-thread; Directive *string `json:"directive"` // set @@ -2356,8 +2211,8 @@ type GlobalDefaultPath struct { // type // Required: true - // Enum: ["current","config","parent","origin"] - // +kubebuilder:validation:Enum=current;config;parent;origin; + // Enum: [current config parent origin] + // +kubebuilder:validation:Enum=current config parent origin; Type string `json:"type"` } @@ -2595,11 +2450,6 @@ func (m *GlobalHarden) ContextValidate(ctx context.Context, formats strfmt.Regis func (m *GlobalHarden) contextValidateRejectPrivilegedPorts(ctx context.Context, formats strfmt.Registry) error { if m.RejectPrivilegedPorts != nil { - - if swag.IsZero(m.RejectPrivilegedPorts) { // not required - return nil - } - if err := m.RejectPrivilegedPorts.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("harden" + "." + "reject_privileged_ports") @@ -2636,13 +2486,13 @@ func (m *GlobalHarden) UnmarshalBinary(b []byte) error { // swagger:model GlobalHardenRejectPrivilegedPorts type GlobalHardenRejectPrivilegedPorts struct { // quic - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Quic string `json:"quic,omitempty"` // tcp - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TCP string `json:"tcp,omitempty"` } @@ -2777,8 +2627,8 @@ func (m *GlobalHardenRejectPrivilegedPorts) UnmarshalBinary(b []byte) error { type GlobalLogSendHostname struct { // enabled // Required: true - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Enabled *string `json:"enabled"` // param diff --git a/models/groups.go b/models/groups.go index 2d5610ba..a2371e5d 100644 --- a/models/groups.go +++ b/models/groups.go @@ -71,11 +71,6 @@ func (m Groups) ContextValidate(ctx context.Context, formats strfmt.Registry) er 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/hash_type.go b/models/hash_type.go index 947cb6ec..865ca409 100644 --- a/models/hash_type.go +++ b/models/hash_type.go @@ -35,17 +35,17 @@ import ( // swagger:model hash_type type HashType struct { // function - // Enum: ["sdbm","djb2","wt6","crc32","none"] - // +kubebuilder:validation:Enum=sdbm;djb2;wt6;crc32;none; + // Enum: [sdbm djb2 wt6 crc32 none] + // +kubebuilder:validation:Enum=sdbm djb2 wt6 crc32 none; Function string `json:"function,omitempty"` // method - // Enum: ["map-based","consistent"] - // +kubebuilder:validation:Enum=map-based;consistent; + // Enum: [map-based consistent] + // +kubebuilder:validation:Enum=map-based consistent; Method string `json:"method,omitempty"` // modifier - // Enum: ["avalanche"] + // Enum: [avalanche] // +kubebuilder:validation:Enum=avalanche; Modifier string `json:"modifier,omitempty"` } diff --git a/models/health.go b/models/health.go index 5ed0fd62..77a89df1 100644 --- a/models/health.go +++ b/models/health.go @@ -35,8 +35,8 @@ import ( // swagger:model health type Health struct { // haproxy - // Enum: ["up","down","unknown"] - // +kubebuilder:validation:Enum=up;down;unknown; + // Enum: [up down unknown] + // +kubebuilder:validation:Enum=up down unknown; Haproxy string `json:"haproxy,omitempty"` } diff --git a/models/http_after_response_rule.go b/models/http_after_response_rule.go index 89a739fa..fba5a9d2 100644 --- a/models/http_after_response_rule.go +++ b/models/http_after_response_rule.go @@ -59,8 +59,8 @@ type HTTPAfterResponseRule struct { CaptureSample string `json:"capture_sample,omitempty"` // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -79,8 +79,8 @@ type HTTPAfterResponseRule struct { HdrName string `json:"hdr_name,omitempty"` // log level - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug","silent"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug;silent; + // Enum: [emerg alert crit err warning notice info debug silent] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug silent; LogLevel string `json:"log_level,omitempty"` // map file @@ -125,14 +125,14 @@ type HTTPAfterResponseRule struct { StatusReason string `json:"status_reason,omitempty"` // strict mode - // Enum: ["on","off"] - // +kubebuilder:validation:Enum=on;off; + // Enum: [on off] + // +kubebuilder:validation:Enum=on off; StrictMode string `json:"strict_mode,omitempty"` // type // Required: true - // Enum: ["add-header","allow","capture","del-acl","del-header","del-map","replace-header","replace-value","sc-add-gpc","sc-inc-gpc","sc-inc-gpc0","sc-inc-gpc1","sc-set-gpt","sc-set-gpt0","set-header","set-log-level","set-map","set-status","set-var","set-var-fmt","strict-mode","unset-var","do-log"] - // +kubebuilder:validation:Enum=add-header;allow;capture;del-acl;del-header;del-map;replace-header;replace-value;sc-add-gpc;sc-inc-gpc;sc-inc-gpc0;sc-inc-gpc1;sc-set-gpt;sc-set-gpt0;set-header;set-log-level;set-map;set-status;set-var;set-var-fmt;strict-mode;unset-var;do-log; + // Enum: [add-header allow capture del-acl del-header del-map replace-header replace-value sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 set-header set-log-level set-map set-status set-var set-var-fmt strict-mode unset-var do-log] + // +kubebuilder:validation:Enum=add-header allow capture del-acl del-header del-map replace-header replace-value sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 set-header set-log-level set-map set-status set-var set-var-fmt strict-mode unset-var do-log; Type string `json:"type"` // var expr diff --git a/models/http_after_response_rules.go b/models/http_after_response_rules.go index 1f95bb34..74e72caa 100644 --- a/models/http_after_response_rules.go +++ b/models/http_after_response_rules.go @@ -71,11 +71,6 @@ func (m HTTPAfterResponseRules) ContextValidate(ctx context.Context, formats str 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/http_check.go b/models/http_check.go index d0483e32..b981f3a0 100644 --- a/models/http_check.go +++ b/models/http_check.go @@ -62,8 +62,8 @@ type HTTPCheck struct { Default bool `json:"default,omitempty"` // error status - // Enum: ["L7OKC","L7RSP","L7STS","L6RSP","L4CON"] - // +kubebuilder:validation:Enum=L7OKC;L7RSP;L7STS;L6RSP;L4CON; + // Enum: [L7OKC L7RSP L7STS L6RSP L4CON] + // +kubebuilder:validation:Enum=L7OKC L7RSP L7STS L6RSP L4CON; ErrorStatus string `json:"error_status,omitempty"` // exclamation mark @@ -74,9 +74,9 @@ type HTTPCheck struct { // match // Pattern: ^[^\s]+$ - // Enum: ["status","rstatus","hdr","fhdr","string","rstring"] + // Enum: [status rstatus hdr fhdr string rstring] // +kubebuilder:validation:Pattern=`^[^\s]+$` - // +kubebuilder:validation:Enum=status;rstatus;hdr;fhdr;string;rstring; + // +kubebuilder:validation:Enum=status rstatus hdr fhdr string rstring; Match string `json:"match,omitempty"` // +kubebuilder:pruning:PreserveUnknownFields @@ -84,16 +84,16 @@ type HTTPCheck struct { Metadata map[string]interface{} `json:"metadata,omitempty"` // method - // Enum: ["HEAD","PUT","POST","GET","TRACE","PATCH","DELETE","CONNECT","OPTIONS"] - // +kubebuilder:validation:Enum=HEAD;PUT;POST;GET;TRACE;PATCH;DELETE;CONNECT;OPTIONS; + // Enum: [HEAD PUT POST GET TRACE PATCH DELETE CONNECT OPTIONS] + // +kubebuilder:validation:Enum=HEAD PUT POST GET TRACE PATCH DELETE CONNECT OPTIONS; Method string `json:"method,omitempty"` // min recv MinRecv *int64 `json:"min_recv,omitempty"` // ok status - // Enum: ["L7OK","L7OKC","L6OK","L4OK"] - // +kubebuilder:validation:Enum=L7OK;L7OKC;L6OK;L4OK; + // Enum: [L7OK L7OKC L6OK L4OK] + // +kubebuilder:validation:Enum=L7OK L7OKC L6OK L4OK; OkStatus string `json:"ok_status,omitempty"` // on error @@ -131,14 +131,14 @@ type HTTPCheck struct { StatusCode string `json:"status-code,omitempty"` // tout status - // Enum: ["L7TOUT","L6TOUT","L4TOUT"] - // +kubebuilder:validation:Enum=L7TOUT;L6TOUT;L4TOUT; + // Enum: [L7TOUT L6TOUT L4TOUT] + // +kubebuilder:validation:Enum=L7TOUT L6TOUT L4TOUT; ToutStatus string `json:"tout_status,omitempty"` // type // Required: true - // Enum: ["comment","connect","disable-on-404","expect","send","send-state","set-var","set-var-fmt","unset-var"] - // +kubebuilder:validation:Enum=comment;connect;disable-on-404;expect;send;send-state;set-var;set-var-fmt;unset-var; + // Enum: [comment connect disable-on-404 expect send send-state set-var set-var-fmt unset-var] + // +kubebuilder:validation:Enum=comment connect disable-on-404 expect send send-state set-var set-var-fmt unset-var; Type string `json:"type"` // uri @@ -666,11 +666,6 @@ func (m *HTTPCheck) contextValidateCheckHeaders(ctx context.Context, formats str for i := 0; i < len(m.CheckHeaders); i++ { if m.CheckHeaders[i] != nil { - - if swag.IsZero(m.CheckHeaders[i]) { // not required - return nil - } - if err := m.CheckHeaders[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("headers" + "." + strconv.Itoa(i)) diff --git a/models/http_checks.go b/models/http_checks.go index cad1c352..5265de6c 100644 --- a/models/http_checks.go +++ b/models/http_checks.go @@ -69,11 +69,6 @@ func (m HTTPChecks) ContextValidate(ctx context.Context, formats strfmt.Registry 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/http_client_options.go b/models/http_client_options.go index 99c00bd3..ceb99ef5 100644 --- a/models/http_client_options.go +++ b/models/http_client_options.go @@ -35,16 +35,16 @@ import ( // swagger:model http_client_options type HTTPClientOptions struct { // resolvers disabled - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ResolversDisabled string `json:"resolvers_disabled,omitempty"` // resolvers id ResolversID string `json:"resolvers_id,omitempty"` // resolvers prefer - // Enum: ["ipv4","ipv6"] - // +kubebuilder:validation:Enum=ipv4;ipv6; + // Enum: [ipv4 ipv6] + // +kubebuilder:validation:Enum=ipv4 ipv6; ResolversPrefer string `json:"resolvers_prefer,omitempty"` // retries @@ -54,8 +54,8 @@ type HTTPClientOptions struct { SslCaFile string `json:"ssl_ca_file,omitempty"` // ssl verify - // Enum: ["","none","required"] - // +kubebuilder:validation:Enum="";none;required; + // Enum: [ none required] + // +kubebuilder:validation:Enum= none required; SslVerify *string `json:"ssl_verify,omitempty"` // timeout connect diff --git a/models/http_error_rule.go b/models/http_error_rule.go index 4b9845a9..cdea3011 100644 --- a/models/http_error_rule.go +++ b/models/http_error_rule.go @@ -50,8 +50,8 @@ type HTTPErrorRule struct { ReturnContent string `json:"return_content,omitempty"` // return content format - // Enum: ["default-errorfiles","errorfile","errorfiles","file","lf-file","string","lf-string"] - // +kubebuilder:validation:Enum=default-errorfiles;errorfile;errorfiles;file;lf-file;string;lf-string; + // Enum: [default-errorfiles errorfile errorfiles file lf-file string lf-string] + // +kubebuilder:validation:Enum=default-errorfiles errorfile errorfiles file lf-file string lf-string; ReturnContentFormat string `json:"return_content_format,omitempty"` // return content type @@ -59,13 +59,13 @@ type HTTPErrorRule struct { // status // Required: true - // Enum: [200,400,401,403,404,405,407,408,410,413,425,429,500,501,502,503,504] - // +kubebuilder:validation:Enum=200;400;401;403;404;405;407;408;410;413;425;429;500;501;502;503;504; + // Enum: [200 400 401 403 404 405 407 408 410 413 425 429 500 501 502 503 504] + // +kubebuilder:validation:Enum=200 400 401 403 404 405 407 408 410 413 425 429 500 501 502 503 504; Status int64 `json:"status"` // type // Required: true - // Enum: ["status"] + // Enum: [status] // +kubebuilder:validation:Enum=status; Type string `json:"type"` } @@ -272,11 +272,6 @@ func (m *HTTPErrorRule) contextValidateReturnHeaders(ctx context.Context, format for i := 0; i < len(m.ReturnHeaders); i++ { if m.ReturnHeaders[i] != nil { - - if swag.IsZero(m.ReturnHeaders[i]) { // not required - return nil - } - if err := m.ReturnHeaders[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("return_hdrs" + "." + strconv.Itoa(i)) diff --git a/models/http_error_rules.go b/models/http_error_rules.go index 3e5c0e3f..ad305413 100644 --- a/models/http_error_rules.go +++ b/models/http_error_rules.go @@ -71,11 +71,6 @@ func (m HTTPErrorRules) ContextValidate(ctx context.Context, formats strfmt.Regi 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/http_errors_section.go b/models/http_errors_section.go index c2c02715..1c5d6526 100644 --- a/models/http_errors_section.go +++ b/models/http_errors_section.go @@ -130,11 +130,6 @@ func (m *HTTPErrorsSection) contextValidateErrorFiles(ctx context.Context, forma for i := 0; i < len(m.ErrorFiles); i++ { if m.ErrorFiles[i] != nil { - - if swag.IsZero(m.ErrorFiles[i]) { // not required - return nil - } - if err := m.ErrorFiles[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("error_files" + "." + strconv.Itoa(i)) diff --git a/models/http_errors_sections.go b/models/http_errors_sections.go index 276c71f4..603c6fe6 100644 --- a/models/http_errors_sections.go +++ b/models/http_errors_sections.go @@ -71,11 +71,6 @@ func (m HTTPErrorsSections) ContextValidate(ctx context.Context, formats strfmt. 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/http_request_rule.go b/models/http_request_rule.go index e55cd3c0..3dd67127 100644 --- a/models/http_request_rule.go +++ b/models/http_request_rule.go @@ -83,8 +83,8 @@ type HTTPRequestRule struct { CaptureSample string `json:"capture_sample,omitempty"` // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -123,8 +123,8 @@ type HTTPRequestRule struct { HintName string `json:"hint_name,omitempty"` // log level - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug","silent"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug;silent; + // Enum: [emerg alert crit err warning notice info debug silent] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug silent; LogLevel string `json:"log_level,omitempty"` // lua action @@ -172,8 +172,8 @@ type HTTPRequestRule struct { NiceValue int64 `json:"nice_value,omitempty"` // normalizer - // Enum: ["fragment-encode","fragment-strip","path-merge-slashes","path-strip-dot","path-strip-dotdot","percent-decode-unreserved","percent-to-uppercase","query-sort-by-name"] - // +kubebuilder:validation:Enum=fragment-encode;fragment-strip;path-merge-slashes;path-strip-dot;path-strip-dotdot;percent-decode-unreserved;percent-to-uppercase;query-sort-by-name; + // Enum: [fragment-encode fragment-strip path-merge-slashes path-strip-dot path-strip-dotdot percent-decode-unreserved percent-to-uppercase query-sort-by-name] + // +kubebuilder:validation:Enum=fragment-encode fragment-strip path-merge-slashes path-strip-dot path-strip-dotdot percent-decode-unreserved percent-to-uppercase query-sort-by-name; Normalizer string `json:"normalizer,omitempty"` // normalizer full @@ -193,24 +193,24 @@ type HTTPRequestRule struct { PathMatch string `json:"path_match,omitempty"` // protocol - // Enum: ["ipv4","ipv6"] - // +kubebuilder:validation:Enum=ipv4;ipv6; + // Enum: [ipv4 ipv6] + // +kubebuilder:validation:Enum=ipv4 ipv6; Protocol string `json:"protocol,omitempty"` // query fmt QueryFmt string `json:"query-fmt,omitempty"` // redir code - // Enum: [301,302,303,307,308] - // +kubebuilder:validation:Enum=301;302;303;307;308; + // Enum: [301 302 303 307 308] + // +kubebuilder:validation:Enum=301 302 303 307 308; RedirCode *int64 `json:"redir_code,omitempty"` // redir option RedirOption string `json:"redir_option,omitempty"` // redir type - // Enum: ["location","prefix","scheme"] - // +kubebuilder:validation:Enum=location;prefix;scheme; + // Enum: [location prefix scheme] + // +kubebuilder:validation:Enum=location prefix scheme; RedirType string `json:"redir_type,omitempty"` // redir value @@ -225,8 +225,8 @@ type HTTPRequestRule struct { ReturnContent string `json:"return_content,omitempty"` // return content format - // Enum: ["default-errorfiles","errorfile","errorfiles","file","lf-file","string","lf-string"] - // +kubebuilder:validation:Enum=default-errorfiles;errorfile;errorfiles;file;lf-file;string;lf-string; + // Enum: [default-errorfiles errorfile errorfiles file lf-file string lf-string] + // +kubebuilder:validation:Enum=default-errorfiles errorfile errorfiles file lf-file string lf-string; ReturnContentFormat string `json:"return_content_format,omitempty"` // return content type @@ -268,16 +268,16 @@ type HTTPRequestRule struct { SpoeGroup string `json:"spoe_group,omitempty"` // strict mode - // Enum: ["on","off"] - // +kubebuilder:validation:Enum=on;off; + // Enum: [on off] + // +kubebuilder:validation:Enum=on off; StrictMode string `json:"strict_mode,omitempty"` // timeout Timeout string `json:"timeout,omitempty"` // timeout type - // Enum: ["server","tunnel","client"] - // +kubebuilder:validation:Enum=server;tunnel;client; + // Enum: [server tunnel client] + // +kubebuilder:validation:Enum=server tunnel client; TimeoutType string `json:"timeout_type,omitempty"` // tos value @@ -300,8 +300,8 @@ type HTTPRequestRule struct { // type // Required: true - // Enum: ["add-acl","add-header","allow","auth","cache-use","capture","del-acl","del-header","del-map","deny","disable-l7-retry","do-resolve","early-hint","lua","normalize-uri","pause","redirect","reject","replace-header","replace-path","replace-pathq","replace-uri","replace-value","return","sc-add-gpc","sc-inc-gpc","sc-inc-gpc0","sc-inc-gpc1","sc-set-gpt","sc-set-gpt0","send-spoe-group","set-bc-mark","set-bc-tos","set-dst","set-dst-port","set-fc-mark","set-fc-tos","set-header","set-log-level","set-map","set-mark","set-method","set-nice","set-path","set-pathq","set-priority-class","set-priority-offset","set-query","set-src","set-src-port","set-timeout","set-tos","set-uri","set-var","set-var-fmt","silent-drop","strict-mode","tarpit","track-sc","unset-var","use-service","wait-for-body","wait-for-handshake","set-bandwidth-limit","set-retries","do-log"] - // +kubebuilder:validation:Enum=add-acl;add-header;allow;auth;cache-use;capture;del-acl;del-header;del-map;deny;disable-l7-retry;do-resolve;early-hint;lua;normalize-uri;pause;redirect;reject;replace-header;replace-path;replace-pathq;replace-uri;replace-value;return;sc-add-gpc;sc-inc-gpc;sc-inc-gpc0;sc-inc-gpc1;sc-set-gpt;sc-set-gpt0;send-spoe-group;set-bc-mark;set-bc-tos;set-dst;set-dst-port;set-fc-mark;set-fc-tos;set-header;set-log-level;set-map;set-mark;set-method;set-nice;set-path;set-pathq;set-priority-class;set-priority-offset;set-query;set-src;set-src-port;set-timeout;set-tos;set-uri;set-var;set-var-fmt;silent-drop;strict-mode;tarpit;track-sc;unset-var;use-service;wait-for-body;wait-for-handshake;set-bandwidth-limit;set-retries;do-log; + // Enum: [add-acl add-header allow auth cache-use capture del-acl del-header del-map deny disable-l7-retry do-resolve early-hint lua normalize-uri pause redirect reject replace-header replace-path replace-pathq replace-uri replace-value return sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-bc-mark set-bc-tos set-dst set-dst-port set-fc-mark set-fc-tos set-header set-log-level set-map set-mark set-method set-nice set-path set-pathq set-priority-class set-priority-offset set-query set-src set-src-port set-timeout set-tos set-uri set-var set-var-fmt silent-drop strict-mode tarpit track-sc unset-var use-service wait-for-body wait-for-handshake set-bandwidth-limit set-retries do-log] + // +kubebuilder:validation:Enum=add-acl add-header allow auth cache-use capture del-acl del-header del-map deny disable-l7-retry do-resolve early-hint lua normalize-uri pause redirect reject replace-header replace-path replace-pathq replace-uri replace-value return sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-bc-mark set-bc-tos set-dst set-dst-port set-fc-mark set-fc-tos set-header set-log-level set-map set-mark set-method set-nice set-path set-pathq set-priority-class set-priority-offset set-query set-src set-src-port set-timeout set-tos set-uri set-var set-var-fmt silent-drop strict-mode tarpit track-sc unset-var use-service wait-for-body wait-for-handshake set-bandwidth-limit set-retries do-log; Type string `json:"type"` // uri fmt @@ -1542,11 +1542,6 @@ func (m *HTTPRequestRule) contextValidateReturnHeaders(ctx context.Context, form for i := 0; i < len(m.ReturnHeaders); i++ { if m.ReturnHeaders[i] != nil { - - if swag.IsZero(m.ReturnHeaders[i]) { // not required - return nil - } - if err := m.ReturnHeaders[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("return_hdrs" + "." + strconv.Itoa(i)) diff --git a/models/http_request_rules.go b/models/http_request_rules.go index 4dd6b80a..6962ced2 100644 --- a/models/http_request_rules.go +++ b/models/http_request_rules.go @@ -71,11 +71,6 @@ func (m HTTPRequestRules) ContextValidate(ctx context.Context, formats strfmt.Re 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/http_response_rule.go b/models/http_response_rule.go index cc8885bf..9b27ed04 100644 --- a/models/http_response_rule.go +++ b/models/http_response_rule.go @@ -75,8 +75,8 @@ type HTTPResponseRule struct { CaptureSample string `json:"capture_sample,omitempty"` // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -105,8 +105,8 @@ type HTTPResponseRule struct { HdrName string `json:"hdr_name,omitempty"` // log level - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug","silent"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug;silent; + // Enum: [emerg alert crit err warning notice info debug silent] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug silent; LogLevel string `json:"log_level,omitempty"` // lua action @@ -149,16 +149,16 @@ type HTTPResponseRule struct { NiceValue int64 `json:"nice_value,omitempty"` // redir code - // Enum: [301,302,303,307,308] - // +kubebuilder:validation:Enum=301;302;303;307;308; + // Enum: [301 302 303 307 308] + // +kubebuilder:validation:Enum=301 302 303 307 308; RedirCode *int64 `json:"redir_code,omitempty"` // redir option RedirOption string `json:"redir_option,omitempty"` // redir type - // Enum: ["location","prefix","scheme"] - // +kubebuilder:validation:Enum=location;prefix;scheme; + // Enum: [location prefix scheme] + // +kubebuilder:validation:Enum=location prefix scheme; RedirType string `json:"redir_type,omitempty"` // redir value @@ -170,8 +170,8 @@ type HTTPResponseRule struct { ReturnContent string `json:"return_content,omitempty"` // return content format - // Enum: ["default-errorfiles","errorfile","errorfiles","file","lf-file","string","lf-string"] - // +kubebuilder:validation:Enum=default-errorfiles;errorfile;errorfiles;file;lf-file;string;lf-string; + // Enum: [default-errorfiles errorfile errorfiles file lf-file string lf-string] + // +kubebuilder:validation:Enum=default-errorfiles errorfile errorfiles file lf-file string lf-string; ReturnContentFormat string `json:"return_content_format,omitempty"` // return content type @@ -220,16 +220,16 @@ type HTTPResponseRule struct { StatusReason string `json:"status_reason,omitempty"` // strict mode - // Enum: ["on","off"] - // +kubebuilder:validation:Enum=on;off; + // Enum: [on off] + // +kubebuilder:validation:Enum=on off; StrictMode string `json:"strict_mode,omitempty"` // timeout Timeout string `json:"timeout,omitempty"` // timeout type - // Enum: ["server","tunnel","client"] - // +kubebuilder:validation:Enum=server;tunnel;client; + // Enum: [server tunnel client] + // +kubebuilder:validation:Enum=server tunnel client; TimeoutType string `json:"timeout_type,omitempty"` // tos value @@ -252,8 +252,8 @@ type HTTPResponseRule struct { // type // Required: true - // Enum: ["add-acl","add-header","allow","cache-store","capture","del-acl","del-header","del-map","deny","lua","pause","redirect","replace-header","replace-value","return","sc-add-gpc","sc-inc-gpc","sc-inc-gpc0","sc-inc-gpc1","sc-set-gpt","sc-set-gpt0","send-spoe-group","set-fc-mark","set-fc-tos","set-header","set-log-level","set-map","set-mark","set-nice","set-status","set-timeout","set-tos","set-var","set-var-fmt","silent-drop","strict-mode","track-sc","unset-var","wait-for-body","set-bandwidth-limit","do-log"] - // +kubebuilder:validation:Enum=add-acl;add-header;allow;cache-store;capture;del-acl;del-header;del-map;deny;lua;pause;redirect;replace-header;replace-value;return;sc-add-gpc;sc-inc-gpc;sc-inc-gpc0;sc-inc-gpc1;sc-set-gpt;sc-set-gpt0;send-spoe-group;set-fc-mark;set-fc-tos;set-header;set-log-level;set-map;set-mark;set-nice;set-status;set-timeout;set-tos;set-var;set-var-fmt;silent-drop;strict-mode;track-sc;unset-var;wait-for-body;set-bandwidth-limit;do-log; + // Enum: [add-acl add-header allow cache-store capture del-acl del-header del-map deny lua pause redirect replace-header replace-value return sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-fc-mark set-fc-tos set-header set-log-level set-map set-mark set-nice set-status set-timeout set-tos set-var set-var-fmt silent-drop strict-mode track-sc unset-var wait-for-body set-bandwidth-limit do-log] + // +kubebuilder:validation:Enum=add-acl add-header allow cache-store capture del-acl del-header del-map deny lua pause redirect replace-header replace-value return sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-fc-mark set-fc-tos set-header set-log-level set-map set-mark set-nice set-status set-timeout set-tos set-var set-var-fmt silent-drop strict-mode track-sc unset-var wait-for-body set-bandwidth-limit do-log; Type string `json:"type"` // var expr @@ -1227,11 +1227,6 @@ func (m *HTTPResponseRule) contextValidateReturnHeaders(ctx context.Context, for for i := 0; i < len(m.ReturnHeaders); i++ { if m.ReturnHeaders[i] != nil { - - if swag.IsZero(m.ReturnHeaders[i]) { // not required - return nil - } - if err := m.ReturnHeaders[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("return_hdrs" + "." + strconv.Itoa(i)) diff --git a/models/http_response_rules.go b/models/http_response_rules.go index 1de0d943..34e17a91 100644 --- a/models/http_response_rules.go +++ b/models/http_response_rules.go @@ -71,11 +71,6 @@ func (m HTTPResponseRules) 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/httpchk_params.go b/models/httpchk_params.go index 16e4e241..77d6be45 100644 --- a/models/httpchk_params.go +++ b/models/httpchk_params.go @@ -39,8 +39,8 @@ type HttpchkParams struct { Host string `json:"host,omitempty"` // method - // Enum: ["HEAD","PUT","POST","GET","TRACE","PATCH","DELETE","CONNECT","OPTIONS"] - // +kubebuilder:validation:Enum=HEAD;PUT;POST;GET;TRACE;PATCH;DELETE;CONNECT;OPTIONS; + // Enum: [HEAD PUT POST GET TRACE PATCH DELETE CONNECT OPTIONS] + // +kubebuilder:validation:Enum=HEAD PUT POST GET TRACE PATCH DELETE CONNECT OPTIONS; Method string `json:"method,omitempty"` // uri diff --git a/models/info.go b/models/info.go index b1bbc397..f1caaaea 100644 --- a/models/info.go +++ b/models/info.go @@ -121,11 +121,6 @@ func (m *Info) ContextValidate(ctx context.Context, formats strfmt.Registry) err func (m *Info) contextValidateAPI(ctx context.Context, formats strfmt.Registry) error { if m.API != nil { - - if swag.IsZero(m.API) { // not required - return nil - } - if err := m.API.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("api") @@ -142,11 +137,6 @@ func (m *Info) contextValidateAPI(ctx context.Context, formats strfmt.Registry) func (m *Info) contextValidateSystem(ctx context.Context, formats strfmt.Registry) error { if m.System != nil { - - if swag.IsZero(m.System) { // not required - return nil - } - if err := m.System.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("system") @@ -341,11 +331,6 @@ func (m *InfoSystem) ContextValidate(ctx context.Context, formats strfmt.Registr func (m *InfoSystem) contextValidateCPUInfo(ctx context.Context, formats strfmt.Registry) error { if m.CPUInfo != nil { - - if swag.IsZero(m.CPUInfo) { // not required - return nil - } - if err := m.CPUInfo.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("system" + "." + "cpu_info") @@ -362,11 +347,6 @@ func (m *InfoSystem) contextValidateCPUInfo(ctx context.Context, formats strfmt. func (m *InfoSystem) contextValidateMemInfo(ctx context.Context, formats strfmt.Registry) error { if m.MemInfo != nil { - - if swag.IsZero(m.MemInfo) { // not required - return nil - } - if err := m.MemInfo.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("system" + "." + "mem_info") diff --git a/models/log_forwards.go b/models/log_forwards.go index 66dd5330..6200f26c 100644 --- a/models/log_forwards.go +++ b/models/log_forwards.go @@ -71,11 +71,6 @@ func (m LogForwards) ContextValidate(ctx context.Context, formats strfmt.Registr 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/log_profile_step.go b/models/log_profile_step.go index 03c8b63d..e5fbcb4d 100644 --- a/models/log_profile_step.go +++ b/models/log_profile_step.go @@ -37,8 +37,8 @@ import ( // swagger:model log_profile_step type LogProfileStep struct { // If enabled, no log shall be emitted for the given step. - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Drop string `json:"drop,omitempty"` // Override "log-format" or "error-log-format" strings depending on the step. @@ -53,8 +53,8 @@ type LogProfileStep struct { // Logging step name. // Required: true - // Enum: ["accept","any","close","connect","error","request","response","http-req","http-res","http-after-res","quic-init","tcp-req-conn","tcp-req-cont","tcp-req-sess"] - // +kubebuilder:validation:Enum=accept;any;close;connect;error;request;response;http-req;http-res;http-after-res;quic-init;tcp-req-conn;tcp-req-cont;tcp-req-sess; + // Enum: [accept any close connect error request response http-req http-res http-after-res quic-init tcp-req-conn tcp-req-cont tcp-req-sess] + // +kubebuilder:validation:Enum=accept any close connect error request response http-req http-res http-after-res quic-init tcp-req-conn tcp-req-cont tcp-req-sess; Step string `json:"step"` } diff --git a/models/log_profile_steps.go b/models/log_profile_steps.go index 5aed2da2..24d69090 100644 --- a/models/log_profile_steps.go +++ b/models/log_profile_steps.go @@ -69,11 +69,6 @@ func (m LogProfileSteps) ContextValidate(ctx context.Context, formats strfmt.Reg 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/log_profiles.go b/models/log_profiles.go index d7823098..d06a2bae 100644 --- a/models/log_profiles.go +++ b/models/log_profiles.go @@ -69,11 +69,6 @@ func (m LogProfiles) ContextValidate(ctx context.Context, formats strfmt.Registr 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/log_target.go b/models/log_target.go index d46cb5cd..f54ab17a 100644 --- a/models/log_target.go +++ b/models/log_target.go @@ -42,13 +42,13 @@ type LogTarget struct { Address string `json:"address,omitempty"` // facility - // Enum: ["kern","user","mail","daemon","auth","syslog","lpr","news","uucp","cron","auth2","ftp","ntp","audit","alert","cron2","local0","local1","local2","local3","local4","local5","local6","local7"] - // +kubebuilder:validation:Enum=kern;user;mail;daemon;auth;syslog;lpr;news;uucp;cron;auth2;ftp;ntp;audit;alert;cron2;local0;local1;local2;local3;local4;local5;local6;local7; + // Enum: [kern user mail daemon auth syslog lpr news uucp cron auth2 ftp ntp audit alert cron2 local0 local1 local2 local3 local4 local5 local6 local7] + // +kubebuilder:validation:Enum=kern user mail daemon auth syslog lpr news uucp cron auth2 ftp ntp audit alert cron2 local0 local1 local2 local3 local4 local5 local6 local7; Facility string `json:"facility,omitempty"` // format - // Enum: ["local","rfc3164","rfc5424","priority","short","timed","iso","raw"] - // +kubebuilder:validation:Enum=local;rfc3164;rfc5424;priority;short;timed;iso;raw; + // Enum: [local rfc3164 rfc5424 priority short timed iso raw] + // +kubebuilder:validation:Enum=local rfc3164 rfc5424 priority short timed iso raw; Format string `json:"format,omitempty"` // global @@ -58,8 +58,8 @@ type LogTarget struct { Length int64 `json:"length,omitempty"` // level - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug; + // Enum: [emerg alert crit err warning notice info debug] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug; Level string `json:"level,omitempty"` // +kubebuilder:pruning:PreserveUnknownFields @@ -67,8 +67,8 @@ type LogTarget struct { Metadata map[string]interface{} `json:"metadata,omitempty"` // minlevel - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug; + // Enum: [emerg alert crit err warning notice info debug] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug; Minlevel string `json:"minlevel,omitempty"` // nolog diff --git a/models/log_targets.go b/models/log_targets.go index b647ddb7..b0bd2e51 100644 --- a/models/log_targets.go +++ b/models/log_targets.go @@ -71,11 +71,6 @@ func (m LogTargets) ContextValidate(ctx context.Context, formats strfmt.Registry 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/lua_options.go b/models/lua_options.go index 507b1e78..d057ee10 100644 --- a/models/lua_options.go +++ b/models/lua_options.go @@ -139,11 +139,6 @@ func (m *LuaOptions) contextValidateLoads(ctx context.Context, formats strfmt.Re for i := 0; i < len(m.Loads); i++ { if m.Loads[i] != nil { - - if swag.IsZero(m.Loads[i]) { // not required - return nil - } - if err := m.Loads[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("loads" + "." + strconv.Itoa(i)) @@ -164,11 +159,6 @@ func (m *LuaOptions) contextValidatePrependPath(ctx context.Context, formats str for i := 0; i < len(m.PrependPath); i++ { if m.PrependPath[i] != nil { - - if swag.IsZero(m.PrependPath[i]) { // not required - return nil - } - if err := m.PrependPath[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("prepend_path" + "." + strconv.Itoa(i)) @@ -274,8 +264,8 @@ type LuaPrependPath struct { Path *string `json:"path"` // type - // Enum: ["path","cpath"] - // +kubebuilder:validation:Enum=path;cpath; + // Enum: [path cpath] + // +kubebuilder:validation:Enum=path cpath; Type string `json:"type,omitempty"` } diff --git a/models/mailer_entries.go b/models/mailer_entries.go index f3df1cc6..58601cf7 100644 --- a/models/mailer_entries.go +++ b/models/mailer_entries.go @@ -71,11 +71,6 @@ func (m MailerEntries) ContextValidate(ctx context.Context, formats strfmt.Regis 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/mailers_sections.go b/models/mailers_sections.go index 7f5a7b9d..0db169e4 100644 --- a/models/mailers_sections.go +++ b/models/mailers_sections.go @@ -71,11 +71,6 @@ func (m MailersSections) ContextValidate(ctx context.Context, formats strfmt.Reg 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/map_entries.go b/models/map_entries.go index 16769bf9..50197599 100644 --- a/models/map_entries.go +++ b/models/map_entries.go @@ -71,11 +71,6 @@ func (m MapEntries) ContextValidate(ctx context.Context, formats strfmt.Registry 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/maps.go b/models/maps.go index 1e2f30b4..84695fa1 100644 --- a/models/maps.go +++ b/models/maps.go @@ -71,11 +71,6 @@ func (m Maps) ContextValidate(ctx context.Context, formats strfmt.Registry) erro 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/monitor_fail.go b/models/monitor_fail.go index bb03845c..79e76b28 100644 --- a/models/monitor_fail.go +++ b/models/monitor_fail.go @@ -36,8 +36,8 @@ import ( type MonitorFail struct { // cond // Required: true - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond *string `json:"cond"` // cond test diff --git a/models/mysql_check_params.go b/models/mysql_check_params.go index 64984b46..848cb8f5 100644 --- a/models/mysql_check_params.go +++ b/models/mysql_check_params.go @@ -35,8 +35,8 @@ import ( // swagger:model mysql_check_params type MysqlCheckParams struct { // client version - // Enum: ["pre-41","post-41"] - // +kubebuilder:validation:Enum=pre-41;post-41; + // Enum: [pre-41 post-41] + // +kubebuilder:validation:Enum=pre-41 post-41; ClientVersion string `json:"client_version,omitempty"` // username diff --git a/models/nameservers.go b/models/nameservers.go index 5c7d07c4..bb4e5415 100644 --- a/models/nameservers.go +++ b/models/nameservers.go @@ -71,11 +71,6 @@ func (m Nameservers) ContextValidate(ctx context.Context, formats strfmt.Registr 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/native_stat.go b/models/native_stat.go index bc86212e..273af0fa 100644 --- a/models/native_stat.go +++ b/models/native_stat.go @@ -47,8 +47,8 @@ type NativeStat struct { Stats *NativeStatStats `json:"stats,omitempty"` // type - // Enum: ["backend","server","frontend"] - // +kubebuilder:validation:Enum=backend;server;frontend; + // Enum: [backend server frontend] + // +kubebuilder:validation:Enum=backend server frontend; Type string `json:"type,omitempty"` } @@ -151,11 +151,6 @@ func (m *NativeStat) ContextValidate(ctx context.Context, formats strfmt.Registr func (m *NativeStat) contextValidateStats(ctx context.Context, formats strfmt.Registry) error { if m.Stats != nil { - - if swag.IsZero(m.Stats) { // not required - return nil - } - if err := m.Stats.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stats") diff --git a/models/native_stat_stats.go b/models/native_stat_stats.go index f22bd4ee..656fd845 100644 --- a/models/native_stat_stats.go +++ b/models/native_stat_stats.go @@ -61,8 +61,8 @@ type NativeStatStats struct { AgentRise *int64 `json:"agent_rise,omitempty"` // agent status - // Enum: ["UNK","INI","SOCKERR","L4OK","L4TOUT","L4CON","L7OK","L7STS"] - // +kubebuilder:validation:Enum=UNK;INI;SOCKERR;L4OK;L4TOUT;L4CON;L7OK;L7STS; + // Enum: [UNK INI SOCKERR L4OK L4TOUT L4CON L7OK L7STS] + // +kubebuilder:validation:Enum=UNK INI SOCKERR L4OK L4TOUT L4CON L7OK L7STS; AgentStatus string `json:"agent_status,omitempty"` // algo @@ -96,8 +96,8 @@ type NativeStatStats struct { CheckRise *int64 `json:"check_rise,omitempty"` // check status - // Enum: ["UNK","INI","SOCKERR","L4OK","L4TOUT","L4CON","L6OK","L6TOUT","L6RSP","L7OK","L7OKC","L7TOUT","L7RSP","L7STS"] - // +kubebuilder:validation:Enum=UNK;INI;SOCKERR;L4OK;L4TOUT;L4CON;L6OK;L6TOUT;L6RSP;L7OK;L7OKC;L7TOUT;L7RSP;L7STS; + // Enum: [UNK INI SOCKERR L4OK L4TOUT L4CON L6OK L6TOUT L6RSP L7OK L7OKC L7TOUT L7RSP L7STS] + // +kubebuilder:validation:Enum=UNK INI SOCKERR L4OK L4TOUT L4CON L6OK L6TOUT L6RSP L7OK L7OKC L7TOUT L7RSP L7STS; CheckStatus string `json:"check_status,omitempty"` // chkdown @@ -203,8 +203,8 @@ type NativeStatStats struct { Lbtot *int64 `json:"lbtot,omitempty"` // mode - // Enum: ["tcp","http","health","unknown"] - // +kubebuilder:validation:Enum=tcp;http;health;unknown; + // Enum: [tcp http health unknown] + // +kubebuilder:validation:Enum=tcp http health unknown; Mode string `json:"mode,omitempty"` // pid @@ -259,8 +259,8 @@ type NativeStatStats struct { SrvAbrt *int64 `json:"srv_abrt,omitempty"` // status - // Enum: ["UP","DOWN","NOLB","MAINT","no check"] - // +kubebuilder:validation:Enum=UP;DOWN;NOLB;MAINT;no check; + // Enum: [UP DOWN NOLB MAINT no check] + // +kubebuilder:validation:Enum=UP DOWN NOLB MAINT no check; Status string `json:"status,omitempty"` // stot diff --git a/models/native_stats.go b/models/native_stats.go index 7cf2c237..8c176392 100644 --- a/models/native_stats.go +++ b/models/native_stats.go @@ -105,11 +105,6 @@ func (m *NativeStats) contextValidateStats(ctx context.Context, formats strfmt.R for i := 0; i < len(m.Stats); i++ { if m.Stats[i] != nil { - - if swag.IsZero(m.Stats[i]) { // not required - return nil - } - if err := m.Stats[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stats" + "." + strconv.Itoa(i)) diff --git a/models/ocsp_update_options.go b/models/ocsp_update_options.go index 0a8645a2..e6f7cedc 100644 --- a/models/ocsp_update_options.go +++ b/models/ocsp_update_options.go @@ -48,8 +48,8 @@ type OcspUpdateOptions struct { Mindelay *int64 `json:"mindelay,omitempty"` // mode - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Mode string `json:"mode,omitempty"` } @@ -149,11 +149,6 @@ func (m *OcspUpdateOptions) ContextValidate(ctx context.Context, formats strfmt. func (m *OcspUpdateOptions) contextValidateHttpproxy(ctx context.Context, formats strfmt.Registry) error { if m.Httpproxy != nil { - - if swag.IsZero(m.Httpproxy) { // not required - return nil - } - if err := m.Httpproxy.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("httpproxy") diff --git a/models/originalto.go b/models/originalto.go index 739d5945..5b7f9cb1 100644 --- a/models/originalto.go +++ b/models/originalto.go @@ -36,7 +36,7 @@ import ( type Originalto struct { // enabled // Required: true - // Enum: ["enabled"] + // Enum: [enabled] // +kubebuilder:validation:Enum=enabled; Enabled *string `json:"enabled"` diff --git a/models/peer_entries.go b/models/peer_entries.go index 6c9e79a4..9e2fb76b 100644 --- a/models/peer_entries.go +++ b/models/peer_entries.go @@ -71,11 +71,6 @@ func (m PeerEntries) ContextValidate(ctx context.Context, formats strfmt.Registr 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/peer_section_base.go b/models/peer_section_base.go index dbb07dc8..582cf44d 100644 --- a/models/peer_section_base.go +++ b/models/peer_section_base.go @@ -159,11 +159,6 @@ func (m *PeerSectionBase) ContextValidate(ctx context.Context, formats strfmt.Re func (m *PeerSectionBase) contextValidateDefaultBind(ctx context.Context, formats strfmt.Registry) error { if m.DefaultBind != nil { - - if swag.IsZero(m.DefaultBind) { // not required - return nil - } - if err := m.DefaultBind.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("default_bind") @@ -180,11 +175,6 @@ func (m *PeerSectionBase) contextValidateDefaultBind(ctx context.Context, format func (m *PeerSectionBase) contextValidateDefaultServer(ctx context.Context, formats strfmt.Registry) error { if m.DefaultServer != nil { - - if swag.IsZero(m.DefaultServer) { // not required - return nil - } - if err := m.DefaultServer.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("default_server") diff --git a/models/peer_sections.go b/models/peer_sections.go index f92a9206..e82195d9 100644 --- a/models/peer_sections.go +++ b/models/peer_sections.go @@ -71,11 +71,6 @@ func (m PeerSections) ContextValidate(ctx context.Context, formats strfmt.Regist 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/performance_options.go b/models/performance_options.go index b381d15a..6d66eb1c 100644 --- a/models/performance_options.go +++ b/models/performance_options.go @@ -86,13 +86,13 @@ type PerformanceOptions struct { Nosplice bool `json:"nosplice,omitempty"` // profiling memory - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ProfilingMemory string `json:"profiling_memory,omitempty"` // profiling tasks - // Enum: ["auto","enabled","disabled"] - // +kubebuilder:validation:Enum=auto;enabled;disabled; + // Enum: [auto enabled disabled] + // +kubebuilder:validation:Enum=auto enabled disabled; ProfilingTasks string `json:"profiling_tasks,omitempty"` // server state base diff --git a/models/persist_rule.go b/models/persist_rule.go index b1000792..b4133f68 100644 --- a/models/persist_rule.go +++ b/models/persist_rule.go @@ -41,7 +41,7 @@ type PersistRule struct { // type // Required: true - // Enum: ["rdp-cookie"] + // Enum: [rdp-cookie] // +kubebuilder:validation:Enum=rdp-cookie; Type *string `json:"type"` } diff --git a/models/process_info.go b/models/process_info.go index 25f50feb..3890e1da 100644 --- a/models/process_info.go +++ b/models/process_info.go @@ -95,11 +95,6 @@ func (m *ProcessInfo) ContextValidate(ctx context.Context, formats strfmt.Regist func (m *ProcessInfo) contextValidateInfo(ctx context.Context, formats strfmt.Registry) error { if m.Info != nil { - - if swag.IsZero(m.Info) { // not required - return nil - } - if err := m.Info.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("info") diff --git a/models/program.go b/models/program.go index deccb2fe..2824fc14 100644 --- a/models/program.go +++ b/models/program.go @@ -56,8 +56,8 @@ type Program struct { Name string `json:"name"` // HAProxy stops and recreates child programs at reload. - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; StartOnReload string `json:"start-on-reload,omitempty"` // The user to run the command as, if different than the HAProxy user. diff --git a/models/programs.go b/models/programs.go index 409de93a..fb915bdd 100644 --- a/models/programs.go +++ b/models/programs.go @@ -69,11 +69,6 @@ func (m Programs) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/q_ui_c_initial_rule.go b/models/q_ui_c_initial_rule.go index 6eac6011..a71622dd 100644 --- a/models/q_ui_c_initial_rule.go +++ b/models/q_ui_c_initial_rule.go @@ -38,8 +38,8 @@ import ( // swagger:model QUICInitialRule type QUICInitialRule struct { // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -51,8 +51,8 @@ type QUICInitialRule struct { // type // Required: true - // Enum: ["reject","accept","send-retry","dgram-drop"] - // +kubebuilder:validation:Enum=reject;accept;send-retry;dgram-drop; + // Enum: [reject accept send-retry dgram-drop] + // +kubebuilder:validation:Enum=reject accept send-retry dgram-drop; Type string `json:"type"` } diff --git a/models/q_ui_c_initial_rules.go b/models/q_ui_c_initial_rules.go index 2bd2b968..1d41d7a5 100644 --- a/models/q_ui_c_initial_rules.go +++ b/models/q_ui_c_initial_rules.go @@ -69,11 +69,6 @@ func (m QUICInitialRules) ContextValidate(ctx context.Context, formats strfmt.Re 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/redispatch.go b/models/redispatch.go index 752684ea..cc473ebb 100644 --- a/models/redispatch.go +++ b/models/redispatch.go @@ -36,8 +36,8 @@ import ( type Redispatch struct { // enabled // Required: true - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Enabled *string `json:"enabled"` // interval diff --git a/models/reload.go b/models/reload.go index 858d9150..65f5346e 100644 --- a/models/reload.go +++ b/models/reload.go @@ -49,8 +49,8 @@ type Reload struct { Response string `json:"response,omitempty"` // status - // Enum: ["failed","in_progress","succeeded"] - // +kubebuilder:validation:Enum=failed;in_progress;succeeded; + // Enum: [failed in_progress succeeded] + // +kubebuilder:validation:Enum=failed in_progress succeeded; Status string `json:"status,omitempty"` } diff --git a/models/reloads.go b/models/reloads.go index 27816469..29932eae 100644 --- a/models/reloads.go +++ b/models/reloads.go @@ -71,11 +71,6 @@ func (m Reloads) ContextValidate(ctx context.Context, formats strfmt.Registry) e 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/resolvers.go b/models/resolvers.go index 4c0e5977..cd3e88ed 100644 --- a/models/resolvers.go +++ b/models/resolvers.go @@ -71,11 +71,6 @@ func (m Resolvers) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/ring_base.go b/models/ring_base.go index b3aba079..6c84ac83 100644 --- a/models/ring_base.go +++ b/models/ring_base.go @@ -41,8 +41,8 @@ type RingBase struct { Description string `json:"description,omitempty"` // format - // Enum: ["iso","local","raw","rfc3164","rfc5424","short","priority","timed"] - // +kubebuilder:validation:Enum=iso;local;raw;rfc3164;rfc5424;short;priority;timed; + // Enum: [iso local raw rfc3164 rfc5424 short priority timed] + // +kubebuilder:validation:Enum=iso local raw rfc3164 rfc5424 short priority timed; Format string `json:"format,omitempty"` // maxlen diff --git a/models/rings.go b/models/rings.go index 8beed234..6edca484 100644 --- a/models/rings.go +++ b/models/rings.go @@ -71,11 +71,6 @@ func (m Rings) ContextValidate(ctx context.Context, formats strfmt.Registry) err 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/runtime_add_server.go b/models/runtime_add_server.go index 32ed4da1..60513dcf 100644 --- a/models/runtime_add_server.go +++ b/models/runtime_add_server.go @@ -49,8 +49,8 @@ type RuntimeAddServer struct { AgentAddr string `json:"agent-addr,omitempty"` // agent check - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AgentCheck string `json:"agent-check,omitempty"` // agent inter @@ -77,18 +77,18 @@ type RuntimeAddServer struct { Alpn string `json:"alpn,omitempty"` // backup - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Backup string `json:"backup,omitempty"` // check - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Check string `json:"check,omitempty"` // check send proxy - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; CheckSendProxy string `json:"check-send-proxy,omitempty"` // check sni @@ -97,8 +97,8 @@ type RuntimeAddServer struct { CheckSni string `json:"check-sni,omitempty"` // check ssl - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; CheckSsl string `json:"check-ssl,omitempty"` // check alpn @@ -112,8 +112,8 @@ type RuntimeAddServer struct { CheckProto string `json:"check_proto,omitempty"` // check via socks4 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; CheckViaSocks4 string `json:"check_via_socks4,omitempty"` // ciphers @@ -142,28 +142,28 @@ type RuntimeAddServer struct { Fastinter *int64 `json:"fastinter,omitempty"` // force sslv3 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceSslv3 string `json:"force_sslv3,omitempty"` // force tlsv10 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv10 string `json:"force_tlsv10,omitempty"` // force tlsv11 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv11 string `json:"force_tlsv11,omitempty"` // force tlsv12 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv12 string `json:"force_tlsv12,omitempty"` // force tlsv13 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv13 string `json:"force_tlsv13,omitempty"` // health check address @@ -188,8 +188,8 @@ type RuntimeAddServer struct { Inter *int64 `json:"inter,omitempty"` // maintenance - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Maintenance string `json:"maintenance,omitempty"` // maxconn @@ -206,50 +206,50 @@ type RuntimeAddServer struct { Name string `json:"name,omitempty"` // no sslv3 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoSslv3 string `json:"no_sslv3,omitempty"` // no tlsv10 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv10 string `json:"no_tlsv10,omitempty"` // no tlsv11 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv11 string `json:"no_tlsv11,omitempty"` // no tlsv12 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv12 string `json:"no_tlsv12,omitempty"` // no tlsv13 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv13 string `json:"no_tlsv13,omitempty"` // npn Npn string `json:"npn,omitempty"` // observe - // Enum: ["layer4","layer7"] - // +kubebuilder:validation:Enum=layer4;layer7; + // Enum: [layer4 layer7] + // +kubebuilder:validation:Enum=layer4 layer7; Observe string `json:"observe,omitempty"` // on error - // Enum: ["fastinter","fail-check","sudden-death","mark-down"] - // +kubebuilder:validation:Enum=fastinter;fail-check;sudden-death;mark-down; + // Enum: [fastinter fail-check sudden-death mark-down] + // +kubebuilder:validation:Enum=fastinter fail-check sudden-death mark-down; OnError string `json:"on-error,omitempty"` // on marked down - // Enum: ["shutdown-sessions"] + // Enum: [shutdown-sessions] // +kubebuilder:validation:Enum=shutdown-sessions; OnMarkedDown string `json:"on-marked-down,omitempty"` // on marked up - // Enum: ["shutdown-backup-sessions"] + // Enum: [shutdown-backup-sessions] // +kubebuilder:validation:Enum=shutdown-backup-sessions; OnMarkedUp string `json:"on-marked-up,omitempty"` @@ -284,23 +284,23 @@ type RuntimeAddServer struct { Rise *int64 `json:"rise,omitempty"` // send proxy - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxy string `json:"send-proxy,omitempty"` // send proxy v2 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxyV2 string `json:"send-proxy-v2,omitempty"` // send proxy v2 ssl - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxyV2Ssl string `json:"send_proxy_v2_ssl,omitempty"` // send proxy v2 ssl cn - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxyV2SslCn string `json:"send_proxy_v2_ssl_cn,omitempty"` // slowstart @@ -317,8 +317,8 @@ type RuntimeAddServer struct { Source string `json:"source,omitempty"` // ssl - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Ssl string `json:"ssl,omitempty"` // ssl cafile @@ -332,36 +332,36 @@ type RuntimeAddServer struct { SslCertificate string `json:"ssl_certificate,omitempty"` // ssl max ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMaxVer string `json:"ssl_max_ver,omitempty"` // ssl min ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMinVer string `json:"ssl_min_ver,omitempty"` // ssl reuse - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SslReuse string `json:"ssl_reuse,omitempty"` // tfo - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tfo string `json:"tfo,omitempty"` // tls tickets - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TLSTickets string `json:"tls_tickets,omitempty"` // track Track string `json:"track,omitempty"` // verify - // Enum: ["none","required"] - // +kubebuilder:validation:Enum=none;required; + // Enum: [none required] + // +kubebuilder:validation:Enum=none required; Verify string `json:"verify,omitempty"` // verifyhost @@ -371,8 +371,8 @@ type RuntimeAddServer struct { Weight *int64 `json:"weight,omitempty"` // ws - // Enum: ["auto","h1","h2"] - // +kubebuilder:validation:Enum=auto;h1;h2; + // Enum: [auto h1 h2] + // +kubebuilder:validation:Enum=auto h1 h2; Ws string `json:"ws,omitempty"` } diff --git a/models/runtime_server.go b/models/runtime_server.go index 8afd71b3..1421095e 100644 --- a/models/runtime_server.go +++ b/models/runtime_server.go @@ -33,7 +33,7 @@ import ( // RuntimeServer Runtime Server // // Runtime transient server properties -// Example: {"address":"127.0.0.5","admin_state":"ready","operational_state":"up","port":80,"server_id":1,"server_name":"web_server"} +// Example: {"address":"142.250.191.142","admin_state":"ready","agent_addr":"127.0.0.1","agent_port":80,"agent_state":0,"backend_forced_id":0,"backend_id":2,"backend_name":"myservers","check_addr":"142.250.191.143","check_health":0,"check_port":80,"check_result":2,"check_state":6,"check_status":17,"forced_id":0,"fqdn":"server.com","id":1,"iweight":1,"last_time_change":123,"name":"server1","operational_state":"up","port":80,"srvrecord":"_myservice._tcp.example.local","use_ssl":false,"uweight":1} // // swagger:model runtime_server type RuntimeServer struct { @@ -44,21 +44,93 @@ type RuntimeServer struct { Address string `json:"address,omitempty"` // admin state - // Enum: ["ready","maint","drain"] - // +kubebuilder:validation:Enum=ready;maint;drain; + // Enum: [ready maint drain] + // +kubebuilder:validation:Enum=ready maint drain; AdminState string `json:"admin_state,omitempty"` + // agent addr + // Read Only: true + AgentAddr string `json:"agent_addr,omitempty"` + + // agent port + // Read Only: true + // Maximum: 65535 + // Minimum: 1 + // +kubebuilder:validation:Maximum=65535 + // +kubebuilder:validation:Minimum=1 + AgentPort *int64 `json:"agent_port,omitempty"` + + // agent state + // Read Only: true + AgentState *int64 `json:"agent_state,omitempty"` + + // backend forced id + // Read Only: true + BackendForcedID *int64 `json:"backend_forced_id,omitempty"` + + // backend id + // Read Only: true + BackendID *int64 `json:"backend_id,omitempty"` + + // backend name + // Read Only: true + BackendName string `json:"backend_name,omitempty"` + + // check addr + // Read Only: true + CheckAddr string `json:"check_addr,omitempty"` + + // check health + // Read Only: true + CheckHealth *int64 `json:"check_health,omitempty"` + + // check port + // Read Only: true + // Maximum: 65535 + // Minimum: 1 + // +kubebuilder:validation:Maximum=65535 + // +kubebuilder:validation:Minimum=1 + CheckPort *int64 `json:"check_port,omitempty"` + + // check result + // Read Only: true + CheckResult *int64 `json:"check_result,omitempty"` + + // check state + // Read Only: true + CheckState *int64 `json:"check_state,omitempty"` + + // check status + // Read Only: true + CheckStatus *int64 `json:"check_status,omitempty"` + + // foreced id + // Read Only: true + ForecedID *int64 `json:"foreced_id,omitempty"` + + // fqdn + // Read Only: true + Fqdn string `json:"fqdn,omitempty"` + // id // Read Only: true ID string `json:"id,omitempty"` + // iweight + // Read Only: true + Iweight *int64 `json:"iweight,omitempty"` + + // last time change + // Read Only: true + LastTimeChange *int64 `json:"last_time_change,omitempty"` + // name // Read Only: true Name string `json:"name,omitempty"` // operational state - // Enum: ["up","down","stopping"] - // +kubebuilder:validation:Enum=up;down;stopping; + // Enum: [up down stopping] + // +kubebuilder:validation:Enum=up down stopping; OperationalState string `json:"operational_state,omitempty"` // port @@ -68,6 +140,18 @@ type RuntimeServer struct { // +kubebuilder:validation:Maximum=65535 // +kubebuilder:validation:Minimum=1 Port *int64 `json:"port,omitempty"` + + // srvrecord + // Read Only: true + Srvrecord string `json:"srvrecord,omitempty"` + + // use ssl + // Read Only: true + UseSsl *bool `json:"use_ssl,omitempty"` + + // uweight + // Read Only: true + Uweight *int64 `json:"uweight,omitempty"` } // Validate validates this runtime server @@ -82,6 +166,14 @@ func (m *RuntimeServer) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateAgentPort(formats); err != nil { + res = append(res, err) + } + + if err := m.validateCheckPort(formats); err != nil { + res = append(res, err) + } + if err := m.validateOperationalState(formats); err != nil { res = append(res, err) } @@ -153,6 +245,38 @@ func (m *RuntimeServer) validateAdminState(formats strfmt.Registry) error { return nil } +func (m *RuntimeServer) validateAgentPort(formats strfmt.Registry) error { + if swag.IsZero(m.AgentPort) { // not required + return nil + } + + if err := validate.MinimumInt("agent_port", "body", *m.AgentPort, 1, false); err != nil { + return err + } + + if err := validate.MaximumInt("agent_port", "body", *m.AgentPort, 65535, false); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) validateCheckPort(formats strfmt.Registry) error { + if swag.IsZero(m.CheckPort) { // not required + return nil + } + + if err := validate.MinimumInt("check_port", "body", *m.CheckPort, 1, false); err != nil { + return err + } + + if err := validate.MaximumInt("check_port", "body", *m.CheckPort, 65535, false); err != nil { + return err + } + + return nil +} + var runtimeServerTypeOperationalStatePropEnum []interface{} func init() { @@ -222,10 +346,74 @@ func (m *RuntimeServer) ContextValidate(ctx context.Context, formats strfmt.Regi res = append(res, err) } + if err := m.contextValidateAgentAddr(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateAgentPort(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateAgentState(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateBackendForcedID(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateBackendID(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateBackendName(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateCheckAddr(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateCheckHealth(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateCheckPort(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateCheckResult(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateCheckState(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateCheckStatus(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateForecedID(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateFqdn(ctx, formats); err != nil { + res = append(res, err) + } + if err := m.contextValidateID(ctx, formats); err != nil { res = append(res, err) } + if err := m.contextValidateIweight(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateLastTimeChange(ctx, formats); err != nil { + res = append(res, err) + } + if err := m.contextValidateName(ctx, formats); err != nil { res = append(res, err) } @@ -234,6 +422,18 @@ func (m *RuntimeServer) ContextValidate(ctx context.Context, formats strfmt.Regi res = append(res, err) } + if err := m.contextValidateSrvrecord(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateUseSsl(ctx, formats); err != nil { + res = append(res, err) + } + + if err := m.contextValidateUweight(ctx, formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { return errors.CompositeValidationError(res...) } @@ -249,6 +449,132 @@ func (m *RuntimeServer) contextValidateAddress(ctx context.Context, formats strf return nil } +func (m *RuntimeServer) contextValidateAgentAddr(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "agent_addr", "body", string(m.AgentAddr)); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateAgentPort(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "agent_port", "body", m.AgentPort); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateAgentState(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "agent_state", "body", m.AgentState); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateBackendForcedID(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "backend_forced_id", "body", m.BackendForcedID); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateBackendID(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "backend_id", "body", m.BackendID); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateBackendName(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "backend_name", "body", string(m.BackendName)); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateCheckAddr(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "check_addr", "body", string(m.CheckAddr)); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateCheckHealth(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "check_health", "body", m.CheckHealth); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateCheckPort(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "check_port", "body", m.CheckPort); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateCheckResult(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "check_result", "body", m.CheckResult); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateCheckState(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "check_state", "body", m.CheckState); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateCheckStatus(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "check_status", "body", m.CheckStatus); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateForecedID(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "foreced_id", "body", m.ForecedID); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateFqdn(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "fqdn", "body", string(m.Fqdn)); err != nil { + return err + } + + return nil +} + func (m *RuntimeServer) contextValidateID(ctx context.Context, formats strfmt.Registry) error { if err := validate.ReadOnly(ctx, "id", "body", string(m.ID)); err != nil { @@ -258,6 +584,24 @@ func (m *RuntimeServer) contextValidateID(ctx context.Context, formats strfmt.Re return nil } +func (m *RuntimeServer) contextValidateIweight(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "iweight", "body", m.Iweight); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateLastTimeChange(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "last_time_change", "body", m.LastTimeChange); err != nil { + return err + } + + return nil +} + func (m *RuntimeServer) contextValidateName(ctx context.Context, formats strfmt.Registry) error { if err := validate.ReadOnly(ctx, "name", "body", string(m.Name)); err != nil { @@ -276,6 +620,33 @@ func (m *RuntimeServer) contextValidatePort(ctx context.Context, formats strfmt. return nil } +func (m *RuntimeServer) contextValidateSrvrecord(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "srvrecord", "body", string(m.Srvrecord)); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateUseSsl(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "use_ssl", "body", m.UseSsl); err != nil { + return err + } + + return nil +} + +func (m *RuntimeServer) contextValidateUweight(ctx context.Context, formats strfmt.Registry) error { + + if err := validate.ReadOnly(ctx, "uweight", "body", m.Uweight); err != nil { + return err + } + + return nil +} + // MarshalBinary interface implementation func (m *RuntimeServer) MarshalBinary() ([]byte, error) { if m == nil { diff --git a/models/runtime_server_compare.go b/models/runtime_server_compare.go index d3d8ecdf..85db8c26 100644 --- a/models/runtime_server_compare.go +++ b/models/runtime_server_compare.go @@ -32,10 +32,74 @@ func (s RuntimeServer) Equal(t RuntimeServer, opts ...Options) bool { return false } + if s.AgentAddr != t.AgentAddr { + return false + } + + if !equalPointers(s.AgentPort, t.AgentPort) { + return false + } + + if !equalPointers(s.AgentState, t.AgentState) { + return false + } + + if !equalPointers(s.BackendForcedID, t.BackendForcedID) { + return false + } + + if !equalPointers(s.BackendID, t.BackendID) { + return false + } + + if s.BackendName != t.BackendName { + return false + } + + if s.CheckAddr != t.CheckAddr { + return false + } + + if !equalPointers(s.CheckHealth, t.CheckHealth) { + return false + } + + if !equalPointers(s.CheckPort, t.CheckPort) { + return false + } + + if !equalPointers(s.CheckResult, t.CheckResult) { + return false + } + + if !equalPointers(s.CheckState, t.CheckState) { + return false + } + + if !equalPointers(s.CheckStatus, t.CheckStatus) { + return false + } + + if !equalPointers(s.ForecedID, t.ForecedID) { + return false + } + + if s.Fqdn != t.Fqdn { + return false + } + if s.ID != t.ID { return false } + if !equalPointers(s.Iweight, t.Iweight) { + return false + } + + if !equalPointers(s.LastTimeChange, t.LastTimeChange) { + return false + } + if s.Name != t.Name { return false } @@ -48,6 +112,18 @@ func (s RuntimeServer) Equal(t RuntimeServer, opts ...Options) bool { return false } + if s.Srvrecord != t.Srvrecord { + return false + } + + if !equalPointers(s.UseSsl, t.UseSsl) { + return false + } + + if !equalPointers(s.Uweight, t.Uweight) { + return false + } + return true } @@ -67,10 +143,74 @@ func (s RuntimeServer) Diff(t RuntimeServer, opts ...Options) map[string][]inter diff["AdminState"] = []interface{}{s.AdminState, t.AdminState} } + if s.AgentAddr != t.AgentAddr { + diff["AgentAddr"] = []interface{}{s.AgentAddr, t.AgentAddr} + } + + if !equalPointers(s.AgentPort, t.AgentPort) { + diff["AgentPort"] = []interface{}{ValueOrNil(s.AgentPort), ValueOrNil(t.AgentPort)} + } + + if !equalPointers(s.AgentState, t.AgentState) { + diff["AgentState"] = []interface{}{ValueOrNil(s.AgentState), ValueOrNil(t.AgentState)} + } + + if !equalPointers(s.BackendForcedID, t.BackendForcedID) { + diff["BackendForcedID"] = []interface{}{ValueOrNil(s.BackendForcedID), ValueOrNil(t.BackendForcedID)} + } + + if !equalPointers(s.BackendID, t.BackendID) { + diff["BackendID"] = []interface{}{ValueOrNil(s.BackendID), ValueOrNil(t.BackendID)} + } + + if s.BackendName != t.BackendName { + diff["BackendName"] = []interface{}{s.BackendName, t.BackendName} + } + + if s.CheckAddr != t.CheckAddr { + diff["CheckAddr"] = []interface{}{s.CheckAddr, t.CheckAddr} + } + + if !equalPointers(s.CheckHealth, t.CheckHealth) { + diff["CheckHealth"] = []interface{}{ValueOrNil(s.CheckHealth), ValueOrNil(t.CheckHealth)} + } + + if !equalPointers(s.CheckPort, t.CheckPort) { + diff["CheckPort"] = []interface{}{ValueOrNil(s.CheckPort), ValueOrNil(t.CheckPort)} + } + + if !equalPointers(s.CheckResult, t.CheckResult) { + diff["CheckResult"] = []interface{}{ValueOrNil(s.CheckResult), ValueOrNil(t.CheckResult)} + } + + if !equalPointers(s.CheckState, t.CheckState) { + diff["CheckState"] = []interface{}{ValueOrNil(s.CheckState), ValueOrNil(t.CheckState)} + } + + if !equalPointers(s.CheckStatus, t.CheckStatus) { + diff["CheckStatus"] = []interface{}{ValueOrNil(s.CheckStatus), ValueOrNil(t.CheckStatus)} + } + + if !equalPointers(s.ForecedID, t.ForecedID) { + diff["ForecedID"] = []interface{}{ValueOrNil(s.ForecedID), ValueOrNil(t.ForecedID)} + } + + if s.Fqdn != t.Fqdn { + diff["Fqdn"] = []interface{}{s.Fqdn, t.Fqdn} + } + if s.ID != t.ID { diff["ID"] = []interface{}{s.ID, t.ID} } + if !equalPointers(s.Iweight, t.Iweight) { + diff["Iweight"] = []interface{}{ValueOrNil(s.Iweight), ValueOrNil(t.Iweight)} + } + + if !equalPointers(s.LastTimeChange, t.LastTimeChange) { + diff["LastTimeChange"] = []interface{}{ValueOrNil(s.LastTimeChange), ValueOrNil(t.LastTimeChange)} + } + if s.Name != t.Name { diff["Name"] = []interface{}{s.Name, t.Name} } @@ -83,5 +223,17 @@ func (s RuntimeServer) Diff(t RuntimeServer, opts ...Options) map[string][]inter diff["Port"] = []interface{}{ValueOrNil(s.Port), ValueOrNil(t.Port)} } + if s.Srvrecord != t.Srvrecord { + diff["Srvrecord"] = []interface{}{s.Srvrecord, t.Srvrecord} + } + + if !equalPointers(s.UseSsl, t.UseSsl) { + diff["UseSsl"] = []interface{}{ValueOrNil(s.UseSsl), ValueOrNil(t.UseSsl)} + } + + if !equalPointers(s.Uweight, t.Uweight) { + diff["Uweight"] = []interface{}{ValueOrNil(s.Uweight), ValueOrNil(t.Uweight)} + } + return diff } diff --git a/models/runtime_server_compare_test.go b/models/runtime_server_compare_test.go index a07fcc51..d1fb0169 100644 --- a/models/runtime_server_compare_test.go +++ b/models/runtime_server_compare_test.go @@ -86,7 +86,21 @@ func TestRuntimeServerEqualFalse(t *testing.T) { if err != nil { t.Error(err) } + result.AgentPort = Ptr(*sample.AgentPort + 1) + result.AgentState = Ptr(*sample.AgentState + 1) + result.BackendForcedID = Ptr(*sample.BackendForcedID + 1) + result.BackendID = Ptr(*sample.BackendID + 1) + result.CheckHealth = Ptr(*sample.CheckHealth + 1) + result.CheckPort = Ptr(*sample.CheckPort + 1) + result.CheckResult = Ptr(*sample.CheckResult + 1) + result.CheckState = Ptr(*sample.CheckState + 1) + result.CheckStatus = Ptr(*sample.CheckStatus + 1) + result.ForecedID = Ptr(*sample.ForecedID + 1) + result.Iweight = Ptr(*sample.Iweight + 1) + result.LastTimeChange = Ptr(*sample.LastTimeChange + 1) result.Port = Ptr(*sample.Port + 1) + result.UseSsl = Ptr(!*sample.UseSsl) + result.Uweight = Ptr(*sample.Uweight + 1) samples = append(samples, struct { a, b RuntimeServer }{sample, result}) @@ -166,7 +180,21 @@ func TestRuntimeServerDiffFalse(t *testing.T) { if err != nil { t.Error(err) } + result.AgentPort = Ptr(*sample.AgentPort + 1) + result.AgentState = Ptr(*sample.AgentState + 1) + result.BackendForcedID = Ptr(*sample.BackendForcedID + 1) + result.BackendID = Ptr(*sample.BackendID + 1) + result.CheckHealth = Ptr(*sample.CheckHealth + 1) + result.CheckPort = Ptr(*sample.CheckPort + 1) + result.CheckResult = Ptr(*sample.CheckResult + 1) + result.CheckState = Ptr(*sample.CheckState + 1) + result.CheckStatus = Ptr(*sample.CheckStatus + 1) + result.ForecedID = Ptr(*sample.ForecedID + 1) + result.Iweight = Ptr(*sample.Iweight + 1) + result.LastTimeChange = Ptr(*sample.LastTimeChange + 1) result.Port = Ptr(*sample.Port + 1) + result.UseSsl = Ptr(!*sample.UseSsl) + result.Uweight = Ptr(*sample.Uweight + 1) samples = append(samples, struct { a, b RuntimeServer }{sample, result}) @@ -174,7 +202,7 @@ func TestRuntimeServerDiffFalse(t *testing.T) { for _, sample := range samples { result := sample.a.Diff(sample.b) - if len(result) != 6 { + if len(result) != 25 { json := jsoniter.ConfigCompatibleWithStandardLibrary a, err := json.Marshal(&sample.a) if err != nil { @@ -184,7 +212,7 @@ func TestRuntimeServerDiffFalse(t *testing.T) { if err != nil { t.Error(err) } - t.Errorf("Expected RuntimeServer to be different in 6 cases, but it is not (%d) %s %s", len(result), a, b) + t.Errorf("Expected RuntimeServer to be different in 25 cases, but it is not (%d) %s %s", len(result), a, b) } } } diff --git a/models/runtime_servers.go b/models/runtime_servers.go index d7b5a3cf..14c34895 100644 --- a/models/runtime_servers.go +++ b/models/runtime_servers.go @@ -71,11 +71,6 @@ func (m RuntimeServers) ContextValidate(ctx context.Context, formats strfmt.Regi 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/s_s_l_front_use.go b/models/s_s_l_front_use.go index 59f27e8b..e4a71dd8 100644 --- a/models/s_s_l_front_use.go +++ b/models/s_s_l_front_use.go @@ -93,8 +93,8 @@ type SSLFrontUse struct { Ocsp string `json:"ocsp,omitempty"` // Automatic OCSP response update - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; OcspUpdate string `json:"ocsp_update,omitempty"` // Signed Certificate Timestamp List filename @@ -104,18 +104,18 @@ type SSLFrontUse struct { Sigalgs string `json:"sigalgs,omitempty"` // ssl max ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMaxVer string `json:"ssl_max_ver,omitempty"` // ssl min ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMinVer string `json:"ssl_min_ver,omitempty"` // verify - // Enum: ["none","optional","required"] - // +kubebuilder:validation:Enum=none;optional;required; + // Enum: [none optional required] + // +kubebuilder:validation:Enum=none optional required; Verify string `json:"verify,omitempty"` } diff --git a/models/s_s_l_front_uses.go b/models/s_s_l_front_uses.go index 945dc926..e94f862a 100644 --- a/models/s_s_l_front_uses.go +++ b/models/s_s_l_front_uses.go @@ -69,11 +69,6 @@ func (m SSLFrontUses) ContextValidate(ctx context.Context, formats strfmt.Regist 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/server_params.go b/models/server_params.go index 141e8daa..5fe0cded 100644 --- a/models/server_params.go +++ b/models/server_params.go @@ -41,8 +41,8 @@ type ServerParams struct { AgentAddr string `json:"agent-addr,omitempty"` // agent check - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AgentCheck string `json:"agent-check,omitempty"` // agent inter @@ -69,13 +69,13 @@ type ServerParams struct { Alpn string `json:"alpn,omitempty"` // backup - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Backup string `json:"backup,omitempty"` // check - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Check string `json:"check,omitempty"` // check pool conn name @@ -84,13 +84,13 @@ type ServerParams struct { CheckPoolConnName string `json:"check-pool-conn-name,omitempty"` // check reuse pool - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; CheckReusePool string `json:"check-reuse-pool,omitempty"` // check send proxy - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; CheckSendProxy string `json:"check-send-proxy,omitempty"` // check sni @@ -99,8 +99,8 @@ type ServerParams struct { CheckSni string `json:"check-sni,omitempty"` // check ssl - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; CheckSsl string `json:"check-ssl,omitempty"` // check alpn @@ -114,8 +114,8 @@ type ServerParams struct { CheckProto string `json:"check_proto,omitempty"` // check via socks4 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; CheckViaSocks4 string `json:"check_via_socks4,omitempty"` // ciphers @@ -155,28 +155,28 @@ type ServerParams struct { Fastinter *int64 `json:"fastinter,omitempty"` // This field is deprecated in favor of sslv3, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceSslv3 string `json:"force_sslv3,omitempty"` // This field is deprecated in favor of tlsv10, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv10 string `json:"force_tlsv10,omitempty"` // This field is deprecated in favor of tlsv11, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv11 string `json:"force_tlsv11,omitempty"` // This field is deprecated in favor of tlsv12, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv12 string `json:"force_tlsv12,omitempty"` // This field is deprecated in favor of tlsv13, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ForceTlsv13 string `json:"force_tlsv13,omitempty"` // guid @@ -212,8 +212,8 @@ type ServerParams struct { InitAddr *string `json:"init-addr,omitempty"` // init state - // Enum: ["fully-up","up","down","fully-down"] - // +kubebuilder:validation:Enum=fully-up;up;down;fully-down; + // Enum: [fully-up up down fully-down] + // +kubebuilder:validation:Enum=fully-up up down fully-down; InitState string `json:"init-state,omitempty"` // inter @@ -225,13 +225,13 @@ type ServerParams struct { LogBufsize *int64 `json:"log-bufsize,omitempty"` // log proto - // Enum: ["legacy","octet-count"] - // +kubebuilder:validation:Enum=legacy;octet-count; + // Enum: [legacy octet-count] + // +kubebuilder:validation:Enum=legacy octet-count; LogProto string `json:"log_proto,omitempty"` // maintenance - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Maintenance string `json:"maintenance,omitempty"` // max reuse @@ -250,55 +250,55 @@ type ServerParams struct { Namespace string `json:"namespace,omitempty"` // This field is deprecated in favor of sslv3, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoSslv3 string `json:"no_sslv3,omitempty"` // This field is deprecated in favor of tlsv10, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv10 string `json:"no_tlsv10,omitempty"` // This field is deprecated in favor of tlsv11, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv11 string `json:"no_tlsv11,omitempty"` // This field is deprecated in favor of tlsv12, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv12 string `json:"no_tlsv12,omitempty"` // This field is deprecated in favor of force_tlsv13, and will be removed in a future release - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoTlsv13 string `json:"no_tlsv13,omitempty"` // no verifyhost - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; NoVerifyhost string `json:"no_verifyhost,omitempty"` // npn Npn string `json:"npn,omitempty"` // observe - // Enum: ["layer4","layer7"] - // +kubebuilder:validation:Enum=layer4;layer7; + // Enum: [layer4 layer7] + // +kubebuilder:validation:Enum=layer4 layer7; Observe string `json:"observe,omitempty"` // on error - // Enum: ["fastinter","fail-check","sudden-death","mark-down"] - // +kubebuilder:validation:Enum=fastinter;fail-check;sudden-death;mark-down; + // Enum: [fastinter fail-check sudden-death mark-down] + // +kubebuilder:validation:Enum=fastinter fail-check sudden-death mark-down; OnError string `json:"on-error,omitempty"` // on marked down - // Enum: ["shutdown-sessions"] + // Enum: [shutdown-sessions] // +kubebuilder:validation:Enum=shutdown-sessions; OnMarkedDown string `json:"on-marked-down,omitempty"` // on marked up - // Enum: ["shutdown-backup-sessions"] + // Enum: [shutdown-backup-sessions] // +kubebuilder:validation:Enum=shutdown-backup-sessions; OnMarkedUp string `json:"on-marked-up,omitempty"` @@ -330,8 +330,8 @@ type ServerParams struct { Redir string `json:"redir,omitempty"` // Toggles the secure renegotiation mechanism for an SSL backend. - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Renegotiate string `json:"renegotiate,omitempty"` // resolve net @@ -340,8 +340,8 @@ type ServerParams struct { ResolveNet string `json:"resolve-net,omitempty"` // resolve prefer - // Enum: ["ipv4","ipv6"] - // +kubebuilder:validation:Enum=ipv4;ipv6; + // Enum: [ipv4 ipv6] + // +kubebuilder:validation:Enum=ipv4 ipv6; ResolvePrefer string `json:"resolve-prefer,omitempty"` // resolve opts @@ -358,23 +358,23 @@ type ServerParams struct { Rise *int64 `json:"rise,omitempty"` // send proxy - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxy string `json:"send-proxy,omitempty"` // send proxy v2 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxyV2 string `json:"send-proxy-v2,omitempty"` // send proxy v2 ssl - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxyV2Ssl string `json:"send_proxy_v2_ssl,omitempty"` // send proxy v2 ssl cn - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendProxyV2SslCn string `json:"send_proxy_v2_ssl_cn,omitempty"` // set proxy v2 tlv fmt @@ -405,8 +405,8 @@ type ServerParams struct { Source string `json:"source,omitempty"` // ssl - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Ssl string `json:"ssl,omitempty"` // ssl cafile @@ -420,28 +420,28 @@ type ServerParams struct { SslCertificate string `json:"ssl_certificate,omitempty"` // ssl max ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMaxVer string `json:"ssl_max_ver,omitempty"` // ssl min ver - // Enum: ["SSLv3","TLSv1.0","TLSv1.1","TLSv1.2","TLSv1.3"] - // +kubebuilder:validation:Enum=SSLv3;TLSv1.0;TLSv1.1;TLSv1.2;TLSv1.3; + // Enum: [SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3] + // +kubebuilder:validation:Enum=SSLv3 TLSv1.0 TLSv1.1 TLSv1.2 TLSv1.3; SslMinVer string `json:"ssl_min_ver,omitempty"` // ssl reuse - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SslReuse string `json:"ssl_reuse,omitempty"` // sslv3 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Sslv3 string `json:"sslv3,omitempty"` // stick - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Stick string `json:"stick,omitempty"` // strict maxconn @@ -453,41 +453,41 @@ type ServerParams struct { TCPUt *int64 `json:"tcp_ut,omitempty"` // tfo - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tfo string `json:"tfo,omitempty"` // tls tickets - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; TLSTickets string `json:"tls_tickets,omitempty"` // tlsv10 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv10 string `json:"tlsv10,omitempty"` // tlsv11 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv11 string `json:"tlsv11,omitempty"` // tlsv12 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv12 string `json:"tlsv12,omitempty"` // tlsv13 - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Tlsv13 string `json:"tlsv13,omitempty"` // track Track string `json:"track,omitempty"` // verify - // Enum: ["none","required"] - // +kubebuilder:validation:Enum=none;required; + // Enum: [none required] + // +kubebuilder:validation:Enum=none required; Verify string `json:"verify,omitempty"` // verifyhost @@ -497,8 +497,8 @@ type ServerParams struct { Weight *int64 `json:"weight,omitempty"` // ws - // Enum: ["auto","h1","h2"] - // +kubebuilder:validation:Enum=auto;h1;h2; + // Enum: [auto h1 h2] + // +kubebuilder:validation:Enum=auto h1 h2; Ws string `json:"ws,omitempty"` } @@ -3177,11 +3177,6 @@ func (m *ServerParams) ContextValidate(ctx context.Context, formats strfmt.Regis func (m *ServerParams) contextValidateSetProxyV2TlvFmt(ctx context.Context, formats strfmt.Registry) error { if m.SetProxyV2TlvFmt != nil { - - if swag.IsZero(m.SetProxyV2TlvFmt) { // not required - return nil - } - if err := m.SetProxyV2TlvFmt.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("set-proxy-v2-tlv-fmt") diff --git a/models/server_params_prepare_for_runtime.go b/models/server_params_prepare_for_runtime.go index 11022aae..2a1d383c 100644 --- a/models/server_params_prepare_for_runtime.go +++ b/models/server_params_prepare_for_runtime.go @@ -15,109 +15,7 @@ func (s ServerParams) PrepareFieldsForRuntimeAddServer() *ServerParams { } func (s *ServerParams) prepareForRuntimeDoNotSendDisabledFields() { - if s.AgentCheck == "disabled" { - s.AgentCheck = "" - } - if s.Backup == "disabled" { - s.Backup = "" - } - if s.Check == "disabled" { - s.Check = "" - } - if s.CheckReusePool == "disabled" { - s.CheckReusePool = "" - } - if s.CheckSendProxy == "disabled" { - s.CheckSendProxy = "" - } - if s.CheckSsl == "disabled" { - s.CheckSsl = "" - } - if s.CheckViaSocks4 == "disabled" { - s.CheckViaSocks4 = "" - } - if s.ForceSslv3 == "disabled" { - s.ForceSslv3 = "" - } - if s.ForceTlsv10 == "disabled" { - s.ForceTlsv10 = "" - } - if s.ForceTlsv11 == "disabled" { - s.ForceTlsv11 = "" - } - if s.ForceTlsv12 == "disabled" { - s.ForceTlsv12 = "" - } - if s.ForceTlsv13 == "disabled" { - s.ForceTlsv13 = "" - } - if s.Maintenance == "disabled" { - s.Maintenance = "" - } - if s.SendProxy == "disabled" { - s.SendProxy = "" - } - if s.SendProxyV2 == "disabled" { - s.SendProxyV2 = "" - } - if s.SendProxyV2Ssl == "disabled" { - s.SendProxyV2Ssl = "" - } - if s.SendProxyV2SslCn == "disabled" { - s.SendProxyV2SslCn = "" - } - if s.Ssl == "disabled" { - s.Ssl = "" - } - if s.SslReuse == "disabled" { - s.SslReuse = "" - } - if s.Sslv3 == "disabled" { - s.Sslv3 = "" - } - if s.Stick == "disabled" { - s.Stick = "" - } - if s.Tfo == "disabled" { - s.Tfo = "" - } - if s.TLSTickets == "disabled" { - s.TLSTickets = "" - } - if s.Tlsv10 == "disabled" { - s.Tlsv10 = "" - } - if s.Tlsv11 == "disabled" { - s.Tlsv11 = "" - } - if s.Tlsv12 == "disabled" { - s.Tlsv12 = "" - } - if s.Tlsv13 == "disabled" { - s.Tlsv13 = "" - } } func (s *ServerParams) prepareForRuntimeDoNotSendEnabledFields() { - if s.NoSslv3 == "enabled" { - s.NoSslv3 = "" - } - if s.NoTlsv10 == "enabled" { - s.NoTlsv10 = "" - } - if s.NoTlsv11 == "enabled" { - s.NoTlsv11 = "" - } - if s.NoTlsv12 == "enabled" { - s.NoTlsv12 = "" - } - if s.NoTlsv13 == "enabled" { - s.NoTlsv13 = "" - } - if s.NoVerifyhost == "enabled" { - s.NoVerifyhost = "" - } - if s.Renegotiate == "enabled" { - s.Renegotiate = "" - } } diff --git a/models/server_switching_rule.go b/models/server_switching_rule.go index da88c46c..daadf42a 100644 --- a/models/server_switching_rule.go +++ b/models/server_switching_rule.go @@ -38,8 +38,8 @@ import ( // swagger:model server_switching_rule type ServerSwitchingRule struct { // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test diff --git a/models/server_switching_rules.go b/models/server_switching_rules.go index a358bfbc..e83b7b0d 100644 --- a/models/server_switching_rules.go +++ b/models/server_switching_rules.go @@ -71,11 +71,6 @@ func (m ServerSwitchingRules) ContextValidate(ctx context.Context, formats strfm 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/server_templates.go b/models/server_templates.go index da1156e8..adf04313 100644 --- a/models/server_templates.go +++ b/models/server_templates.go @@ -71,11 +71,6 @@ func (m ServerTemplates) ContextValidate(ctx context.Context, formats strfmt.Reg 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/servers.go b/models/servers.go index 78d2c4c3..3e523ed3 100644 --- a/models/servers.go +++ b/models/servers.go @@ -71,11 +71,6 @@ func (m Servers) ContextValidate(ctx context.Context, formats strfmt.Registry) e 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/site.go b/models/site.go index 458d6272..eca766fa 100644 --- a/models/site.go +++ b/models/site.go @@ -159,11 +159,6 @@ func (m *Site) contextValidateFarms(ctx context.Context, formats strfmt.Registry for i := 0; i < len(m.Farms); i++ { if m.Farms[i] != nil { - - if swag.IsZero(m.Farms[i]) { // not required - return nil - } - if err := m.Farms[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("farms" + "." + strconv.Itoa(i)) @@ -182,11 +177,6 @@ func (m *Site) contextValidateFarms(ctx context.Context, formats strfmt.Registry func (m *Site) contextValidateService(ctx context.Context, formats strfmt.Registry) error { if m.Service != nil { - - if swag.IsZero(m.Service) { // not required - return nil - } - if err := m.Service.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("service") @@ -227,8 +217,8 @@ type SiteFarm struct { Balance *Balance `json:"balance,omitempty"` // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -238,8 +228,8 @@ type SiteFarm struct { Forwardfor *Forwardfor `json:"forwardfor,omitempty"` // mode - // Enum: ["http","tcp"] - // +kubebuilder:validation:Enum=http;tcp; + // Enum: [http tcp] + // +kubebuilder:validation:Enum=http tcp; Mode string `json:"mode,omitempty"` // name @@ -253,8 +243,8 @@ type SiteFarm struct { // use as // Required: true - // Enum: ["default","conditional"] - // +kubebuilder:validation:Enum=default;conditional; + // Enum: [default conditional] + // +kubebuilder:validation:Enum=default conditional; UseAs string `json:"use_as"` } @@ -525,11 +515,6 @@ func (m *SiteFarm) ContextValidate(ctx context.Context, formats strfmt.Registry) func (m *SiteFarm) contextValidateBalance(ctx context.Context, formats strfmt.Registry) error { if m.Balance != nil { - - if swag.IsZero(m.Balance) { // not required - return nil - } - if err := m.Balance.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("balance") @@ -546,11 +531,6 @@ func (m *SiteFarm) contextValidateBalance(ctx context.Context, formats strfmt.Re func (m *SiteFarm) contextValidateForwardfor(ctx context.Context, formats strfmt.Registry) error { if m.Forwardfor != nil { - - if swag.IsZero(m.Forwardfor) { // not required - return nil - } - if err := m.Forwardfor.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("forwardfor") @@ -569,11 +549,6 @@ func (m *SiteFarm) contextValidateServers(ctx context.Context, formats strfmt.Re for i := 0; i < len(m.Servers); i++ { if m.Servers[i] != nil { - - if swag.IsZero(m.Servers[i]) { // not required - return nil - } - if err := m.Servers[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("servers" + "." + strconv.Itoa(i)) @@ -612,8 +587,8 @@ func (m *SiteFarm) UnmarshalBinary(b []byte) error { // swagger:model SiteService type SiteService struct { // http connection mode - // Enum: ["http-tunnel","httpclose","forced-close","http-server-close","http-keep-alive"] - // +kubebuilder:validation:Enum=http-tunnel;httpclose;forced-close;http-server-close;http-keep-alive; + // Enum: [http-tunnel httpclose forced-close http-server-close http-keep-alive] + // +kubebuilder:validation:Enum=http-tunnel httpclose forced-close http-server-close http-keep-alive; HTTPConnectionMode string `json:"http_connection_mode,omitempty"` // listeners @@ -623,8 +598,8 @@ type SiteService struct { Maxconn *int64 `json:"maxconn,omitempty"` // mode - // Enum: ["http","tcp"] - // +kubebuilder:validation:Enum=http;tcp; + // Enum: [http tcp] + // +kubebuilder:validation:Enum=http tcp; Mode string `json:"mode,omitempty"` } @@ -788,11 +763,6 @@ func (m *SiteService) contextValidateListeners(ctx context.Context, formats strf for i := 0; i < len(m.Listeners); i++ { if m.Listeners[i] != nil { - - if swag.IsZero(m.Listeners[i]) { // not required - return nil - } - if err := m.Listeners[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("service" + "." + "listeners" + "." + strconv.Itoa(i)) diff --git a/models/sites.go b/models/sites.go index 0b2e50b6..536d912e 100644 --- a/models/sites.go +++ b/models/sites.go @@ -74,11 +74,6 @@ func (m Sites) ContextValidate(ctx context.Context, formats strfmt.Registry) err 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/source.go b/models/source.go index e7eae1dc..7929ba44 100644 --- a/models/source.go +++ b/models/source.go @@ -66,8 +66,8 @@ type Source struct { PortSecond int64 `json:"port_second,omitempty"` // usesrc - // Enum: ["address","client","clientip","hdr_ip"] - // +kubebuilder:validation:Enum=address;client;clientip;hdr_ip; + // Enum: [address client clientip hdr_ip] + // +kubebuilder:validation:Enum=address client clientip hdr_ip; Usesrc string `json:"usesrc,omitempty"` } diff --git a/models/spoe_agent.go b/models/spoe_agent.go index fc43d5db..2294f292 100644 --- a/models/spoe_agent.go +++ b/models/spoe_agent.go @@ -37,25 +37,25 @@ import ( // swagger:model spoe_agent type SpoeAgent struct { // async - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Async string `json:"async,omitempty"` // continue on error - // Enum: ["enabled"] + // Enum: [enabled] // +kubebuilder:validation:Enum=enabled; ContinueOnError string `json:"continue-on-error,omitempty"` // dontlog normal - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; DontlogNormal string `json:"dontlog-normal,omitempty"` // engine name EngineName string `json:"engine-name,omitempty"` // force set var - // Enum: ["enabled"] + // Enum: [enabled] // +kubebuilder:validation:Enum=enabled; ForceSetVar string `json:"force-set-var,omitempty"` @@ -111,8 +111,8 @@ type SpoeAgent struct { OptionVarPrefix string `json:"option_var-prefix,omitempty"` // pipelining - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Pipelining string `json:"pipelining,omitempty"` // processing timeout @@ -122,8 +122,8 @@ type SpoeAgent struct { RegisterVarNames string `json:"register-var-names,omitempty"` // send frag payload - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SendFragPayload string `json:"send-frag-payload,omitempty"` // use backend diff --git a/models/spoe_agents.go b/models/spoe_agents.go index 29b983bc..4961cbfa 100644 --- a/models/spoe_agents.go +++ b/models/spoe_agents.go @@ -71,11 +71,6 @@ func (m SpoeAgents) ContextValidate(ctx context.Context, formats strfmt.Registry 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/spoe_groups.go b/models/spoe_groups.go index 6eeb8772..09db7a9f 100644 --- a/models/spoe_groups.go +++ b/models/spoe_groups.go @@ -71,11 +71,6 @@ func (m SpoeGroups) ContextValidate(ctx context.Context, formats strfmt.Registry 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/spoe_message.go b/models/spoe_message.go index bda0a1ef..17f36d75 100644 --- a/models/spoe_message.go +++ b/models/spoe_message.go @@ -153,11 +153,6 @@ func (m *SpoeMessage) contextValidateACL(ctx context.Context, formats strfmt.Reg func (m *SpoeMessage) contextValidateEvent(ctx context.Context, formats strfmt.Registry) error { if m.Event != nil { - - if swag.IsZero(m.Event) { // not required - return nil - } - if err := m.Event.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("event") @@ -194,8 +189,8 @@ func (m *SpoeMessage) UnmarshalBinary(b []byte) error { // swagger:model SpoeMessageEvent type SpoeMessageEvent struct { // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -203,8 +198,8 @@ type SpoeMessageEvent struct { // name // Required: true - // Enum: ["on-backend-http-request","on-backend-tcp-request","on-client-session","on-frontend-http-request","on-frontend-tcp-request","on-http-response","on-server-session","on-tcp-response"] - // +kubebuilder:validation:Enum=on-backend-http-request;on-backend-tcp-request;on-client-session;on-frontend-http-request;on-frontend-tcp-request;on-http-response;on-server-session;on-tcp-response; + // Enum: [on-backend-http-request on-backend-tcp-request on-client-session on-frontend-http-request on-frontend-tcp-request on-http-response on-server-session on-tcp-response] + // +kubebuilder:validation:Enum=on-backend-http-request on-backend-tcp-request on-client-session on-frontend-http-request on-frontend-tcp-request on-http-response on-server-session on-tcp-response; Name *string `json:"name"` } diff --git a/models/spoe_messages.go b/models/spoe_messages.go index 27056f98..37132e7c 100644 --- a/models/spoe_messages.go +++ b/models/spoe_messages.go @@ -71,11 +71,6 @@ func (m SpoeMessages) ContextValidate(ctx context.Context, formats strfmt.Regist 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/spoe_scopes.go b/models/spoe_scopes.go index 59dc7931..f4b5a957 100644 --- a/models/spoe_scopes.go +++ b/models/spoe_scopes.go @@ -26,7 +26,6 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" - "github.com/go-openapi/swag" ) // SpoeScopes SPOE Scopes @@ -65,10 +64,6 @@ func (m SpoeScopes) ContextValidate(ctx context.Context, formats strfmt.Registry for i := 0; i < len(m); i++ { - 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/spoe_transaction.go b/models/spoe_transaction.go index 7c4644d7..f24a2b23 100644 --- a/models/spoe_transaction.go +++ b/models/spoe_transaction.go @@ -47,8 +47,8 @@ type SpoeTransaction struct { ID string `json:"id,omitempty"` // status - // Enum: ["failed","in_progress","success"] - // +kubebuilder:validation:Enum=failed;in_progress;success; + // Enum: [failed in_progress success] + // +kubebuilder:validation:Enum=failed in_progress success; Status string `json:"status,omitempty"` } diff --git a/models/spoe_transactions.go b/models/spoe_transactions.go index 707b164a..c5f0ed01 100644 --- a/models/spoe_transactions.go +++ b/models/spoe_transactions.go @@ -71,11 +71,6 @@ func (m SpoeTransactions) ContextValidate(ctx context.Context, formats strfmt.Re 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/ssl_ca_files.go b/models/ssl_ca_files.go index 0050cbf2..5673913a 100644 --- a/models/ssl_ca_files.go +++ b/models/ssl_ca_files.go @@ -71,11 +71,6 @@ func (m SslCaFiles) ContextValidate(ctx context.Context, formats strfmt.Registry 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/ssl_certificate_id.go b/models/ssl_certificate_id.go index f21e495e..001f04b9 100644 --- a/models/ssl_certificate_id.go +++ b/models/ssl_certificate_id.go @@ -95,11 +95,6 @@ func (m *SslCertificateID) ContextValidate(ctx context.Context, formats strfmt.R func (m *SslCertificateID) contextValidateCertificateID(ctx context.Context, formats strfmt.Registry) error { if m.CertificateID != nil { - - if swag.IsZero(m.CertificateID) { // not required - return nil - } - if err := m.CertificateID.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("certificate_id") diff --git a/models/ssl_certificates.go b/models/ssl_certificates.go index 6e86b9e9..9fcd08a7 100644 --- a/models/ssl_certificates.go +++ b/models/ssl_certificates.go @@ -71,11 +71,6 @@ func (m SslCertificates) ContextValidate(ctx context.Context, formats strfmt.Reg 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/ssl_crl_entries.go b/models/ssl_crl_entries.go index 85980ab6..fcc8dfe9 100644 --- a/models/ssl_crl_entries.go +++ b/models/ssl_crl_entries.go @@ -69,11 +69,6 @@ func (m SslCrlEntries) ContextValidate(ctx context.Context, formats strfmt.Regis 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/ssl_crl_entry.go b/models/ssl_crl_entry.go index a370a4a8..daaca9eb 100644 --- a/models/ssl_crl_entry.go +++ b/models/ssl_crl_entry.go @@ -157,11 +157,6 @@ func (m *SslCrlEntry) contextValidateRevokedCertificates(ctx context.Context, fo for i := 0; i < len(m.RevokedCertificates); i++ { if m.RevokedCertificates[i] != nil { - - if swag.IsZero(m.RevokedCertificates[i]) { // not required - return nil - } - if err := m.RevokedCertificates[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("revoked_certificates" + "." + strconv.Itoa(i)) diff --git a/models/ssl_crls.go b/models/ssl_crls.go index 8f1daa37..91c4f394 100644 --- a/models/ssl_crls.go +++ b/models/ssl_crls.go @@ -71,11 +71,6 @@ func (m SslCrls) ContextValidate(ctx context.Context, formats strfmt.Registry) e 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/ssl_crt_list_entries.go b/models/ssl_crt_list_entries.go index cdab2696..eecd810a 100644 --- a/models/ssl_crt_list_entries.go +++ b/models/ssl_crt_list_entries.go @@ -71,11 +71,6 @@ func (m SslCrtListEntries) 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/ssl_crt_list_files.go b/models/ssl_crt_list_files.go index e7fe62b4..1906bedf 100644 --- a/models/ssl_crt_list_files.go +++ b/models/ssl_crt_list_files.go @@ -71,11 +71,6 @@ func (m SslCrtListFiles) ContextValidate(ctx context.Context, formats strfmt.Reg 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/ssl_crt_lists.go b/models/ssl_crt_lists.go index 933b4e78..d8ee475f 100644 --- a/models/ssl_crt_lists.go +++ b/models/ssl_crt_lists.go @@ -71,11 +71,6 @@ func (m SslCrtLists) ContextValidate(ctx context.Context, formats strfmt.Registr 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/ssl_ocsp_response.go b/models/ssl_ocsp_response.go index 58b29ded..522bed92 100644 --- a/models/ssl_ocsp_response.go +++ b/models/ssl_ocsp_response.go @@ -126,11 +126,6 @@ func (m *SslOcspResponse) ContextValidate(ctx context.Context, formats strfmt.Re func (m *SslOcspResponse) contextValidateResponses(ctx context.Context, formats strfmt.Registry) error { if m.Responses != nil { - - if swag.IsZero(m.Responses) { // not required - return nil - } - if err := m.Responses.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("responses") @@ -269,11 +264,6 @@ func (m *OCSPResponses) ContextValidate(ctx context.Context, formats strfmt.Regi func (m *OCSPResponses) contextValidateCertificateID(ctx context.Context, formats strfmt.Registry) error { if m.CertificateID != nil { - - if swag.IsZero(m.CertificateID) { // not required - return nil - } - if err := m.CertificateID.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("responses" + "." + "certificate_id") diff --git a/models/ssl_options.go b/models/ssl_options.go index 742200b8..07b14984 100644 --- a/models/ssl_options.go +++ b/models/ssl_options.go @@ -40,8 +40,8 @@ type SslOptions struct { SslEngines []*SslEngine `json:"engines,omitempty"` // acme scheduler - // Enum: ["auto","off"] - // +kubebuilder:validation:Enum=auto;off; + // Enum: [auto off] + // +kubebuilder:validation:Enum=auto off; AcmeScheduler string `json:"acme_scheduler,omitempty"` // ca base @@ -102,8 +102,8 @@ type SslOptions struct { Maxsslrate int64 `json:"maxsslrate,omitempty"` // mode async - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ModeAsync string `json:"mode_async,omitempty"` // propquery @@ -123,8 +123,8 @@ type SslOptions struct { SecurityLevel *int64 `json:"security_level,omitempty"` // server verify - // Enum: ["none","required"] - // +kubebuilder:validation:Enum=none;required; + // Enum: [none required] + // +kubebuilder:validation:Enum=none required; ServerVerify string `json:"server_verify,omitempty"` // skip self issued ca @@ -348,11 +348,6 @@ func (m *SslOptions) contextValidateSslEngines(ctx context.Context, formats strf for i := 0; i < len(m.SslEngines); i++ { if m.SslEngines[i] != nil { - - if swag.IsZero(m.SslEngines[i]) { // not required - return nil - } - if err := m.SslEngines[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("engines" + "." + strconv.Itoa(i)) diff --git a/models/stats_http_request.go b/models/stats_http_request.go index 6e68a987..a4006661 100644 --- a/models/stats_http_request.go +++ b/models/stats_http_request.go @@ -46,8 +46,8 @@ type StatsHTTPRequest struct { // type // Required: true - // Enum: ["allow","deny","auth"] - // +kubebuilder:validation:Enum=allow;deny;auth; + // Enum: [allow deny auth] + // +kubebuilder:validation:Enum=allow deny auth; Type *string `json:"type"` } diff --git a/models/stats_options.go b/models/stats_options.go index 6d065c41..3484fcae 100644 --- a/models/stats_options.go +++ b/models/stats_options.go @@ -40,8 +40,8 @@ type StatsOptions struct { StatsAdmin bool `json:"stats_admin,omitempty"` // stats admin cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; StatsAdminCond string `json:"stats_admin_cond,omitempty"` // stats admin cond test @@ -298,11 +298,6 @@ func (m *StatsOptions) contextValidateStatsAuths(ctx context.Context, formats st for i := 0; i < len(m.StatsAuths); i++ { if m.StatsAuths[i] != nil { - - if swag.IsZero(m.StatsAuths[i]) { // not required - return nil - } - if err := m.StatsAuths[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stats_auths" + "." + strconv.Itoa(i)) @@ -323,11 +318,6 @@ func (m *StatsOptions) contextValidateStatsHTTPRequests(ctx context.Context, for for i := 0; i < len(m.StatsHTTPRequests); i++ { if m.StatsHTTPRequests[i] != nil { - - if swag.IsZero(m.StatsHTTPRequests[i]) { // not required - return nil - } - if err := m.StatsHTTPRequests[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("stats_http_requests" + "." + strconv.Itoa(i)) diff --git a/models/stick_rule.go b/models/stick_rule.go index 7e96a4e5..85cfecf3 100644 --- a/models/stick_rule.go +++ b/models/stick_rule.go @@ -38,8 +38,8 @@ import ( // swagger:model stick_rule type StickRule struct { // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -62,8 +62,8 @@ type StickRule struct { // type // Required: true - // Enum: ["match","on","store-request","store-response"] - // +kubebuilder:validation:Enum=match;on;store-request;store-response; + // Enum: [match on store-request store-response] + // +kubebuilder:validation:Enum=match on store-request store-response; Type string `json:"type"` } diff --git a/models/stick_rules.go b/models/stick_rules.go index e18b0918..5b03d968 100644 --- a/models/stick_rules.go +++ b/models/stick_rules.go @@ -71,11 +71,6 @@ func (m StickRules) ContextValidate(ctx context.Context, formats strfmt.Registry 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/stick_table.go b/models/stick_table.go index 78b2c1e4..e2495d9c 100644 --- a/models/stick_table.go +++ b/models/stick_table.go @@ -48,8 +48,8 @@ type StickTable struct { Size *int64 `json:"size,omitempty"` // type - // Enum: ["ip","ipv6","integer","string","binary"] - // +kubebuilder:validation:Enum=ip;ipv6;integer;string;binary; + // Enum: [ip ipv6 integer string binary] + // +kubebuilder:validation:Enum=ip ipv6 integer string binary; Type string `json:"type,omitempty"` // used @@ -170,11 +170,6 @@ func (m *StickTable) contextValidateFields(ctx context.Context, formats strfmt.R for i := 0; i < len(m.Fields); i++ { if m.Fields[i] != nil { - - if swag.IsZero(m.Fields[i]) { // not required - return nil - } - if err := m.Fields[i].ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("fields" + "." + strconv.Itoa(i)) @@ -213,8 +208,8 @@ func (m *StickTable) UnmarshalBinary(b []byte) error { // swagger:model StickTableField type StickTableField struct { // field - // Enum: ["bytes_in_cnt","bytes_in_rate","bytes_out_cnt","bytes_out_rate","conn_cnt","conn_cur","conn_rate","glitch_cnt","glitch_rate","gpc","gpc_rate","gpc0","gpc0_rate","gpc1","gpc1_rate","gpt0","gpt","http_req_cnt","http_req_rate","http_err_cnt","http_err_rate","http_fail_cnt","http_fail_rate","server_id","sess_cnt","sess_rate"] - // +kubebuilder:validation:Enum=bytes_in_cnt;bytes_in_rate;bytes_out_cnt;bytes_out_rate;conn_cnt;conn_cur;conn_rate;glitch_cnt;glitch_rate;gpc;gpc_rate;gpc0;gpc0_rate;gpc1;gpc1_rate;gpt0;gpt;http_req_cnt;http_req_rate;http_err_cnt;http_err_rate;http_fail_cnt;http_fail_rate;server_id;sess_cnt;sess_rate; + // Enum: [bytes_in_cnt bytes_in_rate bytes_out_cnt bytes_out_rate conn_cnt conn_cur conn_rate glitch_cnt glitch_rate gpc gpc_rate gpc0 gpc0_rate gpc1 gpc1_rate gpt0 gpt http_req_cnt http_req_rate http_err_cnt http_err_rate http_fail_cnt http_fail_rate server_id sess_cnt sess_rate] + // +kubebuilder:validation:Enum=bytes_in_cnt bytes_in_rate bytes_out_cnt bytes_out_rate conn_cnt conn_cur conn_rate glitch_cnt glitch_rate gpc gpc_rate gpc0 gpc0_rate gpc1 gpc1_rate gpt0 gpt http_req_cnt http_req_rate http_err_cnt http_err_rate http_fail_cnt http_fail_rate server_id sess_cnt sess_rate; Field string `json:"field,omitempty"` // idx @@ -224,8 +219,8 @@ type StickTableField struct { Period int64 `json:"period,omitempty"` // type - // Enum: ["rate","counter"] - // +kubebuilder:validation:Enum=rate;counter; + // Enum: [rate counter] + // +kubebuilder:validation:Enum=rate counter; Type string `json:"type,omitempty"` } diff --git a/models/stick_table_entries.go b/models/stick_table_entries.go index fe664184..779ae97c 100644 --- a/models/stick_table_entries.go +++ b/models/stick_table_entries.go @@ -71,11 +71,6 @@ func (m StickTableEntries) 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/stick_table_entry.go b/models/stick_table_entry.go index 64ef42a4..cd235804 100644 --- a/models/stick_table_entry.go +++ b/models/stick_table_entry.go @@ -230,11 +230,6 @@ func (m *StickTableEntry) ContextValidate(ctx context.Context, formats strfmt.Re func (m *StickTableEntry) contextValidateGpc(ctx context.Context, formats strfmt.Registry) error { if m.Gpc != nil { - - if swag.IsZero(m.Gpc) { // not required - return nil - } - if err := m.Gpc.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("gpc") @@ -251,11 +246,6 @@ func (m *StickTableEntry) contextValidateGpc(ctx context.Context, formats strfmt func (m *StickTableEntry) contextValidateGpcRate(ctx context.Context, formats strfmt.Registry) error { if m.GpcRate != nil { - - if swag.IsZero(m.GpcRate) { // not required - return nil - } - if err := m.GpcRate.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("gpc_rate") @@ -272,11 +262,6 @@ func (m *StickTableEntry) contextValidateGpcRate(ctx context.Context, formats st func (m *StickTableEntry) contextValidateGpt(ctx context.Context, formats strfmt.Registry) error { if m.Gpt != nil { - - if swag.IsZero(m.Gpt) { // not required - return nil - } - if err := m.Gpt.ContextValidate(ctx, formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("gpt") diff --git a/models/stick_tables.go b/models/stick_tables.go index 10be1e11..fe1d97ad 100644 --- a/models/stick_tables.go +++ b/models/stick_tables.go @@ -71,11 +71,6 @@ func (m StickTables) ContextValidate(ctx context.Context, formats strfmt.Registr 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/table.go b/models/table.go index 67678120..b744a69c 100644 --- a/models/table.go +++ b/models/table.go @@ -61,8 +61,8 @@ type Table struct { Store string `json:"store,omitempty"` // type - // Enum: ["ip","integer","string","binary"] - // +kubebuilder:validation:Enum=ip;integer;string;binary; + // Enum: [ip integer string binary] + // +kubebuilder:validation:Enum=ip integer string binary; Type string `json:"type,omitempty"` // type len diff --git a/models/tables.go b/models/tables.go index fb5362f8..89c0d7f9 100644 --- a/models/tables.go +++ b/models/tables.go @@ -71,11 +71,6 @@ func (m Tables) ContextValidate(ctx context.Context, formats strfmt.Registry) er 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/tcp_check.go b/models/tcp_check.go index 4e10a0ee..369b90a7 100644 --- a/models/tcp_check.go +++ b/models/tcp_check.go @@ -36,8 +36,8 @@ import ( type TCPCheck struct { // action // Required: true - // Enum: ["comment","connect","expect","send","send-lf","send-binary","send-binary-lf","set-var","set-var-fmt","unset-var"] - // +kubebuilder:validation:Enum=comment;connect;expect;send;send-lf;send-binary;send-binary-lf;set-var;set-var-fmt;unset-var; + // Enum: [comment connect expect send send-lf send-binary send-binary-lf set-var set-var-fmt unset-var] + // +kubebuilder:validation:Enum=comment connect expect send send-lf send-binary send-binary-lf set-var set-var-fmt unset-var; Action string `json:"action"` // addr @@ -60,8 +60,8 @@ type TCPCheck struct { Default bool `json:"default,omitempty"` // error status - // Enum: ["L7OKC","L7RSP","L7STS","L6RSP","L4CON"] - // +kubebuilder:validation:Enum=L7OKC;L7RSP;L7STS;L6RSP;L4CON; + // Enum: [L7OKC L7RSP L7STS L6RSP L4CON] + // +kubebuilder:validation:Enum=L7OKC L7RSP L7STS L6RSP L4CON; ErrorStatus string `json:"error_status,omitempty"` // exclamation mark @@ -81,9 +81,9 @@ type TCPCheck struct { // match // Pattern: ^[^\s]+$ - // Enum: ["string","rstring","string-lf","binary","rbinary","binary-lf"] + // Enum: [string rstring string-lf binary rbinary binary-lf] // +kubebuilder:validation:Pattern=`^[^\s]+$` - // +kubebuilder:validation:Enum=string;rstring;string-lf;binary;rbinary;binary-lf; + // +kubebuilder:validation:Enum=string rstring string-lf binary rbinary binary-lf; Match string `json:"match,omitempty"` // +kubebuilder:pruning:PreserveUnknownFields @@ -94,8 +94,8 @@ type TCPCheck struct { MinRecv int64 `json:"min_recv,omitempty"` // ok status - // Enum: ["L7OK","L7OKC","L6OK","L4OK"] - // +kubebuilder:validation:Enum=L7OK;L7OKC;L6OK;L4OK; + // Enum: [L7OK L7OKC L6OK L4OK] + // +kubebuilder:validation:Enum=L7OK L7OKC L6OK L4OK; OkStatus string `json:"ok_status,omitempty"` // on error @@ -133,8 +133,8 @@ type TCPCheck struct { StatusCode string `json:"status-code,omitempty"` // tout status - // Enum: ["L7TOUT","L6TOUT","L4TOUT"] - // +kubebuilder:validation:Enum=L7TOUT;L6TOUT;L4TOUT; + // Enum: [L7TOUT L6TOUT L4TOUT] + // +kubebuilder:validation:Enum=L7TOUT L6TOUT L4TOUT; ToutStatus string `json:"tout_status,omitempty"` // var expr diff --git a/models/tcp_checks.go b/models/tcp_checks.go index a958fba9..9975ddc3 100644 --- a/models/tcp_checks.go +++ b/models/tcp_checks.go @@ -69,11 +69,6 @@ func (m TCPChecks) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/tcp_request_rule.go b/models/tcp_request_rule.go index 2fc423cc..43ad7e2d 100644 --- a/models/tcp_request_rule.go +++ b/models/tcp_request_rule.go @@ -38,8 +38,8 @@ import ( // swagger:model tcp_request_rule type TCPRequestRule struct { // action - // Enum: ["accept","attach-srv","capture","do-resolve","expect-netscaler-cip","expect-proxy","lua","reject","sc-add-gpc","sc-inc-gpc","sc-inc-gpc0","sc-inc-gpc1","sc-set-gpt","sc-set-gpt0","send-spoe-group","set-bandwidth-limit","set-bc-mark","set-bc-tos","set-dst-port","set-dst","set-fc-mark","set-fc-tos","set-log-level","set-mark","set-nice","set-priority-class","set-priority-offset","set-src","set-src-port","set-tos","set-var","set-var-fmt","silent-drop","switch-mode","track-sc","unset-var","use-service","set-retries","do-log"] - // +kubebuilder:validation:Enum=accept;attach-srv;capture;do-resolve;expect-netscaler-cip;expect-proxy;lua;reject;sc-add-gpc;sc-inc-gpc;sc-inc-gpc0;sc-inc-gpc1;sc-set-gpt;sc-set-gpt0;send-spoe-group;set-bandwidth-limit;set-bc-mark;set-bc-tos;set-dst-port;set-dst;set-fc-mark;set-fc-tos;set-log-level;set-mark;set-nice;set-priority-class;set-priority-offset;set-src;set-src-port;set-tos;set-var;set-var-fmt;silent-drop;switch-mode;track-sc;unset-var;use-service;set-retries;do-log; + // Enum: [accept attach-srv capture do-resolve expect-netscaler-cip expect-proxy lua reject sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-bandwidth-limit set-bc-mark set-bc-tos set-dst-port set-dst set-fc-mark set-fc-tos set-log-level set-mark set-nice set-priority-class set-priority-offset set-src set-src-port set-tos set-var set-var-fmt silent-drop switch-mode track-sc unset-var use-service set-retries do-log] + // +kubebuilder:validation:Enum=accept attach-srv capture do-resolve expect-netscaler-cip expect-proxy lua reject sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-bandwidth-limit set-bc-mark set-bc-tos set-dst-port set-dst set-fc-mark set-fc-tos set-log-level set-mark set-nice set-priority-class set-priority-offset set-src set-src-port set-tos set-var set-var-fmt silent-drop switch-mode track-sc unset-var use-service set-retries do-log; Action string `json:"action,omitempty"` // bandwidth limit limit @@ -60,8 +60,8 @@ type TCPRequestRule struct { CaptureSample string `json:"capture_sample,omitempty"` // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -74,8 +74,8 @@ type TCPRequestRule struct { GptValue string `json:"gpt_value,omitempty"` // log level - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug","silent"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug;silent; + // Enum: [emerg alert crit err warning notice info debug silent] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug silent; LogLevel string `json:"log_level,omitempty"` // lua action @@ -103,8 +103,8 @@ type TCPRequestRule struct { NiceValue int64 `json:"nice_value,omitempty"` // resolve protocol - // Enum: ["ipv4","ipv6"] - // +kubebuilder:validation:Enum=ipv4;ipv6; + // Enum: [ipv4 ipv6] + // +kubebuilder:validation:Enum=ipv4 ipv6; ResolveProtocol string `json:"resolve_protocol,omitempty"` // resolve resolvers @@ -159,8 +159,8 @@ type TCPRequestRule struct { // type // Required: true - // Enum: ["connection","content","inspect-delay","session"] - // +kubebuilder:validation:Enum=connection;content;inspect-delay;session; + // Enum: [connection content inspect-delay session] + // +kubebuilder:validation:Enum=connection content inspect-delay session; Type string `json:"type"` // var format diff --git a/models/tcp_request_rules.go b/models/tcp_request_rules.go index 249ff499..b2dadd96 100644 --- a/models/tcp_request_rules.go +++ b/models/tcp_request_rules.go @@ -71,11 +71,6 @@ func (m TCPRequestRules) ContextValidate(ctx context.Context, formats strfmt.Reg 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/tcp_response_rule.go b/models/tcp_response_rule.go index 67cf8f1a..732d7b60 100644 --- a/models/tcp_response_rule.go +++ b/models/tcp_response_rule.go @@ -38,8 +38,8 @@ import ( // swagger:model tcp_response_rule type TCPResponseRule struct { // action - // Enum: ["accept","close","lua","reject","sc-add-gpc","sc-inc-gpc","sc-inc-gpc0","sc-inc-gpc1","sc-set-gpt","sc-set-gpt0","send-spoe-group","set-bandwidth-limit","set-fc-mark","set-fc-tos","set-log-level","set-mark","set-nice","set-tos","set-var","set-var-fmt","silent-drop","unset-var","do-log"] - // +kubebuilder:validation:Enum=accept;close;lua;reject;sc-add-gpc;sc-inc-gpc;sc-inc-gpc0;sc-inc-gpc1;sc-set-gpt;sc-set-gpt0;send-spoe-group;set-bandwidth-limit;set-fc-mark;set-fc-tos;set-log-level;set-mark;set-nice;set-tos;set-var;set-var-fmt;silent-drop;unset-var;do-log; + // Enum: [accept close lua reject sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-bandwidth-limit set-fc-mark set-fc-tos set-log-level set-mark set-nice set-tos set-var set-var-fmt silent-drop unset-var do-log] + // +kubebuilder:validation:Enum=accept close lua reject sc-add-gpc sc-inc-gpc sc-inc-gpc0 sc-inc-gpc1 sc-set-gpt sc-set-gpt0 send-spoe-group set-bandwidth-limit set-fc-mark set-fc-tos set-log-level set-mark set-nice set-tos set-var set-var-fmt silent-drop unset-var do-log; Action string `json:"action,omitempty"` // bandwidth limit limit @@ -52,8 +52,8 @@ type TCPResponseRule struct { BandwidthLimitPeriod string `json:"bandwidth_limit_period,omitempty"` // cond - // Enum: ["if","unless"] - // +kubebuilder:validation:Enum=if;unless; + // Enum: [if unless] + // +kubebuilder:validation:Enum=if unless; Cond string `json:"cond,omitempty"` // cond test @@ -63,8 +63,8 @@ type TCPResponseRule struct { Expr string `json:"expr,omitempty"` // log level - // Enum: ["emerg","alert","crit","err","warning","notice","info","debug","silent"] - // +kubebuilder:validation:Enum=emerg;alert;crit;err;warning;notice;info;debug;silent; + // Enum: [emerg alert crit err warning notice info debug silent] + // +kubebuilder:validation:Enum=emerg alert crit err warning notice info debug silent; LogLevel string `json:"log_level,omitempty"` // lua action @@ -126,8 +126,8 @@ type TCPResponseRule struct { // type // Required: true - // Enum: ["content","inspect-delay"] - // +kubebuilder:validation:Enum=content;inspect-delay; + // Enum: [content inspect-delay] + // +kubebuilder:validation:Enum=content inspect-delay; Type string `json:"type"` // var format diff --git a/models/tcp_response_rules.go b/models/tcp_response_rules.go index 26f8fe85..ba78b301 100644 --- a/models/tcp_response_rules.go +++ b/models/tcp_response_rules.go @@ -71,11 +71,6 @@ func (m TCPResponseRules) ContextValidate(ctx context.Context, formats strfmt.Re 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/trace_entries.go b/models/trace_entries.go index 0fa86e14..5ac83a75 100644 --- a/models/trace_entries.go +++ b/models/trace_entries.go @@ -69,11 +69,6 @@ func (m TraceEntries) ContextValidate(ctx context.Context, formats strfmt.Regist 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/transaction.go b/models/transaction.go index 327e3445..85d9a6ad 100644 --- a/models/transaction.go +++ b/models/transaction.go @@ -47,8 +47,8 @@ type Transaction struct { ID string `json:"id,omitempty"` // status - // Enum: ["failed","outdated","in_progress","success"] - // +kubebuilder:validation:Enum=failed;outdated;in_progress;success; + // Enum: [failed outdated in_progress success] + // +kubebuilder:validation:Enum=failed outdated in_progress success; Status string `json:"status,omitempty"` } diff --git a/models/transactions.go b/models/transactions.go index 2bc270c0..b45c314f 100644 --- a/models/transactions.go +++ b/models/transactions.go @@ -71,11 +71,6 @@ func (m Transactions) ContextValidate(ctx context.Context, formats strfmt.Regist 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/tune_lua_options.go b/models/tune_lua_options.go index dc0796ee..1117a867 100644 --- a/models/tune_lua_options.go +++ b/models/tune_lua_options.go @@ -35,8 +35,8 @@ import ( // swagger:model tune_lua_options type TuneLuaOptions struct { // bool sample conversion - // Enum: ["normal","pre-3.1-bug"] - // +kubebuilder:validation:Enum=normal;pre-3.1-bug; + // Enum: [normal pre-3.1-bug] + // +kubebuilder:validation:Enum=normal pre-3.1-bug; BoolSampleConversion string `json:"bool_sample_conversion,omitempty"` // burst timeout @@ -48,13 +48,13 @@ type TuneLuaOptions struct { ForcedYield int64 `json:"forced_yield,omitempty"` // log loggers - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; LogLoggers string `json:"log_loggers,omitempty"` // log stderr - // Enum: ["auto","enabled","disabled"] - // +kubebuilder:validation:Enum=auto;enabled;disabled; + // Enum: [auto enabled disabled] + // +kubebuilder:validation:Enum=auto enabled disabled; LogStderr string `json:"log_stderr,omitempty"` // maxmem diff --git a/models/tune_options.go b/models/tune_options.go index b342a353..468ec6f6 100644 --- a/models/tune_options.go +++ b/models/tune_options.go @@ -36,8 +36,8 @@ import ( // swagger:model tune_options type TuneOptions struct { // applet zero copy forwarding - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; AppletZeroCopyForwarding string `json:"applet_zero_copy_forwarding,omitempty"` // comp maxlevel @@ -63,8 +63,8 @@ type TuneOptions struct { FailAlloc bool `json:"fail_alloc,omitempty"` // fd edge triggered - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; FdEdgeTriggered string `json:"fd_edge_triggered,omitempty"` // glitches kill cpu usage @@ -75,13 +75,13 @@ type TuneOptions struct { GlitchesKillCPUUsage *int64 `json:"glitches_kill_cpu_usage,omitempty"` // h1 zero copy fwd recv - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; H1ZeroCopyFwdRecv string `json:"h1_zero_copy_fwd_recv,omitempty"` // h1 zero copy fwd send - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; H1ZeroCopyFwdSend string `json:"h1_zero_copy_fwd_send,omitempty"` // h2 be glitches threshold @@ -126,8 +126,8 @@ type TuneOptions struct { H2MaxFrameSize int64 `json:"h2_max_frame_size,omitempty"` // h2 zero copy fwd send - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; H2ZeroCopyFwdSend string `json:"h2_zero_copy_fwd_send,omitempty"` // http cookielen @@ -144,8 +144,8 @@ type TuneOptions struct { HTTPMaxhdr int64 `json:"http_maxhdr,omitempty"` // idle pool shared - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; IdlePoolShared string `json:"idle_pool_shared,omitempty"` // idletimer @@ -156,13 +156,13 @@ type TuneOptions struct { Idletimer *int64 `json:"idletimer,omitempty"` // listener default shards - // Enum: ["by-process","by-thread","by-group"] - // +kubebuilder:validation:Enum=by-process;by-thread;by-group; + // Enum: [by-process by-thread by-group] + // +kubebuilder:validation:Enum=by-process by-thread by-group; ListenerDefaultShards string `json:"listener_default_shards,omitempty"` // listener multi queue - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ListenerMultiQueue string `json:"listener_multi_queue,omitempty"` // max checks per thread @@ -204,8 +204,8 @@ type TuneOptions struct { PoolLowFdRatio int64 `json:"pool_low_fd_ratio,omitempty"` // pt zero copy forwarding - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; PtZeroCopyForwarding string `json:"pt_zero_copy_forwarding,omitempty"` // renice runtime @@ -229,16 +229,16 @@ type TuneOptions struct { RunqueueDepth int64 `json:"runqueue_depth,omitempty"` // sched low latency - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; SchedLowLatency string `json:"sched_low_latency,omitempty"` // stick counters StickCounters *int64 `json:"stick_counters,omitempty"` // takeover other tg connections - // Enum: ["none","restricted","full"] - // +kubebuilder:validation:Enum=none;restricted;full; + // Enum: [none restricted full] + // +kubebuilder:validation:Enum=none restricted full; TakeoverOtherTgConnections string `json:"takeover_other_tg_connections,omitempty"` } diff --git a/models/tune_quic_options.go b/models/tune_quic_options.go index cfcebc8d..0b2dd4ba 100644 --- a/models/tune_quic_options.go +++ b/models/tune_quic_options.go @@ -63,13 +63,13 @@ type TuneQuicOptions struct { RetryThreshold *int64 `json:"retry_threshold,omitempty"` // socket owner - // Enum: ["listener","connection"] - // +kubebuilder:validation:Enum=listener;connection; + // Enum: [listener connection] + // +kubebuilder:validation:Enum=listener connection; SocketOwner string `json:"socket_owner,omitempty"` // zero copy fwd send - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; ZeroCopyFwdSend string `json:"zero_copy_fwd_send,omitempty"` } diff --git a/models/tune_ssl_options.go b/models/tune_ssl_options.go index fe6cbda4..38bb08bb 100644 --- a/models/tune_ssl_options.go +++ b/models/tune_ssl_options.go @@ -51,8 +51,8 @@ type TuneSslOptions struct { ForcePrivateCache bool `json:"force_private_cache,omitempty"` // keylog - // Enum: ["enabled","disabled"] - // +kubebuilder:validation:Enum=enabled;disabled; + // Enum: [enabled disabled] + // +kubebuilder:validation:Enum=enabled disabled; Keylog string `json:"keylog,omitempty"` // lifetime diff --git a/models/userlists.go b/models/userlists.go index 831ca45a..1acc7d7f 100644 --- a/models/userlists.go +++ b/models/userlists.go @@ -71,11 +71,6 @@ func (m Userlists) ContextValidate(ctx context.Context, formats strfmt.Registry) 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/users.go b/models/users.go index cc1ecb3d..18a69e85 100644 --- a/models/users.go +++ b/models/users.go @@ -71,11 +71,6 @@ func (m Users) ContextValidate(ctx context.Context, formats strfmt.Registry) err 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/runtime/servers.go b/runtime/servers.go index 25917201..3d15e1b0 100644 --- a/runtime/servers.go +++ b/runtime/servers.go @@ -127,6 +127,12 @@ func (s *SingleRuntime) SetServerAgentSend(backend, server string, send string) return s.Execute(cmd) } +// SetServerSSL set SSL for server +func (s *SingleRuntime) SetServerSSL(backend, server string, ssl string) error { + cmd := fmt.Sprintf("set server %s/%s ssl %s", backend, server, ssl) + return s.Execute(cmd) +} + // GetServersState returns servers runtime state func (s *SingleRuntime) GetServersState(backend string) (models.RuntimeServers, error) { cmd := "show servers state " + backend @@ -182,18 +188,16 @@ func parseRuntimeServers(output string) (models.RuntimeServers, error) { func parseRuntimeServer(line string) *models.RuntimeServer { fields := strings.Split(line, " ") - if len(fields) < 19 { + if len(fields) < 25 { return nil } - p, err := strconv.ParseInt(fields[18], 10, 64) - var port *int64 + bID, err := strconv.ParseInt(fields[0], 10, 64) + var backendID *int64 if err == nil { - port = &p + backendID = &bID } - admState, _ := misc.GetServerAdminState(fields[6]) - var opState string switch fields[5] { case "0": @@ -204,12 +208,117 @@ func parseRuntimeServer(line string) *models.RuntimeServer { opState = "up" } + admState, _ := misc.GetServerAdminState(fields[6]) + + uW, err := strconv.ParseInt(fields[7], 10, 64) + var uWeight *int64 + if err == nil { + uWeight = &uW + } + + iW, err := strconv.ParseInt(fields[8], 10, 64) + var iWeight *int64 + if err == nil { + iWeight = &iW + } + + lTC, err := strconv.ParseInt(fields[9], 10, 64) + var lastTimeChange *int64 + if err == nil { + lastTimeChange = &lTC + } + + cStatus, err := strconv.ParseInt(fields[10], 10, 64) + var checkStatus *int64 + if err == nil { + checkStatus = &cStatus + } + + cResult, err := strconv.ParseInt(fields[11], 10, 64) + var checkResult *int64 + if err == nil { + checkResult = &cResult + } + + cHealth, err := strconv.ParseInt(fields[12], 10, 64) + var checkHealth *int64 + if err == nil { + checkHealth = &cHealth + } + + cState, err := strconv.ParseInt(fields[13], 10, 64) + var checkState *int64 + if err == nil { + checkState = &cState + } + + aState, err := strconv.ParseInt(fields[14], 10, 64) + var agentState *int64 + if err == nil { + agentState = &aState + } + + bFID, err := strconv.ParseInt(fields[15], 10, 64) + var backendForcedID *int64 + if err == nil { + backendForcedID = &bFID + } + + fID, err := strconv.ParseInt(fields[16], 10, 64) + var forcedID *int64 + if err == nil { + forcedID = &fID + } + + p, err := strconv.ParseInt(fields[18], 10, 64) + var port *int64 + if err == nil { + port = &p + } + + uSSL, err := strconv.ParseBool(fields[20]) + var useSSL *bool + if err == nil { + useSSL = &uSSL + } + + cPort, err := strconv.ParseInt(fields[21], 10, 64) + var checkPort *int64 + if err == nil { + checkPort = &cPort + } + + aPort, err := strconv.ParseInt(fields[24], 10, 64) + var agentPort *int64 + if err == nil { + agentPort = &aPort + } + return &models.RuntimeServer{ + BackendID: backendID, + BackendName: fields[1], + ID: fields[2], Name: fields[3], Address: fields[4], - Port: port, - ID: fields[2], AdminState: admState, OperationalState: opState, + Uweight: uWeight, + Iweight: iWeight, + LastTimeChange: lastTimeChange, + CheckStatus: checkStatus, + CheckResult: checkResult, + CheckHealth: checkHealth, + CheckState: checkState, + AgentState: agentState, + BackendForcedID: backendForcedID, + ForecedID: forcedID, + Fqdn: fields[17], + Port: port, + Srvrecord: fields[19], + UseSsl: useSSL, + CheckPort: checkPort, + CheckAddr: fields[22], + AgentAddr: fields[23], + AgentPort: agentPort, } } diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml index 92fc025b..3f72973e 100644 --- a/specification/build/haproxy_spec.yaml +++ b/specification/build/haproxy_spec.yaml @@ -9723,12 +9723,31 @@ definitions: runtime_server: description: Runtime transient server properties example: - address: 127.0.0.5 + address: 142.250.191.142 admin_state: ready + agent_addr: 127.0.0.1 + agent_port: 80 + agent_state: 0 + backend_forced_id: 0 + backend_id: 2 + backend_name: myservers + check_addr: 142.250.191.143 + check_health: 0 + check_port: 80 + check_result: 2 + check_state: 6 + check_status: 17 + forced_id: 0 + fqdn: server.com + id: 1 + iweight: 1 + last_time_change: 123 + name: server1 operational_state: up port: 80 - server_id: 1 - server_name: web_server + srvrecord: _myservice._tcp.example.local + use_ssl: false + uweight: 1 properties: address: pattern: ^[^\s]+$ @@ -9741,9 +9760,73 @@ definitions: - maint - drain type: string + agent_addr: + readOnly: true + type: string + agent_port: + maximum: 65535 + minimum: 1 + readOnly: true + type: integer + x-nullable: true + agent_state: + readOnly: true + type: integer + x-nullable: true + backend_forced_id: + readOnly: true + type: integer + x-nullable: true + backend_id: + readOnly: true + type: integer + x-nullable: true + backend_name: + readOnly: true + type: string + check_addr: + readOnly: true + type: string + check_health: + readOnly: true + type: integer + x-nullable: true + check_port: + maximum: 65535 + minimum: 1 + readOnly: true + type: integer + x-nullable: true + check_result: + readOnly: true + type: integer + x-nullable: true + check_state: + readOnly: true + type: integer + x-nullable: true + check_status: + readOnly: true + type: integer + x-nullable: true + foreced_id: + readOnly: true + type: integer + x-nullable: true + fqdn: + readOnly: true + type: string id: readOnly: true type: string + iweight: + readOnly: true + type: integer + x-nullable: true + last_time_change: + readOnly: true + type: integer + x-nullable: true name: readOnly: true type: string @@ -9759,6 +9842,16 @@ definitions: readOnly: true type: integer x-nullable: true + srvrecord: + readOnly: true + type: string + use_ssl: + readOnly: true + type: boolean + uweight: + readOnly: true + type: integer + x-nullable: true title: Runtime Server type: object runtime_servers: diff --git a/specification/models/runtime/server.yaml b/specification/models/runtime/server.yaml index 4950a5c6..a96b1ef4 100644 --- a/specification/models/runtime/server.yaml +++ b/specification/models/runtime/server.yaml @@ -4,6 +4,13 @@ server: description: Runtime transient server properties type: object properties: + backend_id: + type: integer + x-nullable: true + readOnly: true + backend_name: + type: string + readOnly: true id: type: string readOnly: true @@ -15,25 +22,111 @@ server: pattern: '^[^\s]+$' x-nullable: false readOnly: true + operational_state: + type: string + enum: [up, down, stopping] + admin_state: + type: string + enum: [ready, maint, drain] + uweight: + type: integer + x-nullable: true + readOnly: true + iweight: + type: integer + x-nullable: true + readOnly: true + last_time_change: + type: integer + x-nullable: true + readOnly: true + check_status: + type: integer + x-nullable: true + readOnly: true + check_result: + type: integer + x-nullable: true + readOnly: true + check_health: + type: integer + x-nullable: true + readOnly: true + check_state: + type: integer + x-nullable: true + readOnly: true + agent_state: + type: integer + x-nullable: true + readOnly: true + backend_forced_id: + type: integer + x-nullable: true + readOnly: true + foreced_id: + type: integer + x-nullable: true + readOnly: true + fqdn: + type: string + readOnly: true port: type: integer x-nullable: true minimum: 1 maximum: 65535 readOnly: true - operational_state: + srvrecord: type: string - enum: [up, down, stopping] - admin_state: + readOnly: true + use_ssl: + type: boolean + readOnly: true + check_port: + type: integer + x-nullable: true + minimum: 1 + maximum: 65535 + readOnly: true + check_addr: type: string - enum: [ready, maint, drain] + readOnly: true + agent_addr: + type: string + readOnly: true + agent_port: + type: integer + x-nullable: true + minimum: 1 + maximum: 65535 + readOnly: true example: - server_id: 1 - server_name: web_server - address: 127.0.0.5 - port: 80 + backend_id: 2 + backend_name: myservers + id: 1 + name: server1 + address: 142.250.191.142 operational_state: up admin_state: ready + uweight: 1 + iweight: 1 + last_time_change: 123 + check_status: 17 + check_result: 2 + check_health: 0 + check_state: 6 + agent_state: 0 + backend_forced_id: 0 + forced_id: 0 + fqdn: server.com + port: 80 + srvrecord: _myservice._tcp.example.local + use_ssl: false + check_port: 80 + check_addr: 142.250.191.143 + agent_addr: 127.0.0.1 + agent_port: 80 add_server: title: Runtime Add Server description: Settable properties when adding a new server using HAProxy's runtime.