diff --git a/api/models/v1_postgres_create_request.go b/api/models/v1_postgres_create_request.go index f09a6d0..09681a3 100644 --- a/api/models/v1_postgres_create_request.go +++ b/api/models/v1_postgres_create_request.go @@ -11,6 +11,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" + "github.com/go-openapi/validate" ) // V1PostgresCreateRequest v1 postgres create request @@ -24,9 +25,20 @@ type V1PostgresCreateRequest struct { // audit logs AuditLogs bool `json:"auditLogs,omitempty"` + // autoassigndedicatedlbipfrom + Autoassigndedicatedlbipfrom string `json:"autoassigndedicatedlbipfrom,omitempty"` + // backup Backup string `json:"backup,omitempty"` + // dedicatedloadbalancerip + // Required: true + Dedicatedloadbalancerip *string `json:"dedicatedloadbalancerip"` + + // dedicatedloadbalancerport + // Required: true + Dedicatedloadbalancerport *int32 `json:"dedicatedloadbalancerport"` + // description Description string `json:"description,omitempty"` @@ -63,6 +75,14 @@ func (m *V1PostgresCreateRequest) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateDedicatedloadbalancerip(formats); err != nil { + res = append(res, err) + } + + if err := m.validateDedicatedloadbalancerport(formats); err != nil { + res = append(res, err) + } + if err := m.validateSize(formats); err != nil { res = append(res, err) } @@ -92,6 +112,24 @@ func (m *V1PostgresCreateRequest) validateAccessList(formats strfmt.Registry) er return nil } +func (m *V1PostgresCreateRequest) validateDedicatedloadbalancerip(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerip", "body", m.Dedicatedloadbalancerip); err != nil { + return err + } + + return nil +} + +func (m *V1PostgresCreateRequest) validateDedicatedloadbalancerport(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerport", "body", m.Dedicatedloadbalancerport); err != nil { + return err + } + + return nil +} + func (m *V1PostgresCreateRequest) validateSize(formats strfmt.Registry) error { if swag.IsZero(m.Size) { // not required return nil diff --git a/api/models/v1_postgres_create_standby_request.go b/api/models/v1_postgres_create_standby_request.go index 8fd5702..85a18ff 100644 --- a/api/models/v1_postgres_create_standby_request.go +++ b/api/models/v1_postgres_create_standby_request.go @@ -19,9 +19,20 @@ import ( // swagger:model v1.PostgresCreateStandbyRequest type V1PostgresCreateStandbyRequest struct { + // autoassigndedicatedlbipfrom + Autoassigndedicatedlbipfrom string `json:"autoassigndedicatedlbipfrom,omitempty"` + // backup Backup string `json:"backup,omitempty"` + // dedicatedloadbalancerip + // Required: true + Dedicatedloadbalancerip *string `json:"dedicatedloadbalancerip"` + + // dedicatedloadbalancerport + // Required: true + Dedicatedloadbalancerport *int32 `json:"dedicatedloadbalancerport"` + // description Description string `json:"description,omitempty"` @@ -46,6 +57,14 @@ type V1PostgresCreateStandbyRequest struct { func (m *V1PostgresCreateStandbyRequest) Validate(formats strfmt.Registry) error { var res []error + if err := m.validateDedicatedloadbalancerip(formats); err != nil { + res = append(res, err) + } + + if err := m.validateDedicatedloadbalancerport(formats); err != nil { + res = append(res, err) + } + if err := m.validatePrimaryID(formats); err != nil { res = append(res, err) } @@ -56,6 +75,24 @@ func (m *V1PostgresCreateStandbyRequest) Validate(formats strfmt.Registry) error return nil } +func (m *V1PostgresCreateStandbyRequest) validateDedicatedloadbalancerip(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerip", "body", m.Dedicatedloadbalancerip); err != nil { + return err + } + + return nil +} + +func (m *V1PostgresCreateStandbyRequest) validateDedicatedloadbalancerport(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerport", "body", m.Dedicatedloadbalancerport); err != nil { + return err + } + + return nil +} + func (m *V1PostgresCreateStandbyRequest) validatePrimaryID(formats strfmt.Registry) error { if err := validate.Required("primaryId", "body", m.PrimaryID); err != nil { diff --git a/api/models/v1_postgres_response.go b/api/models/v1_postgres_response.go index 2a5b839..99555e7 100644 --- a/api/models/v1_postgres_response.go +++ b/api/models/v1_postgres_response.go @@ -38,6 +38,14 @@ type V1PostgresResponse struct { // Format: date-time CreationTimestamp strfmt.DateTime `json:"creationTimestamp,omitempty"` + // dedicatedloadbalancerip + // Required: true + Dedicatedloadbalancerip *string `json:"dedicatedloadbalancerip"` + + // dedicatedloadbalancerport + // Required: true + Dedicatedloadbalancerport *int32 `json:"dedicatedloadbalancerport"` + // description Description string `json:"description,omitempty"` @@ -96,6 +104,14 @@ func (m *V1PostgresResponse) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateDedicatedloadbalancerip(formats); err != nil { + res = append(res, err) + } + + if err := m.validateDedicatedloadbalancerport(formats); err != nil { + res = append(res, err) + } + if err := m.validateID(formats); err != nil { res = append(res, err) } @@ -168,6 +184,24 @@ func (m *V1PostgresResponse) validateCreationTimestamp(formats strfmt.Registry) return nil } +func (m *V1PostgresResponse) validateDedicatedloadbalancerip(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerip", "body", m.Dedicatedloadbalancerip); err != nil { + return err + } + + return nil +} + +func (m *V1PostgresResponse) validateDedicatedloadbalancerport(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerport", "body", m.Dedicatedloadbalancerport); err != nil { + return err + } + + return nil +} + func (m *V1PostgresResponse) validateID(formats strfmt.Registry) error { if err := validate.Required("id", "body", m.ID); err != nil { diff --git a/api/models/v1_postgres_status.go b/api/models/v1_postgres_status.go index 66ab223..692df32 100644 --- a/api/models/v1_postgres_status.go +++ b/api/models/v1_postgres_status.go @@ -7,6 +7,7 @@ package models import ( "context" + "strconv" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -18,6 +19,9 @@ import ( // swagger:model v1.PostgresStatus type V1PostgresStatus struct { + // additionalsockets + Additionalsockets []*V1PostgresSocket `json:"additionalsockets"` + // child reference ChildReference string `json:"childReference,omitempty"` @@ -32,6 +36,10 @@ type V1PostgresStatus struct { func (m *V1PostgresStatus) Validate(formats strfmt.Registry) error { var res []error + if err := m.validateAdditionalsockets(formats); err != nil { + res = append(res, err) + } + if err := m.validateSocket(formats); err != nil { res = append(res, err) } @@ -42,6 +50,32 @@ func (m *V1PostgresStatus) Validate(formats strfmt.Registry) error { return nil } +func (m *V1PostgresStatus) validateAdditionalsockets(formats strfmt.Registry) error { + if swag.IsZero(m.Additionalsockets) { // not required + return nil + } + + for i := 0; i < len(m.Additionalsockets); i++ { + if swag.IsZero(m.Additionalsockets[i]) { // not required + continue + } + + if m.Additionalsockets[i] != nil { + if err := m.Additionalsockets[i].Validate(formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("additionalsockets" + "." + strconv.Itoa(i)) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("additionalsockets" + "." + strconv.Itoa(i)) + } + return err + } + } + + } + + return nil +} + func (m *V1PostgresStatus) validateSocket(formats strfmt.Registry) error { if swag.IsZero(m.Socket) { // not required return nil @@ -65,6 +99,10 @@ func (m *V1PostgresStatus) validateSocket(formats strfmt.Registry) error { func (m *V1PostgresStatus) ContextValidate(ctx context.Context, formats strfmt.Registry) error { var res []error + if err := m.contextValidateAdditionalsockets(ctx, formats); err != nil { + res = append(res, err) + } + if err := m.contextValidateSocket(ctx, formats); err != nil { res = append(res, err) } @@ -75,6 +113,31 @@ func (m *V1PostgresStatus) ContextValidate(ctx context.Context, formats strfmt.R return nil } +func (m *V1PostgresStatus) contextValidateAdditionalsockets(ctx context.Context, formats strfmt.Registry) error { + + for i := 0; i < len(m.Additionalsockets); i++ { + + if m.Additionalsockets[i] != nil { + + if swag.IsZero(m.Additionalsockets[i]) { // not required + return nil + } + + if err := m.Additionalsockets[i].ContextValidate(ctx, formats); err != nil { + if ve, ok := err.(*errors.Validation); ok { + return ve.ValidateName("additionalsockets" + "." + strconv.Itoa(i)) + } else if ce, ok := err.(*errors.CompositeError); ok { + return ce.ValidateName("additionalsockets" + "." + strconv.Itoa(i)) + } + return err + } + } + + } + + return nil +} + func (m *V1PostgresStatus) contextValidateSocket(ctx context.Context, formats strfmt.Registry) error { if m.Socket != nil { diff --git a/api/models/v1_postgres_update_request.go b/api/models/v1_postgres_update_request.go index e12ce0b..0fc74d3 100644 --- a/api/models/v1_postgres_update_request.go +++ b/api/models/v1_postgres_update_request.go @@ -25,12 +25,23 @@ type V1PostgresUpdateRequest struct { // audit logs AuditLogs bool `json:"auditLogs,omitempty"` + // autoassigndedicatedlbipfrom + Autoassigndedicatedlbipfrom string `json:"autoassigndedicatedlbipfrom,omitempty"` + // backup Backup string `json:"backup,omitempty"` // connection Connection *V1Connection `json:"connection,omitempty"` + // dedicatedloadbalancerip + // Required: true + Dedicatedloadbalancerip *string `json:"dedicatedloadbalancerip"` + + // dedicatedloadbalancerport + // Required: true + Dedicatedloadbalancerport *int32 `json:"dedicatedloadbalancerport"` + // description Description string `json:"description,omitempty"` @@ -75,6 +86,14 @@ func (m *V1PostgresUpdateRequest) Validate(formats strfmt.Registry) error { res = append(res, err) } + if err := m.validateDedicatedloadbalancerip(formats); err != nil { + res = append(res, err) + } + + if err := m.validateDedicatedloadbalancerport(formats); err != nil { + res = append(res, err) + } + if err := m.validateID(formats); err != nil { res = append(res, err) } @@ -131,6 +150,24 @@ func (m *V1PostgresUpdateRequest) validateConnection(formats strfmt.Registry) er return nil } +func (m *V1PostgresUpdateRequest) validateDedicatedloadbalancerip(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerip", "body", m.Dedicatedloadbalancerip); err != nil { + return err + } + + return nil +} + +func (m *V1PostgresUpdateRequest) validateDedicatedloadbalancerport(formats strfmt.Registry) error { + + if err := validate.Required("dedicatedloadbalancerport", "body", m.Dedicatedloadbalancerport); err != nil { + return err + } + + return nil +} + func (m *V1PostgresUpdateRequest) validateID(formats strfmt.Registry) error { if err := validate.Required("id", "body", m.ID); err != nil { diff --git a/cloud-api.json b/cloud-api.json index da8c977..c3b0a87 100644 --- a/cloud-api.json +++ b/cloud-api.json @@ -2993,9 +2993,19 @@ "auditLogs": { "type": "boolean" }, + "autoassigndedicatedlbipfrom": { + "type": "string" + }, "backup": { "type": "string" }, + "dedicatedloadbalancerip": { + "type": "string" + }, + "dedicatedloadbalancerport": { + "format": "int32", + "type": "integer" + }, "description": { "type": "string" }, @@ -3033,13 +3043,27 @@ "version": { "type": "string" } - } + }, + "required": [ + "dedicatedloadbalancerip", + "dedicatedloadbalancerport" + ] }, "v1.PostgresCreateStandbyRequest": { "properties": { + "autoassigndedicatedlbipfrom": { + "type": "string" + }, "backup": { "type": "string" }, + "dedicatedloadbalancerip": { + "type": "string" + }, + "dedicatedloadbalancerport": { + "format": "int32", + "type": "integer" + }, "description": { "type": "string" }, @@ -3067,6 +3091,8 @@ } }, "required": [ + "dedicatedloadbalancerip", + "dedicatedloadbalancerport", "primaryId" ] }, @@ -3135,6 +3161,13 @@ "format": "date-time", "type": "string" }, + "dedicatedloadbalancerip": { + "type": "string" + }, + "dedicatedloadbalancerport": { + "format": "int32", + "type": "integer" + }, "description": { "type": "string" }, @@ -3186,6 +3219,8 @@ } }, "required": [ + "dedicatedloadbalancerip", + "dedicatedloadbalancerport", "id", "status" ] @@ -3260,6 +3295,12 @@ }, "v1.PostgresStatus": { "properties": { + "additionalsockets": { + "items": { + "$ref": "#/definitions/v1.PostgresSocket" + }, + "type": "array" + }, "childReference": { "type": "string" }, @@ -3279,12 +3320,22 @@ "auditLogs": { "type": "boolean" }, + "autoassigndedicatedlbipfrom": { + "type": "string" + }, "backup": { "type": "string" }, "connection": { "$ref": "#/definitions/v1.Connection" }, + "dedicatedloadbalancerip": { + "type": "string" + }, + "dedicatedloadbalancerport": { + "format": "int32", + "type": "integer" + }, "description": { "type": "string" }, @@ -3324,6 +3375,8 @@ } }, "required": [ + "dedicatedloadbalancerip", + "dedicatedloadbalancerport", "id" ] },