Introduce dropdowns for node selector screen on affinity (#779)

* Introduce dropdowns for node selector screen on affinity

Fixes https://github.com/miniohq/engineering/issues/138

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>

* Lint

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
This commit is contained in:
Daniel Valdivia
2021-06-02 15:48:17 -07:00
committed by GitHub
parent c1e41e6b0a
commit 8ca6401ac0
22 changed files with 812 additions and 39 deletions

View File

@@ -38,6 +38,7 @@ import (
"github.com/minio/console/models"
"github.com/minio/console/restapi/operations/admin_api"
"github.com/minio/console/restapi/operations/operator_api"
"github.com/minio/console/restapi/operations/user_api"
)
@@ -235,6 +236,9 @@ func NewConsoleAPI(spec *loads.Document) *ConsoleAPI {
AdminAPIListGroupsHandler: admin_api.ListGroupsHandlerFunc(func(params admin_api.ListGroupsParams, principal *models.Principal) middleware.Responder {
return middleware.NotImplemented("operation admin_api.ListGroups has not yet been implemented")
}),
OperatorAPIListNodeLabelsHandler: operator_api.ListNodeLabelsHandlerFunc(func(params operator_api.ListNodeLabelsParams, principal *models.Principal) middleware.Responder {
return middleware.NotImplemented("operation operator_api.ListNodeLabels has not yet been implemented")
}),
UserAPIListObjectsHandler: user_api.ListObjectsHandlerFunc(func(params user_api.ListObjectsParams, principal *models.Principal) middleware.Responder {
return middleware.NotImplemented("operation user_api.ListObjects has not yet been implemented")
}),
@@ -566,6 +570,8 @@ type ConsoleAPI struct {
UserAPIListExternalBucketsHandler user_api.ListExternalBucketsHandler
// AdminAPIListGroupsHandler sets the operation handler for the list groups operation
AdminAPIListGroupsHandler admin_api.ListGroupsHandler
// OperatorAPIListNodeLabelsHandler sets the operation handler for the list node labels operation
OperatorAPIListNodeLabelsHandler operator_api.ListNodeLabelsHandler
// UserAPIListObjectsHandler sets the operation handler for the list objects operation
UserAPIListObjectsHandler user_api.ListObjectsHandler
// AdminAPIListPVCsHandler sets the operation handler for the list p v cs operation
@@ -923,6 +929,9 @@ func (o *ConsoleAPI) Validate() error {
if o.AdminAPIListGroupsHandler == nil {
unregistered = append(unregistered, "admin_api.ListGroupsHandler")
}
if o.OperatorAPIListNodeLabelsHandler == nil {
unregistered = append(unregistered, "operator_api.ListNodeLabelsHandler")
}
if o.UserAPIListObjectsHandler == nil {
unregistered = append(unregistered, "user_api.ListObjectsHandler")
}
@@ -1421,6 +1430,10 @@ func (o *ConsoleAPI) initHandlerCache() {
if o.handlers["GET"] == nil {
o.handlers["GET"] = make(map[string]http.Handler)
}
o.handlers["GET"]["/nodes/labels"] = operator_api.NewListNodeLabels(o.context, o.OperatorAPIListNodeLabelsHandler)
if o.handlers["GET"] == nil {
o.handlers["GET"] = make(map[string]http.Handler)
}
o.handlers["GET"]["/buckets/{bucket_name}/objects"] = user_api.NewListObjects(o.context, o.UserAPIListObjectsHandler)
if o.handlers["GET"] == nil {
o.handlers["GET"] = make(map[string]http.Handler)

View File

@@ -0,0 +1,90 @@
// Code generated by go-swagger; DO NOT EDIT.
// This file is part of MinIO Console Server
// Copyright (c) 2021 MinIO, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
package operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the generate command
import (
"net/http"
"github.com/go-openapi/runtime/middleware"
"github.com/minio/console/models"
)
// ListNodeLabelsHandlerFunc turns a function with the right signature into a list node labels handler
type ListNodeLabelsHandlerFunc func(ListNodeLabelsParams, *models.Principal) middleware.Responder
// Handle executing the request and returning a response
func (fn ListNodeLabelsHandlerFunc) Handle(params ListNodeLabelsParams, principal *models.Principal) middleware.Responder {
return fn(params, principal)
}
// ListNodeLabelsHandler interface for that can handle valid list node labels params
type ListNodeLabelsHandler interface {
Handle(ListNodeLabelsParams, *models.Principal) middleware.Responder
}
// NewListNodeLabels creates a new http.Handler for the list node labels operation
func NewListNodeLabels(ctx *middleware.Context, handler ListNodeLabelsHandler) *ListNodeLabels {
return &ListNodeLabels{Context: ctx, Handler: handler}
}
/*ListNodeLabels swagger:route GET /nodes/labels OperatorAPI listNodeLabels
List node labels
*/
type ListNodeLabels struct {
Context *middleware.Context
Handler ListNodeLabelsHandler
}
func (o *ListNodeLabels) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
route, rCtx, _ := o.Context.RouteInfo(r)
if rCtx != nil {
r = rCtx
}
var Params = NewListNodeLabelsParams()
uprinc, aCtx, err := o.Context.Authorize(r, route)
if err != nil {
o.Context.Respond(rw, r, route.Produces, route, err)
return
}
if aCtx != nil {
r = aCtx
}
var principal *models.Principal
if uprinc != nil {
principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
}
if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
o.Context.Respond(rw, r, route.Produces, route, err)
return
}
res := o.Handler.Handle(Params, principal) // actually handle the request
o.Context.Respond(rw, r, route.Produces, route, res)
}

View File

@@ -0,0 +1,62 @@
// Code generated by go-swagger; DO NOT EDIT.
// This file is part of MinIO Console Server
// Copyright (c) 2021 MinIO, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
package operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the swagger generate command
import (
"net/http"
"github.com/go-openapi/errors"
"github.com/go-openapi/runtime/middleware"
)
// NewListNodeLabelsParams creates a new ListNodeLabelsParams object
// no default values defined in spec.
func NewListNodeLabelsParams() ListNodeLabelsParams {
return ListNodeLabelsParams{}
}
// ListNodeLabelsParams contains all the bound params for the list node labels operation
// typically these are obtained from a http.Request
//
// swagger:parameters ListNodeLabels
type ListNodeLabelsParams struct {
// HTTP Request Object
HTTPRequest *http.Request `json:"-"`
}
// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
// for simple values it will use straight method calls.
//
// To ensure default values, the struct must have been initialized with NewListNodeLabelsParams() beforehand.
func (o *ListNodeLabelsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
var res []error
o.HTTPRequest = r
if len(res) > 0 {
return errors.CompositeValidationError(res...)
}
return nil
}

View File

@@ -0,0 +1,136 @@
// Code generated by go-swagger; DO NOT EDIT.
// This file is part of MinIO Console Server
// Copyright (c) 2021 MinIO, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
package operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the swagger generate command
import (
"net/http"
"github.com/go-openapi/runtime"
"github.com/minio/console/models"
)
// ListNodeLabelsOKCode is the HTTP code returned for type ListNodeLabelsOK
const ListNodeLabelsOKCode int = 200
/*ListNodeLabelsOK A successful response.
swagger:response listNodeLabelsOK
*/
type ListNodeLabelsOK struct {
/*
In: Body
*/
Payload models.NodeLabels `json:"body,omitempty"`
}
// NewListNodeLabelsOK creates ListNodeLabelsOK with default headers values
func NewListNodeLabelsOK() *ListNodeLabelsOK {
return &ListNodeLabelsOK{}
}
// WithPayload adds the payload to the list node labels o k response
func (o *ListNodeLabelsOK) WithPayload(payload models.NodeLabels) *ListNodeLabelsOK {
o.Payload = payload
return o
}
// SetPayload sets the payload to the list node labels o k response
func (o *ListNodeLabelsOK) SetPayload(payload models.NodeLabels) {
o.Payload = payload
}
// WriteResponse to the client
func (o *ListNodeLabelsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
rw.WriteHeader(200)
payload := o.Payload
if payload == nil {
// return empty map
payload = models.NodeLabels{}
}
if err := producer.Produce(rw, payload); err != nil {
panic(err) // let the recovery middleware deal with this
}
}
/*ListNodeLabelsDefault Generic error response.
swagger:response listNodeLabelsDefault
*/
type ListNodeLabelsDefault struct {
_statusCode int
/*
In: Body
*/
Payload *models.Error `json:"body,omitempty"`
}
// NewListNodeLabelsDefault creates ListNodeLabelsDefault with default headers values
func NewListNodeLabelsDefault(code int) *ListNodeLabelsDefault {
if code <= 0 {
code = 500
}
return &ListNodeLabelsDefault{
_statusCode: code,
}
}
// WithStatusCode adds the status to the list node labels default response
func (o *ListNodeLabelsDefault) WithStatusCode(code int) *ListNodeLabelsDefault {
o._statusCode = code
return o
}
// SetStatusCode sets the status to the list node labels default response
func (o *ListNodeLabelsDefault) SetStatusCode(code int) {
o._statusCode = code
}
// WithPayload adds the payload to the list node labels default response
func (o *ListNodeLabelsDefault) WithPayload(payload *models.Error) *ListNodeLabelsDefault {
o.Payload = payload
return o
}
// SetPayload sets the payload to the list node labels default response
func (o *ListNodeLabelsDefault) SetPayload(payload *models.Error) {
o.Payload = payload
}
// WriteResponse to the client
func (o *ListNodeLabelsDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
rw.WriteHeader(o._statusCode)
if o.Payload != nil {
payload := o.Payload
if err := producer.Produce(rw, payload); err != nil {
panic(err) // let the recovery middleware deal with this
}
}
}

View File

@@ -0,0 +1,104 @@
// Code generated by go-swagger; DO NOT EDIT.
// This file is part of MinIO Console Server
// Copyright (c) 2021 MinIO, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
package operator_api
// This file was generated by the swagger tool.
// Editing this file might prove futile when you re-run the generate command
import (
"errors"
"net/url"
golangswaggerpaths "path"
)
// ListNodeLabelsURL generates an URL for the list node labels operation
type ListNodeLabelsURL struct {
_basePath string
}
// WithBasePath sets the base path for this url builder, only required when it's different from the
// base path specified in the swagger spec.
// When the value of the base path is an empty string
func (o *ListNodeLabelsURL) WithBasePath(bp string) *ListNodeLabelsURL {
o.SetBasePath(bp)
return o
}
// SetBasePath sets the base path for this url builder, only required when it's different from the
// base path specified in the swagger spec.
// When the value of the base path is an empty string
func (o *ListNodeLabelsURL) SetBasePath(bp string) {
o._basePath = bp
}
// Build a url path and query string
func (o *ListNodeLabelsURL) Build() (*url.URL, error) {
var _result url.URL
var _path = "/nodes/labels"
_basePath := o._basePath
if _basePath == "" {
_basePath = "/api/v1"
}
_result.Path = golangswaggerpaths.Join(_basePath, _path)
return &_result, nil
}
// Must is a helper function to panic when the url builder returns an error
func (o *ListNodeLabelsURL) Must(u *url.URL, err error) *url.URL {
if err != nil {
panic(err)
}
if u == nil {
panic("url can't be nil")
}
return u
}
// String returns the string representation of the path with query string
func (o *ListNodeLabelsURL) String() string {
return o.Must(o.Build()).String()
}
// BuildFull builds a full url with scheme, host, path and query string
func (o *ListNodeLabelsURL) BuildFull(scheme, host string) (*url.URL, error) {
if scheme == "" {
return nil, errors.New("scheme is required for a full url on ListNodeLabelsURL")
}
if host == "" {
return nil, errors.New("host is required for a full url on ListNodeLabelsURL")
}
base, err := o.Build()
if err != nil {
return nil, err
}
base.Scheme = scheme
base.Host = host
return base, nil
}
// StringFull returns the string representation of a complete url
func (o *ListNodeLabelsURL) StringFull(scheme, host string) string {
return o.Must(o.BuildFull(scheme, host)).String()
}