Updated assets file (#562)

Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>

.dockerignore

@@ -4,3 +4,4 @@ target/
 console
 !console/
 portal-ui/node_modules/
+.git/

.github/workflows/go.yml

@@ -33,4 +33,5 @@ jobs:
         run: |
           make verifiers
           make test
+          make crosscompile
           make console

.github/workflows/react.yml

@@ -0,0 +1,15 @@
+name: "React Tests"
+on:
+  push:
+  pull_request:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install modules
+        working-directory: ./portal-ui
+        run: yarn
+      - name: Run tests
+        working-directory: ./portal-ui
+        run: yarn test

.gitignore

@@ -24,6 +24,11 @@ console
 
 dist/
 
+# Ignore node_modules
+
+portal-ui/node_modules/
+portal-ui/build/
+
 # Ignore tls cert and key
 private.key
 public.crt

DEVELOPMENT.md

@@ -86,9 +86,6 @@ export MINIO_IDENTITY_LDAP_SERVER_INSECURE=on
 ## Run Console
 
 ```
-export CONSOLE_ACCESS_KEY=minio
-export CONSOLE_SECRET_KEY=minio123
-...
 export CONSOLE_LDAP_ENABLED=on
 ./console server
 ```

Dockerfile

@@ -33,7 +33,7 @@ RUN go mod download
 ADD . /go/src/github.com/minio/console/
 WORKDIR /go/src/github.com/minio/console/
 
-COPY --from=uilayer /app/bindata_assetfs.go /go/src/github.com/minio/console/portal-ui/
+COPY --from=uilayer /app/bindata_assetfs.go /go/src/github.com/minio/console/portal-ui/bindata_assetfs.go
 
 ENV CGO_ENABLED=0
 

Dockerfile.release

@@ -1,12 +1,21 @@
-FROM ubuntu:18.04 as certs
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
 
-RUN apt-get update -y && apt-get install -y ca-certificates
+COPY CREDITS /licenses/CREDITS
+COPY LICENSE /licenses/LICENSE
 
-FROM scratch
-MAINTAINER MinIO Development "dev@min.io"
+LABEL name="MinIO" \
+      vendor="MinIO Inc <dev@min.io>" \
+      maintainer="MinIO Inc <dev@min.io>" \
+      version="v0.4.6" \
+      release="v0.4.6" \
+      summary="A graphical user interface for MinIO" \
+      description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads."
+
+RUN \
+     microdnf update --nodocs && \
+     microdnf install ca-certificates --nodocs
+     
 EXPOSE 9090
 COPY console /console
 
-COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-
 ENTRYPOINT ["/console"]

Makefile

@@ -30,6 +30,9 @@ fmt:
 	@GO111MODULE=on gofmt -d cmd/
 	@GO111MODULE=on gofmt -d cluster/
 
+crosscompile:
+	@(env bash $(PWD)/cross-compile.sh)
+
 lint:
 	@echo "Running $@ check"
 	@GO111MODULE=on ${GOPATH}/bin/golangci-lint cache clean
@@ -47,7 +50,7 @@ swagger-gen:
 	@swagger generate server -A console --main-package=console --exclude-main -P models.Principal -f ./swagger.yml -r NOTICE
 
 assets:
-	@(cd portal-ui; yarn install; make build-static; cd ..)
+	@(cd portal-ui; yarn install; make build-static; yarn prettier --write . --loglevel warn;  cd ..)
 
 test:
 	@(GO111MODULE=on go test -race -v github.com/minio/console/restapi/...)

README.md

@@ -3,7 +3,7 @@
 A graphical user interface for [MinIO](https://github.com/minio/minio)
 
 
-| Dashboard  | Adding A User |
+| Dashboard  | Creating a bucket |
 | ------------- | ------------- |
 | ![Dashboard](images/pic1.png)  | ![Dashboard](images/pic2.png) |
 
@@ -13,7 +13,7 @@ All `console` needs is a MinIO user with admin privileges and URL pointing to yo
 > Note: We don't recommend using MinIO's Operator Credentials
 
 1. Create a user for `console` using `mc`. 
-```
+```bash
 $ set +o history
 $ mc admin user add myminio console YOURCONSOLESECRET
 $ set -o history
@@ -21,7 +21,7 @@ $ set -o history
 
 2. Create a policy for `console` with access to everything (for testing and debugging)
 
-```
+```json
 $ cat > consoleAdmin.json << EOF
 {
 	"Version": "2012-10-17",
@@ -57,7 +57,7 @@ $ mc admin policy set myminio consoleAdmin user=console
 
 ### Note
 Additionally, you can create policies to limit the privileges for `console` users, for example, if you want the user to only have access to dashboard, buckets, notifications and watch page, the policy should look like this:
-```
+```json
 {
 	"Version": "2012-10-17",
 	"Statement": [{
@@ -100,15 +100,14 @@ Additionally, you can create policies to limit the privileges for `console` user
 ## Run Console server
 To run the server:
 
-```
-#required to encrypt jwet payload
+```bash
+# Salt to encrypt JWT payload
 export CONSOLE_PBKDF_PASSPHRASE=SECRET
 
 #required to encrypt jwet payload
 export CONSOLE_PBKDF_SALT=SECRET
 
-export CONSOLE_ACCESS_KEY=console
-export CONSOLE_SECRET_KEY=YOURCONSOLESECRET
+# MinIO endpoint
 export CONSOLE_MINIO_SERVER=http://localhost:9000
 ./console server
 ```

cluster/cluster.go

@@ -1,5 +1,5 @@
 // This file is part of MinIO Kubernetes Cloud
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 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

cluster/config.go

@@ -1,5 +1,5 @@
 // This file is part of MinIO Kubernetes Cloud
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 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
@@ -31,7 +31,6 @@ import (
 
 var (
 	errCantDetermineMinIOImage = errors.New("can't determine MinIO Image")
-	errCantDetermineMCImage    = errors.New("can't determine MC Image")
 )
 
 func GetK8sAPIServer() string {
@@ -64,13 +63,8 @@ func GetNsFromFile() string {
 	return string(dat)
 }
 
-// This operation will run only once at console startup
-var namespace = GetNsFromFile()
-
-// Returns the namespace in which the controller is installed
-func GetNs() string {
-	return env.Get(ConsoleNamespace, namespace)
-}
+// Namespace will run only once at console startup
+var Namespace = GetNsFromFile()
 
 // getLatestMinIOImage returns the latest docker image for MinIO if found on the internet
 func getLatestMinIOImage(client HTTPClientI) (*string, error) {
@@ -125,44 +119,3 @@ func GetLatestMinioImage(client HTTPClientI) (*string, error) {
 	}
 	return latestMinIOImage, nil
 }
-
-// getLatestMCImage returns the latest docker image for MC if found on the internet
-func getLatestMCImage() (*string, error) {
-	// Create an http client with a 4 second timeout
-	client := http.Client{
-		Timeout: 4 * time.Second,
-	}
-	resp, err := client.Get("https://dl.min.io/client/mc/release/linux-amd64/")
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-	var re = regexp.MustCompile(`(?m)\.\/mc\.(RELEASE.*?Z)"`)
-	// look for a single match
-	matches := re.FindAllStringSubmatch(string(body), 1)
-	for i := range matches {
-		release := matches[i][1]
-		dockerImage := fmt.Sprintf("minio/mc:%s", release)
-		return &dockerImage, nil
-	}
-	return nil, errCantDetermineMCImage
-}
-
-var latestMCImage, errLatestMCImage = getLatestMCImage()
-
-func GetMCImage() (*string, error) {
-	image := strings.TrimSpace(env.Get(ConsoleMCImage, ""))
-	// if there is a preferred image configured by the user we'll always return that
-	if image != "" {
-		return &image, nil
-	}
-	if errLatestMCImage != nil {
-		return nil, errLatestMCImage
-	}
-	return latestMCImage, nil
-}

cluster/const.go

@@ -1,5 +1,5 @@
 // This file is part of MinIO Kubernetes Cloud
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 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
@@ -21,5 +21,4 @@ const (
 	ConsoleK8SAPIServerTLSRootCA = "CONSOLE_K8S_API_SERVER_TLS_ROOT_CA"
 	ConsoleMinioImage            = "CONSOLE_MINIO_IMAGE"
 	ConsoleMCImage               = "CONSOLE_MC_IMAGE"
-	ConsoleNamespace             = "CONSOLE_NAMESPACE"
 )

cluster/http_client.go

@@ -17,6 +17,7 @@
 package cluster
 
 import (
+	"io"
 	"net/http"
 )
 
@@ -25,6 +26,8 @@ import (
 // that are used within this project.
 type HTTPClientI interface {
 	Get(url string) (resp *http.Response, err error)
+	Post(url, contentType string, body io.Reader) (resp *http.Response, err error)
+	Do(req *http.Request) (*http.Response, error)
 }
 
 // HTTPClient Interface implementation
@@ -38,3 +41,13 @@ type HTTPClient struct {
 func (c *HTTPClient) Get(url string) (resp *http.Response, err error) {
 	return c.Client.Get(url)
 }
+
+// Post implements http.Client.Post()
+func (c *HTTPClient) Post(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+	return c.Client.Post(url, contentType, body)
+}
+
+// Do implements http.Client.Do()
+func (c *HTTPClient) Do(req *http.Request) (*http.Response, error) {
+	return c.Client.Do(req)
+}

cross-compile.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+# Enable tracing if set.
+[ -n "$BASH_XTRACEFD" ] && set -x
+
+_init() {
+    ## All binaries are static make sure to disable CGO.
+    export CGO_ENABLED=0
+
+    ## List of architectures and OS to test coss compilation.
+    SUPPORTED_OSARCH="linux/ppc64le linux/mips64 linux/arm64 linux/s390x darwin/amd64 freebsd/amd64 windows/amd64 linux/arm linux/386 netbsd/amd64"
+}
+
+_build() {
+    local osarch=$1
+    IFS=/ read -r -a arr <<<"$osarch"
+    os="${arr[0]}"
+    arch="${arr[1]}"
+    package=$(go list -f '{{.ImportPath}}' ./cmd/console)
+    printf -- "--> %15s:%s\n" "${osarch}" "${package}"
+
+    # go build -trimpath to build the binary.
+    GOOS=$os GOARCH=$arch GO111MODULE=on go build -trimpath --tags=kqueue --ldflags "-s -w" -o /dev/null ./cmd/console
+}
+
+main() {
+    echo "Testing builds for OS/Arch: ${SUPPORTED_OSARCH}"
+    for each_osarch in ${SUPPORTED_OSARCH}; do
+        _build "${each_osarch}"
+    done
+}
+
+_init && main "$@"

go.mod

@@ -16,20 +16,23 @@ require (
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/minio/cli v1.22.0
 	github.com/minio/kes v0.11.0
-	github.com/minio/mc v0.0.0-20201119214335-d4f9ea859d6c
-	github.com/minio/minio v0.0.0-20201102034248-d8e07f2c41c8
-	github.com/minio/minio-go/v7 v7.0.6-0.20201119032702-6914cb678dde
-	github.com/minio/operator v0.0.0-20201022162018-527e5c32132b
+	github.com/minio/mc v0.0.0-20201220181029-41c804b179de
+	github.com/minio/minio v0.0.0-20201221162327-6df6ac0f3410
+	github.com/minio/minio-go/v7 v7.0.7-0.20201217170524-3baf9ea06f7c
+	github.com/minio/operator v0.0.0-20201204220226-9901d1d0766c
+	github.com/minio/operator/logsearchapi v0.0.0-20201217190212-bf6546b09012
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
 	github.com/secure-io/sio-go v0.3.1
 	github.com/stretchr/testify v1.6.1
 	github.com/unrolled/secure v1.0.7
-	golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee
+	golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392
 	golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	gopkg.in/yaml.v2 v2.3.0
 	k8s.io/api v0.18.6
-	k8s.io/apimachinery v0.18.6
+	k8s.io/apimachinery v0.18.8
 	k8s.io/client-go v0.18.6
 )
+
+replace github.com/minio/operator v0.0.0-20201204220226-9901d1d0766c => github.com/dvaldivia/operator v0.0.0-20201230052356-04efc0ea5890

k8s/operator-console/base/kustomization.yaml

@@ -8,4 +8,3 @@ resources:
   - console-configmap.yaml
   - console-service.yaml
   - console-deployment.yaml
-  - https://github.com/minio/operator/?ref=v3.0.19

k8s/operator-console/operator/kustomization.yaml

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+# beginning of customizations
+#namespace: min-ns
+
+resources:
+  - ../base
+  - https://github.com/minio/operator/?ref=v3.0.29
+

k8s/tools.go

@@ -1,5 +1,5 @@
 // This file is part of MinIO Kubernetes Cloud
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 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

models/account_change_password_request.go

@@ -0,0 +1,98 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
+)
+
+// AccountChangePasswordRequest account change password request
+//
+// swagger:model accountChangePasswordRequest
+type AccountChangePasswordRequest struct {
+
+	// current secret key
+	// Required: true
+	CurrentSecretKey *string `json:"current_secret_key"`
+
+	// new secret key
+	// Required: true
+	NewSecretKey *string `json:"new_secret_key"`
+}
+
+// Validate validates this account change password request
+func (m *AccountChangePasswordRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateCurrentSecretKey(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateNewSecretKey(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *AccountChangePasswordRequest) validateCurrentSecretKey(formats strfmt.Registry) error {
+
+	if err := validate.Required("current_secret_key", "body", m.CurrentSecretKey); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *AccountChangePasswordRequest) validateNewSecretKey(formats strfmt.Registry) error {
+
+	if err := validate.Required("new_secret_key", "body", m.NewSecretKey); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *AccountChangePasswordRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *AccountChangePasswordRequest) UnmarshalBinary(b []byte) error {
+	var res AccountChangePasswordRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/admin_info_response.go

@@ -23,6 +23,9 @@ package models
 // Editing this file might prove futile when you re-run the swagger generate command
 
 import (
+	"strconv"
+
+	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
 )
@@ -40,10 +43,47 @@ type AdminInfoResponse struct {
 
 	// usage
 	Usage int64 `json:"usage,omitempty"`
+
+	// widgets
+	Widgets []*Widget `json:"widgets"`
 }
 
 // Validate validates this admin info response
 func (m *AdminInfoResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateWidgets(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *AdminInfoResponse) validateWidgets(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Widgets) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Widgets); i++ {
+		if swag.IsZero(m.Widgets[i]) { // not required
+			continue
+		}
+
+		if m.Widgets[i] != nil {
+			if err := m.Widgets[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("widgets" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
 	return nil
 }
 

models/create_tenant_request.go

@@ -63,6 +63,12 @@ type CreateTenantRequest struct {
 	// erasure coding parity
 	ErasureCodingParity int64 `json:"erasureCodingParity,omitempty"`
 
+	// expose console
+	ExposeConsole bool `json:"expose_console,omitempty"`
+
+	// expose minio
+	ExposeMinio bool `json:"expose_minio,omitempty"`
+
 	// idp
 	Idp *IdpConfiguration `json:"idp,omitempty"`
 
@@ -90,15 +96,15 @@ type CreateTenantRequest struct {
 	// Required: true
 	Namespace *string `json:"namespace"`
 
+	// pools
+	// Required: true
+	Pools []*Pool `json:"pools"`
+
 	// secret key
 	SecretKey string `json:"secret_key,omitempty"`
 
 	// tls
 	TLS *TLSConfiguration `json:"tls,omitempty"`
-
-	// zones
-	// Required: true
-	Zones []*Zone `json:"zones"`
 }
 
 // Validate validates this create tenant request
@@ -129,11 +135,11 @@ func (m *CreateTenantRequest) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
-	if err := m.validateTLS(formats); err != nil {
+	if err := m.validatePools(formats); err != nil {
 		res = append(res, err)
 	}
 
-	if err := m.validateZones(formats); err != nil {
+	if err := m.validateTLS(formats); err != nil {
 		res = append(res, err)
 	}
 
@@ -237,6 +243,31 @@ func (m *CreateTenantRequest) validateNamespace(formats strfmt.Registry) error {
 	return nil
 }
 
+func (m *CreateTenantRequest) validatePools(formats strfmt.Registry) error {
+
+	if err := validate.Required("pools", "body", m.Pools); err != nil {
+		return err
+	}
+
+	for i := 0; i < len(m.Pools); i++ {
+		if swag.IsZero(m.Pools[i]) { // not required
+			continue
+		}
+
+		if m.Pools[i] != nil {
+			if err := m.Pools[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("pools" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
 func (m *CreateTenantRequest) validateTLS(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.TLS) { // not required
@@ -255,31 +286,6 @@ func (m *CreateTenantRequest) validateTLS(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *CreateTenantRequest) validateZones(formats strfmt.Registry) error {
-
-	if err := validate.Required("zones", "body", m.Zones); err != nil {
-		return err
-	}
-
-	for i := 0; i < len(m.Zones); i++ {
-		if swag.IsZero(m.Zones[i]) { // not required
-			continue
-		}
-
-		if m.Zones[i] != nil {
-			if err := m.Zones[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("zones" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *CreateTenantRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {

models/get_bucket_retention_config.go

@@ -0,0 +1,112 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// GetBucketRetentionConfig get bucket retention config
+//
+// swagger:model getBucketRetentionConfig
+type GetBucketRetentionConfig struct {
+
+	// mode
+	Mode ObjectRetentionMode `json:"mode,omitempty"`
+
+	// unit
+	Unit ObjectRetentionUnit `json:"unit,omitempty"`
+
+	// validity
+	Validity int32 `json:"validity,omitempty"`
+}
+
+// Validate validates this get bucket retention config
+func (m *GetBucketRetentionConfig) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateMode(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateUnit(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *GetBucketRetentionConfig) validateMode(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Mode) { // not required
+		return nil
+	}
+
+	if err := m.Mode.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("mode")
+		}
+		return err
+	}
+
+	return nil
+}
+
+func (m *GetBucketRetentionConfig) validateUnit(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Unit) { // not required
+		return nil
+	}
+
+	if err := m.Unit.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("unit")
+		}
+		return err
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *GetBucketRetentionConfig) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *GetBucketRetentionConfig) UnmarshalBinary(b []byte) error {
+	var res GetBucketRetentionConfig
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/iam_entity.go

@@ -0,0 +1,48 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/validate"
+)
+
+// IamEntity iam entity
+//
+// swagger:model iamEntity
+type IamEntity string
+
+// Validate validates this iam entity
+func (m IamEntity) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := validate.Pattern("", "body", string(m), `^[\w+=,.@-]{1,64}$`); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

models/license.go

@@ -0,0 +1,75 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// License license
+//
+// swagger:model license
+type License struct {
+
+	// account id
+	AccountID int64 `json:"account_id,omitempty"`
+
+	// email
+	Email string `json:"email,omitempty"`
+
+	// expires at
+	ExpiresAt string `json:"expires_at,omitempty"`
+
+	// organization
+	Organization string `json:"organization,omitempty"`
+
+	// plan
+	Plan string `json:"plan,omitempty"`
+
+	// storage capacity
+	StorageCapacity int64 `json:"storage_capacity,omitempty"`
+}
+
+// Validate validates this license
+func (m *License) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *License) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *License) UnmarshalBinary(b []byte) error {
+	var res License
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/log_search_response.go

@@ -0,0 +1,60 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// LogSearchResponse log search response
+//
+// swagger:model logSearchResponse
+type LogSearchResponse struct {
+
+	// list of log search responses
+	Results interface{} `json:"results,omitempty"`
+}
+
+// Validate validates this log search response
+func (m *LogSearchResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *LogSearchResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *LogSearchResponse) UnmarshalBinary(b []byte) error {
+	var res LogSearchResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/make_bucket_request.go

@@ -41,6 +41,9 @@ type MakeBucketRequest struct {
 	// quota
 	Quota *SetBucketQuota `json:"quota,omitempty"`
 
+	// retention
+	Retention *PutBucketRetentionRequest `json:"retention,omitempty"`
+
 	// versioning
 	Versioning bool `json:"versioning,omitempty"`
 }
@@ -57,6 +60,10 @@ func (m *MakeBucketRequest) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
+	if err := m.validateRetention(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -90,6 +97,24 @@ func (m *MakeBucketRequest) validateQuota(formats strfmt.Registry) error {
 	return nil
 }
 
+func (m *MakeBucketRequest) validateRetention(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Retention) { // not required
+		return nil
+	}
+
+	if m.Retention != nil {
+		if err := m.Retention.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("retention")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 // MarshalBinary interface implementation
 func (m *MakeBucketRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {

models/object_retention_unit.go

@@ -0,0 +1,80 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"encoding/json"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/validate"
+)
+
+// ObjectRetentionUnit object retention unit
+//
+// swagger:model objectRetentionUnit
+type ObjectRetentionUnit string
+
+const (
+
+	// ObjectRetentionUnitDays captures enum value "days"
+	ObjectRetentionUnitDays ObjectRetentionUnit = "days"
+
+	// ObjectRetentionUnitYears captures enum value "years"
+	ObjectRetentionUnitYears ObjectRetentionUnit = "years"
+)
+
+// for schema
+var objectRetentionUnitEnum []interface{}
+
+func init() {
+	var res []ObjectRetentionUnit
+	if err := json.Unmarshal([]byte(`["days","years"]`), &res); err != nil {
+		panic(err)
+	}
+	for _, v := range res {
+		objectRetentionUnitEnum = append(objectRetentionUnitEnum, v)
+	}
+}
+
+func (m ObjectRetentionUnit) validateObjectRetentionUnitEnum(path, location string, value ObjectRetentionUnit) error {
+	if err := validate.EnumCase(path, location, value, objectRetentionUnitEnum, true); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Validate validates this object retention unit
+func (m ObjectRetentionUnit) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	// value enum
+	if err := m.validateObjectRetentionUnitEnum("", "body", m); err != nil {
+		return err
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}

models/pool.go

@@ -29,13 +29,13 @@ import (
 	"github.com/go-openapi/validate"
 )
 
-// Zone zone
+// Pool pool
 //
-// swagger:model zone
-type Zone struct {
+// swagger:model pool
+type Pool struct {
 
 	// affinity
-	Affinity *ZoneAffinity `json:"affinity,omitempty"`
+	Affinity *PoolAffinity `json:"affinity,omitempty"`
 
 	// name
 	Name string `json:"name,omitempty"`
@@ -44,26 +44,26 @@ type Zone struct {
 	NodeSelector map[string]string `json:"node_selector,omitempty"`
 
 	// resources
-	Resources *ZoneResources `json:"resources,omitempty"`
+	Resources *PoolResources `json:"resources,omitempty"`
 
 	// servers
 	// Required: true
 	Servers *int64 `json:"servers"`
 
 	// tolerations
-	Tolerations ZoneTolerations `json:"tolerations,omitempty"`
+	Tolerations PoolTolerations `json:"tolerations,omitempty"`
 
 	// volume configuration
 	// Required: true
-	VolumeConfiguration *ZoneVolumeConfiguration `json:"volume_configuration"`
+	VolumeConfiguration *PoolVolumeConfiguration `json:"volume_configuration"`
 
 	// volumes per server
 	// Required: true
 	VolumesPerServer *int32 `json:"volumes_per_server"`
 }
 
-// Validate validates this zone
-func (m *Zone) Validate(formats strfmt.Registry) error {
+// Validate validates this pool
+func (m *Pool) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validateAffinity(formats); err != nil {
@@ -96,7 +96,7 @@ func (m *Zone) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Zone) validateAffinity(formats strfmt.Registry) error {
+func (m *Pool) validateAffinity(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.Affinity) { // not required
 		return nil
@@ -114,7 +114,7 @@ func (m *Zone) validateAffinity(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Zone) validateResources(formats strfmt.Registry) error {
+func (m *Pool) validateResources(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.Resources) { // not required
 		return nil
@@ -132,7 +132,7 @@ func (m *Zone) validateResources(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Zone) validateServers(formats strfmt.Registry) error {
+func (m *Pool) validateServers(formats strfmt.Registry) error {
 
 	if err := validate.Required("servers", "body", m.Servers); err != nil {
 		return err
@@ -141,7 +141,7 @@ func (m *Zone) validateServers(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Zone) validateTolerations(formats strfmt.Registry) error {
+func (m *Pool) validateTolerations(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.Tolerations) { // not required
 		return nil
@@ -157,7 +157,7 @@ func (m *Zone) validateTolerations(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Zone) validateVolumeConfiguration(formats strfmt.Registry) error {
+func (m *Pool) validateVolumeConfiguration(formats strfmt.Registry) error {
 
 	if err := validate.Required("volume_configuration", "body", m.VolumeConfiguration); err != nil {
 		return err
@@ -175,7 +175,7 @@ func (m *Zone) validateVolumeConfiguration(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Zone) validateVolumesPerServer(formats strfmt.Registry) error {
+func (m *Pool) validateVolumesPerServer(formats strfmt.Registry) error {
 
 	if err := validate.Required("volumes_per_server", "body", m.VolumesPerServer); err != nil {
 		return err
@@ -185,7 +185,7 @@ func (m *Zone) validateVolumesPerServer(formats strfmt.Registry) error {
 }
 
 // MarshalBinary interface implementation
-func (m *Zone) MarshalBinary() ([]byte, error) {
+func (m *Pool) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -193,8 +193,8 @@ func (m *Zone) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *Zone) UnmarshalBinary(b []byte) error {
-	var res Zone
+func (m *Pool) UnmarshalBinary(b []byte) error {
+	var res Pool
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -202,10 +202,10 @@ func (m *Zone) UnmarshalBinary(b []byte) error {
 	return nil
 }
 
-// ZoneVolumeConfiguration zone volume configuration
+// PoolVolumeConfiguration pool volume configuration
 //
-// swagger:model ZoneVolumeConfiguration
-type ZoneVolumeConfiguration struct {
+// swagger:model PoolVolumeConfiguration
+type PoolVolumeConfiguration struct {
 
 	// annotations
 	Annotations map[string]string `json:"annotations,omitempty"`
@@ -221,8 +221,8 @@ type ZoneVolumeConfiguration struct {
 	StorageClassName string `json:"storage_class_name,omitempty"`
 }
 
-// Validate validates this zone volume configuration
-func (m *ZoneVolumeConfiguration) Validate(formats strfmt.Registry) error {
+// Validate validates this pool volume configuration
+func (m *PoolVolumeConfiguration) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validateSize(formats); err != nil {
@@ -235,7 +235,7 @@ func (m *ZoneVolumeConfiguration) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneVolumeConfiguration) validateSize(formats strfmt.Registry) error {
+func (m *PoolVolumeConfiguration) validateSize(formats strfmt.Registry) error {
 
 	if err := validate.Required("volume_configuration"+"."+"size", "body", m.Size); err != nil {
 		return err
@@ -245,7 +245,7 @@ func (m *ZoneVolumeConfiguration) validateSize(formats strfmt.Registry) error {
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneVolumeConfiguration) MarshalBinary() ([]byte, error) {
+func (m *PoolVolumeConfiguration) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -253,8 +253,8 @@ func (m *ZoneVolumeConfiguration) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneVolumeConfiguration) UnmarshalBinary(b []byte) error {
-	var res ZoneVolumeConfiguration
+func (m *PoolVolumeConfiguration) UnmarshalBinary(b []byte) error {
+	var res PoolVolumeConfiguration
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}

models/pool_affinity.go

@@ -31,23 +31,23 @@ import (
 	"github.com/go-openapi/validate"
 )
 
-// ZoneAffinity If specified, affinity will define the pod's scheduling constraints
+// PoolAffinity If specified, affinity will define the pod's scheduling constraints
 //
-// swagger:model zoneAffinity
-type ZoneAffinity struct {
+// swagger:model poolAffinity
+type PoolAffinity struct {
 
 	// node affinity
-	NodeAffinity *ZoneAffinityNodeAffinity `json:"nodeAffinity,omitempty"`
+	NodeAffinity *PoolAffinityNodeAffinity `json:"nodeAffinity,omitempty"`
 
 	// pod affinity
-	PodAffinity *ZoneAffinityPodAffinity `json:"podAffinity,omitempty"`
+	PodAffinity *PoolAffinityPodAffinity `json:"podAffinity,omitempty"`
 
 	// pod anti affinity
-	PodAntiAffinity *ZoneAffinityPodAntiAffinity `json:"podAntiAffinity,omitempty"`
+	PodAntiAffinity *PoolAffinityPodAntiAffinity `json:"podAntiAffinity,omitempty"`
 }
 
-// Validate validates this zone affinity
-func (m *ZoneAffinity) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity
+func (m *PoolAffinity) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validateNodeAffinity(formats); err != nil {
@@ -68,7 +68,7 @@ func (m *ZoneAffinity) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneAffinity) validateNodeAffinity(formats strfmt.Registry) error {
+func (m *PoolAffinity) validateNodeAffinity(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.NodeAffinity) { // not required
 		return nil
@@ -86,7 +86,7 @@ func (m *ZoneAffinity) validateNodeAffinity(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneAffinity) validatePodAffinity(formats strfmt.Registry) error {
+func (m *PoolAffinity) validatePodAffinity(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.PodAffinity) { // not required
 		return nil
@@ -104,7 +104,7 @@ func (m *ZoneAffinity) validatePodAffinity(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneAffinity) validatePodAntiAffinity(formats strfmt.Registry) error {
+func (m *PoolAffinity) validatePodAntiAffinity(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.PodAntiAffinity) { // not required
 		return nil
@@ -123,7 +123,7 @@ func (m *ZoneAffinity) validatePodAntiAffinity(formats strfmt.Registry) error {
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinity) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinity) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -131,8 +131,8 @@ func (m *ZoneAffinity) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinity) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinity
+func (m *PoolAffinity) UnmarshalBinary(b []byte) error {
+	var res PoolAffinity
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -140,20 +140,20 @@ func (m *ZoneAffinity) UnmarshalBinary(b []byte) error {
 	return nil
 }
 
-// ZoneAffinityNodeAffinity Describes node affinity scheduling rules for the pod.
+// PoolAffinityNodeAffinity Describes node affinity scheduling rules for the pod.
 //
-// swagger:model ZoneAffinityNodeAffinity
-type ZoneAffinityNodeAffinity struct {
+// swagger:model PoolAffinityNodeAffinity
+type PoolAffinityNodeAffinity struct {
 
 	// The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node matches the corresponding matchExpressions; the node(s) with the highest sum are the most preferred.
-	PreferredDuringSchedulingIgnoredDuringExecution []*ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 `json:"preferredDuringSchedulingIgnoredDuringExecution"`
+	PreferredDuringSchedulingIgnoredDuringExecution []*PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 `json:"preferredDuringSchedulingIgnoredDuringExecution"`
 
 	// required during scheduling ignored during execution
-	RequiredDuringSchedulingIgnoredDuringExecution *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution `json:"requiredDuringSchedulingIgnoredDuringExecution,omitempty"`
+	RequiredDuringSchedulingIgnoredDuringExecution *PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution `json:"requiredDuringSchedulingIgnoredDuringExecution,omitempty"`
 }
 
-// Validate validates this zone affinity node affinity
-func (m *ZoneAffinityNodeAffinity) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity node affinity
+func (m *PoolAffinityNodeAffinity) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validatePreferredDuringSchedulingIgnoredDuringExecution(formats); err != nil {
@@ -170,7 +170,7 @@ func (m *ZoneAffinityNodeAffinity) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneAffinityNodeAffinity) validatePreferredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
+func (m *PoolAffinityNodeAffinity) validatePreferredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.PreferredDuringSchedulingIgnoredDuringExecution) { // not required
 		return nil
@@ -195,7 +195,7 @@ func (m *ZoneAffinityNodeAffinity) validatePreferredDuringSchedulingIgnoredDurin
 	return nil
 }
 
-func (m *ZoneAffinityNodeAffinity) validateRequiredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
+func (m *PoolAffinityNodeAffinity) validateRequiredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.RequiredDuringSchedulingIgnoredDuringExecution) { // not required
 		return nil
@@ -214,7 +214,7 @@ func (m *ZoneAffinityNodeAffinity) validateRequiredDuringSchedulingIgnoredDuring
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinityNodeAffinity) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinityNodeAffinity) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -222,8 +222,8 @@ func (m *ZoneAffinityNodeAffinity) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinityNodeAffinity) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinityNodeAffinity
+func (m *PoolAffinityNodeAffinity) UnmarshalBinary(b []byte) error {
+	var res PoolAffinityNodeAffinity
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -231,10 +231,10 @@ func (m *ZoneAffinityNodeAffinity) UnmarshalBinary(b []byte) error {
 	return nil
 }
 
-// ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+// PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
 //
-// swagger:model ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
-type ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 struct {
+// swagger:model PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
+type PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 struct {
 
 	// A node selector term, associated with the corresponding weight.
 	// Required: true
@@ -245,8 +245,8 @@ type ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItem
 	Weight *int32 `json:"weight"`
 }
 
-// Validate validates this zone affinity node affinity preferred during scheduling ignored during execution items0
-func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity node affinity preferred during scheduling ignored during execution items0
+func (m *PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validatePreference(formats); err != nil {
@@ -263,7 +263,7 @@ func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution
 	return nil
 }
 
-func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validatePreference(formats strfmt.Registry) error {
+func (m *PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validatePreference(formats strfmt.Registry) error {
 
 	if err := validate.Required("preference", "body", m.Preference); err != nil {
 		return err
@@ -281,7 +281,7 @@ func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution
 	return nil
 }
 
-func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validateWeight(formats strfmt.Registry) error {
+func (m *PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validateWeight(formats strfmt.Registry) error {
 
 	if err := validate.Required("weight", "body", m.Weight); err != nil {
 		return err
@@ -291,7 +291,7 @@ func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -299,8 +299,8 @@ func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
+func (m *PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) UnmarshalBinary(b []byte) error {
+	var res PoolAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -308,18 +308,18 @@ func (m *ZoneAffinityNodeAffinityPreferredDuringSchedulingIgnoredDuringExecution
 	return nil
 }
 
-// ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
+// PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to an update), the system may or may not try to eventually evict the pod from its node.
 //
-// swagger:model ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution
-type ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution struct {
+// swagger:model PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution
+type PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution struct {
 
 	// Required. A list of node selector terms. The terms are ORed.
 	// Required: true
 	NodeSelectorTerms []*NodeSelectorTerm `json:"nodeSelectorTerms"`
 }
 
-// Validate validates this zone affinity node affinity required during scheduling ignored during execution
-func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity node affinity required during scheduling ignored during execution
+func (m *PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validateNodeSelectorTerms(formats); err != nil {
@@ -332,7 +332,7 @@ func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution)
 	return nil
 }
 
-func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) validateNodeSelectorTerms(formats strfmt.Registry) error {
+func (m *PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) validateNodeSelectorTerms(formats strfmt.Registry) error {
 
 	if err := validate.Required("nodeAffinity"+"."+"requiredDuringSchedulingIgnoredDuringExecution"+"."+"nodeSelectorTerms", "body", m.NodeSelectorTerms); err != nil {
 		return err
@@ -358,7 +358,7 @@ func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution)
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -366,8 +366,8 @@ func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution)
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution
+func (m *PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution) UnmarshalBinary(b []byte) error {
+	var res PoolAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -375,20 +375,20 @@ func (m *ZoneAffinityNodeAffinityRequiredDuringSchedulingIgnoredDuringExecution)
 	return nil
 }
 
-// ZoneAffinityPodAffinity Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+// PoolAffinityPodAffinity Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, pool, etc. as some other pod(s)).
 //
-// swagger:model ZoneAffinityPodAffinity
-type ZoneAffinityPodAffinity struct {
+// swagger:model PoolAffinityPodAffinity
+type PoolAffinityPodAffinity struct {
 
 	// The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-	PreferredDuringSchedulingIgnoredDuringExecution []*ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 `json:"preferredDuringSchedulingIgnoredDuringExecution"`
+	PreferredDuringSchedulingIgnoredDuringExecution []*PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 `json:"preferredDuringSchedulingIgnoredDuringExecution"`
 
 	// If the affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
 	RequiredDuringSchedulingIgnoredDuringExecution []*PodAffinityTerm `json:"requiredDuringSchedulingIgnoredDuringExecution"`
 }
 
-// Validate validates this zone affinity pod affinity
-func (m *ZoneAffinityPodAffinity) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity pod affinity
+func (m *PoolAffinityPodAffinity) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validatePreferredDuringSchedulingIgnoredDuringExecution(formats); err != nil {
@@ -405,7 +405,7 @@ func (m *ZoneAffinityPodAffinity) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneAffinityPodAffinity) validatePreferredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAffinity) validatePreferredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.PreferredDuringSchedulingIgnoredDuringExecution) { // not required
 		return nil
@@ -430,7 +430,7 @@ func (m *ZoneAffinityPodAffinity) validatePreferredDuringSchedulingIgnoredDuring
 	return nil
 }
 
-func (m *ZoneAffinityPodAffinity) validateRequiredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAffinity) validateRequiredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.RequiredDuringSchedulingIgnoredDuringExecution) { // not required
 		return nil
@@ -456,7 +456,7 @@ func (m *ZoneAffinityPodAffinity) validateRequiredDuringSchedulingIgnoredDuringE
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinityPodAffinity) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinityPodAffinity) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -464,8 +464,8 @@ func (m *ZoneAffinityPodAffinity) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinityPodAffinity) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinityPodAffinity
+func (m *PoolAffinityPodAffinity) UnmarshalBinary(b []byte) error {
+	var res PoolAffinityPodAffinity
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -473,10 +473,10 @@ func (m *ZoneAffinityPodAffinity) UnmarshalBinary(b []byte) error {
 	return nil
 }
 
-// ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+// PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
 //
-// swagger:model ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
-type ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 struct {
+// swagger:model PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
+type PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 struct {
 
 	// pod affinity term
 	// Required: true
@@ -487,8 +487,8 @@ type ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems
 	Weight *int32 `json:"weight"`
 }
 
-// Validate validates this zone affinity pod affinity preferred during scheduling ignored during execution items0
-func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity pod affinity preferred during scheduling ignored during execution items0
+func (m *PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validatePodAffinityTerm(formats); err != nil {
@@ -505,7 +505,7 @@ func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionI
 	return nil
 }
 
-func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validatePodAffinityTerm(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validatePodAffinityTerm(formats strfmt.Registry) error {
 
 	if err := validate.Required("podAffinityTerm", "body", m.PodAffinityTerm); err != nil {
 		return err
@@ -523,7 +523,7 @@ func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionI
 	return nil
 }
 
-func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validateWeight(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validateWeight(formats strfmt.Registry) error {
 
 	if err := validate.Required("weight", "body", m.Weight); err != nil {
 		return err
@@ -533,7 +533,7 @@ func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionI
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -541,8 +541,8 @@ func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionI
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
+func (m *PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) UnmarshalBinary(b []byte) error {
+	var res PoolAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -550,20 +550,20 @@ func (m *ZoneAffinityPodAffinityPreferredDuringSchedulingIgnoredDuringExecutionI
 	return nil
 }
 
-// ZoneAffinityPodAntiAffinity Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+// PoolAffinityPodAntiAffinity Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, pool, etc. as some other pod(s)).
 //
-// swagger:model ZoneAffinityPodAntiAffinity
-type ZoneAffinityPodAntiAffinity struct {
+// swagger:model PoolAffinityPodAntiAffinity
+type PoolAffinityPodAntiAffinity struct {
 
 	// The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions specified by this field, but it may choose a node that violates one or more of the expressions. The node that is most preferred is the one with the greatest sum of weights, i.e. for each node that meets all of the scheduling requirements (resource request, requiredDuringScheduling anti-affinity expressions, etc.), compute a sum by iterating through the elements of this field and adding "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the node(s) with the highest sum are the most preferred.
-	PreferredDuringSchedulingIgnoredDuringExecution []*ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 `json:"preferredDuringSchedulingIgnoredDuringExecution"`
+	PreferredDuringSchedulingIgnoredDuringExecution []*PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 `json:"preferredDuringSchedulingIgnoredDuringExecution"`
 
 	// If the anti-affinity requirements specified by this field are not met at scheduling time, the pod will not be scheduled onto the node. If the anti-affinity requirements specified by this field cease to be met at some point during pod execution (e.g. due to a pod label update), the system may or may not try to eventually evict the pod from its node. When there are multiple elements, the lists of nodes corresponding to each podAffinityTerm are intersected, i.e. all terms must be satisfied.
 	RequiredDuringSchedulingIgnoredDuringExecution []*PodAffinityTerm `json:"requiredDuringSchedulingIgnoredDuringExecution"`
 }
 
-// Validate validates this zone affinity pod anti affinity
-func (m *ZoneAffinityPodAntiAffinity) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity pod anti affinity
+func (m *PoolAffinityPodAntiAffinity) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validatePreferredDuringSchedulingIgnoredDuringExecution(formats); err != nil {
@@ -580,7 +580,7 @@ func (m *ZoneAffinityPodAntiAffinity) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneAffinityPodAntiAffinity) validatePreferredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAntiAffinity) validatePreferredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.PreferredDuringSchedulingIgnoredDuringExecution) { // not required
 		return nil
@@ -605,7 +605,7 @@ func (m *ZoneAffinityPodAntiAffinity) validatePreferredDuringSchedulingIgnoredDu
 	return nil
 }
 
-func (m *ZoneAffinityPodAntiAffinity) validateRequiredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAntiAffinity) validateRequiredDuringSchedulingIgnoredDuringExecution(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.RequiredDuringSchedulingIgnoredDuringExecution) { // not required
 		return nil
@@ -631,7 +631,7 @@ func (m *ZoneAffinityPodAntiAffinity) validateRequiredDuringSchedulingIgnoredDur
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinityPodAntiAffinity) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinityPodAntiAffinity) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -639,8 +639,8 @@ func (m *ZoneAffinityPodAntiAffinity) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinityPodAntiAffinity) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinityPodAntiAffinity
+func (m *PoolAffinityPodAntiAffinity) UnmarshalBinary(b []byte) error {
+	var res PoolAffinityPodAntiAffinity
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
@@ -648,10 +648,10 @@ func (m *ZoneAffinityPodAntiAffinity) UnmarshalBinary(b []byte) error {
 	return nil
 }
 
-// ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+// PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
 //
-// swagger:model ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
-type ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 struct {
+// swagger:model PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
+type PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0 struct {
 
 	// pod affinity term
 	// Required: true
@@ -662,8 +662,8 @@ type ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionI
 	Weight *int32 `json:"weight"`
 }
 
-// Validate validates this zone affinity pod anti affinity preferred during scheduling ignored during execution items0
-func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) Validate(formats strfmt.Registry) error {
+// Validate validates this pool affinity pod anti affinity preferred during scheduling ignored during execution items0
+func (m *PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validatePodAffinityTerm(formats); err != nil {
@@ -680,7 +680,7 @@ func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecut
 	return nil
 }
 
-func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validatePodAffinityTerm(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validatePodAffinityTerm(formats strfmt.Registry) error {
 
 	if err := validate.Required("podAffinityTerm", "body", m.PodAffinityTerm); err != nil {
 		return err
@@ -698,7 +698,7 @@ func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecut
 	return nil
 }
 
-func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validateWeight(formats strfmt.Registry) error {
+func (m *PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) validateWeight(formats strfmt.Registry) error {
 
 	if err := validate.Required("weight", "body", m.Weight); err != nil {
 		return err
@@ -708,7 +708,7 @@ func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecut
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) MarshalBinary() ([]byte, error) {
+func (m *PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -716,8 +716,8 @@ func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecut
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) UnmarshalBinary(b []byte) error {
-	var res ZoneAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
+func (m *PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0) UnmarshalBinary(b []byte) error {
+	var res PoolAffinityPodAntiAffinityPreferredDuringSchedulingIgnoredDuringExecutionItems0
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}

models/pool_resources.go

@@ -27,10 +27,10 @@ import (
 	"github.com/go-openapi/swag"
 )
 
-// ZoneResources If provided, use these requests and limit for cpu/memory resource allocation
+// PoolResources If provided, use these requests and limit for cpu/memory resource allocation
 //
-// swagger:model zoneResources
-type ZoneResources struct {
+// swagger:model poolResources
+type PoolResources struct {
 
 	// Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
 	Limits map[string]int64 `json:"limits,omitempty"`
@@ -39,13 +39,13 @@ type ZoneResources struct {
 	Requests map[string]int64 `json:"requests,omitempty"`
 }
 
-// Validate validates this zone resources
-func (m *ZoneResources) Validate(formats strfmt.Registry) error {
+// Validate validates this pool resources
+func (m *PoolResources) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneResources) MarshalBinary() ([]byte, error) {
+func (m *PoolResources) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -53,8 +53,8 @@ func (m *ZoneResources) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneResources) UnmarshalBinary(b []byte) error {
-	var res ZoneResources
+func (m *PoolResources) UnmarshalBinary(b []byte) error {
+	var res PoolResources
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}

models/pool_toleration_seconds.go

@@ -29,18 +29,18 @@ import (
 	"github.com/go-openapi/validate"
 )
 
-// ZoneTolerationSeconds TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
+// PoolTolerationSeconds TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
 //
-// swagger:model zoneTolerationSeconds
-type ZoneTolerationSeconds struct {
+// swagger:model poolTolerationSeconds
+type PoolTolerationSeconds struct {
 
 	// seconds
 	// Required: true
 	Seconds *int64 `json:"seconds"`
 }
 
-// Validate validates this zone toleration seconds
-func (m *ZoneTolerationSeconds) Validate(formats strfmt.Registry) error {
+// Validate validates this pool toleration seconds
+func (m *PoolTolerationSeconds) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validateSeconds(formats); err != nil {
@@ -53,7 +53,7 @@ func (m *ZoneTolerationSeconds) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneTolerationSeconds) validateSeconds(formats strfmt.Registry) error {
+func (m *PoolTolerationSeconds) validateSeconds(formats strfmt.Registry) error {
 
 	if err := validate.Required("seconds", "body", m.Seconds); err != nil {
 		return err
@@ -63,7 +63,7 @@ func (m *ZoneTolerationSeconds) validateSeconds(formats strfmt.Registry) error {
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneTolerationSeconds) MarshalBinary() ([]byte, error) {
+func (m *PoolTolerationSeconds) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -71,8 +71,8 @@ func (m *ZoneTolerationSeconds) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneTolerationSeconds) UnmarshalBinary(b []byte) error {
-	var res ZoneTolerationSeconds
+func (m *PoolTolerationSeconds) UnmarshalBinary(b []byte) error {
+	var res PoolTolerationSeconds
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}

models/pool_tolerations.go

@@ -30,13 +30,13 @@ import (
 	"github.com/go-openapi/swag"
 )
 
-// ZoneTolerations Tolerations allows users to set entries like effect, key, operator, value.
+// PoolTolerations Tolerations allows users to set entries like effect, key, operator, value.
 //
-// swagger:model zoneTolerations
-type ZoneTolerations []*ZoneTolerationsItems0
+// swagger:model poolTolerations
+type PoolTolerations []*PoolTolerationsItems0
 
-// Validate validates this zone tolerations
-func (m ZoneTolerations) Validate(formats strfmt.Registry) error {
+// Validate validates this pool tolerations
+func (m PoolTolerations) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	for i := 0; i < len(m); i++ {
@@ -61,10 +61,10 @@ func (m ZoneTolerations) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-// ZoneTolerationsItems0 The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
+// PoolTolerationsItems0 The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
 //
-// swagger:model ZoneTolerationsItems0
-type ZoneTolerationsItems0 struct {
+// swagger:model PoolTolerationsItems0
+type PoolTolerationsItems0 struct {
 
 	// Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
 	Effect string `json:"effect,omitempty"`
@@ -76,14 +76,14 @@ type ZoneTolerationsItems0 struct {
 	Operator string `json:"operator,omitempty"`
 
 	// toleration seconds
-	TolerationSeconds *ZoneTolerationSeconds `json:"tolerationSeconds,omitempty"`
+	TolerationSeconds *PoolTolerationSeconds `json:"tolerationSeconds,omitempty"`
 
 	// Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
 	Value string `json:"value,omitempty"`
 }
 
-// Validate validates this zone tolerations items0
-func (m *ZoneTolerationsItems0) Validate(formats strfmt.Registry) error {
+// Validate validates this pool tolerations items0
+func (m *PoolTolerationsItems0) Validate(formats strfmt.Registry) error {
 	var res []error
 
 	if err := m.validateTolerationSeconds(formats); err != nil {
@@ -96,7 +96,7 @@ func (m *ZoneTolerationsItems0) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneTolerationsItems0) validateTolerationSeconds(formats strfmt.Registry) error {
+func (m *PoolTolerationsItems0) validateTolerationSeconds(formats strfmt.Registry) error {
 
 	if swag.IsZero(m.TolerationSeconds) { // not required
 		return nil
@@ -115,7 +115,7 @@ func (m *ZoneTolerationsItems0) validateTolerationSeconds(formats strfmt.Registr
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneTolerationsItems0) MarshalBinary() ([]byte, error) {
+func (m *PoolTolerationsItems0) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -123,8 +123,8 @@ func (m *ZoneTolerationsItems0) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneTolerationsItems0) UnmarshalBinary(b []byte) error {
-	var res ZoneTolerationsItems0
+func (m *PoolTolerationsItems0) UnmarshalBinary(b []byte) error {
+	var res PoolTolerationsItems0
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}

models/pool_update_request.go

@@ -31,21 +31,21 @@ import (
 	"github.com/go-openapi/validate"
 )
 
-// ZoneUpdateRequest zone update request
+// PoolUpdateRequest pool update request
 //
-// swagger:model zoneUpdateRequest
-type ZoneUpdateRequest struct {
+// swagger:model poolUpdateRequest
+type PoolUpdateRequest struct {
 
-	// zones
+	// pools
 	// Required: true
-	Zones []*Zone `json:"zones"`
+	Pools []*Pool `json:"pools"`
 }
 
-// Validate validates this zone update request
-func (m *ZoneUpdateRequest) Validate(formats strfmt.Registry) error {
+// Validate validates this pool update request
+func (m *PoolUpdateRequest) Validate(formats strfmt.Registry) error {
 	var res []error
 
-	if err := m.validateZones(formats); err != nil {
+	if err := m.validatePools(formats); err != nil {
 		res = append(res, err)
 	}
 
@@ -55,21 +55,21 @@ func (m *ZoneUpdateRequest) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *ZoneUpdateRequest) validateZones(formats strfmt.Registry) error {
+func (m *PoolUpdateRequest) validatePools(formats strfmt.Registry) error {
 
-	if err := validate.Required("zones", "body", m.Zones); err != nil {
+	if err := validate.Required("pools", "body", m.Pools); err != nil {
 		return err
 	}
 
-	for i := 0; i < len(m.Zones); i++ {
-		if swag.IsZero(m.Zones[i]) { // not required
+	for i := 0; i < len(m.Pools); i++ {
+		if swag.IsZero(m.Pools[i]) { // not required
 			continue
 		}
 
-		if m.Zones[i] != nil {
-			if err := m.Zones[i].Validate(formats); err != nil {
+		if m.Pools[i] != nil {
+			if err := m.Pools[i].Validate(formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("zones" + "." + strconv.Itoa(i))
+					return ve.ValidateName("pools" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -81,7 +81,7 @@ func (m *ZoneUpdateRequest) validateZones(formats strfmt.Registry) error {
 }
 
 // MarshalBinary interface implementation
-func (m *ZoneUpdateRequest) MarshalBinary() ([]byte, error) {
+func (m *PoolUpdateRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -89,8 +89,8 @@ func (m *ZoneUpdateRequest) MarshalBinary() ([]byte, error) {
 }
 
 // UnmarshalBinary interface implementation
-func (m *ZoneUpdateRequest) UnmarshalBinary(b []byte) error {
-	var res ZoneUpdateRequest
+func (m *PoolUpdateRequest) UnmarshalBinary(b []byte) error {
+	var res PoolUpdateRequest
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}

models/principal.go

@@ -32,17 +32,23 @@ import (
 // swagger:model principal
 type Principal struct {
 
-	// access key ID
-	AccessKeyID string `json:"accessKeyID,omitempty"`
+	// s t s access key ID
+	STSAccessKeyID string `json:"STSAccessKeyID,omitempty"`
+
+	// s t s secret access key
+	STSSecretAccessKey string `json:"STSSecretAccessKey,omitempty"`
+
+	// s t s session token
+	STSSessionToken string `json:"STSSessionToken,omitempty"`
+
+	// account access key
+	AccountAccessKey string `json:"accountAccessKey,omitempty"`
+
+	// account secret key
+	AccountSecretKey string `json:"accountSecretKey,omitempty"`
 
 	// actions
 	Actions []string `json:"actions"`
-
-	// secret access key
-	SecretAccessKey string `json:"secretAccessKey,omitempty"`
-
-	// session token
-	SessionToken string `json:"sessionToken,omitempty"`
 }
 
 // Validate validates this principal

models/put_bucket_retention_request.go

@@ -0,0 +1,121 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
+)
+
+// PutBucketRetentionRequest put bucket retention request
+//
+// swagger:model putBucketRetentionRequest
+type PutBucketRetentionRequest struct {
+
+	// mode
+	// Required: true
+	Mode ObjectRetentionMode `json:"mode"`
+
+	// unit
+	// Required: true
+	Unit ObjectRetentionUnit `json:"unit"`
+
+	// validity
+	// Required: true
+	Validity *int32 `json:"validity"`
+}
+
+// Validate validates this put bucket retention request
+func (m *PutBucketRetentionRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateMode(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateUnit(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateValidity(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *PutBucketRetentionRequest) validateMode(formats strfmt.Registry) error {
+
+	if err := m.Mode.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("mode")
+		}
+		return err
+	}
+
+	return nil
+}
+
+func (m *PutBucketRetentionRequest) validateUnit(formats strfmt.Registry) error {
+
+	if err := m.Unit.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("unit")
+		}
+		return err
+	}
+
+	return nil
+}
+
+func (m *PutBucketRetentionRequest) validateValidity(formats strfmt.Registry) error {
+
+	if err := validate.Required("validity", "body", m.Validity); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *PutBucketRetentionRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *PutBucketRetentionRequest) UnmarshalBinary(b []byte) error {
+	var res PutBucketRetentionRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/result_target.go

@@ -0,0 +1,103 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"strconv"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// ResultTarget result target
+//
+// swagger:model resultTarget
+type ResultTarget struct {
+
+	// legend format
+	LegendFormat string `json:"legendFormat,omitempty"`
+
+	// result
+	Result []*WidgetResult `json:"result"`
+
+	// result type
+	ResultType string `json:"resultType,omitempty"`
+}
+
+// Validate validates this result target
+func (m *ResultTarget) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateResult(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *ResultTarget) validateResult(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Result) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Result); i++ {
+		if swag.IsZero(m.Result[i]) { // not required
+			continue
+		}
+
+		if m.Result[i] != nil {
+			if err := m.Result[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("result" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *ResultTarget) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *ResultTarget) UnmarshalBinary(b []byte) error {
+	var res ResultTarget
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/session_response.go

@@ -36,6 +36,9 @@ import (
 // swagger:model sessionResponse
 type SessionResponse struct {
 
+	// operator
+	Operator bool `json:"operator,omitempty"`
+
 	// pages
 	Pages []string `json:"pages"`
 

models/set_config_response.go

@@ -0,0 +1,60 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// SetConfigResponse set config response
+//
+// swagger:model setConfigResponse
+type SetConfigResponse struct {
+
+	// Returns wheter server needs to restart to apply changes or not
+	Restart bool `json:"restart,omitempty"`
+}
+
+// Validate validates this set config response
+func (m *SetConfigResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *SetConfigResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *SetConfigResponse) UnmarshalBinary(b []byte) error {
+	var res SetConfigResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/set_notification_endpoint_response.go

@@ -0,0 +1,117 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
+)
+
+// SetNotificationEndpointResponse set notification endpoint response
+//
+// swagger:model setNotificationEndpointResponse
+type SetNotificationEndpointResponse struct {
+
+	// account id
+	// Required: true
+	AccountID *string `json:"account_id"`
+
+	// properties
+	// Required: true
+	Properties map[string]string `json:"properties"`
+
+	// restart
+	Restart bool `json:"restart,omitempty"`
+
+	// service
+	// Required: true
+	Service NofiticationService `json:"service"`
+}
+
+// Validate validates this set notification endpoint response
+func (m *SetNotificationEndpointResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateAccountID(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateProperties(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateService(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *SetNotificationEndpointResponse) validateAccountID(formats strfmt.Registry) error {
+
+	if err := validate.Required("account_id", "body", m.AccountID); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *SetNotificationEndpointResponse) validateProperties(formats strfmt.Registry) error {
+
+	return nil
+}
+
+func (m *SetNotificationEndpointResponse) validateService(formats strfmt.Registry) error {
+
+	if err := m.Service.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("service")
+		}
+		return err
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *SetNotificationEndpointResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *SetNotificationEndpointResponse) UnmarshalBinary(b []byte) error {
+	var res SetNotificationEndpointResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/set_policy_multiple_request.go

@@ -0,0 +1,119 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"strconv"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// SetPolicyMultipleRequest set policy multiple request
+//
+// swagger:model setPolicyMultipleRequest
+type SetPolicyMultipleRequest struct {
+
+	// groups
+	Groups []IamEntity `json:"groups"`
+
+	// users
+	Users []IamEntity `json:"users"`
+}
+
+// Validate validates this set policy multiple request
+func (m *SetPolicyMultipleRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateGroups(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateUsers(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *SetPolicyMultipleRequest) validateGroups(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Groups) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Groups); i++ {
+
+		if err := m.Groups[i].Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("groups" + "." + strconv.Itoa(i))
+			}
+			return err
+		}
+
+	}
+
+	return nil
+}
+
+func (m *SetPolicyMultipleRequest) validateUsers(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Users) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Users); i++ {
+
+		if err := m.Users[i].Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("users" + "." + strconv.Itoa(i))
+			}
+			return err
+		}
+
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *SetPolicyMultipleRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *SetPolicyMultipleRequest) UnmarshalBinary(b []byte) error {
+	var res SetPolicyMultipleRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/subscription_validate_request.go

@@ -0,0 +1,66 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// SubscriptionValidateRequest subscription validate request
+//
+// swagger:model subscriptionValidateRequest
+type SubscriptionValidateRequest struct {
+
+	// email
+	Email string `json:"email,omitempty"`
+
+	// license
+	License string `json:"license,omitempty"`
+
+	// password
+	Password string `json:"password,omitempty"`
+}
+
+// Validate validates this subscription validate request
+func (m *SubscriptionValidateRequest) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *SubscriptionValidateRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *SubscriptionValidateRequest) UnmarshalBinary(b []byte) error {
+	var res SubscriptionValidateRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/tenant.go

@@ -50,6 +50,9 @@ type Tenant struct {
 	// enable prometheus
 	EnablePrometheus bool `json:"enable_prometheus,omitempty"`
 
+	// endpoints
+	Endpoints *TenantEndpoints `json:"endpoints,omitempty"`
+
 	// image
 	Image string `json:"image,omitempty"`
 
@@ -59,18 +62,29 @@ type Tenant struct {
 	// namespace
 	Namespace string `json:"namespace,omitempty"`
 
+	// pools
+	Pools []*Pool `json:"pools"`
+
+	// subnet license
+	SubnetLicense *License `json:"subnet_license,omitempty"`
+
 	// total size
 	TotalSize int64 `json:"total_size,omitempty"`
-
-	// zones
-	Zones []*Zone `json:"zones"`
 }
 
 // Validate validates this tenant
 func (m *Tenant) Validate(formats strfmt.Registry) error {
 	var res []error
 
-	if err := m.validateZones(formats); err != nil {
+	if err := m.validateEndpoints(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validatePools(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateSubnetLicense(formats); err != nil {
 		res = append(res, err)
 	}
 
@@ -80,21 +94,39 @@ func (m *Tenant) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *Tenant) validateZones(formats strfmt.Registry) error {
+func (m *Tenant) validateEndpoints(formats strfmt.Registry) error {
 
-	if swag.IsZero(m.Zones) { // not required
+	if swag.IsZero(m.Endpoints) { // not required
 		return nil
 	}
 
-	for i := 0; i < len(m.Zones); i++ {
-		if swag.IsZero(m.Zones[i]) { // not required
+	if m.Endpoints != nil {
+		if err := m.Endpoints.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("endpoints")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *Tenant) validatePools(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Pools) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Pools); i++ {
+		if swag.IsZero(m.Pools[i]) { // not required
 			continue
 		}
 
-		if m.Zones[i] != nil {
-			if err := m.Zones[i].Validate(formats); err != nil {
+		if m.Pools[i] != nil {
+			if err := m.Pools[i].Validate(formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("zones" + "." + strconv.Itoa(i))
+					return ve.ValidateName("pools" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -105,6 +137,24 @@ func (m *Tenant) validateZones(formats strfmt.Registry) error {
 	return nil
 }
 
+func (m *Tenant) validateSubnetLicense(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.SubnetLicense) { // not required
+		return nil
+	}
+
+	if m.SubnetLicense != nil {
+		if err := m.SubnetLicense.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("subnet_license")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 // MarshalBinary interface implementation
 func (m *Tenant) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -122,3 +172,38 @@ func (m *Tenant) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
+
+// TenantEndpoints tenant endpoints
+//
+// swagger:model TenantEndpoints
+type TenantEndpoints struct {
+
+	// console
+	Console string `json:"console,omitempty"`
+
+	// minio
+	Minio string `json:"minio,omitempty"`
+}
+
+// Validate validates this tenant endpoints
+func (m *TenantEndpoints) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *TenantEndpoints) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *TenantEndpoints) UnmarshalBinary(b []byte) error {
+	var res TenantEndpoints
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/tenant_list.go

@@ -50,14 +50,14 @@ type TenantList struct {
 	// namespace
 	Namespace string `json:"namespace,omitempty"`
 
+	// pool count
+	PoolCount int64 `json:"pool_count,omitempty"`
+
 	// total size
 	TotalSize int64 `json:"total_size,omitempty"`
 
 	// volume count
 	VolumeCount int64 `json:"volume_count,omitempty"`
-
-	// zone count
-	ZoneCount int64 `json:"zone_count,omitempty"`
 }
 
 // Validate validates this tenant list

models/widget.go

@@ -0,0 +1,219 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"strconv"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// Widget widget
+//
+// swagger:model widget
+type Widget struct {
+
+	// options
+	Options *WidgetOptions `json:"options,omitempty"`
+
+	// targets
+	Targets []*ResultTarget `json:"targets"`
+
+	// title
+	Title string `json:"title,omitempty"`
+
+	// type
+	Type string `json:"type,omitempty"`
+}
+
+// Validate validates this widget
+func (m *Widget) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateOptions(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateTargets(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *Widget) validateOptions(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Options) { // not required
+		return nil
+	}
+
+	if m.Options != nil {
+		if err := m.Options.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("options")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *Widget) validateTargets(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Targets) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Targets); i++ {
+		if swag.IsZero(m.Targets[i]) { // not required
+			continue
+		}
+
+		if m.Targets[i] != nil {
+			if err := m.Targets[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("targets" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *Widget) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *Widget) UnmarshalBinary(b []byte) error {
+	var res Widget
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
+
+// WidgetOptions widget options
+//
+// swagger:model WidgetOptions
+type WidgetOptions struct {
+
+	// reduce options
+	ReduceOptions *WidgetOptionsReduceOptions `json:"reduceOptions,omitempty"`
+}
+
+// Validate validates this widget options
+func (m *WidgetOptions) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateReduceOptions(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *WidgetOptions) validateReduceOptions(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.ReduceOptions) { // not required
+		return nil
+	}
+
+	if m.ReduceOptions != nil {
+		if err := m.ReduceOptions.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("options" + "." + "reduceOptions")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *WidgetOptions) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *WidgetOptions) UnmarshalBinary(b []byte) error {
+	var res WidgetOptions
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
+
+// WidgetOptionsReduceOptions widget options reduce options
+//
+// swagger:model WidgetOptionsReduceOptions
+type WidgetOptionsReduceOptions struct {
+
+	// calcs
+	Calcs []string `json:"calcs"`
+}
+
+// Validate validates this widget options reduce options
+func (m *WidgetOptionsReduceOptions) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *WidgetOptionsReduceOptions) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *WidgetOptionsReduceOptions) UnmarshalBinary(b []byte) error {
+	var res WidgetOptionsReduceOptions
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

models/widget_result.go

@@ -0,0 +1,63 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 models
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
+)
+
+// WidgetResult widget result
+//
+// swagger:model widgetResult
+type WidgetResult struct {
+
+	// metric
+	Metric map[string]string `json:"metric,omitempty"`
+
+	// values
+	Values []interface{} `json:"values"`
+}
+
+// Validate validates this widget result
+func (m *WidgetResult) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *WidgetResult) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *WidgetResult) UnmarshalBinary(b []byte) error {
+	var res WidgetResult
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}

pkg/acl/endpoints.go

@@ -22,26 +22,28 @@ import (
 
 // endpoints definition
 var (
-	configuration       = "/configurations-list"
+	configuration       = "/settings"
 	users               = "/users"
 	groups              = "/groups"
 	iamPolicies         = "/policies"
 	dashboard           = "/dashboard"
 	profiling           = "/profiling"
-	watch               = "/watch"
-	notifications       = "/notification-endpoints"
 	buckets             = "/buckets"
 	bucketsDetail       = "/buckets/:bucketName"
-	serviceAccounts     = "/service-accounts"
+	serviceAccounts     = "/account"
 	tenants             = "/tenants"
 	tenantsDetail       = "/namespaces/:tenantNamespace/tenants/:tenantName"
-	heal                = "/heal"
 	remoteBuckets       = "/remote-buckets"
 	replication         = "/replication"
 	objectBrowser       = "/object-browser/:bucket/*"
 	objectBrowserBucket = "/object-browser/:bucket"
 	mainObjectBrowser   = "/object-browser"
 	license             = "/license"
+	watch               = "/watch"
+	heal                = "/heal"
+	trace               = "/trace"
+	logs                = "/logs"
+	healthInfo          = "/health-info"
 )
 
 type ConfigurationActionSet struct {
@@ -122,28 +124,6 @@ var usersActionSet = ConfigurationActionSet{
 	),
 }
 
-// watchActionSet contains the list of admin actions required for this endpoint to work
-var watchActionSet = ConfigurationActionSet{
-	actionTypes: iampolicy.NewActionSet(
-		iampolicy.AllAdminActions,
-	),
-	actions: iampolicy.NewActionSet(
-		iampolicy.ListenBucketNotificationAction,
-	),
-}
-
-// notificationsActionSet contains the list of admin actions required for this endpoint to work
-var notificationsActionSet = ConfigurationActionSet{
-	actionTypes: iampolicy.NewActionSet(
-		iampolicy.AllActions,
-	),
-	actions: iampolicy.NewActionSet(
-		iampolicy.ListenBucketNotificationAction,
-		iampolicy.PutBucketNotificationAction,
-		iampolicy.GetBucketNotificationAction,
-	),
-}
-
 // bucketsActionSet contains the list of admin actions required for this endpoint to work
 var bucketsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(
@@ -182,16 +162,6 @@ var tenantsActionSet = ConfigurationActionSet{
 	actions:     iampolicy.NewActionSet(),
 }
 
-// healActionSet contains the list of admin actions required for this endpoint to work
-var healActionSet = ConfigurationActionSet{
-	actionTypes: iampolicy.NewActionSet(
-		iampolicy.AllAdminActions,
-	),
-	actions: iampolicy.NewActionSet(
-		iampolicy.HealAdminAction,
-	),
-}
-
 var remoteBucketsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(
 		iampolicy.AllAdminActions,
@@ -222,6 +192,56 @@ var licenseActionSet = ConfigurationActionSet{
 	actions:     iampolicy.NewActionSet(),
 }
 
+// watchActionSet contains the list of admin actions required for this endpoint to work
+var watchActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ListenBucketNotificationAction,
+	),
+}
+
+// healActionSet contains the list of admin actions required for this endpoint to work
+var healActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.HealAdminAction,
+	),
+}
+
+// logsActionSet contains the list of admin actions required for this endpoint to work
+var logsActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.ConsoleLogAdminAction,
+	),
+}
+
+// traceActionSet contains the list of admin actions required for this endpoint to work
+var traceActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.TraceAdminAction,
+	),
+}
+
+// healthInfoActionSet contains the list of admin actions required for this endpoint to work
+var healthInfoActionSet = ConfigurationActionSet{
+	actionTypes: iampolicy.NewActionSet(
+		iampolicy.AllAdminActions,
+	),
+	actions: iampolicy.NewActionSet(
+		iampolicy.HealthInfoAdminAction,
+	),
+}
+
 // endpointRules contains the mapping between endpoints and ActionSets, additional rules can be added here
 var endpointRules = map[string]ConfigurationActionSet{
 	configuration:       configurationActionSet,
@@ -230,24 +250,27 @@ var endpointRules = map[string]ConfigurationActionSet{
 	iamPolicies:         iamPoliciesActionSet,
 	dashboard:           dashboardActionSet,
 	profiling:           profilingActionSet,
-	watch:               watchActionSet,
-	notifications:       notificationsActionSet,
 	buckets:             bucketsActionSet,
 	bucketsDetail:       bucketsActionSet,
 	serviceAccounts:     serviceAccountsActionSet,
-	heal:                healActionSet,
 	remoteBuckets:       remoteBucketsActionSet,
 	replication:         replicationActionSet,
 	objectBrowser:       objectBrowserActionSet,
 	mainObjectBrowser:   objectBrowserActionSet,
 	objectBrowserBucket: objectBrowserActionSet,
 	license:             licenseActionSet,
+	watch:               watchActionSet,
+	heal:                healActionSet,
+	trace:               traceActionSet,
+	logs:                logsActionSet,
+	healthInfo:          healthInfoActionSet,
 }
 
 // operatorRules contains the mapping between endpoints and ActionSets for operator only mode
 var operatorRules = map[string]ConfigurationActionSet{
 	tenants:       tenantsActionSet,
 	tenantsDetail: tenantsActionSet,
+	license:       licenseActionSet,
 }
 
 // operatorOnly ENV variable
@@ -308,12 +331,9 @@ func GetAuthorizedEndpoints(actions []string) []string {
 		rangeTake = operatorRules
 	}
 
-	if len(actions) == 0 {
-		return []string{}
-	}
 	// Prepare new ActionSet structure that will hold all the user actions
 	userAllowedAction := actionsStringToActionSet(actions)
-	allowedEndpoints := []string{}
+	var allowedEndpoints []string
 	for endpoint, rules := range rangeTake {
 		// check if user policy matches s3:* or admin:* typesIntersection
 		endpointActionTypes := rules.actionTypes

pkg/acl/endpoints_test.go

@@ -72,7 +72,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 15,
+			want: 18,
 		},
 		{
 			name: "all s3 endpoints",
@@ -81,7 +81,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 8,
+			want: 7,
 		},
 		{
 			name: "all admin and s3 endpoints",
@@ -91,14 +91,14 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 18,
+			want: 20,
 		},
 		{
-			name: "no endpoints",
+			name: "Console User - default endpoints",
 			args: args{
 				[]string{},
 			},
-			want: 0,
+			want: 5,
 		},
 	}
 
@@ -116,7 +116,7 @@ func TestOperatorOnlyEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 2,
+			want: 3,
 		},
 		{
 			name: "Operator Only - all s3 endpoints",
@@ -125,7 +125,7 @@ func TestOperatorOnlyEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 2,
+			want: 3,
 		},
 		{
 			name: "Operator Only - all admin and s3 endpoints",
@@ -135,14 +135,14 @@ func TestOperatorOnlyEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 2,
+			want: 3,
 		},
 		{
-			name: "Operator Only - no endpoints",
+			name: "Operator Only - default endpoints",
 			args: args{
 				[]string{},
 			},
-			want: 0,
+			want: 3,
 		},
 	}
 

pkg/auth/idp.go

@@ -20,26 +20,28 @@ import (
 	"context"
 
 	"github.com/minio/console/pkg/auth/idp/oauth2"
+
+	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
-// IdentityProviderClient interface with all functions to be implemented
-// by mock when testing, it should include all IdentityProviderClient respective api calls
+// IdentityProviderI interface with all functions to be implemented
+// by mock when testing, it should include all IdentityProvider respective api calls
 // that are used within this project.
-type IdentityProviderClient interface {
-	VerifyIdentity(ctx context.Context, code, state string) (*oauth2.User, error)
+type IdentityProviderI interface {
+	VerifyIdentity(ctx context.Context, code, state string) (*credentials.Credentials, error)
 	GenerateLoginURL() string
 }
 
 // Interface implementation
 //
-// Define the structure of a IdentityProvider Client and define the functions that are actually used
+// Define the structure of a IdentityProvider with Client inside and define the functions that are used
 // during the authentication flow.
 type IdentityProvider struct {
-	Client IdentityProviderClient
+	Client *oauth2.Provider
 }
 
 // VerifyIdentity will verify the user identity against the idp using the authorization code flow
-func (c IdentityProvider) VerifyIdentity(ctx context.Context, code, state string) (*oauth2.User, error) {
+func (c IdentityProvider) VerifyIdentity(ctx context.Context, code, state string) (*credentials.Credentials, error) {
 	return c.Client.VerifyIdentity(ctx, code, state)
 }
 

pkg/auth/idp/oauth2/config.go

@@ -19,10 +19,16 @@
 package oauth2
 
 import (
+	"strings"
+
 	"github.com/minio/console/pkg/auth/utils"
 	"github.com/minio/minio/pkg/env"
 )
 
+func GetSTSEndpoint() string {
+	return strings.TrimSpace(env.Get(ConsoleMinIOServer, "http://localhost:9000"))
+}
+
 func GetIdpURL() string {
 	return env.Get(ConsoleIdpURL, "")
 }
@@ -40,10 +46,6 @@ func GetIdpCallbackURL() string {
 	return env.Get(ConsoleIdpCallbackURL, "")
 }
 
-func GetIdpAdminRoles() string {
-	return env.Get(ConsoleIdpAdminRoles, "")
-}
-
 func IsIdpEnabled() bool {
 	return GetIdpURL() != "" &&
 		GetIdpClientID() != "" &&
@@ -64,8 +66,3 @@ var defaultSaltForIdpHmac = utils.RandomCharString(64)
 func getSaltForIdpHmac() string {
 	return env.Get(ConsoleIdpHmacSalt, defaultSaltForIdpHmac)
 }
-
-// GetSaltForIdpHmac returns the policy to be assigned to the users authenticating via an IDP
-func GetIDPPolicyForUser() string {
-	return env.Get(ConsoleIdpPolicyUser, "consoleAdmin")
-}

pkg/auth/idp/oauth2/const.go

@@ -18,12 +18,11 @@ package oauth2
 
 const (
 	// const for idp configuration
+	ConsoleMinIOServer       = "CONSOLE_MINIO_SERVER"
 	ConsoleIdpURL            = "CONSOLE_IDP_URL"
 	ConsoleIdpClientID       = "CONSOLE_IDP_CLIENT_ID"
 	ConsoleIdpSecret         = "CONSOLE_IDP_SECRET"
 	ConsoleIdpCallbackURL    = "CONSOLE_IDP_CALLBACK"
-	ConsoleIdpAdminRoles     = "CONSOLE_IDP_ADMIN_ROLES"
 	ConsoleIdpHmacPassphrase = "CONSOLE_IDP_HMAC_PASSPHRASE"
 	ConsoleIdpHmacSalt       = "CONSOLE_IDP_HMAC_SALT"
-	ConsoleIdpPolicyUser     = "CONSOLE_IDP_POLICY_USER"
 )

pkg/auth/idp/oauth2/provider.go

@@ -26,6 +26,9 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
+	"time"
+
+	"github.com/minio/minio-go/v7/pkg/credentials"
 
 	"github.com/coreos/go-oidc"
 	"github.com/minio/console/pkg/auth/utils"
@@ -110,14 +113,13 @@ func NewOauth2ProviderClient(ctx context.Context, scopes []string) (*Provider, e
 		scopes = []string{oidc.ScopeOpenID, "profile", "app_metadata", "user_metadata", "email"}
 	}
 	client := new(Provider)
-	config := xoauth2.Config{
+	client.oauth2Config = &xoauth2.Config{
 		ClientID:     GetIdpClientID(),
 		ClientSecret: GetIdpSecret(),
 		RedirectURL:  GetIdpCallbackURL(),
 		Endpoint:     provider.Endpoint(),
 		Scopes:       scopes,
 	}
-	client.oauth2Config = &config
 	client.oidcProvider = provider
 	client.ClientID = GetIdpClientID()
 
@@ -137,7 +139,7 @@ type User struct {
 	LastLogin         string                 `json:"last_login"`
 	LastPasswordReset string                 `json:"last_password_reset"`
 	LoginsCount       int                    `json:"logins_count"`
-	Mltifactor        string                 `json:"multifactor"`
+	MultiFactor       string                 `json:"multifactor"`
 	Name              string                 `json:"name"`
 	Nickname          string                 `json:"nickname"`
 	PhoneNumber       string                 `json:"phone_number"`
@@ -150,39 +152,31 @@ type User struct {
 }
 
 // VerifyIdentity will contact the configured IDP and validate the user identity based on the authorization code
-func (client *Provider) VerifyIdentity(ctx context.Context, code, state string) (*User, error) {
+func (client *Provider) VerifyIdentity(ctx context.Context, code, state string) (*credentials.Credentials, error) {
 	// verify the provided state is valid (prevents CSRF attacks)
 	if !validateOauth2State(state) {
 		return nil, errGeneric
 	}
-	// verify the authorization code against the identity oidcProvider
-	// idp will return a token in exchange
-	token, err := client.oauth2Config.Exchange(ctx, code)
+	getWebTokenExpiry := func() (*credentials.WebIdentityToken, error) {
+		oauth2Token, err := client.oauth2Config.Exchange(ctx, code)
+		if err != nil {
+			return nil, err
+		}
+		if !oauth2Token.Valid() {
+			return nil, errors.New("invalid token")
+		}
+
+		return &credentials.WebIdentityToken{
+			Token:  oauth2Token.Extra("id_token").(string),
+			Expiry: int(oauth2Token.Expiry.Sub(time.Now().UTC()).Seconds()),
+		}, nil
+	}
+	stsEndpoint := GetSTSEndpoint()
+	sts, err := credentials.NewSTSWebIdentity(stsEndpoint, getWebTokenExpiry)
 	if err != nil {
-		log.Println("Failed to verify authorization code", err)
-		return nil, errGeneric
+		return nil, err
 	}
-	// extract and check id_token field is provided in the response
-	rawIDToken, ok := token.Extra("id_token").(string)
-	if !ok {
-		log.Println("No id_token field in oauth2 token")
-		return nil, errGeneric
-	}
-	config := &oidc.Config{
-		ClientID: client.ClientID,
-	}
-	idToken, err := client.oidcProvider.Verifier(config).Verify(ctx, rawIDToken)
-	if err != nil {
-		log.Println("Failed to verify ID token", err)
-		return nil, errGeneric
-	}
-	var profile User
-	// Populate the profile object using the claims included in the token
-	if err := idToken.Claims(&profile); err != nil {
-		log.Println("Failed to read profile information", err)
-		return nil, errGeneric
-	}
-	return &profile, nil
+	return sts, nil
 }
 
 // validateOauth2State validates the provided state was originated using the same

pkg/auth/idp/oauth2/provider_test.go

@@ -69,30 +69,3 @@ func TestGenerateLoginURL(t *testing.T) {
 	url := oauth2Provider.GenerateLoginURL()
 	funcAssert.NotEqual("", url)
 }
-
-func TestVerifyIdentity(t *testing.T) {
-	ctx := context.Background()
-	funcAssert := assert.New(t)
-	// mock data
-	oauth2Provider := Provider{
-		oauth2Config: Oauth2configMock{},
-		oidcProvider: &oidc.Provider{},
-	}
-	// Test-1 : VerifyIdentity() should fail because of bad state token
-	_, err := oauth2Provider.VerifyIdentity(ctx, "AAABBBCCCDDDEEEFFF", "badtoken")
-	funcAssert.NotNil(err)
-	// Test-2 : VerifyIdentity() should fail because no id_token is provided by the idp
-	oauth2ConfigExchangeMock = func(ctx context.Context, code string, opts ...oauth2.AuthCodeOption) (*oauth2.Token, error) {
-		return &oauth2.Token{}, nil
-	}
-	state := GetRandomStateWithHMAC(32)
-	code := "AAABBBCCCDDDEEEFFF"
-	_, err = oauth2Provider.VerifyIdentity(ctx, code, state)
-	funcAssert.NotNil(err)
-	// Test-3 : VerifyIdentity() should fail because no id_token is provided by the idp
-	// TODO
-	// Test-4 : VerifyIdentity() should fail because oidcProvider.Verifier returned an error
-	// TODO
-	// Test-5 : VerifyIdentity() should fail because idToken.Claims contains invalid fields
-	// TODO
-}

pkg/auth/token.go

@@ -24,6 +24,7 @@ import (
 	"crypto/sha1"
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -58,12 +59,14 @@ func IsSessionTokenValid(token string) bool {
 	return err == nil
 }
 
-// DecryptedClaims claims struct for decrypted credentials
-type DecryptedClaims struct {
-	AccessKeyID     string
-	SecretAccessKey string
-	SessionToken    string
-	Actions         []string
+// TokenClaims claims struct for decrypted credentials
+type TokenClaims struct {
+	STSAccessKeyID     string   `json:"stsAccessKeyID,omitempty"`
+	STSSecretAccessKey string   `json:"stsSecretAccessKey,omitempty"`
+	STSSessionToken    string   `json:"stsSessionToken,omitempty"`
+	AccountAccessKey   string   `json:"accountAccessKey,omitempty"`
+	AccountSecretKey   string   `json:"accountSecretKey,omitempty"`
+	Actions            []string `json:"actions,omitempty"`
 }
 
 // SessionTokenAuthenticate takes a session token, decode it, extract claims and validate the signature
@@ -71,12 +74,15 @@ type DecryptedClaims struct {
 //
 // returns claims after validation in the following format:
 //
-//	type DecryptedClaims struct {
-//		AccessKeyID
-//		SecretAccessKey
-//		SessionToken
+//	type TokenClaims struct {
+//		STSAccessKeyID
+//		STSSecretAccessKey
+//		STSSessionToken
+//		AccountAccessKey
+//		AccountSecretKey
+//		Actions
 //	}
-func SessionTokenAuthenticate(token string) (*DecryptedClaims, error) {
+func SessionTokenAuthenticate(token string) (*TokenClaims, error) {
 	if token == "" {
 		return nil, errNoAuthToken
 	}
@@ -94,9 +100,16 @@ func SessionTokenAuthenticate(token string) (*DecryptedClaims, error) {
 
 // NewEncryptedTokenForClient generates a new session token with claims based on the provided STS credentials, first
 // encrypts the claims and the sign them
-func NewEncryptedTokenForClient(credentials *credentials.Value, actions []string) (string, error) {
+func NewEncryptedTokenForClient(credentials *credentials.Value, accountAccessKey, accountSecretKey string, actions []string) (string, error) {
 	if credentials != nil {
-		encryptedClaims, err := encryptClaims(credentials.AccessKeyID, credentials.SecretAccessKey, credentials.SessionToken, actions)
+		encryptedClaims, err := encryptClaims(&TokenClaims{
+			STSAccessKeyID:     credentials.AccessKeyID,
+			STSSecretAccessKey: credentials.SecretAccessKey,
+			STSSessionToken:    credentials.SessionToken,
+			AccountAccessKey:   accountAccessKey,
+			AccountSecretKey:   accountSecretKey,
+			Actions:            actions,
+		})
 		if err != nil {
 			return "", err
 		}
@@ -107,8 +120,11 @@ func NewEncryptedTokenForClient(credentials *credentials.Value, actions []string
 
 // encryptClaims() receives the STS claims, concatenate them and encrypt them using AES-GCM
 // returns a base64 encoded ciphertext
-func encryptClaims(accessKeyID, secretAccessKey, sessionToken string, actions []string) (string, error) {
-	payload := []byte(fmt.Sprintf("%s#%s#%s#%s", accessKeyID, secretAccessKey, sessionToken, strings.Join(actions, ",")))
+func encryptClaims(credentials *TokenClaims) (string, error) {
+	payload, err := json.Marshal(credentials)
+	if err != nil {
+		return "", err
+	}
 	ciphertext, err := encrypt(payload, []byte{})
 	if err != nil {
 		log.Println(err)
@@ -117,8 +133,8 @@ func encryptClaims(accessKeyID, secretAccessKey, sessionToken string, actions []
 	return base64.StdEncoding.EncodeToString(ciphertext), nil
 }
 
-// decryptClaims() receives base64 encoded ciphertext, decode it, decrypt it (AES-GCM) and produces a *DecryptedClaims object
-func decryptClaims(ciphertext string) (*DecryptedClaims, error) {
+// decryptClaims() receives base64 encoded ciphertext, decode it, decrypt it (AES-GCM) and produces a *TokenClaims object
+func decryptClaims(ciphertext string) (*TokenClaims, error) {
 	decoded, err := base64.StdEncoding.DecodeString(ciphertext)
 	if err != nil {
 		log.Println(err)
@@ -129,19 +145,13 @@ func decryptClaims(ciphertext string) (*DecryptedClaims, error) {
 		log.Println(err)
 		return nil, errClaimsFormat
 	}
-	s := strings.Split(string(plaintext), "#")
-	// Validate that the decrypted string has the right format "accessKeyID:secretAccessKey:sessionToken"
-	if len(s) != 4 {
+	tokenClaims := &TokenClaims{}
+	err = json.Unmarshal(plaintext, tokenClaims)
+	if err != nil {
+		log.Println(err)
 		return nil, errClaimsFormat
 	}
-	accessKeyID, secretAccessKey, sessionToken, actions := s[0], s[1], s[2], s[3]
-	actionsList := strings.Split(actions, ",")
-	return &DecryptedClaims{
-		AccessKeyID:     accessKeyID,
-		SecretAccessKey: secretAccessKey,
-		SessionToken:    sessionToken,
-		Actions:         actionsList,
-	}, nil
+	return tokenClaims, nil
 }
 
 const (
@@ -315,9 +325,11 @@ func GetClaimsFromTokenInRequest(req *http.Request) (*models.Principal, error) {
 		return nil, err
 	}
 	return &models.Principal{
-		AccessKeyID:     claims.AccessKeyID,
-		Actions:         claims.Actions,
-		SecretAccessKey: claims.SecretAccessKey,
-		SessionToken:    claims.SessionToken,
+		STSAccessKeyID:     claims.STSAccessKeyID,
+		Actions:            claims.Actions,
+		STSSecretAccessKey: claims.STSSecretAccessKey,
+		STSSessionToken:    claims.STSSessionToken,
+		AccountAccessKey:   claims.AccountAccessKey,
+		AccountSecretKey:   claims.AccountSecretKey,
 	}, nil
 }

pkg/auth/token_test.go

@@ -36,14 +36,14 @@ func TestNewJWTWithClaimsForClient(t *testing.T) {
 	funcAssert := assert.New(t)
 	// Test-1 : NewEncryptedTokenForClient() is generated correctly without errors
 	function := "NewEncryptedTokenForClient()"
-	token, err := NewEncryptedTokenForClient(creds, []string{""})
+	token, err := NewEncryptedTokenForClient(creds, "", "", []string{""})
 	if err != nil || token == "" {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err)
 	}
 	// saving token for future tests
 	goodToken = token
 	// Test-2 : NewEncryptedTokenForClient() throws error because of empty credentials
-	if _, err = NewEncryptedTokenForClient(nil, []string{""}); err != nil {
+	if _, err = NewEncryptedTokenForClient(nil, "", "", []string{""}); err != nil {
 		funcAssert.Equal("provided credentials are empty", err.Error())
 	}
 }
@@ -56,9 +56,9 @@ func TestJWTAuthenticate(t *testing.T) {
 	if err != nil || claims == nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err)
 	} else {
-		funcAssert.Equal(claims.AccessKeyID, creds.AccessKeyID)
-		funcAssert.Equal(claims.SecretAccessKey, creds.SecretAccessKey)
-		funcAssert.Equal(claims.SessionToken, creds.SessionToken)
+		funcAssert.Equal(claims.STSAccessKeyID, creds.AccessKeyID)
+		funcAssert.Equal(claims.STSSecretAccessKey, creds.SecretAccessKey)
+		funcAssert.Equal(claims.STSSessionToken, creds.SessionToken)
 	}
 	// Test-2 : SessionTokenAuthenticate() return an error because of a tampered token
 	if _, err := SessionTokenAuthenticate(badToken); err != nil {

pkg/certs/certs.go

@@ -28,13 +28,10 @@ import (
 	"github.com/minio/cli"
 	"github.com/minio/minio/cmd/config"
 	"github.com/minio/minio/cmd/logger"
-	"github.com/minio/minio/pkg/certs"
-	certsx "github.com/minio/minio/pkg/certs"
+	xcerts "github.com/minio/minio/pkg/certs"
 	"github.com/mitchellh/go-homedir"
 )
 
-type GetCertificateFunc = certs.GetCertificateFunc
-
 // ConfigDir - points to a user set directory.
 type ConfigDir struct {
 	Path string
@@ -142,7 +139,7 @@ func getPrivateKeyFile() string {
 	return filepath.Join(GlobalCertsDir.Get(), PrivateKeyFile)
 }
 
-func GetTLSConfig() (x509Certs []*x509.Certificate, manager *certs.Manager, err error) {
+func GetTLSConfig() (x509Certs []*x509.Certificate, manager *xcerts.Manager, err error) {
 
 	ctx := context.Background()
 
@@ -154,7 +151,7 @@ func GetTLSConfig() (x509Certs []*x509.Certificate, manager *certs.Manager, err
 		return nil, nil, err
 	}
 
-	manager, err = certs.NewManager(ctx, getPublicCertFile(), getPrivateKeyFile(), config.LoadX509KeyPair)
+	manager, err = xcerts.NewManager(ctx, getPublicCertFile(), getPrivateKeyFile(), config.LoadX509KeyPair)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -222,9 +219,9 @@ func GetTLSConfig() (x509Certs []*x509.Certificate, manager *certs.Manager, err
 	return x509Certs, manager, nil
 }
 
-func GetAllCertificatesAndCAs() (*x509.CertPool, []*x509.Certificate, *certs.Manager) {
+func GetAllCertificatesAndCAs() (*x509.CertPool, []*x509.Certificate, *xcerts.Manager) {
 	// load all CAs from ~/.console/certs/CAs
-	GlobalRootCAs, err := certsx.GetRootCAs(GlobalCertsCADir.Get())
+	GlobalRootCAs, err := xcerts.GetRootCAs(GlobalCertsCADir.Get())
 	logger.FatalIf(err, "Failed to read root CAs (%v)", err)
 	// load all certs from ~/.console/certs
 	globalPublicCerts, globalTLSCertsManager, err := GetTLSConfig()

pkg/subnet/config.go

@@ -0,0 +1,51 @@
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2020 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 subnet
+
+import (
+	"errors"
+	"log"
+
+	"github.com/minio/minio/pkg/env"
+	"github.com/minio/minio/pkg/licverifier"
+)
+
+// GetSubnetURL
+func GetSubnetURL() string {
+	return env.Get(ConsoleSubnetURL, "https://subnet.min.io")
+}
+
+// GetLicenseInfoFromJWT will return license metadata from a jwt string license
+func GetLicenseInfoFromJWT(license string, publicKeys []string) (*licverifier.LicenseInfo, error) {
+	if license == "" {
+		return nil, errors.New("license is not present")
+	}
+	for _, publicKey := range publicKeys {
+		lv, err := licverifier.NewLicenseVerifier([]byte(publicKey))
+		if err != nil {
+			log.Print(err)
+			continue
+		}
+		licInfo, err := lv.Verify(license)
+		if err != nil {
+			log.Print(err)
+			continue
+		}
+		return &licInfo, nil
+	}
+	return nil, errors.New("invalid license key")
+}

pkg/subnet/config_test.go

@@ -0,0 +1,88 @@
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2020 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 subnet
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/minio/minio/pkg/licverifier"
+)
+
+func TestGetLicenseInfoFromJWT(t *testing.T) {
+	license := "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsZW5pbitjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiY29uc29sZS1jdXN0b21lciIsImV4cCI6MS42Mzk5NTI2MTE2MDkxNDQ3MzJlOSwiaXNzIjoic3VibmV0QG1pbmlvLmlvIiwiY2FwYWNpdHkiOjI1LCJpYXQiOjEuNjA4NDE2NjExNjA5MTQ0NzMyZTksImFjY291bnRJZCI6MTc2LCJzZXJ2aWNlVHlwZSI6IlNUQU5EQVJEIn0.ndtf8V_FJTvhXeemVLlORyDev6RJaSPhZ2djkMVK9SvXD0srR_qlYJATPjC4NljkS71nXMGVDov5uCTuUL97x6FGQEKDruA-z24x_2Zr8kof4LfBb3HUHudCR8QvE--I"
+	publicKeys := []string{`-----BEGIN PUBLIC KEY-----
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEbo+e1wpBY4tBq9AONKww3Kq7m6QP/TBQ
+mr/cKCUyBL7rcAvg0zNq1vcSrUSGlAmY3SEDCu3GOKnjG/U4E7+p957ocWSV+mQU
+9NKlTdQFGF3+aO6jbQ4hX/S5qPyF+a3z
+-----END PUBLIC KEY-----`}
+
+	mockLicense, _ := GetLicenseInfoFromJWT(license, publicKeys)
+
+	type args struct {
+		license    string
+		publicKeys []string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *licverifier.LicenseInfo
+		wantErr bool
+	}{
+		{
+			name: "error because missing license",
+			args: args{
+				license:    "",
+				publicKeys: OfflinePublicKeys,
+			},
+			wantErr: true,
+		},
+		{
+			name: "error because invalid license",
+			args: args{
+				license:    "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsZW5pbitjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiY29uc29sZS1jdXN0b21lciIsImV4cCI6MS42Mzk5NTI2MTE2MDkxNDQ3MzJlOSwiaXNzIjoic3VibmV0QG1pbmlvLmlvIiwiY2FwYWNpdHkiOjI1LCJpYXQiOjEuNjA4NDE2NjExNjA5MTQ0NzMyZTksImFjY291bnRJZCI6MTc2LCJzZXJ2aWNlVHlwZSI6IlNUQU5EQVJEIn0.ndtf8V_FJTvhXeemVLlORyDev6RJaSPhZ2djkMVK9SvXD0srR_qlYJATPjC4NljkS71nXMGVDov5uCTuUL97x6FGQEKDruA-z24x_2Zr8kof4LfBb3HUHudCR8QvE--I",
+				publicKeys: []string{"eaeaeae"},
+			},
+			wantErr: true,
+		},
+		{
+			name: "license successfully verified",
+			args: args{
+				license: "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsZW5pbitjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiY29uc29sZS1jdXN0b21lciIsImV4cCI6MS42Mzk5NTI2MTE2MDkxNDQ3MzJlOSwiaXNzIjoic3VibmV0QG1pbmlvLmlvIiwiY2FwYWNpdHkiOjI1LCJpYXQiOjEuNjA4NDE2NjExNjA5MTQ0NzMyZTksImFjY291bnRJZCI6MTc2LCJzZXJ2aWNlVHlwZSI6IlNUQU5EQVJEIn0.ndtf8V_FJTvhXeemVLlORyDev6RJaSPhZ2djkMVK9SvXD0srR_qlYJATPjC4NljkS71nXMGVDov5uCTuUL97x6FGQEKDruA-z24x_2Zr8kof4LfBb3HUHudCR8QvE--I",
+				publicKeys: []string{`-----BEGIN PUBLIC KEY-----
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEbo+e1wpBY4tBq9AONKww3Kq7m6QP/TBQ
+mr/cKCUyBL7rcAvg0zNq1vcSrUSGlAmY3SEDCu3GOKnjG/U4E7+p957ocWSV+mQU
+9NKlTdQFGF3+aO6jbQ4hX/S5qPyF+a3z
+-----END PUBLIC KEY-----`},
+			},
+			wantErr: false,
+			want:    mockLicense,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := GetLicenseInfoFromJWT(tt.args.license, tt.args.publicKeys)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GetLicenseInfoFromJWT() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("GetLicenseInfoFromJWT() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/subnet/const.go

@@ -0,0 +1,36 @@
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2020 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 subnet
+
+var (
+	OfflinePublicKeys = []string{
+		`-----BEGIN PUBLIC KEY-----
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEaK31xujr6/rZ7ZfXZh3SlwovjC+X8wGq
+qkltaKyTLRENd4w3IRktYYCRgzpDLPn/nrf7snV/ERO5qcI7fkEES34IVEr+2Uff
+JkO2PfyyAYEO/5dBlPh1Undu9WQl6J7B
+-----END PUBLIC KEY-----`, // https://subnet.min.io/downloads/license-pubkey.pem
+	}
+)
+
+const (
+	// Constants for subnet configuration
+	ConsoleSubnetURL = "CONSOLE_SUBNET_URL"
+	// Subnet endpoints
+	publicKey          = "/downloads/license-pubkey.pem"
+	loginEndpoint      = "/api/auth/login"
+	licenseKeyEndpoint = "/api/auth/subscription/license-key"
+)

pkg/subnet/subnet.go

@@ -0,0 +1,173 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 subnet
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+
+	"github.com/minio/console/cluster"
+	"github.com/minio/minio/pkg/licverifier"
+)
+
+// subnetLoginRequest body request for subnet login
+type subnetLoginRequest struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
+// tokenInfo
+type tokenInfo struct {
+	AccessToken string  `json:"access_token"`
+	ExpiresIn   float64 `json:"expires_in"`
+	TokenType   string  `json:"token_type"`
+}
+
+// subnetLoginResponse body resonse from subnet after login
+type subnetLoginResponse struct {
+	HasMembership bool      `json:"has_memberships"`
+	TokenInfo     tokenInfo `json:"token_info"`
+}
+
+// LicenseMetadata claims in subnet license
+type LicenseMetadata struct {
+	Email       string `json:"email"`
+	Issuer      string `json:"issuer"`
+	TeamName    string `json:"teamName"`
+	ServiceType string `json:"serviceType"`
+	RequestedAt string `json:"requestedAt"`
+	ExpiresAt   string `json:"expiresAt"`
+	AccountID   int64  `json:"accountId"`
+	Capacity    int64  `json:"capacity"`
+}
+
+// subnetLicenseResponse body response returned by subnet license endpoint
+type subnetLicenseResponse struct {
+	License  string          `json:"license"`
+	Metadata LicenseMetadata `json:"metadata"`
+}
+
+// getLicenseFromCredentials will perform authentication against subnet using
+// user provided credentials and return the current subnet license key
+func getLicenseFromCredentials(client cluster.HTTPClientI, username, password string) (string, error) {
+	request := subnetLoginRequest{
+		Username: username,
+		Password: password,
+	}
+	// http body for login request
+	payloadBytes, err := json.Marshal(request)
+	if err != nil {
+		return "", err
+	}
+	subnetURL := GetSubnetURL()
+	url := fmt.Sprintf("%s%s", subnetURL, loginEndpoint)
+	// Authenticate against subnet using email/password provided by user
+	resp, err := client.Post(url, "application/json", bytes.NewReader(payloadBytes))
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+	bodyBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	subnetSession := &subnetLoginResponse{}
+	// Parse subnet login response
+	err = json.Unmarshal(bodyBytes, subnetSession)
+	if err != nil {
+		return "", err
+	}
+
+	// Get license key using session token
+	token := subnetSession.TokenInfo.AccessToken
+	url = fmt.Sprintf("%s%s", subnetURL, licenseKeyEndpoint)
+	req, err := http.NewRequest("POST", url, nil)
+	if err != nil {
+		return "", err
+	}
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+	resp, err = client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+	bodyBytes, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	userLicense := &subnetLicenseResponse{}
+	// Parse subnet license response
+	err = json.Unmarshal(bodyBytes, userLicense)
+	if err != nil {
+		return "", err
+	}
+	return userLicense.License, nil
+}
+
+// downloadSubnetPublicKey will download the current subnet public key.
+func downloadSubnetPublicKey(client cluster.HTTPClientI) (string, error) {
+	// Get the public key directly from Subnet
+	url := fmt.Sprintf("%s%s", GetSubnetURL(), publicKey)
+	resp, err := client.Get(url)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+	buf := new(bytes.Buffer)
+	_, err = buf.ReadFrom(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	return buf.String(), err
+}
+
+// ValidateLicense will download the current subnet public key, if the public key its not available for license
+// verification then console will fall back to verification with hardcoded public keys
+func ValidateLicense(client cluster.HTTPClientI, licenseKey, email, password string) (licInfo *licverifier.LicenseInfo, license string, err error) {
+	var publicKeys []string
+	if email != "" && password != "" {
+		// fetch subnet license key using user credentials
+		license, err = getLicenseFromCredentials(client, email, password)
+		if err != nil {
+			return nil, "", err
+		}
+	} else if licenseKey != "" {
+		license = licenseKey
+	} else {
+		return nil, "", errors.New("invalid license")
+	}
+	subnetPubKey, err := downloadSubnetPublicKey(client)
+	if err != nil {
+		log.Print(err)
+		// there was an issue getting the subnet public key
+		// use hardcoded public keys instead
+		publicKeys = OfflinePublicKeys
+	} else {
+		publicKeys = append(publicKeys, subnetPubKey)
+	}
+	licInfo, err = GetLicenseInfoFromJWT(license, publicKeys)
+	if err != nil {
+		return nil, "", err
+	}
+	return licInfo, license, nil
+}

pkg/subnet/subnet_test.go

@@ -0,0 +1,330 @@
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2020 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 subnet
+
+import (
+	"bytes"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"testing"
+
+	"errors"
+)
+
+var HTTPGetMock func(url string) (resp *http.Response, err error)
+var HTTPPostMock func(url, contentType string, body io.Reader) (resp *http.Response, err error)
+var HTTPDoMock func(req *http.Request) (*http.Response, error)
+
+type HTTPClientMock struct {
+	Client *http.Client
+}
+
+func (c *HTTPClientMock) Get(url string) (resp *http.Response, err error) {
+	return HTTPGetMock(url)
+}
+
+func (c *HTTPClientMock) Post(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+	return HTTPPostMock(url, contentType, body)
+}
+
+func (c *HTTPClientMock) Do(req *http.Request) (*http.Response, error) {
+	return HTTPDoMock(req)
+}
+
+func Test_getLicenseFromCredentials(t *testing.T) {
+	// HTTP Client mock
+	clientMock := HTTPClientMock{
+		Client: &http.Client{},
+	}
+	type args struct {
+		client   HTTPClientMock
+		username string
+		password string
+	}
+	tests := []struct {
+		name     string
+		args     args
+		want     string
+		wantErr  bool
+		mockFunc func()
+	}{
+		{
+			name: "error when login against subnet",
+			args: args{
+				client:   clientMock,
+				username: "invalid",
+				password: "invalid",
+			},
+			want:    "",
+			wantErr: true,
+			mockFunc: func() {
+				HTTPPostMock = func(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+					return nil, errors.New("something went wrong")
+				}
+			},
+		},
+		{
+			name: "error because of malformed subnet response",
+			args: args{
+				client:   clientMock,
+				username: "invalid",
+				password: "invalid",
+			},
+			want:    "",
+			wantErr: true,
+			mockFunc: func() {
+				HTTPPostMock = func(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte("foo")))}, nil
+				}
+			},
+		},
+		{
+			name: "error when obtaining license from subnet",
+			args: args{
+				client:   clientMock,
+				username: "valid",
+				password: "valid",
+			},
+			want:    "",
+			wantErr: true,
+			mockFunc: func() {
+				HTTPPostMock = func(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+					// returning test jwt token
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte("{\"has_memberships\":true,\"token_info\":{\"access_token\":\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik4wRXdOa1V5UXpORU1UUkNOekU0UmpSR1JVWkJSa1UxUmtZNE9EY3lOekZHTXpjNU1qZ3hNZyJ9.eyJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vY2xhaW1zL2dyb3VwcyI6W10sImh0dHBzOi8vaWQuc3VibmV0Lm1pbi5pby9jbGFpbXMvcm9sZXMiOltdLCJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vY2xhaW1zL2VtYWlsIjoibGVuaW4rYzFAbWluaW8uaW8iLCJpc3MiOiJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vIiwic3ViIjoiYXV0aDB8NWZjZWFlYTMyNTNhZjEwMDc3NDZkMDM0IiwiYXVkIjoiaHR0cHM6Ly9zdWJuZXQubWluLmlvL2FwaSIsImlhdCI6MTYwODQxNjE5NiwiZXhwIjoxNjExMDA4MTk2LCJhenAiOiI1WTA0eVZlejNiOFgxUFVzRHVqSmxuZXVuY3ExVjZxaiIsInNjb3BlIjoib2ZmbGluZV9hY2Nlc3MiLCJndHkiOiJwYXNzd29yZCJ9.GC8DRLT0jUEteuBZBmyMXMswLSblCr_89Gu5NcVRUzKSYAaZ5VFW4UFgo1BpiC0sePuWJ0Vykitphx7znTfZfj5B3mZbOw3ejG6kxz7nm9DuYMmySJFYnwroZ9EP02vkW7-n_-YvEg8le1wXfkJ3lTUzO3aWddS4rfQRsZ2YJJUj61GiNyEK_QNP4PrYOuzLyD1wV75NejFqfcFoj7nRkT1K2BM0-89-_f2AFDGTjov6Ig6s1s-zLC9wxcYSmubNwpCJytZmQgPqIepOr065Y6OB4n0n0B5sXguuGuzb8VAkECrHhHPz8ta926fc0jC4XxVCNKdbV1_qC3-1yY7AJA\",\"expires_in\":2592000.0,\"token_type\":\"Bearer\"}}")))}, nil
+				}
+				HTTPDoMock = func(req *http.Request) (*http.Response, error) {
+					return nil, errors.New("something went wrong")
+				}
+			},
+		},
+		{
+			name: "error when obtaining license from subnet because of malformed response",
+			args: args{
+				client:   clientMock,
+				username: "valid",
+				password: "valid",
+			},
+			want:    "",
+			wantErr: true,
+			mockFunc: func() {
+				HTTPPostMock = func(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+					// returning test jwt token
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte("{\"has_memberships\":true,\"token_info\":{\"access_token\":\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik4wRXdOa1V5UXpORU1UUkNOekU0UmpSR1JVWkJSa1UxUmtZNE9EY3lOekZHTXpjNU1qZ3hNZyJ9.eyJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vY2xhaW1zL2dyb3VwcyI6W10sImh0dHBzOi8vaWQuc3VibmV0Lm1pbi5pby9jbGFpbXMvcm9sZXMiOltdLCJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vY2xhaW1zL2VtYWlsIjoibGVuaW4rYzFAbWluaW8uaW8iLCJpc3MiOiJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vIiwic3ViIjoiYXV0aDB8NWZjZWFlYTMyNTNhZjEwMDc3NDZkMDM0IiwiYXVkIjoiaHR0cHM6Ly9zdWJuZXQubWluLmlvL2FwaSIsImlhdCI6MTYwODQxNjE5NiwiZXhwIjoxNjExMDA4MTk2LCJhenAiOiI1WTA0eVZlejNiOFgxUFVzRHVqSmxuZXVuY3ExVjZxaiIsInNjb3BlIjoib2ZmbGluZV9hY2Nlc3MiLCJndHkiOiJwYXNzd29yZCJ9.GC8DRLT0jUEteuBZBmyMXMswLSblCr_89Gu5NcVRUzKSYAaZ5VFW4UFgo1BpiC0sePuWJ0Vykitphx7znTfZfj5B3mZbOw3ejG6kxz7nm9DuYMmySJFYnwroZ9EP02vkW7-n_-YvEg8le1wXfkJ3lTUzO3aWddS4rfQRsZ2YJJUj61GiNyEK_QNP4PrYOuzLyD1wV75NejFqfcFoj7nRkT1K2BM0-89-_f2AFDGTjov6Ig6s1s-zLC9wxcYSmubNwpCJytZmQgPqIepOr065Y6OB4n0n0B5sXguuGuzb8VAkECrHhHPz8ta926fc0jC4XxVCNKdbV1_qC3-1yY7AJA\",\"expires_in\":2592000.0,\"token_type\":\"Bearer\"}}")))}, nil
+				}
+				HTTPDoMock = func(req *http.Request) (*http.Response, error) {
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte("foo")))}, nil
+				}
+			},
+		},
+		{
+			name: "license obtained successfully",
+			args: args{
+				client:   clientMock,
+				username: "valid",
+				password: "valid",
+			},
+			want:    "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsZW5pbitjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiY29uc29sZS1jdXN0b21lciIsImV4cCI6MS42Mzk5NTI2MTE2MDkxNDQ3MzJlOSwiaXNzIjoic3VibmV0QG1pbmlvLmlvIiwiY2FwYWNpdHkiOjI1LCJpYXQiOjEuNjA4NDE2NjExNjA5MTQ0NzMyZTksImFjY291bnRJZCI6MTc2LCJzZXJ2aWNlVHlwZSI6IlNUQU5EQVJEIn0.ndtf8V_FJTvhXeemVLlORyDev6RJaSPhZ2djkMVK9SvXD0srR_qlYJATPjC4NljkS71nXMGVDov5uCTuUL97x6FGQEKDruA-z24x_2Zr8kof4LfBb3HUHudCR8QvE--I",
+			wantErr: false,
+			mockFunc: func() {
+				HTTPPostMock = func(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+					// returning test jwt token
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte("{\"has_memberships\":true,\"token_info\":{\"access_token\":\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6Ik4wRXdOa1V5UXpORU1UUkNOekU0UmpSR1JVWkJSa1UxUmtZNE9EY3lOekZHTXpjNU1qZ3hNZyJ9.eyJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vY2xhaW1zL2dyb3VwcyI6W10sImh0dHBzOi8vaWQuc3VibmV0Lm1pbi5pby9jbGFpbXMvcm9sZXMiOltdLCJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vY2xhaW1zL2VtYWlsIjoibGVuaW4rYzFAbWluaW8uaW8iLCJpc3MiOiJodHRwczovL2lkLnN1Ym5ldC5taW4uaW8vIiwic3ViIjoiYXV0aDB8NWZjZWFlYTMyNTNhZjEwMDc3NDZkMDM0IiwiYXVkIjoiaHR0cHM6Ly9zdWJuZXQubWluLmlvL2FwaSIsImlhdCI6MTYwODQxNjE5NiwiZXhwIjoxNjExMDA4MTk2LCJhenAiOiI1WTA0eVZlejNiOFgxUFVzRHVqSmxuZXVuY3ExVjZxaiIsInNjb3BlIjoib2ZmbGluZV9hY2Nlc3MiLCJndHkiOiJwYXNzd29yZCJ9.GC8DRLT0jUEteuBZBmyMXMswLSblCr_89Gu5NcVRUzKSYAaZ5VFW4UFgo1BpiC0sePuWJ0Vykitphx7znTfZfj5B3mZbOw3ejG6kxz7nm9DuYMmySJFYnwroZ9EP02vkW7-n_-YvEg8le1wXfkJ3lTUzO3aWddS4rfQRsZ2YJJUj61GiNyEK_QNP4PrYOuzLyD1wV75NejFqfcFoj7nRkT1K2BM0-89-_f2AFDGTjov6Ig6s1s-zLC9wxcYSmubNwpCJytZmQgPqIepOr065Y6OB4n0n0B5sXguuGuzb8VAkECrHhHPz8ta926fc0jC4XxVCNKdbV1_qC3-1yY7AJA\",\"expires_in\":2592000.0,\"token_type\":\"Bearer\"}}")))}, nil
+				}
+				HTTPDoMock = func(req *http.Request) (*http.Response, error) {
+					// returning test jwt license
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte("{\"license\":\"eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsZW5pbitjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiY29uc29sZS1jdXN0b21lciIsImV4cCI6MS42Mzk5NTI2MTE2MDkxNDQ3MzJlOSwiaXNzIjoic3VibmV0QG1pbmlvLmlvIiwiY2FwYWNpdHkiOjI1LCJpYXQiOjEuNjA4NDE2NjExNjA5MTQ0NzMyZTksImFjY291bnRJZCI6MTc2LCJzZXJ2aWNlVHlwZSI6IlNUQU5EQVJEIn0.ndtf8V_FJTvhXeemVLlORyDev6RJaSPhZ2djkMVK9SvXD0srR_qlYJATPjC4NljkS71nXMGVDov5uCTuUL97x6FGQEKDruA-z24x_2Zr8kof4LfBb3HUHudCR8QvE--I\",\"metadata\":{\"email\":\"lenin+c1@minio.io\",\"issuer\":\"subnet@minio.io\",\"accountId\":176,\"teamName\":\"console-customer\",\"serviceType\":\"STANDARD\",\"capacity\":25,\"requestedAt\":\"2020-12-19T22:23:31.609144732Z\",\"expiresAt\":\"2021-12-19T22:23:31.609144732Z\"}}")))}, nil
+				}
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.mockFunc != nil {
+				tt.mockFunc()
+			}
+			got, err := getLicenseFromCredentials(&tt.args.client, tt.args.username, tt.args.password)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("getLicenseFromCredentials() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("getLicenseFromCredentials() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_downloadSubnetPublicKey(t *testing.T) {
+	// HTTP Client mock
+	clientMock := HTTPClientMock{
+		Client: &http.Client{},
+	}
+	type args struct {
+		client HTTPClientMock
+	}
+	tests := []struct {
+		name     string
+		args     args
+		want     string
+		wantErr  bool
+		mockFunc func()
+	}{
+		{
+			name: "error downloading public key",
+			args: args{
+				client: clientMock,
+			},
+			mockFunc: func() {
+				HTTPGetMock = func(url string) (resp *http.Response, err error) {
+					return nil, errors.New("something went wrong")
+				}
+			},
+			wantErr: true,
+			want:    "",
+		},
+		{
+			name: "public key download successfully",
+			args: args{
+				client: clientMock,
+			},
+			mockFunc: func() {
+				HTTPGetMock = func(url string) (resp *http.Response, err error) {
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte("foo")))}, nil
+				}
+			},
+			wantErr: false,
+			want:    "foo",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.mockFunc != nil {
+				tt.mockFunc()
+			}
+			got, err := downloadSubnetPublicKey(&tt.args.client)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("downloadSubnetPublicKey() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("downloadSubnetPublicKey() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestValidateLicense(t *testing.T) {
+	// HTTP Client mock
+	clientMock := HTTPClientMock{
+		Client: &http.Client{},
+	}
+	type args struct {
+		client     HTTPClientMock
+		licenseKey string
+		email      string
+		password   string
+	}
+	tests := []struct {
+		name        string
+		args        args
+		wantLicense string
+		wantErr     bool
+		mockFunc    func()
+	}{
+		{
+			name: "error because nor license nor user or password was provided",
+			args: args{
+				client:     clientMock,
+				licenseKey: "",
+				email:      "",
+				password:   "",
+			},
+			wantErr: true,
+		},
+		{
+			name: "error because could not get license from credentials",
+			args: args{
+				client:     clientMock,
+				licenseKey: "",
+				email:      "email",
+				password:   "password",
+			},
+			wantErr: true,
+			mockFunc: func() {
+				HTTPPostMock = func(url, contentType string, body io.Reader) (resp *http.Response, err error) {
+					return nil, errors.New("something went wrong")
+				}
+			},
+		},
+		{
+			name: "error because invalid license",
+			args: args{
+				client:     clientMock,
+				licenseKey: "invalid license",
+				email:      "",
+				password:   "",
+			},
+			wantErr: true,
+			mockFunc: func() {
+				HTTPGetMock = func(url string) (resp *http.Response, err error) {
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte(`-----BEGIN PUBLIC KEY-----
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEbo+e1wpBY4tBq9AONKww3Kq7m6QP/TBQ
+mr/cKCUyBL7rcAvg0zNq1vcSrUSGlAmY3SEDCu3GOKnjG/U4E7+p957ocWSV+mQU
+9NKlTdQFGF3+aO6jbQ4hX/S5qPyF+a3z
+-----END PUBLIC KEY-----`)))}, nil
+				}
+			},
+		},
+		{
+			name: "license validated successfully",
+			args: args{
+				client:     clientMock,
+				licenseKey: "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsZW5pbitjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiY29uc29sZS1jdXN0b21lciIsImV4cCI6MS42Mzk5NTI2MTE2MDkxNDQ3MzJlOSwiaXNzIjoic3VibmV0QG1pbmlvLmlvIiwiY2FwYWNpdHkiOjI1LCJpYXQiOjEuNjA4NDE2NjExNjA5MTQ0NzMyZTksImFjY291bnRJZCI6MTc2LCJzZXJ2aWNlVHlwZSI6IlNUQU5EQVJEIn0.ndtf8V_FJTvhXeemVLlORyDev6RJaSPhZ2djkMVK9SvXD0srR_qlYJATPjC4NljkS71nXMGVDov5uCTuUL97x6FGQEKDruA-z24x_2Zr8kof4LfBb3HUHudCR8QvE--I",
+				email:      "",
+				password:   "",
+			},
+			wantErr: false,
+			mockFunc: func() {
+				HTTPGetMock = func(url string) (resp *http.Response, err error) {
+					return &http.Response{Body: ioutil.NopCloser(bytes.NewReader([]byte(`-----BEGIN PUBLIC KEY-----
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEbo+e1wpBY4tBq9AONKww3Kq7m6QP/TBQ
+mr/cKCUyBL7rcAvg0zNq1vcSrUSGlAmY3SEDCu3GOKnjG/U4E7+p957ocWSV+mQU
+9NKlTdQFGF3+aO6jbQ4hX/S5qPyF+a3z
+-----END PUBLIC KEY-----`)))}, nil
+				}
+			},
+			wantLicense: "eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsZW5pbitjMUBtaW5pby5pbyIsInRlYW1OYW1lIjoiY29uc29sZS1jdXN0b21lciIsImV4cCI6MS42Mzk5NTI2MTE2MDkxNDQ3MzJlOSwiaXNzIjoic3VibmV0QG1pbmlvLmlvIiwiY2FwYWNpdHkiOjI1LCJpYXQiOjEuNjA4NDE2NjExNjA5MTQ0NzMyZTksImFjY291bnRJZCI6MTc2LCJzZXJ2aWNlVHlwZSI6IlNUQU5EQVJEIn0.ndtf8V_FJTvhXeemVLlORyDev6RJaSPhZ2djkMVK9SvXD0srR_qlYJATPjC4NljkS71nXMGVDov5uCTuUL97x6FGQEKDruA-z24x_2Zr8kof4LfBb3HUHudCR8QvE--I",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.mockFunc != nil {
+				tt.mockFunc()
+			}
+			_, gotLicense, err := ValidateLicense(&tt.args.client, tt.args.licenseKey, tt.args.email, tt.args.password)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("ValidateLicense() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if gotLicense != tt.wantLicense {
+				t.Errorf("ValidateLicense() gotLicense = %v, want %v", gotLicense, tt.wantLicense)
+			}
+		})
+	}
+}

pkg/utils/parity.go

@@ -185,9 +185,9 @@ func getTotalSizes(argPatterns []ellipses.ArgPattern) []uint64 {
 }
 
 // PossibleParityValues returns possible parities for input args,
-// parties are calculated in uniform manner for one zone or
-// multiple zones, ensuring that parities returned are common
-// and applicable across all zones.
+// parties are calculated in uniform manner for one pool or
+// multiple pools, ensuring that parities returned are common
+// and applicable across all pools.
 func PossibleParityValues(args ...string) ([]string, error) {
 	setIndexes, err := parseEndpointSet(args...)
 	if err != nil {

portal-ui/.prettierignore

@@ -0,0 +1,2 @@
+build 
+coverage

portal-ui/.prettierrc.json

@@ -0,0 +1 @@
+{}

portal-ui/config-overrides.js

@@ -1,10 +1,10 @@
-const rewireReactHotLoader = require('react-app-rewire-hot-loader');
+const rewireReactHotLoader = require("react-app-rewire-hot-loader");
 
 /* config-overrides.js */
 module.exports = function override(config, env) {
-    if (env === 'development') {
-        config.resolve.alias['react-dom'] = '@hot-loader/react-dom';
-    }
-    config = rewireReactHotLoader(config, env);
-    return config;
+  if (env === "development") {
+    config.resolve.alias["react-dom"] = "@hot-loader/react-dom";
+  }
+  config = rewireReactHotLoader(config, env);
+  return config;
 };

portal-ui/package.json

@@ -3,18 +3,19 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@babel/helper-create-regexp-features-plugin": "^7.7.4",
-    "@babel/plugin-transform-react-jsx-development": "^7.9.0",
-    "@hot-loader/react-dom": "^16.9.0",
+    "@date-io/moment": "1.x",
+    "@hot-loader/react-dom": "17.0.1",
     "@material-ui/core": "^4.9.12",
     "@material-ui/icons": "^4.9.1",
+    "@material-ui/pickers": "^3.2.10",
     "@types/history": "^4.7.3",
     "@types/jest": "24.0.23",
     "@types/lodash": "^4.14.149",
     "@types/node": "12.12.8",
-    "@types/react": "16.9.11",
+    "@types/react": "17.0.0",
     "@types/react-copy-to-clipboard": "^4.3.0",
     "@types/react-dom": "16.9.4",
+    "@types/react-grid-layout": "^1.1.1",
     "@types/react-redux": "^7.1.5",
     "@types/react-router": "^5.1.3",
     "@types/react-router-dom": "^5.1.2",
@@ -29,15 +30,16 @@
     "history": "^4.10.1",
     "local-storage-fallback": "^4.1.1",
     "lodash": "^4.17.19",
-    "moment": "^2.24.0",
-    "react": "^16.13.1",
+    "moment": "^2.29.1",
+    "react": "17.0.1",
     "react-app-rewire-hot-loader": "^2.0.1",
     "react-app-rewired": "^2.1.6",
     "react-async-hook": "^3.6.1",
     "react-chartjs-2": "^2.9.0",
     "react-codemirror2": "^7.1.0",
     "react-copy-to-clipboard": "^5.0.2",
-    "react-dom": "^16.12.0",
+    "react-dom": "17.0.1",
+    "react-grid-layout": "^1.2.0",
     "react-hot-loader": "^4.13.0",
     "react-moment": "^0.9.7",
     "react-redux": "^7.1.3",
@@ -50,7 +52,6 @@
     "redux-thunk": "^2.3.0",
     "superagent": "^5.1.0",
     "typeface-roboto": "^0.0.75",
-    "typescript": "3.6.4",
     "use-debounce": "^5.0.1",
     "websocket": "^1.0.31"
   },
@@ -77,6 +78,8 @@
   },
   "proxy": "http://localhost:9090/",
   "devDependencies": {
-    "prettier": "^1.19.1"
+    "jest": "^24.9.0",
+    "prettier": "2.2.1",
+    "typescript": "^4.1.2"
   }
 }

portal-ui/public/index.html

@@ -4,21 +4,44 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="MinIO Console"
-    />
+    <meta name="description" content="MinIO Console" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-      <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap" rel="stylesheet">
-      <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-icon-180x180.png">
-      <link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png">
-      <link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/favicon-96x96.png">
-      <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png">
-      <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-      <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#3a4e54">
+    <link
+      href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap"
+      rel="stylesheet"
+    />
+    <link
+      rel="apple-touch-icon"
+      sizes="180x180"
+      href="%PUBLIC_URL%/apple-icon-180x180.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="%PUBLIC_URL%/favicon-32x32.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="96x96"
+      href="%PUBLIC_URL%/favicon-96x96.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="%PUBLIC_URL%/favicon-16x16.png"
+    />
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link
+      rel="mask-icon"
+      href="%PUBLIC_URL%/safari-pinned-tab.svg"
+      color="#3a4e54"
+    />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

portal-ui/src/ProtectedRoutes.tsx

@@ -18,10 +18,10 @@ import React, { useEffect, useState } from "react";
 import { Redirect } from "react-router-dom";
 import { connect } from "react-redux";
 import { AppState } from "./store";
-import { userLoggedIn } from "./actions";
+import { consoleOperatorMode, userLoggedIn } from "./actions";
 import api from "./common/api";
-import { clearSession } from "./common/utils";
 import { saveSessionResponse } from "./screens/Console/actions";
+import { ISessionResponse } from "./screens/Console/types";
 
 const mapState = (state: AppState) => ({
   loggedIn: state.system.loggedIn,
@@ -29,6 +29,7 @@ const mapState = (state: AppState) => ({
 
 const connector = connect(mapState, {
   userLoggedIn,
+  consoleOperatorMode,
   saveSessionResponse,
 });
 
@@ -36,6 +37,7 @@ interface ProtectedRouteProps {
   loggedIn: boolean;
   Component: any;
   userLoggedIn: typeof userLoggedIn;
+  consoleOperatorMode: typeof consoleOperatorMode;
   saveSessionResponse: typeof saveSessionResponse;
 }
 
@@ -43,19 +45,25 @@ const ProtectedRoute = ({
   Component,
   loggedIn,
   userLoggedIn,
+  consoleOperatorMode,
   saveSessionResponse,
 }: ProtectedRouteProps) => {
   const [sessionLoading, setSessionLoading] = useState<boolean>(true);
   useEffect(() => {
     api
       .invoke("GET", `/api/v1/session`)
-      .then((res) => {
+      .then((res: ISessionResponse) => {
         saveSessionResponse(res);
         userLoggedIn(true);
         setSessionLoading(false);
+        // check for tenants presence, that indicates we are in operator mode
+        if (res.operator) {
+          consoleOperatorMode(true);
+          document.title = "MinIO Operator";
+        }
       })
       .catch(() => setSessionLoading(false));
-  }, [saveSessionResponse]);
+  }, [saveSessionResponse, consoleOperatorMode, userLoggedIn]);
 
   // if we still trying to retrieve user session render nothing
   if (sessionLoading) {

portal-ui/src/actions.ts

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// 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
@@ -16,35 +16,91 @@
 
 import {
   MENU_OPEN,
+  OPERATOR_MODE,
   SERVER_IS_LOADING,
   SERVER_NEEDS_RESTART,
-  USER_LOGGED
+  USER_LOGGED,
+  SET_LOADING_PROGRESS,
+  SET_SNACK_BAR_MESSAGE,
+  SET_SERVER_DIAG_STAT,
+  SET_ERROR_SNACK_MESSAGE,
+  SET_SNACK_MODAL_MESSAGE,
+  SET_MODAL_ERROR_MESSAGE,
 } from "./types";
 
 export function userLoggedIn(loggedIn: boolean) {
   return {
     type: USER_LOGGED,
-    logged: loggedIn
+    logged: loggedIn,
+  };
+}
+
+export function consoleOperatorMode(operatorMode: boolean) {
+  return {
+    type: OPERATOR_MODE,
+    operatorMode: operatorMode,
   };
 }
 
 export function setMenuOpen(open: boolean) {
   return {
     type: MENU_OPEN,
-    open: open
+    open: open,
   };
 }
 
 export function serverNeedsRestart(needsRestart: boolean) {
   return {
     type: SERVER_NEEDS_RESTART,
-    needsRestart: needsRestart
+    needsRestart: needsRestart,
   };
 }
 
 export function serverIsLoading(isLoading: boolean) {
   return {
     type: SERVER_IS_LOADING,
-    isLoading: isLoading
+    isLoading: isLoading,
   };
 }
+
+export const setLoadingProgress = (progress: number) => {
+  return {
+    type: SET_LOADING_PROGRESS,
+    loadingProgress: progress,
+  };
+};
+
+export const setServerDiagStat = (status: string) => {
+  return {
+    type: SET_SERVER_DIAG_STAT,
+    serverDiagnosticStatus: status,
+  };
+};
+
+export const setSnackBarMessage = (message: string) => {
+  return {
+    type: SET_SNACK_BAR_MESSAGE,
+    message,
+  };
+};
+
+export const setErrorSnackMessage = (message: string) => {
+  return {
+    type: SET_ERROR_SNACK_MESSAGE,
+    message,
+  };
+};
+
+export const setModalSnackMessage = (message: string) => {
+  return {
+    type: SET_SNACK_MODAL_MESSAGE,
+    message,
+  };
+};
+
+export const setModalErrorSnackMessage = (message: string) => {
+  return {
+    type: SET_MODAL_ERROR_MESSAGE,
+    message,
+  };
+};

portal-ui/src/common/Copyright.tsx

@@ -1,16 +1,16 @@
-import React from 'react'
+import React from "react";
 import Typography from "@material-ui/core/Typography";
 import Link from "@material-ui/core/Link";
 
 export default function Copyright() {
-    return (
-        <Typography variant="body2" color="textSecondary" align="center">
-        {'Copyright © '}
-        <Link color="inherit" href="https://material-ui.com/">
+  return (
+    <Typography variant="body2" color="textSecondary" align="center">
+      {"Copyright © "}
+      <Link color="inherit" href="https://material-ui.com/">
         MinIO
-        </Link>{' '}
-    {new Date().getFullYear()}
-    {'.'}
+      </Link>{" "}
+      {new Date().getFullYear()}
+      {"."}
     </Typography>
-);
+  );
 }

portal-ui/src/common/MinTablePaginationActions.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 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
@@ -19,7 +19,7 @@ import {
   createStyles,
   makeStyles,
   Theme,
-  useTheme
+  useTheme,
 } from "@material-ui/core/styles";
 import React from "react";
 import { IconButton } from "@material-ui/core";
@@ -31,8 +31,8 @@ const useStyles1 = makeStyles((theme: Theme) =>
   createStyles({
     root: {
       flexShrink: 0,
-      marginLeft: theme.spacing(2.5)
-    }
+      marginLeft: theme.spacing(2.5),
+    },
   })
 );
 

portal-ui/src/common/Title.tsx

@@ -1,6 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import Typography from '@material-ui/core/Typography';
+import React from "react";
+import PropTypes from "prop-types";
+import Typography from "@material-ui/core/Typography";
 
 export default function Title(props: React.Props<any>) {
   return (

portal-ui/src/common/__tests__/utils.test.ts

@@ -0,0 +1,85 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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/>.
+
+import {
+  erasureCodeCalc,
+  getBytes,
+  niceBytes,
+  setMemoryResource,
+} from "../utils";
+
+test("A variety of formatting results", () => {
+  expect(niceBytes("1024")).toBe("1.0 KiB");
+  expect(niceBytes("1048576")).toBe("1.0 MiB");
+  expect(niceBytes("1073741824")).toBe("1.0 GiB");
+});
+
+test("From value and unit to a number of bytes", () => {
+  expect(getBytes("1", "KiB")).toBe("1024");
+  expect(getBytes("1", "MiB")).toBe("1048576");
+  expect(getBytes("1", "GiB")).toBe("1073741824");
+});
+
+test("From value and unit to a number of bytes for kubernetes", () => {
+  expect(getBytes("1", "Ki", true)).toBe("1024");
+  expect(getBytes("1", "Mi", true)).toBe("1048576");
+  expect(getBytes("1", "Gi", true)).toBe("1073741824");
+});
+
+test("Determine the amount of memory to use", () => {
+  expect(setMemoryResource(1024, "1024", 1024)).toStrictEqual({
+    error: "There are not enough memory resources available",
+    limit: 0,
+    request: 0,
+  });
+  expect(setMemoryResource(64, "1099511627776", 34359738368)).toStrictEqual({
+    error:
+      "The requested memory is greater than the max available memory for the selected number of nodes",
+    limit: 0,
+    request: 0,
+  });
+  expect(setMemoryResource(2, "17179869184", 34359738368)).toStrictEqual({
+    error: "",
+    limit: 34359738368,
+    request: 2147483648,
+  });
+});
+
+test("Determine the correct values for EC Parity calculation", () => {
+  expect(erasureCodeCalc([], 50, 5000, 4)).toStrictEqual({
+    error: 1,
+    defaultEC: "",
+    erasureCodeSet: 0,
+    maxEC: "",
+    rawCapacity: "0",
+    storageFactors: [],
+  });
+  expect(erasureCodeCalc(["EC:2"], 4, 26843545600, 4)).toStrictEqual({
+    error: 0,
+    storageFactors: [
+      {
+        erasureCode: "EC:2",
+        storageFactor: 2,
+        maxCapacity: "53687091200",
+        maxFailureTolerations: 2,
+      },
+    ],
+    maxEC: "EC:2",
+    rawCapacity: "107374182400",
+    erasureCodeSet: 4,
+    defaultEC: "EC:2",
+  });
+});

portal-ui/src/common/api/index.ts

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 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

portal-ui/src/common/types.ts

@@ -34,8 +34,8 @@ export interface ITenant {
   volume_count: string;
   volume_size: string;
   volumes_per_server?: string;
-  zone_count: string;
-  zones?: IZoneModel[];
+  pool_count: string;
+  pools?: IPoolModel[];
   used_capacity?: string;
   endpoint?: string;
   storage_class?: string;
@@ -58,13 +58,22 @@ export interface ITenantCreator {
   secret_key: string;
   image: string;
   console_image: string;
-  zones: IZoneModel[];
+  expose_minio: boolean;
+  expose_console: boolean;
+  pools: IPoolModel[];
   namespace: string;
   erasureCodingParity: number;
   tls?: ITLSTenantConfiguration;
   encryption?: IEncryptionConfiguration;
   idp?: IIDPConfiguration;
   annotations?: Object;
+  image_registry?: ImageRegistry;
+}
+
+export interface ImageRegistry {
+  registry: string;
+  username: string;
+  password: string;
 }
 
 export interface ITenantUpdateObject {
@@ -243,19 +252,11 @@ export interface IStorageDistribution {
   pvSize: number;
 }
 
-export interface IErasureCodeCalc {
-  error: number;
-  maxEC: string;
-  erasureCodeSet: number;
-  rawCapacity: string;
-  storageFactors: IStorageFactors[];
-  defaultEC: string;
-}
-
 export interface IStorageFactors {
   erasureCode: string;
   storageFactor: number;
   maxCapacity: string;
+  maxFailureTolerations: number;
 }
 
 export interface ITenantHealthInList {
@@ -292,7 +293,7 @@ export interface IArchivedTenant {
   capacity: number;
 }
 
-export interface IZoneModel {
+export interface IPoolModel {
   name?: string;
   servers: number;
   volumes_per_server: number;
@@ -302,8 +303,8 @@ export interface IZoneModel {
   resources?: IResourceModel;
 }
 
-export interface IUpdateZone {
-  zones: IZoneModel[];
+export interface IUpdatePool {
+  pools: IPoolModel[];
 }
 
 export interface INode {
@@ -331,3 +332,12 @@ export interface ICapacity {
   value: string;
   unit: string;
 }
+
+export interface IErasureCodeCalc {
+  error: number;
+  maxEC: string;
+  erasureCodeSet: number;
+  rawCapacity: string;
+  defaultEC: string;
+  storageFactors: IStorageFactors[];
+}

portal-ui/src/common/utils.ts

@@ -15,7 +15,12 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import storage from "local-storage-fallback";
-import { ICapacity, IZoneModel } from "./types";
+import {
+  ICapacity,
+  IErasureCodeCalc,
+  IPoolModel,
+  IStorageFactors,
+} from "./types";
 
 const minStReq = 1073741824; // Minimal Space required for MinIO
 const minMemReq = 2147483648; // Minimal Memory required for MinIO in bytes
@@ -34,7 +39,7 @@ export const units = [
 export const k8sUnits = ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei"];
 export const k8sCalcUnits = ["B", ...k8sUnits];
 
-export const niceBytes = (x: string) => {
+export const niceBytes = (x: string, showK8sUnits: boolean = false) => {
   let l = 0,
     n = parseInt(x, 10) || 0;
 
@@ -43,7 +48,12 @@ export const niceBytes = (x: string) => {
   }
   //include a decimal point and a tenths-place digit if presenting
   //less than ten of KB or greater units
-  return n.toFixed(n < 10 && l > 0 ? 1 : 0) + " " + units[l];
+  const k8sUnitsN = ["B", ...k8sUnits];
+  return (
+    n.toFixed(n < 10 && l > 0 ? 1 : 0) +
+    " " +
+    (showK8sUnits ? k8sUnitsN[l] : units[l])
+  );
 };
 
 export const setCookie = (name: string, val: string) => {
@@ -94,11 +104,11 @@ export const k8sfactorForDropdown = () => {
 export const getBytes = (
   value: string,
   unit: string,
-  fork8s: boolean = false
+  fromk8s: boolean = false
 ) => {
   const vl: number = parseFloat(value);
 
-  const unitsTake = fork8s ? k8sCalcUnits : units;
+  const unitsTake = fromk8s ? k8sCalcUnits : units;
 
   const powFactor = unitsTake.findIndex((element) => element === unit);
 
@@ -193,7 +203,8 @@ export const setMemoryResource = (
 export const calculateDistribution = (
   capacityToUse: ICapacity,
   forcedNodes: number = 0,
-  limitSize: number = 0
+  limitSize: number = 0,
+  drivesPerServer: number = 0
 ) => {
   let numberOfNodes = {};
   const requestedSizeBytes = getBytes(
@@ -204,7 +215,7 @@ export const calculateDistribution = (
 
   if (parseInt(requestedSizeBytes, 10) < minStReq) {
     return {
-      error: "The zone size must be greater than 1Gi",
+      error: "The pool size must be greater than 1Gi",
       nodes: 0,
       persistentVolumes: 0,
       disks: 0,
@@ -222,7 +233,22 @@ export const calculateDistribution = (
     };
   }
 
-  numberOfNodes = calculateStorage(requestedSizeBytes, forcedNodes, limitSize);
+  if (drivesPerServer <= 0) {
+    return {
+      error: "Number of drives must be at least 1",
+      nodes: 0,
+      persistentVolumes: 0,
+      disks: 0,
+      pvSize: 0,
+    };
+  }
+
+  numberOfNodes = calculateStorage(
+    requestedSizeBytes,
+    forcedNodes,
+    limitSize,
+    drivesPerServer
+  );
 
   return numberOfNodes;
 };
@@ -230,14 +256,21 @@ export const calculateDistribution = (
 const calculateStorage = (
   requestedBytes: string,
   forcedNodes: number,
-  limitSize: number
+  limitSize: number,
+  drivesPerServer: number
 ) => {
   // Size validation
   const intReqBytes = parseInt(requestedBytes, 10);
   const maxDiskSize = minStReq * 256; // 256 GiB
 
   // We get the distribution
-  return structureCalc(forcedNodes, intReqBytes, maxDiskSize, limitSize);
+  return structureCalc(
+    forcedNodes,
+    intReqBytes,
+    maxDiskSize,
+    limitSize,
+    drivesPerServer
+  );
 };
 
 const structureCalc = (
@@ -324,9 +357,189 @@ const structureCalc = (
   };
 };
 
-// Zone Name Generator
-export const generateZoneName = (zones: IZoneModel[]) => {
-  const zoneCounter = zones.length;
+// Erasure Code Parity Calc
+export const erasureCodeCalc = (
+  parityValidValues: string[],
+  totalDisks: number,
+  pvSize: number,
+  totalNodes: number
+): IErasureCodeCalc => {
+  // Parity Values is empty
+  if (parityValidValues.length < 1) {
+    return {
+      error: 1,
+      defaultEC: "",
+      erasureCodeSet: 0,
+      maxEC: "",
+      rawCapacity: "0",
+      storageFactors: [],
+    };
+  }
 
-  return `zone-${zoneCounter}`;
+  const totalStorage = totalDisks * pvSize;
+  const maxEC = parityValidValues[0];
+  const maxParityNumber = parseInt(maxEC.split(":")[1], 10);
+
+  const erasureStripeSet = maxParityNumber * 2; // ESS is calculated by multiplying maximum parity by two.
+
+  const storageFactors: IStorageFactors[] = parityValidValues.map(
+    (currentParity) => {
+      const parityNumber = parseInt(currentParity.split(":")[1], 10);
+      const storageFactor =
+        erasureStripeSet / (erasureStripeSet - parityNumber);
+
+      const maxCapacity = Math.floor(totalStorage / storageFactor);
+      const maxTolerations =
+        totalDisks - Math.floor(totalDisks / storageFactor);
+      return {
+        erasureCode: currentParity,
+        storageFactor,
+        maxCapacity: maxCapacity.toString(10),
+        maxFailureTolerations: maxTolerations,
+      };
+    }
+  );
+
+  let defaultEC = maxEC;
+
+  const fourVar = parityValidValues.find((element) => element === "EC:4");
+
+  if (totalDisks >= 8 && totalNodes > 16 && fourVar) {
+    defaultEC = "EC:4";
+  }
+
+  return {
+    error: 0,
+    storageFactors,
+    maxEC,
+    rawCapacity: totalStorage.toString(10),
+    erasureCodeSet: erasureStripeSet,
+    defaultEC,
+  };
+};
+
+// Pool Name Generator
+export const generatePoolName = (pools: IPoolModel[]) => {
+  const poolCounter = pools.length;
+
+  return `pool-${poolCounter}`;
+};
+
+// seconds / minutes /hours / Days / Years calculator
+export const niceDays = (secondsValue: string) => {
+  let seconds = parseFloat(secondsValue);
+
+  const days = Math.floor(seconds / (3600 * 24));
+
+  seconds -= days * 3600 * 24;
+  const hours = Math.floor(seconds / 3600);
+  seconds -= hours * 3600;
+  const minutes = Math.floor(seconds / 60);
+  seconds -= minutes * 60;
+
+  if (days > 365) {
+    const years = days / 365;
+    return `${years} year${Math.floor(years) === 1 ? "" : "s"}`;
+  }
+
+  if (days > 30) {
+    const months = Math.floor(days / 30);
+    const diffDays = days - months * 30;
+
+    return `${months} month${Math.floor(months) === 1 ? "" : "s"} ${
+      diffDays > 0 ? `${diffDays} day${diffDays > 1 ? "s" : ""}` : ""
+    }`;
+  }
+
+  if (days >= 7 && days <= 30) {
+    const weeks = Math.floor(days / 7);
+
+    return `${Math.floor(weeks)} week${weeks === 1 ? "" : "s"}`;
+  }
+
+  if (days >= 1 && days <= 6) {
+    return `${days} day${days > 1 ? "s" : ""}`;
+  }
+
+  return `${hours >= 1 ? `${hours} hour${hours > 1 ? "s" : ""}` : ""} ${
+    minutes >= 1 && hours === 0
+      ? `${minutes} minute${minutes > 1 ? "s" : ""}`
+      : ""
+  } ${
+    seconds >= 1 && minutes === 0 && hours === 0
+      ? `${seconds} second${seconds > 1 ? "s" : ""}`
+      : ""
+  }`;
+};
+
+export const getTimeFromTimestamp = (
+  timestamp: string,
+  fullDate: boolean = false
+) => {
+  const dateObject = new Date(parseInt(timestamp) * 1000);
+
+  if (fullDate) {
+    return `${dateObject.getFullYear()}-${String(
+      dateObject.getMonth() + 1
+    ).padStart(2, "0")}-${String(dateObject.getDay()).padStart(
+      2,
+      "0"
+    )} ${dateObject.getHours()}:${String(dateObject.getMinutes()).padStart(
+      2,
+      "0"
+    )}:${String(dateObject.getSeconds()).padStart(2, "0")}`;
+  }
+  return `${dateObject.getHours()}:${String(dateObject.getMinutes()).padStart(
+    2,
+    "0"
+  )}`;
+};
+
+export const calculateBytes = (
+  x: string,
+  showDecimals = false,
+  roundFloor = true
+) => {
+  const bytes = parseInt(x, 10);
+
+  if (bytes === 0) {
+    return { total: 0, unit: k8sCalcUnits[0] };
+  }
+
+  // Gi : GiB
+  const k = 1024;
+
+  // Get unit for measure
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+  const fractionDigits = showDecimals ? 0 : 1;
+
+  const bytesUnit = bytes / Math.pow(k, i);
+
+  const roundedUnit = roundFloor ? Math.floor(bytesUnit) : bytesUnit;
+
+  // Get Unit parsed
+  const unitParsed = parseFloat(roundedUnit.toFixed(fractionDigits));
+  const finalUnit = k8sCalcUnits[i];
+
+  return { total: unitParsed, unit: finalUnit };
+};
+
+export const nsToSeconds = (nanoseconds: number) => {
+  const conversion = nanoseconds * 0.000000001;
+  const round = Math.round((conversion + Number.EPSILON) * 10000) / 10000;
+
+  return `${round} s`;
+};
+
+export const textToRGBColor = (text: string) => {
+  const splitText = text.split("");
+
+  const hashVl = splitText.reduce((acc, currItem) => {
+    return acc + currItem.charCodeAt(0) + ((acc << 5) - acc);
+  }, 0);
+
+  const hashColored = ((hashVl * 100) & 0x00ffffff).toString(16).toUpperCase();
+
+  return `#${hashColored.padStart(6, "0")}`;
 };

portal-ui/src/history.ts

@@ -1,4 +1,3 @@
 import { createBrowserHistory } from "history";
 
-
 export default createBrowserHistory();

portal-ui/src/icons/AddIcon.tsx

@@ -16,19 +16,17 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class AddIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon viewBox="0 0 12 12">
-        <path
-          fill="#081c42"
-          className="a"
-          d="M-13160.269,1885.114h-3.235v-4.381h-4.382V1877.5h4.382v-4.381h3.235v4.381h4.383v3.238h-4.383v4.38Z"
-          transform="translate(13167.886 -1873.114)"
-        />
-      </SvgIcon>
-    );
-  }
-}
+const AddIcon = () => {
+  return (
+    <SvgIcon viewBox="0 0 12 12">
+      <path
+        fill="#081c42"
+        className="a"
+        d="M-13160.269,1885.114h-3.235v-4.381h-4.382V1877.5h4.382v-4.381h3.235v4.381h4.383v3.238h-4.383v4.38Z"
+        transform="translate(13167.886 -1873.114)"
+      />
+    </SvgIcon>
+  );
+};
 
 export default AddIcon;

portal-ui/src/icons/AllBucketsIcon.tsx

@@ -16,60 +16,59 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class AllBucketsIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon viewBox="0 0 15.834 17.375">
-        <defs>
-          <linearGradient
-            id="a"
-            y1="0.5"
-            x2="1"
-            y2="0.5"
-            gradientUnits="objectBoundingBox"
-          >
-            <stop offset="0.044" stopColor="#362585" />
-            <stop offset="0.301" stopColor="#281b6f" />
-            <stop offset="1" stopColor="#1e1560" />
-          </linearGradient>
-        </defs>
-        <g transform="translate(0 0.375)">
-          <circle
-            style={{ opacity: 0.1, fill: "url(#a)" }}
-            cx="6.625"
-            cy="6.625"
-            r="6.625"
-            transform="translate(0 3.75)"
+
+const AllBucketsIcon = () => {
+  return (
+    <SvgIcon viewBox="0 0 15.834 17.375">
+      <defs>
+        <linearGradient
+          id="a"
+          y1="0.5"
+          x2="1"
+          y2="0.5"
+          gradientUnits="objectBoundingBox"
+        >
+          <stop offset="0.044" stopColor="#362585" />
+          <stop offset="0.301" stopColor="#281b6f" />
+          <stop offset="1" stopColor="#1e1560" />
+        </linearGradient>
+      </defs>
+      <g transform="translate(0 0.375)">
+        <circle
+          style={{ opacity: 0.1, fill: "url(#a)" }}
+          cx="6.625"
+          cy="6.625"
+          r="6.625"
+          transform="translate(0 3.75)"
+        />
+        <g transform="translate(3.092)">
+          <ellipse
+            style={{
+              fill: "none",
+              stroke: "#707070",
+              strokeMiterlimit: 10,
+              strokeWidth: "0.75px",
+            }}
+            cx="6.183"
+            cy="1.244"
+            rx="6.183"
+            ry="1.244"
+            transform="translate(0)"
+          />
+          <path
+            style={{
+              fill: "none",
+              stroke: "#707070",
+              strokeMiterlimit: 10,
+              strokeWidth: "0.75px",
+            }}
+            d="M-3722.174,1225.225l-1.687,10.292a.858.858,0,0,1-.578.669,12.182,12.182,0,0,1-3.918.647,12.187,12.187,0,0,1-3.894-.639.878.878,0,0,1-.6-.678q-.843-5.145-1.687-10.291"
+            transform="translate(3734.541 -1223.981)"
           />
-          <g transform="translate(3.092)">
-            <ellipse
-              style={{
-                fill: "none",
-                stroke: "#707070",
-                strokeMiterlimit: 10,
-                strokeWidth: "0.75px",
-              }}
-              cx="6.183"
-              cy="1.244"
-              rx="6.183"
-              ry="1.244"
-              transform="translate(0)"
-            />
-            <path
-              style={{
-                fill: "none",
-                stroke: "#707070",
-                strokeMiterlimit: 10,
-                strokeWidth: "0.75px",
-              }}
-              d="M-3722.174,1225.225l-1.687,10.292a.858.858,0,0,1-.578.669,12.182,12.182,0,0,1-3.918.647,12.187,12.187,0,0,1-3.894-.639.878.878,0,0,1-.6-.678q-.843-5.145-1.687-10.291"
-              transform="translate(3734.541 -1223.981)"
-            />
-          </g>
         </g>
-      </SvgIcon>
-    );
-  }
-}
+      </g>
+    </SvgIcon>
+  );
+};
 
 export default AllBucketsIcon;

portal-ui/src/icons/BackSettingsIcon.tsx

@@ -0,0 +1,53 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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/>.
+
+import React from "react";
+import { SvgIcon } from "@material-ui/core";
+
+const BackSettingsIcon = () => (
+  <SvgIcon viewBox="0 0 10.847 6.572">
+    <g transform="translate(-84.793 -81.193)">
+      <line
+        x2="9.64"
+        transform="translate(85.5 84.5)"
+        fill="none"
+        stroke="#000"
+        strokeLinecap="round"
+        strokeWidth="1"
+      />
+      <line
+        y1="2.558"
+        x2="2.645"
+        transform="translate(85.5 81.9)"
+        fill="none"
+        stroke="#000"
+        strokeLinecap="round"
+        strokeWidth="1"
+      />
+      <line
+        x2="2.645"
+        y2="2.558"
+        transform="translate(85.5 84.5)"
+        fill="none"
+        stroke="#000"
+        strokeLinecap="round"
+        strokeWidth="1"
+      />
+    </g>
+  </SvgIcon>
+);
+
+export default BackSettingsIcon;

portal-ui/src/icons/BucketsIcon.tsx

@@ -16,16 +16,15 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class BucketsIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-          <path d="M8.392,10H1.608L0,0H10Z" />
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+
+const BucketsIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+        <path d="M8.392,10H1.608L0,0H10Z" />
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default BucketsIcon;

portal-ui/src/icons/ClustersIcon.tsx

@@ -16,108 +16,106 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class ClustersIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
-          <g transform="translate(79 438.479)">
+const ClustersIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9">
+        <g transform="translate(79 438.479)">
+          <g>
             <g>
-              <g>
-                <rect x="-77.9" y="-434.5" width="7.8" height="1" />
-              </g>
-            </g>
-            <g>
-              <g>
-                <rect
-                  x="-77.9"
-                  y="-434.5"
-                  transform="matrix(0.4999 -0.8661 0.8661 0.4999 338.8698 -281.1237)"
-                  width="7.8"
-                  height="1"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <rect
-                  x="-74.5"
-                  y="-437.9"
-                  transform="matrix(0.866 -0.5001 0.5001 0.866 207.1129 -95.1668)"
-                  width="1"
-                  height="7.8"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-71.8-430.1h-4.5l-2.2-3.9l2.2-3.9h4.5l2.2,3.9L-71.8-430.1z M-75.7-431.1h3.3l1.7-2.9l-1.7-2.9h-3.3
-				l-1.7,2.9L-75.7-431.1z"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-72.3-434c0,0.9-0.7,1.7-1.7,1.7c-0.9,0-1.7-0.7-1.7-1.7c0-0.9,0.7-1.7,1.7-1.7
-				C-73.1-435.7-72.3-434.9-72.3-434z"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-76.8-434c0,0.6-0.5,1.1-1.1,1.1c0,0,0,0,0,0c-0.6,0-1.1-0.5-1.1-1.1c0,0,0,0,0,0c0-0.6,0.5-1.1,1.1-1.1
-				c0,0,0,0,0,0C-77.3-435.1-76.8-434.6-76.8-434C-76.8-434-76.8-434-76.8-434z"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-69-434c0,0.6-0.5,1.1-1.1,1.1c0,0,0,0,0,0c-0.6,0-1.1-0.5-1.1-1.1c0,0,0,0,0,0c0-0.6,0.5-1.1,1.1-1.1
-				c0,0,0,0,0,0C-69.5-435.1-69-434.6-69-434C-69-434-69-434-69-434z"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-75.4-431.6c0.5,0.3,0.7,1,0.4,1.5c-0.3,0.5-1,0.7-1.5,0.4c0,0,0,0,0,0c-0.5-0.3-0.7-1-0.4-1.5
-				C-76.6-431.7-75.9-431.9-75.4-431.6C-75.4-431.6-75.4-431.6-75.4-431.6z"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-71.5-438.3c0.5,0.3,0.7,1,0.4,1.5c-0.3,0.5-1,0.7-1.5,0.4c0,0,0,0,0,0c-0.5-0.3-0.7-1-0.4-1.5
-				C-72.7-438.5-72-438.6-71.5-438.3C-71.5-438.3-71.5-438.3-71.5-438.3z"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-72.6-431.6c0.5-0.3,1.2-0.1,1.5,0.4c0,0,0,0,0,0c0.3,0.5,0.1,1.2-0.4,1.5c-0.5,0.3-1.2,0.1-1.5-0.4
-				c0,0,0,0,0,0C-73.3-430.6-73.1-431.3-72.6-431.6z"
-                />
-              </g>
-            </g>
-            <g>
-              <g>
-                <path
-                  d="M-76.5-438.3c0.5-0.3,1.2-0.1,1.5,0.4c0,0,0,0,0,0c0.3,0.5,0.1,1.2-0.4,1.5c-0.5,0.3-1.2,0.1-1.5-0.4
-				c0,0,0,0,0,0C-77.2-437.3-77-438-76.5-438.3z"
-                />
-              </g>
+              <rect x="-77.9" y="-434.5" width="7.8" height="1" />
             </g>
           </g>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+          <g>
+            <g>
+              <rect
+                x="-77.9"
+                y="-434.5"
+                transform="matrix(0.4999 -0.8661 0.8661 0.4999 338.8698 -281.1237)"
+                width="7.8"
+                height="1"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <rect
+                x="-74.5"
+                y="-437.9"
+                transform="matrix(0.866 -0.5001 0.5001 0.866 207.1129 -95.1668)"
+                width="1"
+                height="7.8"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-71.8-430.1h-4.5l-2.2-3.9l2.2-3.9h4.5l2.2,3.9L-71.8-430.1z M-75.7-431.1h3.3l1.7-2.9l-1.7-2.9h-3.3
+				l-1.7,2.9L-75.7-431.1z"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-72.3-434c0,0.9-0.7,1.7-1.7,1.7c-0.9,0-1.7-0.7-1.7-1.7c0-0.9,0.7-1.7,1.7-1.7
+				C-73.1-435.7-72.3-434.9-72.3-434z"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-76.8-434c0,0.6-0.5,1.1-1.1,1.1c0,0,0,0,0,0c-0.6,0-1.1-0.5-1.1-1.1c0,0,0,0,0,0c0-0.6,0.5-1.1,1.1-1.1
+				c0,0,0,0,0,0C-77.3-435.1-76.8-434.6-76.8-434C-76.8-434-76.8-434-76.8-434z"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-69-434c0,0.6-0.5,1.1-1.1,1.1c0,0,0,0,0,0c-0.6,0-1.1-0.5-1.1-1.1c0,0,0,0,0,0c0-0.6,0.5-1.1,1.1-1.1
+				c0,0,0,0,0,0C-69.5-435.1-69-434.6-69-434C-69-434-69-434-69-434z"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-75.4-431.6c0.5,0.3,0.7,1,0.4,1.5c-0.3,0.5-1,0.7-1.5,0.4c0,0,0,0,0,0c-0.5-0.3-0.7-1-0.4-1.5
+				C-76.6-431.7-75.9-431.9-75.4-431.6C-75.4-431.6-75.4-431.6-75.4-431.6z"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-71.5-438.3c0.5,0.3,0.7,1,0.4,1.5c-0.3,0.5-1,0.7-1.5,0.4c0,0,0,0,0,0c-0.5-0.3-0.7-1-0.4-1.5
+				C-72.7-438.5-72-438.6-71.5-438.3C-71.5-438.3-71.5-438.3-71.5-438.3z"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-72.6-431.6c0.5-0.3,1.2-0.1,1.5,0.4c0,0,0,0,0,0c0.3,0.5,0.1,1.2-0.4,1.5c-0.5,0.3-1.2,0.1-1.5-0.4
+				c0,0,0,0,0,0C-73.3-430.6-73.1-431.3-72.6-431.6z"
+              />
+            </g>
+          </g>
+          <g>
+            <g>
+              <path
+                d="M-76.5-438.3c0.5-0.3,1.2-0.1,1.5,0.4c0,0,0,0,0,0c0.3,0.5,0.1,1.2-0.4,1.5c-0.5,0.3-1.2,0.1-1.5-0.4
+				c0,0,0,0,0,0C-77.2-437.3-77-438-76.5-438.3z"
+              />
+            </g>
+          </g>
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default ClustersIcon;

portal-ui/src/icons/ConfigurationsListIcon.tsx

@@ -16,27 +16,26 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class ConfigurationsListIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-          <rect width="1.433" height="1" />
-          <rect width="7.828" height="1" transform="translate(2.172)" />
-          <rect width="1.433" height="1" transform="translate(0 6)" />
-          <rect width="1.433" height="1" transform="translate(0 3)" />
-          <rect width="1.433" height="1" transform="translate(0 9)" />
-          <rect width="1.368" height="0.569" transform="translate(6.316 9)" />
-          <path d="M5.566,9.569v-.31l-.238-.138-.269.155-.65.375L4.034,9V9H2.172v1H5.566Z" />
-          <path d="M9.966,9l-.375.65-.65-.375-.269-.155-.238.138V10H10V9H9.967Z" />
-          <path d="M3.625,6.793l.269-.155V6.362l-.269-.155L3.266,6H2.172V7H3.266Z" />
-          <path d="M8.434,3.431v.31l.238.138.269-.155.649-.375L9.966,4V4H10V3H8.434Z" />
-          <path d="M4.034,4l.375-.65.65.375.269.155.238-.138V3H2.172V4H4.033Z" />
-          <path d="M9.356,5.929,10,5.558,9.316,4.373l-.644.372-.988-.571V3.431H6.316v.743l-.988.571-.644-.372L4,5.558l.644.371V7.071L4,7.442l.684,1.185.644-.372.988.571v.743H7.684V8.826l.988-.571.644.372L10,7.442l-.644-.371ZM7,7.278A.778.778,0,1,1,7.778,6.5.779.779,0,0,1,7,7.278Z" />
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+
+const ConfigurationsListIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+        <rect width="1.433" height="1" />
+        <rect width="7.828" height="1" transform="translate(2.172)" />
+        <rect width="1.433" height="1" transform="translate(0 6)" />
+        <rect width="1.433" height="1" transform="translate(0 3)" />
+        <rect width="1.433" height="1" transform="translate(0 9)" />
+        <rect width="1.368" height="0.569" transform="translate(6.316 9)" />
+        <path d="M5.566,9.569v-.31l-.238-.138-.269.155-.65.375L4.034,9V9H2.172v1H5.566Z" />
+        <path d="M9.966,9l-.375.65-.65-.375-.269-.155-.238.138V10H10V9H9.967Z" />
+        <path d="M3.625,6.793l.269-.155V6.362l-.269-.155L3.266,6H2.172V7H3.266Z" />
+        <path d="M8.434,3.431v.31l.238.138.269-.155.649-.375L9.966,4V4H10V3H8.434Z" />
+        <path d="M4.034,4l.375-.65.65.375.269.155.238-.138V3H2.172V4H4.033Z" />
+        <path d="M9.356,5.929,10,5.558,9.316,4.373l-.644.372-.988-.571V3.431H6.316v.743l-.988.571-.644-.372L4,5.558l.644.371V7.071L4,7.442l.684,1.185.644-.372.988.571v.743H7.684V8.826l.988-.571.644.372L10,7.442l-.644-.371ZM7,7.278A.778.778,0,1,1,7.778,6.5.779.779,0,0,1,7,7.278Z" />
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default ConfigurationsListIcon;

portal-ui/src/icons/ConsoleIcon.tsx

@@ -16,22 +16,20 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class ConsoleIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-          <g transform="translate(-518 -361)">
-            <path
-              d="M-126,0V10h10V0Zm1.5,8.5V2.95h7V8.5Z"
-              transform="translate(644 361)"
-            />
-            <rect width="2" height="1" transform="translate(520.272 364.772)" />
-          </g>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+const ConsoleIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+        <g transform="translate(-518 -361)">
+          <path
+            d="M-126,0V10h10V0Zm1.5,8.5V2.95h7V8.5Z"
+            transform="translate(644 361)"
+          />
+          <rect width="2" height="1" transform="translate(520.272 364.772)" />
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default ConsoleIcon;

portal-ui/src/icons/CopyIcon.tsx

@@ -16,24 +16,23 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class CopyIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-          <title>ic_h_copy-new_sl</title>
-          <g id="Layer_2" data-name="Layer 2">
-            <g id="Layer_1-2" data-name="Layer 1">
-              <path
-                className="cls-1"
-                d="M0,0V16H16V0ZM11.886,9.048H9.048v2.838h-2.1V9.048H4.114v-2.1H6.952V4.114h2.1V6.952h2.838Z"
-              />
-            </g>
+
+const CopyIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+        <title>ic_h_copy-new_sl</title>
+        <g id="Layer_2" data-name="Layer 2">
+          <g id="Layer_1-2" data-name="Layer 1">
+            <path
+              className="cls-1"
+              d="M0,0V16H16V0ZM11.886,9.048H9.048v2.838h-2.1V9.048H4.114v-2.1H6.952V4.114h2.1V6.952h2.838Z"
+            />
           </g>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default CopyIcon;

portal-ui/src/icons/CreateIcon.tsx

@@ -16,35 +16,29 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class CreateIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
-          <g
-            id="Group_55"
-            data-name="Group 55"
-            transform="translate(1002 -2555)"
-          >
-            <rect
-              id="Rectangle_29"
-              width="2"
-              height="12"
-              transform="translate(-997 2555)"
-              fill="#fff"
-            />
-            <rect
-              id="Rectangle_30"
-              width="2"
-              height="12"
-              transform="translate(-990 2560) rotate(90)"
-              fill="#fff"
-            />
-          </g>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+const CreateIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
+        <g id="Group_55" data-name="Group 55" transform="translate(1002 -2555)">
+          <rect
+            id="Rectangle_29"
+            width="2"
+            height="12"
+            transform="translate(-997 2555)"
+            fill="#fff"
+          />
+          <rect
+            id="Rectangle_30"
+            width="2"
+            height="12"
+            transform="translate(-990 2560) rotate(90)"
+            fill="#fff"
+          />
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default CreateIcon;

portal-ui/src/icons/DashboardIcon.tsx

@@ -16,33 +16,32 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class DashboardIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-          <g transform="translate(249 720)">
-            <rect
-              width="6"
-              height="5"
-              transform="translate(-244 -720) rotate(90)"
-            />
-            <rect width="4" height="4" transform="translate(-243 -720)" />
-            <rect
-              width="5"
-              height="4"
-              transform="translate(-239 -715) rotate(90)"
-            />
-            <rect
-              width="5"
-              height="3"
-              transform="translate(-244 -710) rotate(180)"
-            />
-          </g>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+
+const DashboardIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+        <g transform="translate(249 720)">
+          <rect
+            width="6"
+            height="5"
+            transform="translate(-244 -720) rotate(90)"
+          />
+          <rect width="4" height="4" transform="translate(-243 -720)" />
+          <rect
+            width="5"
+            height="4"
+            transform="translate(-239 -715) rotate(90)"
+          />
+          <rect
+            width="5"
+            height="3"
+            transform="translate(-244 -710) rotate(180)"
+          />
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default DashboardIcon;

portal-ui/src/icons/DeleteIcon.tsx

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2019 MinIO, Inc.
+// Copyright (c) 2020 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
@@ -16,19 +16,18 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class DeleteIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10.402 13">
-          <path
-            d="M6.761 1V0H3.64v1H.004v1h10.4V1zM.004 2.998l1.672 10h7.052l1.673-10zm3.412 8.243l-.552-6.478h.653l.553 6.472zm3.569 0h-.653l.551-6.472h.654z"
-            className="a"
-          ></path>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+
+const DeleteIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10.402 13">
+        <path
+          d="M6.761 1V0H3.64v1H.004v1h10.4V1zM.004 2.998l1.672 10h7.052l1.673-10zm3.412 8.243l-.552-6.478h.653l.553 6.472zm3.569 0h-.653l.551-6.472h.654z"
+          className="a"
+        ></path>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default DeleteIcon;

portal-ui/src/icons/DownloadIcon.tsx

@@ -17,17 +17,15 @@
 import React from "react";
 import SvgIcon from "@material-ui/core/SvgIcon";
 
-class DownloadIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 12.996">
-          <path d="M11.05 9.096v1.95h-9.1v-1.95H0v3.9h13v-3.9z"></path>
-          <path d="M6.5 9.75L9 6.672H7.475V0h-1.95v6.672H4z"></path>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+const DownloadIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 12.996">
+        <path d="M11.05 9.096v1.95h-9.1v-1.95H0v3.9h13v-3.9z"></path>
+        <path d="M6.5 9.75L9 6.672H7.475V0h-1.95v6.672H4z"></path>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default DownloadIcon;

portal-ui/src/icons/EgressIcon.tsx

@@ -16,58 +16,56 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class EgressIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon viewBox="0 0 18.344 17.009">
-        <defs>
-          <linearGradient
-            id="a"
-            y1="0.5"
-            x2="1"
-            y2="0.5"
-            gradientUnits="objectBoundingBox"
-          >
-            <stop offset="0.044" stopColor="#362585" />
-            <stop offset="0.301" stopColor="#281b6f" />
-            <stop offset="1" stopColor="#1e1560" />
-          </linearGradient>
-        </defs>
-        <g transform="translate(0 0.25)">
-          <ellipse
-            style={{ opacity: 0.1, fill: "url(#a)" }}
-            cx="7.462"
-            cy="7.462"
-            rx="7.462"
-            ry="7.462"
-            transform="translate(0 1.835)"
-          />
-          <rect
-            style={{
-              fill: "none",
-              stroke: "#707070",
-              strokeMiterlimit: 10,
-              strokeWidth: "0.5px",
-            }}
-            width="9.323"
-            height="9.323"
-            transform="translate(4.083)"
-          />
-          <rect
-            style={{
-              fill: "none",
-              stroke: "#707070",
-              strokeMiterlimit: 10,
-              strokeWidth: "0.5px",
-            }}
-            width="8.223"
-            height="8.223"
-            transform="translate(9.871 5.307)"
-          />
-        </g>
-      </SvgIcon>
-    );
-  }
-}
+const EgressIcon = () => {
+  return (
+    <SvgIcon viewBox="0 0 18.344 17.009">
+      <defs>
+        <linearGradient
+          id="a"
+          y1="0.5"
+          x2="1"
+          y2="0.5"
+          gradientUnits="objectBoundingBox"
+        >
+          <stop offset="0.044" stopColor="#362585" />
+          <stop offset="0.301" stopColor="#281b6f" />
+          <stop offset="1" stopColor="#1e1560" />
+        </linearGradient>
+      </defs>
+      <g transform="translate(0 0.25)">
+        <ellipse
+          style={{ opacity: 0.1, fill: "url(#a)" }}
+          cx="7.462"
+          cy="7.462"
+          rx="7.462"
+          ry="7.462"
+          transform="translate(0 1.835)"
+        />
+        <rect
+          style={{
+            fill: "none",
+            stroke: "#707070",
+            strokeMiterlimit: 10,
+            strokeWidth: "0.5px",
+          }}
+          width="9.323"
+          height="9.323"
+          transform="translate(4.083)"
+        />
+        <rect
+          style={{
+            fill: "none",
+            stroke: "#707070",
+            strokeMiterlimit: 10,
+            strokeWidth: "0.5px",
+          }}
+          width="8.223"
+          height="8.223"
+          transform="translate(9.871 5.307)"
+        />
+      </g>
+    </SvgIcon>
+  );
+};
 
 export default EgressIcon;

portal-ui/src/icons/GroupsIcon.tsx

@@ -16,26 +16,25 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class GroupsIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9.787">
-          <g transform="translate(177 719.787)">
-            <g transform="translate(-105 -720)">
-              <path d="M-65,5a3,3,0,0,0-1.131.224A3.981,3.981,0,0,1-65,8v2h3V8A3,3,0,0,0-65,5Z" />
-              <path d="M-72,10h6V8a3,3,0,0,0-3-3,3,3,0,0,0-3,3Z" />
-              <path
-                className="a"
-                d="M-65,.213a1.993,1.993,0,0,0-1.384.561A2.967,2.967,0,0,1-66,2.213a2.964,2.964,0,0,1-.384,1.439A1.989,1.989,0,0,0-65,4.213a2,2,0,0,0,2-2A2,2,0,0,0-65,.213Z"
-              />
-              <circle cx="2" cy="2" r="2" transform="translate(-71 0.213)" />
-            </g>
+
+const GroupsIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 9.787">
+        <g transform="translate(177 719.787)">
+          <g transform="translate(-105 -720)">
+            <path d="M-65,5a3,3,0,0,0-1.131.224A3.981,3.981,0,0,1-65,8v2h3V8A3,3,0,0,0-65,5Z" />
+            <path d="M-72,10h6V8a3,3,0,0,0-3-3,3,3,0,0,0-3,3Z" />
+            <path
+              className="a"
+              d="M-65,.213a1.993,1.993,0,0,0-1.384.561A2.967,2.967,0,0,1-66,2.213a2.964,2.964,0,0,1-.384,1.439A1.989,1.989,0,0,0-65,4.213a2,2,0,0,0,2-2A2,2,0,0,0-65,.213Z"
+            />
+            <circle cx="2" cy="2" r="2" transform="translate(-71 0.213)" />
           </g>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default GroupsIcon;

portal-ui/src/icons/HealIcon.tsx

@@ -16,38 +16,21 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class HealIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10.014 9.993">
-          <path
-            className="a"
-            d="M9.162,5.971h0L8.192,5,9.346,3.846a2.257,2.257,0,0,0,0-3.192,2.311,2.311,0,0,0-3.192,0L5,1.808,4.029.837,3.846.654a2.311,2.311,0,0,0-3.192,0,2.257,2.257,0,0,0,0,3.192l.184.183h0L1.808,5,.654,6.154A2.257,2.257,0,0,0,3.846,9.346L5,8.192l.971.971.183.183A2.257,2.257,0,0,0,9.346,6.154Zm-2.29-4.6a1.27,1.27,0,0,1,1.757,0,1.242,1.242,0,0,1,0,1.757L7.475,4.283,5.717,2.525Zm-5.5,1.757A1.243,1.243,0,0,1,3.129,1.371l.183.183L1.555,3.312Zm1.757,5.5a1.27,1.27,0,0,1-1.757,0,1.242,1.242,0,0,1,0-1.757L2.525,5.717,4.283,7.475Zm2.843-.9-.254-.253L2.525,4.283l-.253-.254L4.029,2.272l.254.253L7.475,5.717l.253.254Zm2.657.9a1.271,1.271,0,0,1-1.757,0l-.183-.183L8.446,6.688l.183.183h0a1.241,1.241,0,0,1,0,1.757Z"
-            transform="translate(0.007 -0.014)"
-          />
-          <circle
-            cx="0.5"
-            cy="0.5"
-            r="0.5"
-            transform="translate(4.507 4.486)"
-          />
-          <circle
-            cx="0.5"
-            cy="0.5"
-            r="0.5"
-            transform="translate(3.507 3.486)"
-          />
-          <circle
-            cx="0.5"
-            cy="0.5"
-            r="0.5"
-            transform="translate(5.507 5.486)"
-          />
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+const HealIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10.014 9.993">
+        <path
+          className="a"
+          d="M9.162,5.971h0L8.192,5,9.346,3.846a2.257,2.257,0,0,0,0-3.192,2.311,2.311,0,0,0-3.192,0L5,1.808,4.029.837,3.846.654a2.311,2.311,0,0,0-3.192,0,2.257,2.257,0,0,0,0,3.192l.184.183h0L1.808,5,.654,6.154A2.257,2.257,0,0,0,3.846,9.346L5,8.192l.971.971.183.183A2.257,2.257,0,0,0,9.346,6.154Zm-2.29-4.6a1.27,1.27,0,0,1,1.757,0,1.242,1.242,0,0,1,0,1.757L7.475,4.283,5.717,2.525Zm-5.5,1.757A1.243,1.243,0,0,1,3.129,1.371l.183.183L1.555,3.312Zm1.757,5.5a1.27,1.27,0,0,1-1.757,0,1.242,1.242,0,0,1,0-1.757L2.525,5.717,4.283,7.475Zm2.843-.9-.254-.253L2.525,4.283l-.253-.254L4.029,2.272l.254.253L7.475,5.717l.253.254Zm2.657.9a1.271,1.271,0,0,1-1.757,0l-.183-.183L8.446,6.688l.183.183h0a1.241,1.241,0,0,1,0,1.757Z"
+          transform="translate(0.007 -0.014)"
+        />
+        <circle cx="0.5" cy="0.5" r="0.5" transform="translate(4.507 4.486)" />
+        <circle cx="0.5" cy="0.5" r="0.5" transform="translate(3.507 3.486)" />
+        <circle cx="0.5" cy="0.5" r="0.5" transform="translate(5.507 5.486)" />
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default HealIcon;

portal-ui/src/icons/IAMPoliciesIcon.tsx

@@ -16,19 +16,18 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class BucketsIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.75 10">
-          <path
-            d="M-44.625,10l-4.353-2.419L-53.375,10V0h8.75Z"
-            transform="translate(53.375)"
-          />
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+
+const BucketsIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.75 10">
+        <path
+          d="M-44.625,10l-4.353-2.419L-53.375,10V0h8.75Z"
+          transform="translate(53.375)"
+        />
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default BucketsIcon;

portal-ui/src/icons/LambdaNotificationsIcon.tsx

@@ -16,19 +16,17 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class LambdaNotificationsIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-          <path
-            d="M0,0v10l2.8-2.2H10V0H0z M6.6,6L5.6,6.4l-0.8-2l-1.5,2L2.5,5.9l1.9-2.6L4.1,2.4H3.2v-1h1.5l1.4,3.7l0.9-0.4
+const LambdaNotificationsIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
+        <path
+          d="M0,0v10l2.8-2.2H10V0H0z M6.6,6L5.6,6.4l-0.8-2l-1.5,2L2.5,5.9l1.9-2.6L4.1,2.4H3.2v-1h1.5l1.4,3.7l0.9-0.4
 	l0.4,0.9L6.6,6z"
-          />
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+        />
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default LambdaNotificationsIcon;

portal-ui/src/icons/LicenseIcon.tsx

@@ -17,31 +17,29 @@
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
 
-class LicenseIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 11">
-          <path fill="#fff" d="M11 11H0V2h11v9zM2 8v1h7V8zm0-3v1h5V5z"></path>
-          <g
-            fill="#07274a"
-            stroke="#fdfdfd"
-            strokeWidth="0.5"
-            transform="translate(7)"
-          >
-            <circle cx="3" cy="3" r="3" stroke="none"></circle>
-            <circle cx="3" cy="3" r="2.75" fill="none"></circle>
-          </g>
-          <path
-            fill="none"
-            stroke="#fff"
-            strokeWidth="0.5"
-            d="M8.73 2.794l.954.953 1.471-1.471"
-          ></path>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+const LicenseIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 11">
+        <path fill="#fff" d="M11 11H0V2h11v9zM2 8v1h7V8zm0-3v1h5V5z"></path>
+        <g
+          fill="#07274a"
+          stroke="#fdfdfd"
+          strokeWidth="0.5"
+          transform="translate(7)"
+        >
+          <circle cx="3" cy="3" r="3" stroke="none"></circle>
+          <circle cx="3" cy="3" r="2.75" fill="none"></circle>
+        </g>
+        <path
+          fill="none"
+          stroke="#fff"
+          strokeWidth="0.5"
+          d="M8.73 2.794l.954.953 1.471-1.471"
+        ></path>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default LicenseIcon;

portal-ui/src/icons/LogoutIcon.tsx

@@ -16,32 +16,30 @@
 
 import React from "react";
 import { SvgIcon } from "@material-ui/core";
-class LogoutIcon extends React.Component {
-  render() {
-    return (
-      <SvgIcon>
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12.122 10.571">
-          <g transform="translate(0 0.5)">
-            <path
-              style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
-              d="M4816.27,3755.205v-2.939h8.539v9.571h-8.539v-2.932"
-              transform="translate(-4813.187 -3752.266)"
-            />
-            <path
-              style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
-              d="M4813.187,3757.052h8.081"
-              transform="translate(-4813.187 -3752.266)"
-            />
-            <path
-              style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
-              d="M4806.5,3756.511l2.265,2.063-2.265,2.063"
-              transform="translate(-4800.808 -3753.863)"
-            />
-          </g>
-        </svg>
-      </SvgIcon>
-    );
-  }
-}
+const LogoutIcon = () => {
+  return (
+    <SvgIcon>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12.122 10.571">
+        <g transform="translate(0 0.5)">
+          <path
+            style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
+            d="M4816.27,3755.205v-2.939h8.539v9.571h-8.539v-2.932"
+            transform="translate(-4813.187 -3752.266)"
+          />
+          <path
+            style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
+            d="M4813.187,3757.052h8.081"
+            transform="translate(-4813.187 -3752.266)"
+          />
+          <path
+            style={{ fill: "none", stroke: "rgba(255,255,255,0.8)" }}
+            d="M4806.5,3756.511l2.265,2.063-2.265,2.063"
+            transform="translate(-4800.808 -3753.863)"
+          />
+        </g>
+      </svg>
+    </SvgIcon>
+  );
+};
 
 export default LogoutIcon;