From e6086afdbeb0c755044702f95aa0714222170b5c Mon Sep 17 00:00:00 2001 From: adfost Date: Fri, 10 Sep 2021 21:13:30 -0700 Subject: [PATCH] adding volumes page (#1019) --- operatorapi/embedded_spec.go | 74 ++++++++ operatorapi/operations/operator_api.go | 12 ++ .../operator_api/list_p_v_cs_for_tenant.go | 88 ++++++++++ .../list_p_v_cs_for_tenant_parameters.go | 112 ++++++++++++ .../list_p_v_cs_for_tenant_responses.go | 133 +++++++++++++++ .../list_p_v_cs_for_tenant_urlbuilder.go | 124 ++++++++++++++ operatorapi/operator_volumes.go | 54 ++++++ pkg/acl/endpoints.go | 2 + pkg/acl/endpoints_test.go | 8 +- portal-ui/src/screens/Console/Console.tsx | 4 + .../Tenants/TenantDetails/TenantDetails.tsx | 15 ++ .../Tenants/TenantDetails/VolumesSummary.tsx | 160 ++++++++++++++++++ swagger-operator.yml | 25 +++ 13 files changed, 807 insertions(+), 4 deletions(-) create mode 100644 operatorapi/operations/operator_api/list_p_v_cs_for_tenant.go create mode 100644 operatorapi/operations/operator_api/list_p_v_cs_for_tenant_parameters.go create mode 100644 operatorapi/operations/operator_api/list_p_v_cs_for_tenant_responses.go create mode 100644 operatorapi/operations/operator_api/list_p_v_cs_for_tenant_urlbuilder.go create mode 100644 portal-ui/src/screens/Console/Tenants/TenantDetails/VolumesSummary.tsx diff --git a/operatorapi/embedded_spec.go b/operatorapi/embedded_spec.go index e5a604ba6..6b13f7390 100644 --- a/operatorapi/embedded_spec.go +++ b/operatorapi/embedded_spec.go @@ -958,6 +958,43 @@ func init() { } } }, + "/namespaces/{namespace}/tenants/{tenant}/pvcs": { + "get": { + "tags": [ + "OperatorAPI" + ], + "summary": "List all PVCs from given Tenant", + "operationId": "ListPVCsForTenant", + "parameters": [ + { + "type": "string", + "name": "namespace", + "in": "path", + "required": true + }, + { + "type": "string", + "name": "tenant", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/listPVCsResponse" + } + }, + "default": { + "description": "Generic error response.", + "schema": { + "$ref": "#/definitions/error" + } + } + } + } + }, "/namespaces/{namespace}/tenants/{tenant}/security": { "get": { "tags": [ @@ -4017,6 +4054,43 @@ func init() { } } }, + "/namespaces/{namespace}/tenants/{tenant}/pvcs": { + "get": { + "tags": [ + "OperatorAPI" + ], + "summary": "List all PVCs from given Tenant", + "operationId": "ListPVCsForTenant", + "parameters": [ + { + "type": "string", + "name": "namespace", + "in": "path", + "required": true + }, + { + "type": "string", + "name": "tenant", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/listPVCsResponse" + } + }, + "default": { + "description": "Generic error response.", + "schema": { + "$ref": "#/definitions/error" + } + } + } + } + }, "/namespaces/{namespace}/tenants/{tenant}/security": { "get": { "tags": [ diff --git a/operatorapi/operations/operator_api.go b/operatorapi/operations/operator_api.go index 9a90b3b32..404ce1f64 100644 --- a/operatorapi/operations/operator_api.go +++ b/operatorapi/operations/operator_api.go @@ -117,6 +117,9 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI { OperatorAPIListPVCsHandler: operator_api.ListPVCsHandlerFunc(func(params operator_api.ListPVCsParams, principal *models.Principal) middleware.Responder { return middleware.NotImplemented("operation operator_api.ListPVCs has not yet been implemented") }), + OperatorAPIListPVCsForTenantHandler: operator_api.ListPVCsForTenantHandlerFunc(func(params operator_api.ListPVCsForTenantParams, principal *models.Principal) middleware.Responder { + return middleware.NotImplemented("operation operator_api.ListPVCsForTenant has not yet been implemented") + }), OperatorAPIListTenantsHandler: operator_api.ListTenantsHandlerFunc(func(params operator_api.ListTenantsParams, principal *models.Principal) middleware.Responder { return middleware.NotImplemented("operation operator_api.ListTenants has not yet been implemented") }), @@ -262,6 +265,8 @@ type OperatorAPI struct { OperatorAPIListNodeLabelsHandler operator_api.ListNodeLabelsHandler // OperatorAPIListPVCsHandler sets the operation handler for the list p v cs operation OperatorAPIListPVCsHandler operator_api.ListPVCsHandler + // OperatorAPIListPVCsForTenantHandler sets the operation handler for the list p v cs for tenant operation + OperatorAPIListPVCsForTenantHandler operator_api.ListPVCsForTenantHandler // OperatorAPIListTenantsHandler sets the operation handler for the list tenants operation OperatorAPIListTenantsHandler operator_api.ListTenantsHandler // UserAPILoginHandler sets the operation handler for the login operation @@ -437,6 +442,9 @@ func (o *OperatorAPI) Validate() error { if o.OperatorAPIListPVCsHandler == nil { unregistered = append(unregistered, "operator_api.ListPVCsHandler") } + if o.OperatorAPIListPVCsForTenantHandler == nil { + unregistered = append(unregistered, "operator_api.ListPVCsForTenantHandler") + } if o.OperatorAPIListTenantsHandler == nil { unregistered = append(unregistered, "operator_api.ListTenantsHandler") } @@ -670,6 +678,10 @@ func (o *OperatorAPI) initHandlerCache() { if o.handlers["GET"] == nil { o.handlers["GET"] = make(map[string]http.Handler) } + o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/pvcs"] = operator_api.NewListPVCsForTenant(o.context, o.OperatorAPIListPVCsForTenantHandler) + if o.handlers["GET"] == nil { + o.handlers["GET"] = make(map[string]http.Handler) + } o.handlers["GET"]["/namespaces/{namespace}/tenants"] = operator_api.NewListTenants(o.context, o.OperatorAPIListTenantsHandler) if o.handlers["POST"] == nil { o.handlers["POST"] = make(map[string]http.Handler) diff --git a/operatorapi/operations/operator_api/list_p_v_cs_for_tenant.go b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant.go new file mode 100644 index 000000000..0178c8eb7 --- /dev/null +++ b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant.go @@ -0,0 +1,88 @@ +// 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 . +// + +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" +) + +// ListPVCsForTenantHandlerFunc turns a function with the right signature into a list p v cs for tenant handler +type ListPVCsForTenantHandlerFunc func(ListPVCsForTenantParams, *models.Principal) middleware.Responder + +// Handle executing the request and returning a response +func (fn ListPVCsForTenantHandlerFunc) Handle(params ListPVCsForTenantParams, principal *models.Principal) middleware.Responder { + return fn(params, principal) +} + +// ListPVCsForTenantHandler interface for that can handle valid list p v cs for tenant params +type ListPVCsForTenantHandler interface { + Handle(ListPVCsForTenantParams, *models.Principal) middleware.Responder +} + +// NewListPVCsForTenant creates a new http.Handler for the list p v cs for tenant operation +func NewListPVCsForTenant(ctx *middleware.Context, handler ListPVCsForTenantHandler) *ListPVCsForTenant { + return &ListPVCsForTenant{Context: ctx, Handler: handler} +} + +/* ListPVCsForTenant swagger:route GET /namespaces/{namespace}/tenants/{tenant}/pvcs OperatorAPI listPVCsForTenant + +List all PVCs from given Tenant + +*/ +type ListPVCsForTenant struct { + Context *middleware.Context + Handler ListPVCsForTenantHandler +} + +func (o *ListPVCsForTenant) ServeHTTP(rw http.ResponseWriter, r *http.Request) { + route, rCtx, _ := o.Context.RouteInfo(r) + if rCtx != nil { + *r = *rCtx + } + var Params = NewListPVCsForTenantParams() + 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) + +} diff --git a/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_parameters.go b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_parameters.go new file mode 100644 index 000000000..157581382 --- /dev/null +++ b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_parameters.go @@ -0,0 +1,112 @@ +// 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 . +// + +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" + "github.com/go-openapi/strfmt" +) + +// NewListPVCsForTenantParams creates a new ListPVCsForTenantParams object +// +// There are no default values defined in the spec. +func NewListPVCsForTenantParams() ListPVCsForTenantParams { + + return ListPVCsForTenantParams{} +} + +// ListPVCsForTenantParams contains all the bound params for the list p v cs for tenant operation +// typically these are obtained from a http.Request +// +// swagger:parameters ListPVCsForTenant +type ListPVCsForTenantParams struct { + + // HTTP Request Object + HTTPRequest *http.Request `json:"-"` + + /* + Required: true + In: path + */ + Namespace string + /* + Required: true + In: path + */ + Tenant string +} + +// 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 NewListPVCsForTenantParams() beforehand. +func (o *ListPVCsForTenantParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error { + var res []error + + o.HTTPRequest = r + + rNamespace, rhkNamespace, _ := route.Params.GetOK("namespace") + if err := o.bindNamespace(rNamespace, rhkNamespace, route.Formats); err != nil { + res = append(res, err) + } + + rTenant, rhkTenant, _ := route.Params.GetOK("tenant") + if err := o.bindTenant(rTenant, rhkTenant, route.Formats); err != nil { + res = append(res, err) + } + if len(res) > 0 { + return errors.CompositeValidationError(res...) + } + return nil +} + +// bindNamespace binds and validates parameter Namespace from path. +func (o *ListPVCsForTenantParams) bindNamespace(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: true + // Parameter is provided by construction from the route + o.Namespace = raw + + return nil +} + +// bindTenant binds and validates parameter Tenant from path. +func (o *ListPVCsForTenantParams) bindTenant(rawData []string, hasKey bool, formats strfmt.Registry) error { + var raw string + if len(rawData) > 0 { + raw = rawData[len(rawData)-1] + } + + // Required: true + // Parameter is provided by construction from the route + o.Tenant = raw + + return nil +} diff --git a/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_responses.go b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_responses.go new file mode 100644 index 000000000..24a54d4a9 --- /dev/null +++ b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_responses.go @@ -0,0 +1,133 @@ +// 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 . +// + +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" +) + +// ListPVCsForTenantOKCode is the HTTP code returned for type ListPVCsForTenantOK +const ListPVCsForTenantOKCode int = 200 + +/*ListPVCsForTenantOK A successful response. + +swagger:response listPVCsForTenantOK +*/ +type ListPVCsForTenantOK struct { + + /* + In: Body + */ + Payload *models.ListPVCsResponse `json:"body,omitempty"` +} + +// NewListPVCsForTenantOK creates ListPVCsForTenantOK with default headers values +func NewListPVCsForTenantOK() *ListPVCsForTenantOK { + + return &ListPVCsForTenantOK{} +} + +// WithPayload adds the payload to the list p v cs for tenant o k response +func (o *ListPVCsForTenantOK) WithPayload(payload *models.ListPVCsResponse) *ListPVCsForTenantOK { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the list p v cs for tenant o k response +func (o *ListPVCsForTenantOK) SetPayload(payload *models.ListPVCsResponse) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *ListPVCsForTenantOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) { + + rw.WriteHeader(200) + if o.Payload != nil { + payload := o.Payload + if err := producer.Produce(rw, payload); err != nil { + panic(err) // let the recovery middleware deal with this + } + } +} + +/*ListPVCsForTenantDefault Generic error response. + +swagger:response listPVCsForTenantDefault +*/ +type ListPVCsForTenantDefault struct { + _statusCode int + + /* + In: Body + */ + Payload *models.Error `json:"body,omitempty"` +} + +// NewListPVCsForTenantDefault creates ListPVCsForTenantDefault with default headers values +func NewListPVCsForTenantDefault(code int) *ListPVCsForTenantDefault { + if code <= 0 { + code = 500 + } + + return &ListPVCsForTenantDefault{ + _statusCode: code, + } +} + +// WithStatusCode adds the status to the list p v cs for tenant default response +func (o *ListPVCsForTenantDefault) WithStatusCode(code int) *ListPVCsForTenantDefault { + o._statusCode = code + return o +} + +// SetStatusCode sets the status to the list p v cs for tenant default response +func (o *ListPVCsForTenantDefault) SetStatusCode(code int) { + o._statusCode = code +} + +// WithPayload adds the payload to the list p v cs for tenant default response +func (o *ListPVCsForTenantDefault) WithPayload(payload *models.Error) *ListPVCsForTenantDefault { + o.Payload = payload + return o +} + +// SetPayload sets the payload to the list p v cs for tenant default response +func (o *ListPVCsForTenantDefault) SetPayload(payload *models.Error) { + o.Payload = payload +} + +// WriteResponse to the client +func (o *ListPVCsForTenantDefault) 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 + } + } +} diff --git a/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_urlbuilder.go b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_urlbuilder.go new file mode 100644 index 000000000..fd6427550 --- /dev/null +++ b/operatorapi/operations/operator_api/list_p_v_cs_for_tenant_urlbuilder.go @@ -0,0 +1,124 @@ +// 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 . +// + +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" + "strings" +) + +// ListPVCsForTenantURL generates an URL for the list p v cs for tenant operation +type ListPVCsForTenantURL struct { + Namespace string + Tenant string + + _basePath string + // avoid unkeyed usage + _ struct{} +} + +// 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 *ListPVCsForTenantURL) WithBasePath(bp string) *ListPVCsForTenantURL { + 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 *ListPVCsForTenantURL) SetBasePath(bp string) { + o._basePath = bp +} + +// Build a url path and query string +func (o *ListPVCsForTenantURL) Build() (*url.URL, error) { + var _result url.URL + + var _path = "/namespaces/{namespace}/tenants/{tenant}/pvcs" + + namespace := o.Namespace + if namespace != "" { + _path = strings.Replace(_path, "{namespace}", namespace, -1) + } else { + return nil, errors.New("namespace is required on ListPVCsForTenantURL") + } + + tenant := o.Tenant + if tenant != "" { + _path = strings.Replace(_path, "{tenant}", tenant, -1) + } else { + return nil, errors.New("tenant is required on ListPVCsForTenantURL") + } + + _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 *ListPVCsForTenantURL) 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 *ListPVCsForTenantURL) String() string { + return o.Must(o.Build()).String() +} + +// BuildFull builds a full url with scheme, host, path and query string +func (o *ListPVCsForTenantURL) BuildFull(scheme, host string) (*url.URL, error) { + if scheme == "" { + return nil, errors.New("scheme is required for a full url on ListPVCsForTenantURL") + } + if host == "" { + return nil, errors.New("host is required for a full url on ListPVCsForTenantURL") + } + + 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 *ListPVCsForTenantURL) StringFull(scheme, host string) string { + return o.Must(o.BuildFull(scheme, host)).String() +} diff --git a/operatorapi/operator_volumes.go b/operatorapi/operator_volumes.go index 6c7fe6485..cf3e4785a 100644 --- a/operatorapi/operator_volumes.go +++ b/operatorapi/operator_volumes.go @@ -18,6 +18,7 @@ package operatorapi import ( "context" + "fmt" miniov1 "github.com/minio/operator/pkg/apis/minio.min.io/v1" @@ -39,6 +40,16 @@ func registerVolumesHandlers(api *operations.OperatorAPI) { return operator_api.NewListPVCsOK().WithPayload(payload) }) + + api.OperatorAPIListPVCsForTenantHandler = operator_api.ListPVCsForTenantHandlerFunc(func(params operator_api.ListPVCsForTenantParams, session *models.Principal) middleware.Responder { + payload, err := getPVCsForTenantResponse(session, params) + + if err != nil { + return operator_api.NewListPVCsForTenantDefault(int(err.Code)).WithPayload(err) + } + + return operator_api.NewListPVCsForTenantOK().WithPayload(payload) + }) } func getPVCsResponse(session *models.Principal) (*models.ListPVCsResponse, *models.Error) { @@ -83,3 +94,46 @@ func getPVCsResponse(session *models.Principal) (*models.ListPVCsResponse, *mode return &PVCsResponse, nil } + +func getPVCsForTenantResponse(session *models.Principal, params operator_api.ListPVCsForTenantParams) (*models.ListPVCsResponse, *models.Error) { + ctx := context.Background() + clientset, err := cluster.K8sClient(session.STSSessionToken) + + if err != nil { + return nil, prepareError(err) + } + + // Filter Tenant PVCs. They keep their v1 tenant annotation + listOpts := metav1.ListOptions{ + LabelSelector: fmt.Sprintf("v1.min.io/tenant=%s", params.Tenant), + } + + // List all PVCs + listAllPvcs, err2 := clientset.CoreV1().PersistentVolumeClaims(params.Namespace).List(ctx, listOpts) + + if err2 != nil { + return nil, prepareError(err2) + } + + var ListPVCs []*models.PvcsListResponse + + for _, pvc := range listAllPvcs.Items { + pvcResponse := models.PvcsListResponse{ + Name: pvc.Name, + Age: pvc.CreationTimestamp.String(), + Capacity: pvc.Status.Capacity.Storage().String(), + Namespace: pvc.Namespace, + Status: string(pvc.Status.Phase), + StorageClass: *pvc.Spec.StorageClassName, + Volume: pvc.Spec.VolumeName, + Tenant: pvc.Labels["v1.min.io/tenant"], + } + ListPVCs = append(ListPVCs, &pvcResponse) + } + + PVCsResponse := models.ListPVCsResponse{ + Pvcs: ListPVCs, + } + + return &PVCsResponse, nil +} diff --git a/pkg/acl/endpoints.go b/pkg/acl/endpoints.go index 4f68213e1..4ebe91350 100644 --- a/pkg/acl/endpoints.go +++ b/pkg/acl/endpoints.go @@ -49,6 +49,7 @@ var ( tenantsDetailMetrics = "/namespaces/:tenantNamespace/tenants/:tenantName/metrics" tenantsDetailPods = "/namespaces/:tenantNamespace/tenants/:tenantName/pods" tenantsDetailPools = "/namespaces/:tenantNamespace/tenants/:tenantName/pools" + tenantsDetailVolumes = "/namespaces/:tenantNamespace/tenants/:tenantName/volumes" tenantsDetailLicense = "/namespaces/:tenantNamespace/tenants/:tenantName/license" tenantsDetailSecurity = "/namespaces/:tenantNamespace/tenants/:tenantName/security" storage = "/storage" @@ -322,6 +323,7 @@ var operatorRules = map[string]ConfigurationActionSet{ tenantsDetailMetrics: tenantsActionSet, tenantsDetailPods: tenantsActionSet, tenantsDetailPools: tenantsActionSet, + tenantsDetailVolumes: tenantsActionSet, tenantsDetailLicense: tenantsActionSet, tenantsDetailSecurity: tenantsActionSet, podsDetail: tenantsActionSet, diff --git a/pkg/acl/endpoints_test.go b/pkg/acl/endpoints_test.go index 389ce0a0b..186c10718 100644 --- a/pkg/acl/endpoints_test.go +++ b/pkg/acl/endpoints_test.go @@ -116,7 +116,7 @@ func TestOperatorOnlyEndpoints(t *testing.T) { "admin:*", }, }, - want: 14, + want: 15, }, { name: "Operator Only - all s3 endpoints", @@ -125,7 +125,7 @@ func TestOperatorOnlyEndpoints(t *testing.T) { "s3:*", }, }, - want: 14, + want: 15, }, { name: "Operator Only - all admin and s3 endpoints", @@ -135,14 +135,14 @@ func TestOperatorOnlyEndpoints(t *testing.T) { "s3:*", }, }, - want: 14, + want: 15, }, { name: "Operator Only - default endpoints", args: args{ []string{}, }, - want: 14, + want: 15, }, } diff --git a/portal-ui/src/screens/Console/Console.tsx b/portal-ui/src/screens/Console/Console.tsx index 6200614ec..39c88a428 100644 --- a/portal-ui/src/screens/Console/Console.tsx +++ b/portal-ui/src/screens/Console/Console.tsx @@ -339,6 +339,10 @@ const Console = ({ component: TenantDetails, path: "/namespaces/:tenantNamespace/tenants/:tenantName/pools", }, + { + component: TenantDetails, + path: "/namespaces/:tenantNamespace/tenants/:tenantName/volumes", + }, { component: TenantDetails, path: "/namespaces/:tenantNamespace/tenants/:tenantName/license", diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx index 9a7d1d425..b4d3abb60 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx @@ -42,6 +42,7 @@ import TenantSummary from "./TenantSummary"; import TenantLicense from "./TenantLicense"; import PoolsSummary from "./PoolsSummary"; import PodsSummary from "./PodsSummary"; +import VolumesSummary from "./VolumesSummary"; import TenantMetrics from "./TenantMetrics"; import TenantSecurity from "./TenantSecurity"; import List from "@material-ui/core/List"; @@ -191,6 +192,7 @@ const TenantDetails = ({ case "pools": case "pods": case ":podName": + case "volumes": case "metrics": case "license": case "security": @@ -381,6 +383,15 @@ const TenantDetails = ({ > + { + changeRoute("volumes"); + }} + > + + + . + +import React, { Fragment, useEffect, useState } from "react"; +import get from "lodash/get"; +import { connect } from "react-redux"; +import { createStyles, Theme, withStyles } from "@material-ui/core/styles"; +import { Grid, InputAdornment, TextField } from "@material-ui/core"; +import { + actionsTray, + containerForHeader, + searchField, +} from "../../Common/FormComponents/common/styleLibrary"; +import { IPVCsResponse, IStoragePVCs } from "../../Storage/types"; +import { setErrorSnackMessage } from "../../../../actions"; +import { ErrorResponseHandler } from "../../../../common/types"; +import api from "../../../../common/api"; +import TableWrapper from "../../Common/TableWrapper/TableWrapper"; +import SearchIcon from "../../../../icons/SearchIcon"; + +interface ITenantVolumesProps { + classes: any; + setErrorSnackMessage: typeof setErrorSnackMessage; + match: any; +} + +const styles = (theme: Theme) => + createStyles({ + headerLabel: { + fontSize: 22, + fontWeight: 600, + color: "#000", + marginTop: 4, + }, + breadcrumLink: { + textDecoration: "none", + color: "black", + }, + tableWrapper: { + height: "calc(100vh - 267px)", + }, + ...actionsTray, + ...searchField, + ...containerForHeader(theme.spacing(4)), + }); + +const TenantVolumes = ({ + classes, + setErrorSnackMessage, + match, +}: ITenantVolumesProps) => { + const [records, setRecords] = useState([]); + const [filter, setFilter] = useState(""); + const [loading, setLoading] = useState(true); + + const tenantName = match.params["tenantName"]; + const tenantNamespace = match.params["tenantNamespace"]; + + useEffect(() => { + if (loading) { + api + .invoke( + "GET", + `/api/v1/namespaces/${tenantNamespace}/tenants/${tenantName}/pvcs` + ) + .then((res: IPVCsResponse) => { + let volumes = get(res, "pvcs", []); + setRecords(volumes ? volumes : []); + setLoading(false); + }) + .catch((err: ErrorResponseHandler) => { + setLoading(false); + setErrorSnackMessage(err); + }); + } + }, [loading, setErrorSnackMessage]); + + const filteredRecords: IStoragePVCs[] = records.filter((elementItem) => + elementItem.name.includes(filter) + ); + + return ( + +

Volumes

+ + + + + ), + }} + onChange={(e) => { + setFilter(e.target.value); + }} + /> + + +
+ + + + + + ); +}; + +const mapDispatchToProps = { + setErrorSnackMessage, +}; + +const connector = connect(null, mapDispatchToProps); + +export default withStyles(styles)(connector(TenantVolumes)); diff --git a/swagger-operator.yml b/swagger-operator.yml index abe128d02..47b666458 100644 --- a/swagger-operator.yml +++ b/swagger-operator.yml @@ -505,6 +505,31 @@ paths: tags: - OperatorAPI + /namespaces/{namespace}/tenants/{tenant}/pvcs: + get: + summary: List all PVCs from given Tenant + operationId: ListPVCsForTenant + parameters: + - name: namespace + in: path + required: true + type: string + - name: tenant + in: path + required: true + type: string + responses: + 200: + description: A successful response. + schema: + $ref: "#/definitions/listPVCsResponse" + default: + description: Generic error response. + schema: + $ref: "#/definitions/error" + tags: + - OperatorAPI + /namespaces/{namespace}/tenants/{tenant}/usage: get: summary: Get Usage For The Tenant