Correcting doc links on Configuration pages

2022-04-29 10:53:02 -05:00
2105 changed files with 41130 additions and 95406 deletions
--- a/.github/workflows/common.sh
+++ b/.github/workflows/common.sh
@@ -38,9 +38,11 @@ function setup_kind() {
 }

 function install_operator() {
+    echo "Installing Current Operator"
+
+    # TODO: Compile the current branch and create an overlay to use that image version
+    try kubectl apply -k "${SCRIPT_DIR}/../../portal-ui/tests/scripts/resources"

-    echo "  Load minio/operator image to the cluster"
-	try kubectl apply -k github.com/minio/operator/
    echo "Waiting for k8s api"
    sleep 10
    echo "Waiting for Operator Pods to come online (2m timeout)"
@@ -89,55 +91,4 @@ function check_tenant_status() {
    kubectl run admin-mc -i --tty --image minio/mc --command -- bash -c "until (mc alias set minio/ https://minio.$1.svc.cluster.local $USER $PASSWORD); do echo \"...waiting... for 5secs\" && sleep 5; done; mc admin info minio/;"

    echo "Done."
-}
-
-function wait_for_resource() {
-	waitdone=0
-	totalwait=0
-	echo "command to wait on:"
-	command_to_wait="kubectl -n $1 get pods -l $3=$2 --no-headers"
-	echo $command_to_wait
-
-	while true; do
-	waitdone=$($command_to_wait | wc -l)
-	if [ "$waitdone" -ne 0 ]; then
-		echo "Found $waitdone pods"
-			break
-	fi
-	sleep 5
-	totalwait=$((totalwait + 5))
-	if [ "$totalwait" -gt 305 ]; then
-			echo "Unable to get resource after 5 minutes, exiting."
-			try false
-	fi
-	done
-}
-
-# Install tenant function is being used by deploy-tenant and check-prometheus
-function install_tenant() {
-
-	namespace=tenant-lite
-	key=v1.min.io/tenant
-	value=storage-lite
-	echo "Installing lite tenant"
-
-	try kubectl apply -k "${SCRIPT_DIR}/tenant-lite"
-
-	echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
-	echo $namespace
-	echo $value
-	echo $key
-	wait_for_resource $namespace $value $key
-
-	echo "Waiting for tenant pods to come online (5m timeout)"
-	try kubectl wait --namespace $namespace \
-	--for=condition=ready pod \
-	--selector $key=$value \
-	--timeout=300s
-
-	echo "Wait for Prometheus PVC to be bound"
-	while [[ $(kubectl get pvc storage-lite-prometheus-storage-lite-prometheus-0 -n tenant-lite -o 'jsonpath={..status.phase}') != "Bound" ]]; do echo "waiting for PVC status" && sleep 1 && kubectl get pvc -A; done
-
-	echo "Build passes basic tenant creation"
-
-}
+}
--- a/.github/workflows/deploy-tenant.sh
+++ b/.github/workflows/deploy-tenant.sh
@@ -20,17 +20,17 @@ export SCRIPT_DIR

 source "${SCRIPT_DIR}/common.sh"

-function install_tenants() {
-	echo "Installing tenants"

-	# Install lite & kes tenants
-	try kubectl apply -k "${SCRIPT_DIR}/../portal-ui/tests/scripts/tenant-lite"
-	try kubectl apply -k "${SCRIPT_DIR}/../portal-ui/tests/scripts/tenant-kes-encryption"

-	echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
-	waitdone=0
-	totalwait=0
-	while true; do
+function install_tenant() {
+    echo "Installing lite tenant"
+
+	try kubectl apply -k "${SCRIPT_DIR}/../../portal-ui/tests/scripts/tenant"
+
+    echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
+    waitdone=0
+    totalwait=0
+    while true; do
 	waitdone=$(kubectl -n tenant-lite get pods -l v1.min.io/tenant=storage-lite --no-headers | wc -l)
 	if [ "$waitdone" -ne 0 ]; then
 	    echo "Found $waitdone pods"
@@ -39,34 +39,33 @@ function install_tenants() {
 	sleep 5
 	totalwait=$((totalwait + 5))
 	if [ "$totalwait" -gt 300 ]; then
-		echo "Tenant never created statefulset after 5 minutes"
-		try false
+	    echo "Tenant never created statefulset after 5 minutes"
+	    try false
 	fi
-	done
+    done

-	echo "Waiting for tenant pods to come online (5m timeout)"
-	try kubectl wait --namespace tenant-lite \
+    echo "Waiting for tenant pods to come online (5m timeout)"
+    try kubectl wait --namespace tenant-lite \
 	--for=condition=ready pod \
 	--selector="v1.min.io/tenant=storage-lite" \
 	--timeout=300s

-	echo "Build passes basic tenant creation"
+    echo "Build passes basic tenant creation"
 }


 function main() {
-	destroy_kind
-	setup_kind
-	install_operator
-	install_tenants
-	check_tenant_status tenant-lite storage-lite
-	kubectl proxy &
-	# Beginning  Kubernetes 1.24 ----> Service Account Token Secrets are not 
-	# automatically generated, to generate them manually, users must manually
-	# create the secret, for our examples where we lead people to get the JWT
-	# from the console-sa service account, they additionally need to manually
-	# generate the secret via
-	kubectl apply -f "${SCRIPT_DIR}/console-sa-secret.yaml"
+    destroy_kind
+
+    setup_kind
+
+    install_operator
+
+    install_tenant
+
+    check_tenant_status tenant-lite storage-lite
+
+    kubectl proxy &
 }

 main "$@"
--- a/.github/workflows/jobs.yaml
+++ b/.github/workflows/jobs.yaml
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,29 +5,28 @@ linters-settings:
  misspell:
    locale: US

-  goheader:
-    values:
-      regexp:
-        copyright-holder: Copyright \(c\) (20\d\d\-20\d\d)|2021|({{year}})
-    template-path: .license.tmpl
-
 linters:
  disable-all: true
  enable:
+    - typecheck
    - goimports
    - misspell
    - govet
    - revive
    - ineffassign
    - gosimple
-    - gomodguard
-    - gofmt
+    - deadcode
+    - unparam
    - unused
-    - unconvert
-    - varcheck
-    - gocritic
-    - gofumpt
-    - durationcheck
+    - structcheck
+    - goheader
+
+linters-settings:
+  goheader:
+    values:
+      regexp:
+        copyright-holder: Copyright \(c\) (20\d\d\-20\d\d)|2021|({{year}})
+    template-path: .license.tmpl

 service:
  golangci-lint-version: 1.43.0 # use the fixed version to not introduce new linters unexpectedly
@@ -35,15 +34,14 @@ service:
 issues:
  exclude-use-default: false
  exclude:
-    - should have a package comment
-    # TODO(y4m4): Remove once all exported ident. have comments!
-    - comment on exported function
-    - comment on exported type
-    - should have comment
-    - use leading k in Go names
-    - comment on exported const
+      - should have a package comment
+      # TODO(y4m4): Remove once all exported ident. have comments!      
+      - comment on exported function
+      - comment on exported type
+      - should have comment
+      - use leading k in Go names
+      - comment on exported const
 run:
  skip-dirs:
    - pkg/clientgen
    - pkg/apis/networking.gke.io
-    - restapi/operations
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,7 +13,7 @@ release:
 before:
  hooks:
    # you may remove this if you don't use vgo
-    - go mod tidy -compat=1.18
+    - go mod tidy -compat=1.17

 builds:
  -
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-17
--- a/.semgrepignore
+++ b/.semgrepignore
@@ -1,33 +0,0 @@
-# Ignore git items
-.gitignore
-.git/
-:include .gitignore
-
-# Common large paths
-node_modules/
-portal-ui/node_modules/
-build/
-dist/
-.idea/
-vendor/
-.env/
-.venv/
-.tox/
-*.min.js
-
-# Common test paths
-test/
-tests/
-*_test.go
-
-# Semgrep rules folder
-.semgrep
-
-# Semgrep-action log folder
-.semgrep_logs/
-
-# Ignore VsCode files
-.vscode/
-*.code-workspace
-*~
-.eslintcache
--- a/2702
+++ b/2702
--- a/7
+++ b/7
@@ -1,5 +1,4 @@
-ARG NODE_VERSION
-FROM node:$NODE_VERSION as uilayer
+FROM node:17 as uilayer

 WORKDIR /app

@@ -13,7 +12,7 @@ RUN make build-static

 USER node

-FROM golang:1.18 as golayer
+FROM golang:1.17 as golayer

 RUN apt-get update -y && apt-get install -y ca-certificates

@@ -32,7 +31,7 @@ ENV CGO_ENABLED=0
 COPY --from=uilayer /app/build /go/src/github.com/minio/console/portal-ui/build
 RUN go build --tags=kqueue,operator -ldflags "-w -s" -a -o console ./cmd/console

-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
 MAINTAINER MinIO Development "dev@min.io"
 EXPOSE 9090

--- a/Dockerfile.assets
+++ b/Dockerfile.assets
@@ -1,5 +1,4 @@
-ARG NODE_VERSION
-FROM node:$NODE_VERSION as uilayer
+FROM node:17 as uilayer

 WORKDIR /app

--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5

 ARG TAG

--- a/105
+++ b/105
@@ -5,8 +5,6 @@ BUILD_VERSION:=$(shell git describe --exact-match --tags $(git log -n1 --pretty=
 BUILD_TIME:=$(shell date 2>/dev/null)
 TAG ?= "minio/console:$(BUILD_VERSION)-dev"
 MINIO_VERSION ?= "quay.io/minio/minio:latest"
-TARGET_BUCKET ?= "target"
-NODE_VERSION := $(shell cat .nvmrc)

 default: console

@@ -16,19 +14,22 @@ console:
 	@(GO111MODULE=on CGO_ENABLED=0 go build -trimpath --tags=kqueue,operator --ldflags "-s -w" -o console ./cmd/console)

 k8sdev:
-	@docker build -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' --build-arg NODE_VERSION='$(NODE_VERSION)' .
+	@docker build -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' .
 	@kind load docker-image $(TAG)
 	@echo "Done, now restart your console deployment"

 getdeps:
 	@mkdir -p ${GOPATH}/bin
-	@echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin
+	@which golangci-lint 1>/dev/null || (echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.43.0)

 verifiers: getdeps fmt lint

 fmt:
 	@echo "Running $@ check"
-	@(env bash $(PWD)/verify-gofmt.sh)
+	@GO111MODULE=on gofmt -d restapi/
+	@GO111MODULE=on gofmt -d pkg/
+	@GO111MODULE=on gofmt -d cmd/
+	@GO111MODULE=on gofmt -d cluster/

 crosscompile:
 	@(env bash $(PWD)/cross-compile.sh $(arg1))
@@ -43,13 +44,9 @@ install: console
 	@mkdir -p $(GOPATH)/bin && cp -f $(PWD)/console $(GOPATH)/bin/console
 	@echo "Installation successful. To learn more, try \"console --help\"."

-swagger-gen: clean-swagger swagger-console swagger-operator apply-gofmt
+swagger-gen: clean-swagger swagger-console swagger-operator
 	@echo "Done Generating swagger server code from yaml"

-apply-gofmt:
-	@echo "Applying gofmt to all generated an existing files"
-	@GO111MODULE=on gofmt -w .
-
 clean-swagger:
 	@echo "cleaning"
 	@rm -rf models
@@ -65,8 +62,7 @@ swagger-operator:
 	@swagger generate server -A operator --main-package=operator --server-package=operatorapi --exclude-main -P models.Principal -f ./swagger-operator.yml -r NOTICE

 assets:
-	@(if [ -f "${NVM_DIR}/nvm.sh" ]; then \. "${NVM_DIR}/nvm.sh" && nvm install && nvm use && npm install -g yarn ; fi &&\
-	  cd portal-ui; yarn install --prefer-offline; make build-static; yarn prettier --write . --loglevel warn; cd ..)
+	@(cd portal-ui; yarn install --prefer-offline; make build-static; yarn prettier --write . --loglevel warn; cd ..)

 test-integration:
 	@(docker stop pgsqlcontainer || true)
@@ -78,8 +74,8 @@ test-integration:
 	@echo $(MINIO_VERSION)
 	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 --net=mynet123 -d --name minio --rm -p 9000:9000 -p 9001:9001 -e MINIO_KMS_SECRET_KEY=my-minio-key:OSMM+vkKUTCvQs9YL/CVMIMt43HFhkUpqJxTmGl6rYw= $(MINIO_VERSION) server /data{1...4} --console-address ':9001' && sleep 5)
 	@(docker run --net=mynet123 --ip=173.18.0.3 --name pgsqlcontainer --rm -p 5432:5432 -e POSTGRES_PASSWORD=password -d postgres && sleep 5)
-	@echo "execute test and get coverage for test-integration:"
-	@(cd integration && go test -coverpkg=../restapi -c -tags testrunmain . && mkdir -p coverage && export THETARGET=$(TARGET_BUCKET) && echo "THETARGET: ${THETARGET}" && ./integration.test -test.v -test.run "^Test*" -test.coverprofile=coverage/system.out)
+	@echo "execute test and get coverage"
+	@(cd integration && go test -coverpkg=../restapi -c -tags testrunmain . && mkdir -p coverage && ./integration.test -test.v -test.run "^Test*" -test.coverprofile=coverage/system.out)
 	@(docker stop pgsqlcontainer)
 	@(docker stop minio)
 	@(docker network rm mynet123)
@@ -135,25 +131,29 @@ test-replication:
 test-sso-integration:
 	@echo "create the network in bridge mode to communicate all containers"
 	@(docker network create my-net)
-	@echo "run openldap container using MinIO Image: quay.io/minio/openldap:latest"
+	@echo "execute latest keycloak container"
 	@(docker run \
-		-e LDAP_ORGANIZATION="MinIO Inc" \
-		-e LDAP_DOMAIN="min.io" \
-		-e LDAP_ADMIN_PASSWORD="admin" \
-		--network my-net \
-		-p 389:389 \
-		-p 636:636 \
-		--name openldap \
-		--detach quay.io/minio/openldap:latest)
-	@echo "Run Dex container using MinIO Image: quay.io/minio/dex:latest"
+	--rm \
+	--name keycloak-container \
+	--network my-net \
+	-p 8080:8080 \
+	-e KEYCLOAK_USER=admin \
+	-e KEYCLOAK_PASSWORD=admin jboss/keycloak:latest -b 0.0.0.0 -bprivate 127.0.0.1 &)
+	@echo "wait 60 sec until keycloak is listenning on port, then go for minio server"
+	@(sleep 60)
+	@echo "execute keycloak-config-cli container to configure keycloak for Single Sign On with MinIO"
 	@(docker run \
-		-e DEX_ISSUER=http://dex:5556/dex \
-		-e DEX_CLIENT_REDIRECT_URI=http://127.0.0.1:9090/oauth_callback \
-		-e DEX_LDAP_SERVER=openldap:389 \
-		--network my-net \
-		-p 5556:5556 \
-		--name dex \
-		--detach quay.io/minio/dex:latest)
+	--rm \
+	--network my-net \
+	--name keycloak-config-cli \
+	-e KEYCLOAK_URL=http://keycloak-container:8080/auth \
+	-e KEYCLOAK_USER="admin" \
+	-e KEYCLOAK_PASSWORD="admin" \
+	-e KEYCLOAK_AVAILABILITYCHECK_ENABLED=true \
+	-e KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s \
+	-e IMPORT_FILES_LOCATIONS='/config/realm-export.json' \
+	-v /home/runner/work/console/console/sso-integration/config:/config \
+	adorsys/keycloak-config-cli:latest)
 	@echo "running minio server"
 	@(docker run \
 	-v /data1 -v /data2 -v /data3 -v /data4 \
@@ -163,22 +163,19 @@ test-sso-integration:
 	--rm \
 	-p 9000:9000 \
 	-p 9001:9001 \
-	-e MINIO_IDENTITY_OPENID_CLIENT_ID="minio-client-app" \
-	-e MINIO_IDENTITY_OPENID_CLIENT_SECRET="minio-client-app-secret" \
-	-e MINIO_IDENTITY_OPENID_CLAIM_NAME=name \
-	-e MINIO_IDENTITY_OPENID_CONFIG_URL=http://dex:5556/dex/.well-known/openid-configuration \
-	-e MINIO_IDENTITY_OPENID_REDIRECT_URI=http://127.0.0.1:9090/oauth_callback \
+	-e MINIO_IDENTITY_OPENID_CLIENT_SECRET=0nfJuqIt0iPnRIUJkvetve5l38C6gi9W \
 	-e MINIO_ROOT_USER=minio \
 	-e MINIO_ROOT_PASSWORD=minio123 $(MINIO_VERSION) server /data{1...4} --address :9000 --console-address :9001)
-	@echo "run mc commands to set the policy"
+	@(sleep 60)
+	@echo "run mc commands"
 	@(docker run --name minio-client --network my-net -dit --entrypoint=/bin/sh minio/mc)
 	@(docker exec minio-client mc alias set myminio/ http://minio:9000 minio minio123)
-	@echo "adding policy to Dillon Harper to be able to login:"
-	@(cd sso-integration && docker cp allaccess.json minio-client:/ && docker exec minio-client mc admin policy add myminio "Dillon Harper" allaccess.json)
+	@(docker exec minio-client mc admin config set myminio identity_openid config_url="http://keycloak-container:8080/auth/realms/myrealm/.well-known/openid-configuration" client_id="account")
+	@(docker exec minio-client mc admin service restart myminio)
 	@echo "starting bash script"
 	@(env bash $(PWD)/sso-integration/set-sso.sh)
-	@echo "add python module"
-	@(pip3 install bs4)
+	@echo "install jq"
+	@(sudo apt install jq)
 	@echo "Executing the test:"
 	@(cd sso-integration && go test -coverpkg=../restapi -c -tags testrunmain . && mkdir -p coverage && ./sso-integration.test -test.v -test.run "^Test*" -test.coverprofile=coverage/sso-system.out)

@@ -206,26 +203,6 @@ test-permissions-3:
 	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-3/")
 	@(docker stop minio)

-test-permissions-4:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-4/")
-	@(docker stop minio)
-
-test-permissions-5:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-5/")
-	@(docker stop minio)
-
-test-permissions-6:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-6/")
-	@(docker stop minio)
-
-test-permissions-7:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-7/")
-	@(docker stop minio)
-
 test-apply-permissions:
 	@(env bash $(PWD)/portal-ui/tests/scripts/initialize-env.sh)

@@ -246,10 +223,6 @@ test:
 	@echo "execute test and get coverage"
 	@(cd restapi && mkdir coverage && GO111MODULE=on go test -test.v -coverprofile=coverage/coverage.out)

-test-unit-test-operator:
-	@echo "execute unit test and get coverage for operatorapi"
-	@(cd operatorapi && mkdir coverage && GO111MODULE=on go test -test.v -coverprofile=coverage/coverage-unit-test-operatorapi.out)
-
 test-pkg:
 	@echo "execute test and get coverage"
 	@(cd pkg && mkdir coverage && GO111MODULE=on go test -test.v -coverprofile=coverage/coverage-pkg.out)
@@ -264,7 +237,7 @@ clean:
 	@rm -vf console

 docker:
-	@docker buildx build --output=type=docker --platform linux/amd64 -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' --build-arg NODE_VERSION='$(NODE_VERSION)' .
+	@docker buildx build --output=type=docker --platform linux/amd64 -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' .

 release: swagger-gen
 	@echo "Generating Release: $(RELEASE)"
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ docker pull minio/console

 ### Build from source
 > You will need a working Go environment. Therefore, please follow [How to install Go](https://golang.org/doc/install).
-> Minimum version required is go1.18
+> Minimum version required is go1.17

 ```
 go install github.com/minio/console/cmd/console@latest
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -17,7 +17,6 @@
 package cluster

 import (
-	directpvclient "github.com/minio/directpv/pkg/client"
 	operator "github.com/minio/operator/pkg/client/clientset/versioned"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -26,8 +25,8 @@ import (

 // getTLSClientConfig will return the right TLS configuration for the K8S client based on the configured TLS certificate
 func getTLSClientConfig() rest.TLSClientConfig {
-	defaultRootCAFile := "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-	customRootCAFile := getK8sAPIServerTLSRootCA()
+	var defaultRootCAFile = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+	var customRootCAFile = getK8sAPIServerTLSRootCA()
 	tlsClientConfig := rest.TLSClientConfig{}
 	// if console is running inside k8s by default he will have access to the CA Cert from the k8s local authority
 	if _, err := certutil.NewPool(defaultRootCAFile); err == nil {
@@ -64,13 +63,3 @@ func OperatorClient(token string) (*operator.Clientset, error) {
 func K8sClient(token string) (*kubernetes.Clientset, error) {
 	return kubernetes.NewForConfig(GetK8sConfig(token))
 }
-
-// DirectPV interfaces  required to fetch information
-
-func DirectPVDriveInterface(token string) (*directpvclient.DirectCSIDriveInterface, error) {
-	return directpvclient.DirectCSIDriveInterfaceForConfig(GetK8sConfig(token))
-}
-
-func DirectPVVolumeInterface(token string) (*directpvclient.DirectCSIVolumeInterface, error) {
-	return directpvclient.DirectCSIVolumeInterfaceForConfig(GetK8sConfig(token))
-}
--- a/cmd/console/app_commands.go
+++ b/cmd/console/app_commands.go
@@ -40,6 +40,7 @@ var appCmds = []cli.Command{

 // StartServer starts the console service
 func StartServer(ctx *cli.Context) error {
+
 	// Load all certificates
 	if err := loadAllCerts(ctx); err != nil {
 		// Log this as a warning and continue running console without TLS certificates
--- a/cmd/console/operator.go
+++ b/cmd/console/operator.go
@@ -189,6 +189,7 @@ func loadOperatorAllCerts(ctx *cli.Context) error {

 // StartServer starts the console service
 func startOperatorServer(ctx *cli.Context) error {
+
 	if err := loadAllCerts(ctx); err != nil {
 		// Log this as a warning and continue running console without TLS certificates
 		restapi.LogError("Unable to load certs: %v", err)
--- a/go.mod
+++ b/go.mod
@@ -1,199 +1,162 @@
 module github.com/minio/console

-go 1.18
+go 1.17

 require (
 	github.com/blang/semver/v4 v4.0.0
-	github.com/cheggaaa/pb/v3 v3.1.0
+	github.com/cheggaaa/pb/v3 v3.0.8
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.13.0
-	github.com/go-openapi/errors v0.20.3
-	github.com/go-openapi/loads v0.21.2
-	github.com/go-openapi/runtime v0.25.0
-	github.com/go-openapi/spec v0.20.7
-	github.com/go-openapi/strfmt v0.21.3
-	github.com/go-openapi/swag v0.22.3
-	github.com/go-openapi/validate v0.22.0
-	github.com/golang-jwt/jwt/v4 v4.4.3
+	github.com/go-openapi/errors v0.20.2
+	github.com/go-openapi/loads v0.21.1
+	github.com/go-openapi/runtime v0.23.3
+	github.com/go-openapi/spec v0.20.5
+	github.com/go-openapi/strfmt v0.21.2
+	github.com/go-openapi/swag v0.21.1
+	github.com/go-openapi/validate v0.21.0
+	github.com/golang-jwt/jwt/v4 v4.4.1
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/jessevdk/go-flags v1.5.0
-	github.com/klauspost/compress v1.15.12
-	github.com/minio/cli v1.24.2
-	github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651
+	github.com/klauspost/compress v1.15.1
+	github.com/minio/cli v1.22.0
 	github.com/minio/highwayhash v1.0.2
-	github.com/minio/kes v0.22.2
-	github.com/minio/madmin-go/v2 v2.0.1
-	github.com/minio/mc v0.0.0-20221209193822-daa06599e44d
-	github.com/minio/minio-go/v7 v7.0.45
-	github.com/minio/operator v0.0.0-20220902184351-21e4073132b0
-	github.com/minio/pkg v1.5.6
-	github.com/minio/selfupdate v0.5.0
+	github.com/minio/kes v0.19.2
+	github.com/minio/madmin-go v1.3.12
+	github.com/minio/mc v0.0.0-20220419155441-cc4ff3a0cc82
+	github.com/minio/minio-go/v7 v7.0.24
+	github.com/minio/operator v0.0.0-20220414212219-ba4c097324b2
+	github.com/minio/pkg v1.1.21
+	github.com/minio/selfupdate v0.4.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/rs/xid v1.4.0
 	github.com/secure-io/sio-go v0.3.1
-	github.com/stretchr/testify v1.8.1
-	github.com/tidwall/gjson v1.14.4
-	github.com/unrolled/secure v1.13.0
-	golang.org/x/crypto v0.4.0
-	golang.org/x/net v0.4.0
-	golang.org/x/oauth2 v0.3.0
-	// Added to include security fix for
-	// https://github.com/golang/go/issues/56152
-	golang.org/x/text v0.5.0 // indirect
+	github.com/stretchr/testify v1.7.1
+	github.com/tidwall/gjson v1.14.0
+	github.com/unrolled/secure v1.10.0
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
+	golang.org/x/net v0.0.0-20220421235706-1d1ef9303861
+	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.25.4
-	k8s.io/apimachinery v0.25.4
-	k8s.io/client-go v0.25.4
-	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
+	k8s.io/api v0.23.5
+	k8s.io/apimachinery v0.23.5
+	k8s.io/client-go v0.23.5
 )

 require (
-	aead.dev/mem v0.2.0 // indirect
-	cloud.google.com/go/compute v1.12.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.1 // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.27 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/logger v0.2.1 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
-	github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/briandowns/spinner v1.18.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/charmbracelet/bubbles v0.14.0 // indirect
-	github.com/charmbracelet/bubbletea v0.22.1 // indirect
-	github.com/charmbracelet/lipgloss v0.6.0 // indirect
+	github.com/charmbracelet/bubbles v0.10.3 // indirect
+	github.com/charmbracelet/bubbletea v0.20.0 // indirect
+	github.com/charmbracelet/lipgloss v0.5.0 // indirect
 	github.com/cheggaaa/pb v1.0.29 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.4.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
-	github.com/gdamore/tcell/v2 v2.5.3 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 // indirect
+	github.com/go-logr/logr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/analysis v0.21.4 // indirect
+	github.com/go-openapi/analysis v0.21.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/goccy/go-json v0.9.11 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/goccy/go-json v0.9.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jedib0t/go-pretty/v6 v6.3.8 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/juju/ratelimit v1.0.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.1 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.11 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
-	github.com/lestrrat-go/httpcc v1.0.1 // indirect
-	github.com/lestrrat-go/iter v1.0.2 // indirect
-	github.com/lestrrat-go/jwx v1.2.25 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.0 // indirect
+	github.com/lestrrat-go/httpcc v1.0.0 // indirect
+	github.com/lestrrat-go/iter v1.0.1 // indirect
+	github.com/lestrrat-go/jwx v1.2.19 // indirect
 	github.com/lestrrat-go/option v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-ieproxy v0.0.1 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
-	github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 // indirect
-	github.com/miekg/dns v1.1.48 // indirect
-	github.com/minio/colorjson v1.0.4 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/minio/colorjson v1.0.2 // indirect
 	github.com/minio/filepath v1.0.0 // indirect
-	github.com/minio/madmin-go v1.7.5 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.6.6 // indirect
 	github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
-	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.13.0 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/navidys/tvxwidgets v0.1.1 // indirect
+	github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect
+	github.com/navidys/tvxwidgets v0.1.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/philhofer/fwd v1.1.2-0.20210722190033-5c56ac6d0bb9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pkg/xattr v0.4.9 // indirect
+	github.com/pkg/xattr v0.4.5 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
-	github.com/prometheus/client_golang v1.13.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/prometheus/prom2json v1.3.2 // indirect
-	github.com/rivo/tview v0.0.0-20220916081518-2e69b7385a37 // indirect
-	github.com/rivo/uniseg v0.4.3 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/rivo/tview v0.0.0-20220216162559-96063d6082f3 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/shirou/gopsutil/v3 v3.22.9 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.10.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/shirou/gopsutil/v3 v3.22.2 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tinylib/msgp v1.1.7-0.20211026165309-e818a1881b0e // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.5 // indirect
-	go.mongodb.org/mongo-driver v1.10.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.2 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.2 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.2 // indirect
+	go.mongodb.org/mongo-driver v1.8.4 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.23.0 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/term v0.3.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
-	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c // indirect
-	google.golang.org/grpc v1.50.1 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a // indirect
+	google.golang.org/grpc v1.44.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/h2non/filetype.v1 v1.0.5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.24.3 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/klog/v2 v2.40.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
+	maze.io/x/duration v0.0.0-20160924141736-faac084b6075 // indirect
 	sigs.k8s.io/controller-runtime v0.11.1 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
--- a/integration/access_rules_test.go
+++ b/integration/access_rules_test.go
@@ -1,216 +0,0 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 integration
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_AddAccessRuleAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddBucket("testaccessruleadd", false, false, nil, nil)
-
-	type args struct {
-		bucket string
-		prefix string
-		access string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Create Access Rule - Valid",
-			args: args{
-				bucket: "testaccessruleadd",
-				prefix: "/test/",
-				access: "readonly",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Add Access Rule - Invalid",
-			args: args{
-				bucket: "testaccessruleadd",
-				prefix: "/test/",
-				access: "readonl",
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-		{
-			name: "Add Access Rule - Invalid Bucket",
-			args: args{
-				bucket: "fakebucket",
-				prefix: "/test/",
-				access: "readonl",
-			},
-			expectedStatus: 404,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-			requestDataPolicy["prefix"] = tt.args.prefix
-			requestDataPolicy["access"] = tt.args.access
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/bucket/%s/access-rules", tt.args.bucket), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_GetAccessRulesAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddBucket("testaccessruleget", false, false, nil, nil)
-
-	type args struct {
-		bucket string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get Access Rule - Valid",
-			args: args{
-				bucket: "testaccessruleget",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/bucket/%s/access-rules", tt.args.bucket), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_DeleteAccessRuleAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddBucket("testaccessruledelete", false, false, nil, nil)
-
-	type args struct {
-		prefix string
-		access string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Delete Access Rule - Valid",
-			args: args{
-				prefix: "/test/",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-			requestDataPolicy["prefix"] = tt.args.prefix
-			requestDataPolicy["access"] = tt.args.access
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"DELETE", "http://localhost:9090/api/v1/bucket/testaccessruledelete/access-rules", requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
--- a/integration/admin_api_integration_test.go
+++ b/integration/admin_api_integration_test.go
@@ -154,6 +154,7 @@ func NotifyPostgres() (*http.Response, error) {
 }

 func TestNotifyPostgres(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)

@@ -169,9 +170,11 @@ func TestNotifyPostgres(t *testing.T) {
 	if response != nil {
 		assert.Equal(200, response.StatusCode, finalResponse)
 	}
+
 }

 func TestRestartService(t *testing.T) {
+
 	assert := assert.New(t)
 	restartResponse, restartError := RestartService()
 	assert.Nil(restartError)
@@ -187,6 +190,7 @@ func TestRestartService(t *testing.T) {
 			addObjRsp,
 		)
 	}
+
 }

 func ListPoliciesWithBucket(bucketName string) (*http.Response, error) {
@@ -210,6 +214,7 @@ func ListPoliciesWithBucket(bucketName string) (*http.Response, error) {
 }

 func TestListPoliciesWithBucket(t *testing.T) {
+
 	// Test Variables
 	bucketName := "testlistpolicieswithbucket"
 	assert := assert.New(t)
@@ -229,6 +234,7 @@ func TestListPoliciesWithBucket(t *testing.T) {
 			parsedResponse,
 		)
 	}
+
 }

 func ListUsersWithAccessToBucket(bucketName string) (*http.Response, error) {
@@ -252,6 +258,7 @@ func ListUsersWithAccessToBucket(bucketName string) (*http.Response, error) {
 }

 func TestListUsersWithAccessToBucket(t *testing.T) {
+
 	// Test Variables
 	bucketName := "testlistuserswithaccesstobucket1"
 	assert := assert.New(t)
@@ -271,9 +278,11 @@ func TestListUsersWithAccessToBucket(t *testing.T) {
 			parsedResponse,
 		)
 	}
+
 }

 func TestGetNodes(t *testing.T) {
+
 	assert := assert.New(t)
 	getNodesResponse, getNodesError := GetNodes()
 	assert.Nil(getNodesError)
@@ -289,6 +298,7 @@ func TestGetNodes(t *testing.T) {
 			addObjRsp,
 		)
 	}
+
 }

 func ArnList() (*http.Response, error) {
--- a/integration/buckets_test.go
+++ b/integration/buckets_test.go
@@ -56,7 +56,8 @@ func inspectHTTPResponse(httpResponse *http.Response) string {
 }

 func initConsoleServer() (*restapi.Server, error) {
-	// os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
+
+	//os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")

 	swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
 	if err != nil {
@@ -78,7 +79,7 @@ func initConsoleServer() (*restapi.Server, error) {
 	// register all APIs
 	server.ConfigureAPI()

-	// restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager = globalRootCAs, globalPublicCerts, globalTLSCerts
+	//restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager = globalRootCAs, globalPublicCerts, globalTLSCerts

 	consolePort, _ := strconv.Atoi("9090")

@@ -91,6 +92,7 @@ func initConsoleServer() (*restapi.Server, error) {
 }

 func TestMain(m *testing.M) {
+
 	// start console server
 	go func() {
 		fmt.Println("start server")
@@ -101,6 +103,7 @@ func TestMain(m *testing.M) {
 			return
 		}
 		srv.Serve()
+
 	}()

 	fmt.Println("sleeping")
@@ -129,6 +132,7 @@ func TestMain(m *testing.M) {
 	request.Header.Add("Content-Type", "application/json")

 	response, err := client.Do(request)
+
 	if err != nil {
 		log.Println(err)
 		return
@@ -158,7 +162,7 @@ func TestMain(m *testing.M) {

 	requestDataBody = bytes.NewReader(requestDataJSON)

-	// delete bucket
+	// get list of buckets
 	request, err = http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test1", requestDataBody)
 	if err != nil {
 		log.Println(err)
--- a/integration/config_test.go
+++ b/integration/config_test.go
@@ -31,48 +31,8 @@ import (
 func Test_ConfigAPI(t *testing.T) {
 	assert := assert.New(t)

-	tests := []struct {
-		name           string
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name:           "Config - Valid",
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			request, err := http.NewRequest("GET", "http://localhost:9090/api/v1/configs", nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
-}
-
-func Test_GetConfigAPI(t *testing.T) {
-	assert := assert.New(t)
-
 	type args struct {
-		name string
+		api string
 	}
 	tests := []struct {
 		name           string
@@ -81,146 +41,18 @@ func Test_GetConfigAPI(t *testing.T) {
 		expectedError  error
 	}{
 		{
-			name: "Get Config - Valid",
+			name: "Config - Valid",
 			args: args{
-				name: "storage_class",
+				api: "/configs",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
 		},
-		{
-			name: "Get Config - Invalid",
-			args: args{
-				name: "asdf",
-			},
-			expectedStatus: 404,
-			expectedError:  nil,
-		},
 	}

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}

-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/configs/%s", tt.args.name), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
-}
-
-func Test_SetConfigAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	type args struct {
-		name      string
-		keyValues []map[string]interface{}
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Set Config - Valid",
-			args: args{
-				name:      "region",
-				keyValues: []map[string]interface{}{{"key": "name", "value": "testServer"}, {"key": "region", "value": "us-west-1"}},
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Set Config - Invalid",
-			args: args{
-				name:      "regiontest",
-				keyValues: []map[string]interface{}{{"key": "name", "value": "testServer"}, {"key": "region", "value": "us-west-1"}},
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataPolicy["key_values"] = tt.args.keyValues
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/configs/%s", tt.args.name), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
-}
-
-func Test_ResetConfigAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	type args struct {
-		name string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Reset Config - Valid",
-			args: args{
-				name: "region",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Reset Config - Invalid",
-			args: args{
-				name: "regiontest",
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -230,7 +62,7 @@ func Test_ResetConfigAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"POST", fmt.Sprintf("http://localhost:9090/api/v1/configs/%s/reset", tt.args.name), requestDataBody)
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -247,4 +79,5 @@ func Test_ResetConfigAPI(t *testing.T) {
 			}
 		})
 	}
+
 }
--- a/integration/groups_test.go
+++ b/integration/groups_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -35,6 +34,7 @@ func Test_AddGroupAPI(t *testing.T) {
 	AddUser("member1", "testtest", []string{}, []string{"consoleAdmin"})

 	type args struct {
+		api     string
 		group   string
 		members []string
 	}
@@ -47,6 +47,7 @@ func Test_AddGroupAPI(t *testing.T) {
 		{
 			name: "Create Group - Valid",
 			args: args{
+				api:     "/groups",
 				group:   "test",
 				members: []string{"member1"},
 			},
@@ -56,6 +57,7 @@ func Test_AddGroupAPI(t *testing.T) {
 		{
 			name: "Create Group - Invalid",
 			args: args{
+				api:     "/groups",
 				group:   "test",
 				members: []string{},
 			},
@@ -66,10 +68,13 @@ func Test_AddGroupAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

+			// Add policy
+
 			requestDataPolicy := map[string]interface{}{}
 			requestDataPolicy["group"] = tt.args.group
 			requestDataPolicy["members"] = tt.args.members
@@ -77,7 +82,7 @@ func Test_AddGroupAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"POST", "http://localhost:9090/api/v1/groups", requestDataBody)
+				"POST", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -92,188 +97,10 @@ func Test_AddGroupAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
-}

-func Test_GetGroupAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddUser("member2", "testtest", []string{}, []string{"consoleAdmin"})
-	AddGroup("getgroup1", []string{"member2"})
-
-	type args struct {
-		api string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get Group - Valid",
-			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("getgroup1")),
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Get Group - Invalid",
-			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("askfjalkd")),
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_ListGroupsAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	tests := []struct {
-		name           string
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name:           "Get Group - Valid",
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"GET", "http://localhost:9090/api/v1/groups", requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_PutGroupsAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddUser("member3", "testtest", []string{}, []string{"consoleAdmin"})
-	AddGroup("putgroup1", []string{})
-
-	type args struct {
-		api     string
-		members []string
-		status  string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Put Group - Valid",
-			args: args{
-				api:     base64.StdEncoding.EncodeToString([]byte("putgroup1")),
-				members: []string{"member3"},
-				status:  "enabled",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Put Group - Invalid",
-			args: args{
-				api:     base64.StdEncoding.EncodeToString([]byte("gdgfdfgd")),
-				members: []string{"member3"},
-				status:  "enabled",
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataPolicy["members"] = tt.args.members
-			requestDataPolicy["status"] = tt.args.status
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
 }

 func Test_DeleteGroupAPI(t *testing.T) {
@@ -293,28 +120,19 @@ func Test_DeleteGroupAPI(t *testing.T) {
 	}{
 		{
 			name: "Delete Group - Valid",
+			verb: "DELETE",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("grouptests1")),
+				api: "/group?name=grouptests1",
 			},
-			verb:           "DELETE",
 			expectedStatus: 204,
 			expectedError:  nil,
 		},
-		{
-			name: "Delete Group - Invalid",
-			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("grouptests12345")),
-			},
-			verb:           "DELETE",
-			expectedStatus: 404,
-			expectedError:  nil,
-		},
 		{
 			name: "Access Group After Delete - Invalid",
+			verb: "GET",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("grouptests1")),
+				api: "/group?name=grouptests1",
 			},
-			verb:           "GET",
 			expectedStatus: 500,
 			expectedError:  nil,
 		},
@@ -322,16 +140,19 @@ func Test_DeleteGroupAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

+			// Add policy
+
 			requestDataPolicy := map[string]interface{}{}

 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
+				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -346,6 +167,8 @@ func Test_DeleteGroupAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
+
 }
--- a/integration/inspect_test.go
+++ b/integration/inspect_test.go
@@ -1,106 +0,0 @@
-package integration
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func Inspect(volume string, file string, enc bool) (*http.Response, error) {
-	requestURL := fmt.Sprintf("http://localhost:9090/api/v1/admin/inspect?volume=%s&file=%s&encrypt=%t", volume, file, enc)
-	request, err := http.NewRequest(
-		"GET", requestURL, nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestInspect(t *testing.T) {
-	assert := assert.New(t)
-
-	type args struct {
-		volume  string
-		file    string
-		encrypt bool
-	}
-
-	// Inspect returns successful response always
-	tests := []struct {
-		name          string
-		args          args
-		expStatusCode int
-		expectedError bool
-	}{
-		{
-			name: "Test Invalid Path",
-			args: args{
-				volume:  "/test-with-slash",
-				file:    "/test-with-slash",
-				encrypt: false,
-			},
-			expStatusCode: 200,
-			expectedError: false,
-		},
-
-		{
-			name: "Test Invalid characters in Path",
-			args: args{
-				volume:  "//test",
-				file:    "//bucket",
-				encrypt: false,
-			},
-			expStatusCode: 200,
-			expectedError: true,
-		},
-		{
-			name: "Test valid bucket",
-			args: args{
-				volume:  "test-bucket",
-				file:    "test.txt",
-				encrypt: true,
-			},
-			expStatusCode: 200,
-			expectedError: false,
-		},
-		{
-			name: "Test Empty Path", // Un processable entity error
-			args: args{
-				volume:  "",
-				file:    "",
-				encrypt: false,
-			},
-			expStatusCode: 422,
-			expectedError: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resp, err := Inspect(tt.args.volume, tt.args.file, tt.args.encrypt)
-			if tt.expectedError {
-				assert.Nil(err)
-				if err != nil {
-					log.Println(err)
-					return
-				}
-			}
-			if resp != nil {
-				assert.Equal(
-					tt.expStatusCode,
-					resp.StatusCode,
-				)
-			}
-		})
-	}
-}
--- a/integration/login_test.go
+++ b/integration/login_test.go
@@ -32,6 +32,7 @@ import (
 )

 func TestLoginStrategy(t *testing.T) {
+
 	assert := assert.New(t)

 	// image for now:
@@ -69,9 +70,11 @@ func TestLoginStrategy(t *testing.T) {
 		assert.Equal(models.LoginDetailsLoginStrategyForm, loginDetails.LoginStrategy, "Login Details don't match")

 	}
+
 }

 func TestLogout(t *testing.T) {
+
 	assert := assert.New(t)

 	// image for now:
@@ -116,8 +119,8 @@ func TestLogout(t *testing.T) {
 		log.Println("authentication token not found in cookies response")
 		return
 	}
-	logoutRequest := bytes.NewReader([]byte("{}"))
-	request, err = http.NewRequest("POST", "http://localhost:9090/api/v1/logout", logoutRequest)
+
+	request, err = http.NewRequest("POST", "http://localhost:9090/api/v1/logout", requestDataBody)
 	if err != nil {
 		log.Println(err)
 		return
@@ -126,37 +129,9 @@ func TestLogout(t *testing.T) {
 	request.Header.Add("Content-Type", "application/json")

 	response, err = client.Do(request)
+
 	assert.NotNil(response, "Logout response is nil")
 	assert.Nil(err, "Logout errored out")
 	assert.Equal(response.StatusCode, 200)
-}
-
-func TestBadLogin(t *testing.T) {
-	assert := assert.New(t)
-
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	requestData := map[string]string{
-		"accessKey": "minioadmin",
-		"secretKey": "minioadminbad",
-	}
-
-	requestDataJSON, _ := json.Marshal(requestData)
-
-	requestDataBody := bytes.NewReader(requestDataJSON)
-
-	request, err := http.NewRequest("POST", "http://localhost:9090/api/v1/login", requestDataBody)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	request.Header.Add("Content-Type", "application/json")
-
-	response, err := client.Do(request)
-
-	assert.Equal(401, response.StatusCode, "Login request not rejected")
-	assert.NotNil(response, "Login response is  nil")
-	assert.Nil(err, "Login errored out")
+
 }
--- a/integration/objects_test.go
+++ b/integration/objects_test.go
@@ -34,6 +34,7 @@ import (
 )

 func TestObjectGet(t *testing.T) {
+
 	// for setup we'll create a bucket and upload a file
 	endpoint := "localhost:9000"
 	accessKeyID := "minioadmin"
@@ -193,4 +194,5 @@ func TestObjectGet(t *testing.T) {
 			}
 		})
 	}
+
 }
--- a/integration/policy_test.go
+++ b/integration/policy_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -32,7 +31,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func AddPolicy(name, definition string) (*http.Response, error) {
+func AddPolicy(name string, definition string) (*http.Response, error) {
 	/*
 		This is an atomic function to add user and can be reused across
 		different functions.
@@ -60,7 +59,7 @@ func AddPolicy(name, definition string) (*http.Response, error) {
 	return response, err
 }

-func SetPolicy(policies []string, entityName, entityType string) (*http.Response, error) {
+func SetPolicy(policies []string, entityName string, entityType string) (*http.Response, error) {
 	/*
 		This is an atomic function to add user and can be reused across
 		different functions.
@@ -154,35 +153,11 @@ func Test_AddPolicyAPI(t *testing.T) {
 			expectedStatus: 500,
 			expectedError:  nil,
 		},
-		{
-			name: "Create Policy - Space in Name",
-			args: args{
-				api:  "/policies",
-				name: "space test",
-				policy: swag.String(`
-  {
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Action": [
-        "s3:GetBucketLocation",
-        "s3:GetObject"
-      ],
-      "Resource": [
-        "arn:aws:s3:::*"
-      ]
-    }
-  ]
-}`),
-			},
-			expectedStatus: 400,
-			expectedError:  nil,
-		},
 	}

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -213,6 +188,7 @@ func Test_AddPolicyAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_SetPolicyAPI(t *testing.T) {
@@ -297,6 +273,7 @@ func Test_SetPolicyAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -328,6 +305,7 @@ func Test_SetPolicyAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_SetPolicyMultipleAPI(t *testing.T) {
@@ -409,6 +387,7 @@ func Test_SetPolicyMultipleAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -438,6 +417,7 @@ func Test_SetPolicyMultipleAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_ListPoliciesAPI(t *testing.T) {
@@ -464,6 +444,7 @@ func Test_ListPoliciesAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -486,6 +467,7 @@ func Test_ListPoliciesAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_GetPolicyAPI(t *testing.T) {
@@ -520,7 +502,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 		{
 			name: "Get Policies - Invalid",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("test3")),
+				api: "/policy?name=test3",
 			},
 			expectedStatus: 500,
 			expectedError:  nil,
@@ -528,7 +510,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 		{
 			name: "Get Policies - Valid",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("getpolicytest")),
+				api: "/policy?name=getpolicytest",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -537,12 +519,13 @@ func Test_GetPolicyAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

 			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/policy/%s", tt.args.api), nil)
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
 			if err != nil {
 				log.Println(err)
 				return
@@ -559,6 +542,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_PolicyListUsersAPI(t *testing.T) {
@@ -595,7 +579,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Valid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("policylistusers")) + "/users",
+				api: "/policies/policylistusers/users",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -603,7 +587,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Invalid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("test2")) + "/users",
+				api: "/policies/test2/users",
 			},
 			expectedStatus: 404,
 			expectedError:  nil,
@@ -612,6 +596,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -636,8 +621,10 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 					assert.Equal("[\"policyuser4\"]\n", string(bodyBytes))
 				}
 			}
+
 		})
 	}
+
 }

 func Test_PolicyListGroupsAPI(t *testing.T) {
@@ -674,7 +661,7 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Valid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("policylistgroups")) + "/groups",
+				api: "/policies/policylistgroups/groups",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -682,7 +669,7 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Invalid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("test3")) + "/groups",
+				api: "/policies/test3/groups",
 			},
 			expectedStatus: 404,
 			expectedError:  nil,
@@ -691,6 +678,7 @@ func Test_PolicyListGroupsAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -715,8 +703,10 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 					assert.Equal("[\"testgroup12345\"]\n", string(bodyBytes))
 				}
 			}
+
 		})
 	}
+
 }

 func Test_DeletePolicyAPI(t *testing.T) {
@@ -751,7 +741,7 @@ func Test_DeletePolicyAPI(t *testing.T) {
 		{
 			name: "Delete Policies - Valid",
 			args: args{
-				api:    base64.StdEncoding.EncodeToString([]byte("testdelete")),
+				api:    "/policy?name=testdelete",
 				method: "DELETE",
 			},
 			expectedStatus: 204,
@@ -760,7 +750,7 @@ func Test_DeletePolicyAPI(t *testing.T) {
 		{
 			name: "Get Policy After Delete - Invalid",
 			args: args{
-				api:    base64.StdEncoding.EncodeToString([]byte("testdelete")),
+				api:    "/policy?name=testdelete",
 				method: "GET",
 			},
 			expectedStatus: 500,
@@ -770,12 +760,13 @@ func Test_DeletePolicyAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

 			request, err := http.NewRequest(
-				tt.args.method, fmt.Sprintf("http://localhost:9090/api/v1/policy/%s", tt.args.api), nil)
+				tt.args.method, fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
 			if err != nil {
 				log.Println(err)
 				return
@@ -792,71 +783,5 @@ func Test_DeletePolicyAPI(t *testing.T) {
 			}
 		})
 	}
-}

-func Test_GetAUserPolicyAPI(t *testing.T) {
-	assert := assert.New(t)
-	// Create a User with a Policy to use for testing
-	groups := []string{}
-	policies := []string{"readwrite"}
-	_, err := AddUser("getuserpolicyuser", "secretKey", groups, policies)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	// encode usernames to pass to api
-	bName := []byte("getuserpolicyuser")
-	fName := []byte("failname")
-	encodedName := base64.URLEncoding.EncodeToString(bName)
-	encodedFailName := base64.URLEncoding.EncodeToString(fName)
-
-	type args struct {
-		api string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get User Policy - Invalid",
-			args: args{
-				api: "/user/" + encodedFailName + "/policies",
-			},
-			expectedStatus: 401,
-			expectedError:  nil,
-		},
-		{
-			name: "Get User Policy - Valid",
-			args: args{
-				api: "/user/" + encodedName + "/policies",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
 }
--- a/integration/profiling_test.go
+++ b/integration/profiling_test.go
@@ -20,16 +20,18 @@ import (
 	"archive/zip"
 	"bytes"
 	"fmt"
+	"io"
 	"log"
 	"net/http"
+	"strings"
 	"testing"
+	"time"

-	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/assert"
 )

 func TestStartProfiling(t *testing.T) {
-	testAssert := assert.New(t)
+	testAsser := assert.New(t)

 	tests := []struct {
 		name string
@@ -41,6 +43,7 @@ func TestStartProfiling(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			files := map[string]bool{
 				"profile-127.0.0.1:9000-goroutines.txt":                false,
 				"profile-127.0.0.1:9000-goroutines-before.txt":         false,
@@ -56,28 +59,53 @@ func TestStartProfiling(t *testing.T) {
 				"profile-127.0.0.1:9000-mutex-before.pprof":            false,
 			}

-			wsDestination := "/ws/profile?types=cpu,mem,block,mutex,trace,threads,goroutines"
-			wsFinalURL := fmt.Sprintf("ws://localhost:9090%s", wsDestination)
-
-			ws, _, err := websocket.DefaultDialer.Dial(wsFinalURL, nil)
-			if err != nil {
-				log.Println(err)
-				return
+			client := &http.Client{
+				Timeout: 3 * time.Second,
 			}
-			defer ws.Close()

-			_, zipFileBytes, err := ws.ReadMessage()
+			destination := "/api/v1/profiling/start"
+			finalURL := fmt.Sprintf("http://localhost:9090%s", destination)
+			request, err := http.NewRequest("POST", finalURL, strings.NewReader("{\"type\":\"cpu,mem,block,mutex,trace,threads,goroutines\"}"))
 			if err != nil {
 				log.Println(err)
 				return
 			}

+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+
+			response, err := client.Do(request)
+
+			testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+			testAsser.Equal(201, response.StatusCode)
+
+			time.Sleep(5 * time.Second)
+
+			destination = "/api/v1/profiling/stop"
+			finalURL = fmt.Sprintf("http://localhost:9090%s", destination)
+			request, err = http.NewRequest("POST", finalURL, nil)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+
+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+
+			response, err = client.Do(request)
+
+			testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+			testAsser.Equal(200, response.StatusCode)
+			zipFileBytes, err := io.ReadAll(response.Body)
+			if err != nil {
+				testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+			}
 			filetype := http.DetectContentType(zipFileBytes)
-			testAssert.Equal("application/zip", filetype)
+			testAsser.Equal("application/zip", filetype)

 			zipReader, err := zip.NewReader(bytes.NewReader(zipFileBytes), int64(len(zipFileBytes)))
 			if err != nil {
-				testAssert.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+				testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
 			}

 			// Read all the files from zip archive
@@ -86,7 +114,7 @@ func TestStartProfiling(t *testing.T) {
 			}

 			for k, v := range files {
-				testAssert.Equal(true, v, fmt.Sprintf("%s : compressed file expected to have %v file inside", tt.name, k))
+				testAsser.Equal(true, v, fmt.Sprintf("%s : compressed file expected to have %v file inside", tt.name, k))
 			}
 		})
 	}
--- a/integration/service_account_test.go
+++ b/integration/service_account_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -75,8 +74,7 @@ func TestAddServiceAccount(t *testing.T) {
 		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
 	}

-	requestDataPolicy := map[string]interface{}{
-		"policy": `
+	requestDataPolicy := map[string]interface{}{"policy": `
  {
  "Version": "2012-10-17",
  "Statement": [
@@ -96,7 +94,7 @@ func TestAddServiceAccount(t *testing.T) {
 	requestDataJSON, _ = json.Marshal(requestDataPolicy)
 	requestDataBody = bytes.NewReader(requestDataJSON)
 	request, err = http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", requestDataBody)
+		"PUT", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", requestDataBody)
 	if err != nil {
 		log.Println(err)
 		return
@@ -115,7 +113,7 @@ func TestAddServiceAccount(t *testing.T) {

 	// Test policy
 	request, err = http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", nil)
+		"GET", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", nil)
 	if err != nil {
 		log.Println(err)
 		return
@@ -147,7 +145,7 @@ func TestAddServiceAccount(t *testing.T) {
 	// {{baseUrl}}/user?name=proident velit
 	// Investiga como se borra en el browser.
 	request, err = http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1")), nil)
+		"DELETE", "http://localhost:9090/api/v1/service-accounts/testuser1", nil)
 	if err != nil {
 		log.Println(err)
 		return
@@ -163,6 +161,7 @@ func TestAddServiceAccount(t *testing.T) {
 		fmt.Println("DELETE StatusCode:", response.StatusCode)
 		assert.Equal(204, response.StatusCode, "has to be 204 when delete user")
 	}
+
 }

 func Test_ServiceAccountsAPI(t *testing.T) {
@@ -239,6 +238,7 @@ func Test_ServiceAccountsAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -268,8 +268,10 @@ func Test_ServiceAccountsAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
+
 }

 func DeleteMultipleServiceAccounts(serviceAccounts []string) (*http.Response, error) {
@@ -308,9 +310,9 @@ func TestCreateServiceAccountForUserWithCredentials(t *testing.T) {
 	serviceAccountLengthInBytes := 40 // As observed, update as needed

 	// 1. Create the user
-	groups := []string{}
-	policies := []string{}
-	secretKey := "testcreateserviceaccountforuserwithcrede"
+	var groups = []string{}
+	var policies = []string{}
+	var secretKey = "testcreateserviceaccountforuserwithcrede"
 	response, err := AddUser(userName, "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -403,4 +405,5 @@ func TestCreateServiceAccountForUserWithCredentials(t *testing.T) {
 			inspectHTTPResponse(response),
 		)
 	}
+
 }
--- a/integration/tiers_test.go
+++ b/integration/tiers_test.go
@@ -27,6 +27,7 @@ import (
 )

 func TestTiersList(t *testing.T) {
+
 	assert := assert.New(t)

 	// image for now:
@@ -50,4 +51,5 @@ func TestTiersList(t *testing.T) {
 	assert.NotNil(response, "Tiers List response is nil")
 	assert.Nil(err, "Tiers List errored out")
 	assert.Equal(response.StatusCode, 200)
+
 }
--- a/integration/user_api_bucket_test.go
+++ b/integration/user_api_bucket_test.go
--- a/integration/users_test.go
+++ b/integration/users_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -32,7 +31,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func AddUser(accessKey, secretKey string, groups, policies []string) (*http.Response, error) {
+func AddUser(accessKey string, secretKey string, groups []string, policies []string) (*http.Response, error) {
 	/*
 		This is an atomic function to add user and can be reused across
 		different functions.
@@ -63,7 +62,6 @@ func AddUser(accessKey, secretKey string, groups, policies []string) (*http.Resp
 }

 func DeleteUser(userName string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		This is an atomic function to delete user and can be reused across
 		different functions.
@@ -72,7 +70,7 @@ func DeleteUser(userName string) (*http.Response, error) {
 		Timeout: 3 * time.Second,
 	}
 	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user/"+userName, nil)
+		"DELETE", "http://localhost:9090/api/v1/user?name="+userName, nil)
 	if err != nil {
 		log.Println(err)
 	}
@@ -82,7 +80,7 @@ func DeleteUser(userName string) (*http.Response, error) {
 	return response, err
 }

-func ListUsers(offset, limit string) (*http.Response, error) {
+func ListUsers(offset string, limit string) (*http.Response, error) {
 	/*
 		This is an atomic function to list users.
 		{{baseUrl}}/users?offset=-5480083&limit=-5480083
@@ -104,7 +102,6 @@ func ListUsers(offset, limit string) (*http.Response, error) {
 }

 func GetUserInformation(userName string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to get user information via API:
 		{{baseUrl}}/user?name=proident velit
@@ -114,7 +111,7 @@ func GetUserInformation(userName string) (*http.Response, error) {
 	}
 	request, err := http.NewRequest(
 		"GET",
-		"http://localhost:9090/api/v1/user/"+userName,
+		"http://localhost:9090/api/v1/user?name="+userName,
 		nil)
 	if err != nil {
 		log.Println(err)
@@ -125,8 +122,7 @@ func GetUserInformation(userName string) (*http.Response, error) {
 	return response, err
 }

-func UpdateUserInformation(name, status string, groups []string) (*http.Response, error) {
-	name = base64.StdEncoding.EncodeToString([]byte(name))
+func UpdateUserInformation(name string, status string, groups []string) (*http.Response, error) {
 	/*
 		Helper function to update user information:
 		PUT: {{baseUrl}}/user?name=proident velit
@@ -149,7 +145,7 @@ func UpdateUserInformation(name, status string, groups []string) (*http.Response
 	requestDataJSON, _ := json.Marshal(requestDataAdd)
 	requestDataBody := bytes.NewReader(requestDataJSON)
 	request, err := http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/user/"+name, requestDataBody)
+		"PUT", "http://localhost:9090/api/v1/user?name="+name, requestDataBody)
 	if err != nil {
 		log.Println(err)
 	}
@@ -160,7 +156,6 @@ func UpdateUserInformation(name, status string, groups []string) (*http.Response
 }

 func RemoveUser(name string) (*http.Response, error) {
-	name = base64.StdEncoding.EncodeToString([]byte(name))
 	/*
 		Helper function to remove user.
 		DELETE: {{baseUrl}}/user?name=proident velit
@@ -169,7 +164,7 @@ func RemoveUser(name string) (*http.Response, error) {
 		Timeout: 3 * time.Second,
 	}
 	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user/"+name, nil)
+		"DELETE", "http://localhost:9090/api/v1/user?name="+name, nil)
 	if err != nil {
 		log.Println(err)
 	}
@@ -180,7 +175,6 @@ func RemoveUser(name string) (*http.Response, error) {
 }

 func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to update groups for a user
 		PUT: {{baseUrl}}/user/groups?name=username
@@ -201,7 +195,7 @@ func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, err
 	requestDataBody := bytes.NewReader(requestDataJSON)
 	request, err := http.NewRequest(
 		"PUT",
-		"http://localhost:9090/api/v1/user/"+userName+"/groups",
+		"http://localhost:9090/api/v1/user/groups?name="+userName,
 		requestDataBody,
 	)
 	if err != nil {
@@ -213,8 +207,7 @@ func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, err
 	return response, err
 }

-func CreateServiceAccountForUser(userName, policy string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
+func CreateServiceAccountForUser(userName string, policy string) (*http.Response, error) {
 	/*
 		Helper function to Create Service Account for user
 		POST: api/v1/user/username/service-accounts
@@ -244,8 +237,7 @@ func CreateServiceAccountForUser(userName, policy string) (*http.Response, error
 	return response, err
 }

-func CreateServiceAccountForUserWithCredentials(userName, policy, accessKey, secretKey string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
+func CreateServiceAccountForUserWithCredentials(userName string, policy string, accessKey string, secretKey string) (*http.Response, error) {
 	// Helper function to test "Create Service Account for User With Credentials" end point.
 	client := &http.Client{
 		Timeout: 3 * time.Second,
@@ -272,7 +264,6 @@ func CreateServiceAccountForUserWithCredentials(userName, policy, accessKey, sec
 }

 func ReturnsAListOfServiceAccountsForAUser(userName string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to return a list of service accounts for a user.
 		GET: {{baseUrl}}/user/:name/service-accounts
@@ -321,7 +312,7 @@ func AddGroup(group string, members []string) (*http.Response, error) {
 	return response, err
 }

-func UsersGroupsBulk(users, groups []string) (*http.Response, error) {
+func UsersGroupsBulk(users []string, groups []string) (*http.Response, error) {
 	/*
 		Helper function to test Bulk functionality to Add Users to Groups.
 		PUT: {{baseUrl}}/users-groups-bulk
@@ -372,8 +363,8 @@ func TestAddUser(t *testing.T) {
 	assert := assert.New(t)

 	// With no groups & no policies
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser("accessKey", "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -393,6 +384,7 @@ func TestAddUser(t *testing.T) {
 		fmt.Println("DELETE StatusCode:", response.StatusCode)
 		assert.Equal(204, response.StatusCode, "has to be 204 when delete user")
 	}
+
 }

 func TestListUsers(t *testing.T) {
@@ -406,8 +398,8 @@ func TestListUsers(t *testing.T) {
 	assert := assert.New(t)

 	// With no groups & no policies
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}

 	// 1. Create the users
 	numberOfUsers := 5
@@ -462,6 +454,7 @@ func TestListUsers(t *testing.T) {
 				response.StatusCode, "has to be 204 when delete user")
 		}
 	}
+
 }

 func TestGetUserInfo(t *testing.T) {
@@ -472,8 +465,8 @@ func TestGetUserInfo(t *testing.T) {
 	// 1. Create the user
 	fmt.Println("TestGetUserInfo(): 1. Create the user")
 	assert := assert.New(t)
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser("accessKey", "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -507,6 +500,7 @@ func TestGetUserInfo(t *testing.T) {
 	expected := "{\"accessKey\":\"accessKey\",\"memberOf\":null,\"policy\":[],\"status\":\"enabled\"}\n"
 	obtained := string(b)
 	assert.Equal(expected, obtained, "User Information is wrong")
+
 }

 func TestUpdateUserInfoSuccessfulResponse(t *testing.T) {
@@ -517,8 +511,8 @@ func TestUpdateUserInfoSuccessfulResponse(t *testing.T) {
 	assert := assert.New(t)

 	// 1. Create an active user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	addUserResponse, addUserError := AddUser(
 		"updateuser", "secretKey", groups, policies)
 	if addUserError != nil {
@@ -551,6 +545,7 @@ func TestUpdateUserInfoSuccessfulResponse(t *testing.T) {
 		log.Fatalln(err)
 	}
 	assert.True(strings.Contains(string(b), "disabled"))
+
 }

 func TestUpdateUserInfoGenericErrorResponse(t *testing.T) {
@@ -561,8 +556,8 @@ func TestUpdateUserInfoGenericErrorResponse(t *testing.T) {
 	assert := assert.New(t)

 	// 1. Create an active user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	addUserResponse, addUserError := AddUser(
 		"updateusererror", "secretKey", groups, policies)
 	if addUserError != nil {
@@ -595,6 +590,7 @@ func TestUpdateUserInfoGenericErrorResponse(t *testing.T) {
 		log.Fatalln(err)
 	}
 	assert.True(strings.Contains(string(b), "status not valid"))
+
 }

 func TestRemoveUserSuccessfulResponse(t *testing.T) {
@@ -605,8 +601,8 @@ func TestRemoveUserSuccessfulResponse(t *testing.T) {
 	assert := assert.New(t)

 	// 1. Create an active user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	addUserResponse, addUserError := AddUser(
 		"testremoveuser1", "secretKey", groups, policies)
 	if addUserError != nil {
@@ -648,6 +644,7 @@ func TestRemoveUserSuccessfulResponse(t *testing.T) {
 	fmt.Println(finalResponse)
 	assert.True(strings.Contains(
 		finalResponse, "The specified user does not exist"), finalResponse)
+
 }

 func TestUpdateGroupsForAUser(t *testing.T) {
@@ -660,8 +657,8 @@ func TestUpdateGroupsForAUser(t *testing.T) {
 	groupName := "updategroupforausergroup"
 	userName := "updategroupsforauser1"
 	assert := assert.New(t)
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser(userName, "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -673,7 +670,7 @@ func TestUpdateGroupsForAUser(t *testing.T) {
 	}

 	// 2. Update the groups of the created user with newGroups
-	newGroups := make([]string, 3)
+	var newGroups = make([]string, 3)
 	for i := 0; i < numberOfGroups; i++ {
 		newGroups[i] = groupName + strconv.Itoa(i)
 	}
@@ -704,6 +701,7 @@ func TestUpdateGroupsForAUser(t *testing.T) {
 		assert.True(strings.Contains(
 			finalResponse, groupName+strconv.Itoa(i)), finalResponse)
 	}
+
 }

 func TestCreateServiceAccountForUser(t *testing.T) {
@@ -718,8 +716,8 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 	serviceAccountLengthInBytes := 40 // As observed, update as needed

 	// 1. Create the user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser(userName, "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -749,10 +747,8 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 	}

 	// 3. Verify the service account for the user
-	listOfAccountsResponse, listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
-
-	fmt.Println(listOfAccountsResponse, listOfAccountsError)
-
+	listOfAccountsResponse,
+		listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
 	if listOfAccountsError != nil {
 		log.Println(listOfAccountsError)
 		assert.Fail("Error in listOfAccountsError")
@@ -765,8 +761,8 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 			finalResponse,
 		)
 	}
-
 	assert.Equal(len(finalResponse), serviceAccountLengthInBytes, finalResponse)
+
 }

 func TestUsersGroupsBulk(t *testing.T) {
@@ -778,11 +774,11 @@ func TestUsersGroupsBulk(t *testing.T) {
 	assert := assert.New(t)
 	numberOfUsers := 5
 	numberOfGroups := 1
-	// var groups = []string{}
-	policies := []string{}
+	//var groups = []string{}
+	var policies = []string{}
 	username := "testusersgroupbulk"
 	groupName := "testusersgroupsbulkgroupone"
-	members := []string{}
+	var members = []string{}
 	users := make([]string, numberOfUsers)
 	groups := make([]string, numberOfGroups)

@@ -854,69 +850,7 @@ func TestUsersGroupsBulk(t *testing.T) {
 			assert.Equal(200, responseGetUserInfo.StatusCode, finalResponse)
 		}
 		// Make sure the user belongs to the created group
-		assert.True(strings.Contains(finalResponse, groupName))
-	}
-}
-
-func Test_GetUserPolicyAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	// 1. Create an active user with valid policy
-	groups := []string{}
-	policies := []string{"readwrite"}
-	addUserResponse, addUserError := AddUser(
-		"getpolicyuser", "secretKey", groups, policies)
-	if addUserError != nil {
-		log.Println(addUserError)
-		return
-	}
-	if addUserResponse != nil {
-		fmt.Println("StatusCode:", addUserResponse.StatusCode)
-		assert.Equal(
-			201, addUserResponse.StatusCode, "Status Code is incorrect")
-	}
-
-	type args struct {
-		api string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get User Policies",
-			args: args{
-				api: "/user/policy",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
+		assert.True(strings.Contains(string(finalResponse), groupName))
 	}
+
 }
--- a/integration/version_test.go
+++ b/integration/version_test.go
@@ -68,6 +68,8 @@ func Test_VersionAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
+
 }
--- a/k8s/metrics-dev.yaml
+++ b/k8s/metrics-dev.yaml
@@ -149,5 +149,5 @@ spec:
            - name: tmp-dir
              mountPath: /tmp
      nodeSelector:
-        kubernetes.io/os: linux
+        beta.kubernetes.io/os: linux
        kubernetes.io/arch: "amd64"
--- a/k8s/operator-console/base/console-deployment.yaml
+++ b/k8s/operator-console/base/console-deployment.yaml
@@ -15,7 +15,7 @@ spec:
      serviceAccountName: console-sa
      containers:
        - name: console
-          image: 'minio/console:v0.22.3'
+          image: 'minio/console:v0.16.0'
          imagePullPolicy: "IfNotPresent"
          env:
            - name: CONSOLE_OPERATOR_MODE
--- a/k8s/operator-console/standalone/console-deployment.yaml
+++ b/k8s/operator-console/standalone/console-deployment.yaml
@@ -32,7 +32,7 @@ spec:
    spec:
      containers:
        - name: console
-          image: 'minio/console:v0.22.3'
+          image: 'minio/console:v0.16.0'
          imagePullPolicy: "IfNotPresent"
          env:
            - name: CONSOLE_MINIO_SERVER
--- a/models/a_user_policy_response.go
+++ b/models/a_user_policy_response.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// AUserPolicyResponse a user policy response
-//
-// swagger:model aUserPolicyResponse
-type AUserPolicyResponse struct {
-
-	// policy
-	Policy string `json:"policy,omitempty"`
-}
-
-// Validate validates this a user policy response
-func (m *AUserPolicyResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this a user policy response based on context it is used
-func (m *AUserPolicyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AUserPolicyResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AUserPolicyResponse) UnmarshalBinary(b []byte) error {
-	var res AUserPolicyResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/admin_info_response.go
+++ b/models/admin_info_response.go
@@ -24,13 +24,11 @@ package models

 import (
 	"context"
-	"encoding/json"
 	"strconv"

 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
 )

 // AdminInfoResponse admin info response
@@ -38,19 +36,15 @@ import (
 // swagger:model adminInfoResponse
 type AdminInfoResponse struct {

-	// advanced metrics status
-	// Enum: [not configured available unavailable]
-	AdvancedMetricsStatus string `json:"advancedMetricsStatus,omitempty"`
-
-	// backend
-	Backend *BackendProperties `json:"backend,omitempty"`
-
 	// buckets
 	Buckets int64 `json:"buckets,omitempty"`

 	// objects
 	Objects int64 `json:"objects,omitempty"`

+	// prometheus not ready
+	PrometheusNotReady bool `json:"prometheusNotReady,omitempty"`
+
 	// servers
 	Servers []*ServerProperties `json:"servers"`

@@ -65,14 +59,6 @@ type AdminInfoResponse struct {
 func (m *AdminInfoResponse) Validate(formats strfmt.Registry) error {
 	var res []error

-	if err := m.validateAdvancedMetricsStatus(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateBackend(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateServers(formats); err != nil {
 		res = append(res, err)
 	}
@@ -87,70 +73,6 @@ func (m *AdminInfoResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }

-var adminInfoResponseTypeAdvancedMetricsStatusPropEnum []interface{}
-
-func init() {
-	var res []string
-	if err := json.Unmarshal([]byte(`["not configured","available","unavailable"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		adminInfoResponseTypeAdvancedMetricsStatusPropEnum = append(adminInfoResponseTypeAdvancedMetricsStatusPropEnum, v)
-	}
-}
-
-const (
-
-	// AdminInfoResponseAdvancedMetricsStatusNotConfigured captures enum value "not configured"
-	AdminInfoResponseAdvancedMetricsStatusNotConfigured string = "not configured"
-
-	// AdminInfoResponseAdvancedMetricsStatusAvailable captures enum value "available"
-	AdminInfoResponseAdvancedMetricsStatusAvailable string = "available"
-
-	// AdminInfoResponseAdvancedMetricsStatusUnavailable captures enum value "unavailable"
-	AdminInfoResponseAdvancedMetricsStatusUnavailable string = "unavailable"
-)
-
-// prop value enum
-func (m *AdminInfoResponse) validateAdvancedMetricsStatusEnum(path, location string, value string) error {
-	if err := validate.EnumCase(path, location, value, adminInfoResponseTypeAdvancedMetricsStatusPropEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *AdminInfoResponse) validateAdvancedMetricsStatus(formats strfmt.Registry) error {
-	if swag.IsZero(m.AdvancedMetricsStatus) { // not required
-		return nil
-	}
-
-	// value enum
-	if err := m.validateAdvancedMetricsStatusEnum("advancedMetricsStatus", "body", m.AdvancedMetricsStatus); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *AdminInfoResponse) validateBackend(formats strfmt.Registry) error {
-	if swag.IsZero(m.Backend) { // not required
-		return nil
-	}
-
-	if m.Backend != nil {
-		if err := m.Backend.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("backend")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("backend")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *AdminInfoResponse) validateServers(formats strfmt.Registry) error {
 	if swag.IsZero(m.Servers) { // not required
 		return nil
@@ -207,10 +129,6 @@ func (m *AdminInfoResponse) validateWidgets(formats strfmt.Registry) error {
 func (m *AdminInfoResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

-	if err := m.contextValidateBackend(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.contextValidateServers(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -225,22 +143,6 @@ func (m *AdminInfoResponse) ContextValidate(ctx context.Context, formats strfmt.
 	return nil
 }

-func (m *AdminInfoResponse) contextValidateBackend(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Backend != nil {
-		if err := m.Backend.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("backend")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("backend")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *AdminInfoResponse) contextValidateServers(ctx context.Context, formats strfmt.Registry) error {

 	for i := 0; i < len(m.Servers); i++ {
--- a/models/api_key.go
+++ b/models/api_key.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// APIKey api key
-//
-// swagger:model apiKey
-type APIKey struct {
-
-	// api key
-	APIKey string `json:"apiKey,omitempty"`
-}
-
-// Validate validates this api key
-func (m *APIKey) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this api key based on context it is used
-func (m *APIKey) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *APIKey) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *APIKey) UnmarshalBinary(b []byte) error {
-	var res APIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/backend_properties.go
+++ b/models/backend_properties.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// BackendProperties backend properties
-//
-// swagger:model BackendProperties
-type BackendProperties struct {
-
-	// backend type
-	BackendType string `json:"backendType,omitempty"`
-
-	// rr s c parity
-	RrSCParity int64 `json:"rrSCParity,omitempty"`
-
-	// standard s c parity
-	StandardSCParity int64 `json:"standardSCParity,omitempty"`
-}
-
-// Validate validates this backend properties
-func (m *BackendProperties) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this backend properties based on context it is used
-func (m *BackendProperties) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BackendProperties) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BackendProperties) UnmarshalBinary(b []byte) error {
-	var res BackendProperties
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/condition.go
+++ b/models/condition.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Condition condition
-//
-// swagger:model condition
-type Condition struct {
-
-	// status
-	Status string `json:"status,omitempty"`
-
-	// type
-	Type string `json:"type,omitempty"`
-}
-
-// Validate validates this condition
-func (m *Condition) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this condition based on context it is used
-func (m *Condition) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Condition) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Condition) UnmarshalBinary(b []byte) error {
-	var res Condition
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/config_map.go
+++ b/models/config_map.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// ConfigMap config map
-//
-// swagger:model configMap
-type ConfigMap struct {
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// optional
-	Optional bool `json:"optional,omitempty"`
-}
-
-// Validate validates this config map
-func (m *ConfigMap) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this config map based on context it is used
-func (m *ConfigMap) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ConfigMap) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ConfigMap) UnmarshalBinary(b []byte) error {
-	var res ConfigMap
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/container.go
+++ b/models/container.go
@@ -1,309 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Container container
-//
-// swagger:model container
-type Container struct {
-
-	// args
-	Args []string `json:"args"`
-
-	// container ID
-	ContainerID string `json:"containerID,omitempty"`
-
-	// environment variables
-	EnvironmentVariables []*EnvironmentVariable `json:"environmentVariables"`
-
-	// host ports
-	HostPorts []string `json:"hostPorts"`
-
-	// image
-	Image string `json:"image,omitempty"`
-
-	// image ID
-	ImageID string `json:"imageID,omitempty"`
-
-	// last state
-	LastState *State `json:"lastState,omitempty"`
-
-	// mounts
-	Mounts []*Mount `json:"mounts"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// ports
-	Ports []string `json:"ports"`
-
-	// ready
-	Ready bool `json:"ready,omitempty"`
-
-	// restart count
-	RestartCount int64 `json:"restartCount,omitempty"`
-
-	// state
-	State *State `json:"state,omitempty"`
-}
-
-// Validate validates this container
-func (m *Container) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateEnvironmentVariables(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateLastState(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateMounts(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateState(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Container) validateEnvironmentVariables(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentVariables) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.EnvironmentVariables); i++ {
-		if swag.IsZero(m.EnvironmentVariables[i]) { // not required
-			continue
-		}
-
-		if m.EnvironmentVariables[i] != nil {
-			if err := m.EnvironmentVariables[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) validateLastState(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastState) { // not required
-		return nil
-	}
-
-	if m.LastState != nil {
-		if err := m.LastState.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("lastState")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("lastState")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Container) validateMounts(formats strfmt.Registry) error {
-	if swag.IsZero(m.Mounts) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Mounts); i++ {
-		if swag.IsZero(m.Mounts[i]) { // not required
-			continue
-		}
-
-		if m.Mounts[i] != nil {
-			if err := m.Mounts[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("mounts" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("mounts" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) validateState(formats strfmt.Registry) error {
-	if swag.IsZero(m.State) { // not required
-		return nil
-	}
-
-	if m.State != nil {
-		if err := m.State.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("state")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("state")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this container based on the context it is used
-func (m *Container) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateEnvironmentVariables(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateLastState(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateMounts(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateState(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Container) contextValidateEnvironmentVariables(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.EnvironmentVariables); i++ {
-
-		if m.EnvironmentVariables[i] != nil {
-			if err := m.EnvironmentVariables[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) contextValidateLastState(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.LastState != nil {
-		if err := m.LastState.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("lastState")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("lastState")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Container) contextValidateMounts(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Mounts); i++ {
-
-		if m.Mounts[i] != nil {
-			if err := m.Mounts[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("mounts" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("mounts" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) contextValidateState(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.State != nil {
-		if err := m.State.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("state")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("state")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Container) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Container) UnmarshalBinary(b []byte) error {
-	var res Container
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/create_tenant_request.go
+++ b/models/create_tenant_request.go
@@ -58,9 +58,6 @@ type CreateTenantRequest struct {
 	// encryption
 	Encryption *EncryptionConfiguration `json:"encryption,omitempty"`

-	// environment variables
-	EnvironmentVariables []*EnvironmentVariable `json:"environmentVariables"`
-
 	// erasure coding parity
 	ErasureCodingParity int64 `json:"erasureCodingParity,omitempty"`

@@ -88,8 +85,8 @@ type CreateTenantRequest struct {
 	// log search configuration
 	LogSearchConfiguration *LogSearchConfiguration `json:"logSearchConfiguration,omitempty"`

-	// mount path
-	MountPath string `json:"mount_path,omitempty"`
+	// mounth path
+	MounthPath string `json:"mounth_path,omitempty"`

 	// name
 	// Required: true
@@ -126,10 +123,6 @@ func (m *CreateTenantRequest) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateEnvironmentVariables(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateIdp(formats); err != nil {
 		res = append(res, err)
 	}
@@ -206,32 +199,6 @@ func (m *CreateTenantRequest) validateEncryption(formats strfmt.Registry) error
 	return nil
 }

-func (m *CreateTenantRequest) validateEnvironmentVariables(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentVariables) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.EnvironmentVariables); i++ {
-		if swag.IsZero(m.EnvironmentVariables[i]) { // not required
-			continue
-		}
-
-		if m.EnvironmentVariables[i] != nil {
-			if err := m.EnvironmentVariables[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
 func (m *CreateTenantRequest) validateIdp(formats strfmt.Registry) error {
 	if swag.IsZero(m.Idp) { // not required
 		return nil
@@ -388,10 +355,6 @@ func (m *CreateTenantRequest) ContextValidate(ctx context.Context, formats strfm
 		res = append(res, err)
 	}

-	if err := m.contextValidateEnvironmentVariables(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.contextValidateIdp(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -454,26 +417,6 @@ func (m *CreateTenantRequest) contextValidateEncryption(ctx context.Context, for
 	return nil
 }

-func (m *CreateTenantRequest) contextValidateEnvironmentVariables(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.EnvironmentVariables); i++ {
-
-		if m.EnvironmentVariables[i] != nil {
-			if err := m.EnvironmentVariables[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
 func (m *CreateTenantRequest) contextValidateIdp(ctx context.Context, formats strfmt.Registry) error {

 	if m.Idp != nil {
--- a/models/csi_format_error_response.go
+++ b/models/csi_format_error_response.go
@@ -29,10 +29,10 @@ import (
 	"github.com/go-openapi/swag"
 )

-// PvFormatErrorResponse pv format error response
+// CsiFormatErrorResponse csi format error response
 //
-// swagger:model pvFormatErrorResponse
-type PvFormatErrorResponse struct {
+// swagger:model csiFormatErrorResponse
+type CsiFormatErrorResponse struct {

 	// drive
 	Drive string `json:"drive,omitempty"`
@@ -44,18 +44,18 @@ type PvFormatErrorResponse struct {
 	Node string `json:"node,omitempty"`
 }

-// Validate validates this pv format error response
-func (m *PvFormatErrorResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this csi format error response
+func (m *CsiFormatErrorResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validates this pv format error response based on context it is used
-func (m *PvFormatErrorResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this csi format error response based on context it is used
+func (m *CsiFormatErrorResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }

 // MarshalBinary interface implementation
-func (m *PvFormatErrorResponse) MarshalBinary() ([]byte, error) {
+func (m *CsiFormatErrorResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -63,8 +63,8 @@ func (m *PvFormatErrorResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *PvFormatErrorResponse) UnmarshalBinary(b []byte) error {
-	var res PvFormatErrorResponse
+func (m *CsiFormatErrorResponse) UnmarshalBinary(b []byte) error {
+	var res CsiFormatErrorResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/csr_element.go
+++ b/models/csr_element.go
@@ -1,154 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// CsrElement csr element
-//
-// swagger:model csrElement
-type CsrElement struct {
-
-	// annotations
-	Annotations []*Annotation `json:"annotations"`
-
-	// deletion grace period seconds
-	DeletionGracePeriodSeconds int64 `json:"deletion_grace_period_seconds,omitempty"`
-
-	// generate name
-	GenerateName string `json:"generate_name,omitempty"`
-
-	// generation
-	Generation int64 `json:"generation,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// namespace
-	Namespace string `json:"namespace,omitempty"`
-
-	// resource version
-	ResourceVersion string `json:"resource_version,omitempty"`
-
-	// status
-	Status string `json:"status,omitempty"`
-}
-
-// Validate validates this csr element
-func (m *CsrElement) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAnnotations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElement) validateAnnotations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Annotations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Annotations); i++ {
-		if swag.IsZero(m.Annotations[i]) { // not required
-			continue
-		}
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this csr element based on the context it is used
-func (m *CsrElement) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAnnotations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElement) contextValidateAnnotations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Annotations); i++ {
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *CsrElement) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *CsrElement) UnmarshalBinary(b []byte) error {
-	var res CsrElement
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/csr_elements.go
+++ b/models/csr_elements.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// CsrElements csr elements
-//
-// swagger:model csrElements
-type CsrElements struct {
-
-	// csr element
-	CsrElement []*CsrElement `json:"csrElement"`
-}
-
-// Validate validates this csr elements
-func (m *CsrElements) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCsrElement(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElements) validateCsrElement(formats strfmt.Registry) error {
-	if swag.IsZero(m.CsrElement) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.CsrElement); i++ {
-		if swag.IsZero(m.CsrElement[i]) { // not required
-			continue
-		}
-
-		if m.CsrElement[i] != nil {
-			if err := m.CsrElement[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this csr elements based on the context it is used
-func (m *CsrElements) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCsrElement(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElements) contextValidateCsrElement(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.CsrElement); i++ {
-
-		if m.CsrElement[i] != nil {
-			if err := m.CsrElement[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *CsrElements) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *CsrElements) UnmarshalBinary(b []byte) error {
-	var res CsrElements
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/describe_p_v_c_wrapper.go
+++ b/models/describe_p_v_c_wrapper.go
@@ -1,217 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// DescribePVCWrapper describe p v c wrapper
-//
-// swagger:model describePVCWrapper
-type DescribePVCWrapper struct {
-
-	// access modes
-	AccessModes []string `json:"accessModes"`
-
-	// annotations
-	Annotations []*Annotation `json:"annotations"`
-
-	// capacity
-	Capacity string `json:"capacity,omitempty"`
-
-	// finalizers
-	Finalizers []string `json:"finalizers"`
-
-	// labels
-	Labels []*Label `json:"labels"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// namespace
-	Namespace string `json:"namespace,omitempty"`
-
-	// status
-	Status string `json:"status,omitempty"`
-
-	// storage class
-	StorageClass string `json:"storageClass,omitempty"`
-
-	// volume
-	Volume string `json:"volume,omitempty"`
-
-	// volume mode
-	VolumeMode string `json:"volumeMode,omitempty"`
-}
-
-// Validate validates this describe p v c wrapper
-func (m *DescribePVCWrapper) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAnnotations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateLabels(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePVCWrapper) validateAnnotations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Annotations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Annotations); i++ {
-		if swag.IsZero(m.Annotations[i]) { // not required
-			continue
-		}
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePVCWrapper) validateLabels(formats strfmt.Registry) error {
-	if swag.IsZero(m.Labels) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Labels); i++ {
-		if swag.IsZero(m.Labels[i]) { // not required
-			continue
-		}
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this describe p v c wrapper based on the context it is used
-func (m *DescribePVCWrapper) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAnnotations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateLabels(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePVCWrapper) contextValidateAnnotations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Annotations); i++ {
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePVCWrapper) contextValidateLabels(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Labels); i++ {
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *DescribePVCWrapper) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *DescribePVCWrapper) UnmarshalBinary(b []byte) error {
-	var res DescribePVCWrapper
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/describe_pod_wrapper.go
+++ b/models/describe_pod_wrapper.go
@@ -1,517 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// DescribePodWrapper describe pod wrapper
-//
-// swagger:model describePodWrapper
-type DescribePodWrapper struct {
-
-	// annotations
-	Annotations []*Annotation `json:"annotations"`
-
-	// conditions
-	Conditions []*Condition `json:"conditions"`
-
-	// containers
-	Containers []*Container `json:"containers"`
-
-	// controller ref
-	ControllerRef string `json:"controllerRef,omitempty"`
-
-	// deletion grace period seconds
-	DeletionGracePeriodSeconds int64 `json:"deletionGracePeriodSeconds,omitempty"`
-
-	// deletion timestamp
-	DeletionTimestamp string `json:"deletionTimestamp,omitempty"`
-
-	// labels
-	Labels []*Label `json:"labels"`
-
-	// message
-	Message string `json:"message,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// namespace
-	Namespace string `json:"namespace,omitempty"`
-
-	// node name
-	NodeName string `json:"nodeName,omitempty"`
-
-	// node selector
-	NodeSelector []*NodeSelector `json:"nodeSelector"`
-
-	// phase
-	Phase string `json:"phase,omitempty"`
-
-	// pod IP
-	PodIP string `json:"podIP,omitempty"`
-
-	// priority
-	Priority int64 `json:"priority,omitempty"`
-
-	// priority class name
-	PriorityClassName string `json:"priorityClassName,omitempty"`
-
-	// qos class
-	QosClass string `json:"qosClass,omitempty"`
-
-	// reason
-	Reason string `json:"reason,omitempty"`
-
-	// start time
-	StartTime string `json:"startTime,omitempty"`
-
-	// tolerations
-	Tolerations []*Toleration `json:"tolerations"`
-
-	// volumes
-	Volumes []*Volume `json:"volumes"`
-}
-
-// Validate validates this describe pod wrapper
-func (m *DescribePodWrapper) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAnnotations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateConditions(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateContainers(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateLabels(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateNodeSelector(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateTolerations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateVolumes(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePodWrapper) validateAnnotations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Annotations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Annotations); i++ {
-		if swag.IsZero(m.Annotations[i]) { // not required
-			continue
-		}
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateConditions(formats strfmt.Registry) error {
-	if swag.IsZero(m.Conditions) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Conditions); i++ {
-		if swag.IsZero(m.Conditions[i]) { // not required
-			continue
-		}
-
-		if m.Conditions[i] != nil {
-			if err := m.Conditions[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("conditions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("conditions" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateContainers(formats strfmt.Registry) error {
-	if swag.IsZero(m.Containers) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Containers); i++ {
-		if swag.IsZero(m.Containers[i]) { // not required
-			continue
-		}
-
-		if m.Containers[i] != nil {
-			if err := m.Containers[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("containers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("containers" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateLabels(formats strfmt.Registry) error {
-	if swag.IsZero(m.Labels) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Labels); i++ {
-		if swag.IsZero(m.Labels[i]) { // not required
-			continue
-		}
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateNodeSelector(formats strfmt.Registry) error {
-	if swag.IsZero(m.NodeSelector) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.NodeSelector); i++ {
-		if swag.IsZero(m.NodeSelector[i]) { // not required
-			continue
-		}
-
-		if m.NodeSelector[i] != nil {
-			if err := m.NodeSelector[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateTolerations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Tolerations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Tolerations); i++ {
-		if swag.IsZero(m.Tolerations[i]) { // not required
-			continue
-		}
-
-		if m.Tolerations[i] != nil {
-			if err := m.Tolerations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateVolumes(formats strfmt.Registry) error {
-	if swag.IsZero(m.Volumes) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Volumes); i++ {
-		if swag.IsZero(m.Volumes[i]) { // not required
-			continue
-		}
-
-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this describe pod wrapper based on the context it is used
-func (m *DescribePodWrapper) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAnnotations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateConditions(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateContainers(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateLabels(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateNodeSelector(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateTolerations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateVolumes(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateAnnotations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Annotations); i++ {
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateConditions(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Conditions); i++ {
-
-		if m.Conditions[i] != nil {
-			if err := m.Conditions[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("conditions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("conditions" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateContainers(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Containers); i++ {
-
-		if m.Containers[i] != nil {
-			if err := m.Containers[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("containers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("containers" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateLabels(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Labels); i++ {
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateNodeSelector(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.NodeSelector); i++ {
-
-		if m.NodeSelector[i] != nil {
-			if err := m.NodeSelector[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateTolerations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Tolerations); i++ {
-
-		if m.Tolerations[i] != nil {
-			if err := m.Tolerations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateVolumes(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Volumes); i++ {
-
-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *DescribePodWrapper) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *DescribePodWrapper) UnmarshalBinary(b []byte) error {
-	var res DescribePodWrapper
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/direct_c_s_i_drive_info.go
+++ b/models/direct_c_s_i_drive_info.go
@@ -29,10 +29,10 @@ import (
 	"github.com/go-openapi/swag"
 )

-// DirectPVDriveInfo direct p v drive info
+// DirectCSIDriveInfo direct c s i drive info
 //
-// swagger:model directPVDriveInfo
-type DirectPVDriveInfo struct {
+// swagger:model directCSIDriveInfo
+type DirectCSIDriveInfo struct {

 	// allocated
 	Allocated int64 `json:"allocated,omitempty"`
@@ -56,18 +56,18 @@ type DirectPVDriveInfo struct {
 	Volumes int64 `json:"volumes,omitempty"`
 }

-// Validate validates this direct p v drive info
-func (m *DirectPVDriveInfo) Validate(formats strfmt.Registry) error {
+// Validate validates this direct c s i drive info
+func (m *DirectCSIDriveInfo) Validate(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validates this direct p v drive info based on context it is used
-func (m *DirectPVDriveInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this direct c s i drive info based on context it is used
+func (m *DirectCSIDriveInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }

 // MarshalBinary interface implementation
-func (m *DirectPVDriveInfo) MarshalBinary() ([]byte, error) {
+func (m *DirectCSIDriveInfo) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -75,8 +75,8 @@ func (m *DirectPVDriveInfo) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *DirectPVDriveInfo) UnmarshalBinary(b []byte) error {
-	var res DirectPVDriveInfo
+func (m *DirectCSIDriveInfo) UnmarshalBinary(b []byte) error {
+	var res DirectCSIDriveInfo
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/direct_c_s_i_volume_info.go
+++ b/models/direct_c_s_i_volume_info.go
@@ -29,10 +29,10 @@ import (
 	"github.com/go-openapi/swag"
 )

-// DirectPVVolumeInfo direct p v volume info
+// DirectCSIVolumeInfo direct c s i volume info
 //
-// swagger:model directPVVolumeInfo
-type DirectPVVolumeInfo struct {
+// swagger:model directCSIVolumeInfo
+type DirectCSIVolumeInfo struct {

 	// capacity
 	Capacity int64 `json:"capacity,omitempty"`
@@ -47,18 +47,18 @@ type DirectPVVolumeInfo struct {
 	Volume string `json:"volume,omitempty"`
 }

-// Validate validates this direct p v volume info
-func (m *DirectPVVolumeInfo) Validate(formats strfmt.Registry) error {
+// Validate validates this direct c s i volume info
+func (m *DirectCSIVolumeInfo) Validate(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validates this direct p v volume info based on context it is used
-func (m *DirectPVVolumeInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this direct c s i volume info based on context it is used
+func (m *DirectCSIVolumeInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }

 // MarshalBinary interface implementation
-func (m *DirectPVVolumeInfo) MarshalBinary() ([]byte, error) {
+func (m *DirectCSIVolumeInfo) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -66,8 +66,8 @@ func (m *DirectPVVolumeInfo) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *DirectPVVolumeInfo) UnmarshalBinary(b []byte) error {
-	var res DirectPVVolumeInfo
+func (m *DirectCSIVolumeInfo) UnmarshalBinary(b []byte) error {
+	var res DirectCSIVolumeInfo
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/encryption_configuration.go
+++ b/models/encryption_configuration.go
@@ -42,6 +42,9 @@ type EncryptionConfiguration struct {
 	// azure
 	Azure *AzureConfiguration `json:"azure,omitempty"`

+	// client
+	Client *KeyPairConfiguration `json:"client,omitempty"`
+
 	// gcp
 	Gcp *GcpConfiguration `json:"gcp,omitempty"`

@@ -51,15 +54,6 @@ type EncryptionConfiguration struct {
 	// image
 	Image string `json:"image,omitempty"`

-	// kms mtls
-	KmsMtls *EncryptionConfigurationAO1KmsMtls `json:"kms_mtls,omitempty"`
-
-	// minio mtls
-	MinioMtls *KeyPairConfiguration `json:"minio_mtls,omitempty"`
-
-	// raw
-	Raw string `json:"raw,omitempty"`
-
 	// replicas
 	Replicas string `json:"replicas,omitempty"`

@@ -69,8 +63,8 @@ type EncryptionConfiguration struct {
 	// security context
 	SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-	// server tls
-	ServerTLS *KeyPairConfiguration `json:"server_tls,omitempty"`
+	// server
+	Server *KeyPairConfiguration `json:"server,omitempty"`

 	// vault
 	Vault *VaultConfiguration `json:"vault,omitempty"`
@@ -91,25 +85,21 @@ func (m *EncryptionConfiguration) UnmarshalJSON(raw []byte) error {

 		Azure *AzureConfiguration `json:"azure,omitempty"`

+		Client *KeyPairConfiguration `json:"client,omitempty"`
+
 		Gcp *GcpConfiguration `json:"gcp,omitempty"`

 		Gemalto *GemaltoConfiguration `json:"gemalto,omitempty"`

 		Image string `json:"image,omitempty"`

-		KmsMtls *EncryptionConfigurationAO1KmsMtls `json:"kms_mtls,omitempty"`
-
-		MinioMtls *KeyPairConfiguration `json:"minio_mtls,omitempty"`
-
-		Raw string `json:"raw,omitempty"`
-
 		Replicas string `json:"replicas,omitempty"`

 		SecretsToBeDeleted []string `json:"secretsToBeDeleted"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		ServerTLS *KeyPairConfiguration `json:"server_tls,omitempty"`
+		Server *KeyPairConfiguration `json:"server,omitempty"`

 		Vault *VaultConfiguration `json:"vault,omitempty"`
 	}
@@ -121,25 +111,21 @@ func (m *EncryptionConfiguration) UnmarshalJSON(raw []byte) error {

 	m.Azure = dataAO1.Azure

+	m.Client = dataAO1.Client
+
 	m.Gcp = dataAO1.Gcp

 	m.Gemalto = dataAO1.Gemalto

 	m.Image = dataAO1.Image

-	m.KmsMtls = dataAO1.KmsMtls
-
-	m.MinioMtls = dataAO1.MinioMtls
-
-	m.Raw = dataAO1.Raw
-
 	m.Replicas = dataAO1.Replicas

 	m.SecretsToBeDeleted = dataAO1.SecretsToBeDeleted

 	m.SecurityContext = dataAO1.SecurityContext

-	m.ServerTLS = dataAO1.ServerTLS
+	m.Server = dataAO1.Server

 	m.Vault = dataAO1.Vault

@@ -160,25 +146,21 @@ func (m EncryptionConfiguration) MarshalJSON() ([]byte, error) {

 		Azure *AzureConfiguration `json:"azure,omitempty"`

+		Client *KeyPairConfiguration `json:"client,omitempty"`
+
 		Gcp *GcpConfiguration `json:"gcp,omitempty"`

 		Gemalto *GemaltoConfiguration `json:"gemalto,omitempty"`

 		Image string `json:"image,omitempty"`

-		KmsMtls *EncryptionConfigurationAO1KmsMtls `json:"kms_mtls,omitempty"`
-
-		MinioMtls *KeyPairConfiguration `json:"minio_mtls,omitempty"`
-
-		Raw string `json:"raw,omitempty"`
-
 		Replicas string `json:"replicas,omitempty"`

 		SecretsToBeDeleted []string `json:"secretsToBeDeleted"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		ServerTLS *KeyPairConfiguration `json:"server_tls,omitempty"`
+		Server *KeyPairConfiguration `json:"server,omitempty"`

 		Vault *VaultConfiguration `json:"vault,omitempty"`
 	}
@@ -187,25 +169,21 @@ func (m EncryptionConfiguration) MarshalJSON() ([]byte, error) {

 	dataAO1.Azure = m.Azure

+	dataAO1.Client = m.Client
+
 	dataAO1.Gcp = m.Gcp

 	dataAO1.Gemalto = m.Gemalto

 	dataAO1.Image = m.Image

-	dataAO1.KmsMtls = m.KmsMtls
-
-	dataAO1.MinioMtls = m.MinioMtls
-
-	dataAO1.Raw = m.Raw
-
 	dataAO1.Replicas = m.Replicas

 	dataAO1.SecretsToBeDeleted = m.SecretsToBeDeleted

 	dataAO1.SecurityContext = m.SecurityContext

-	dataAO1.ServerTLS = m.ServerTLS
+	dataAO1.Server = m.Server

 	dataAO1.Vault = m.Vault

@@ -234,6 +212,10 @@ func (m *EncryptionConfiguration) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

+	if err := m.validateClient(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateGcp(formats); err != nil {
 		res = append(res, err)
 	}
@@ -242,19 +224,11 @@ func (m *EncryptionConfiguration) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateKmsMtls(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateMinioMtls(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateSecurityContext(formats); err != nil {
 		res = append(res, err)
 	}

-	if err := m.validateServerTLS(formats); err != nil {
+	if err := m.validateServer(formats); err != nil {
 		res = append(res, err)
 	}

@@ -308,6 +282,26 @@ func (m *EncryptionConfiguration) validateAzure(formats strfmt.Registry) error {
 	return nil
 }

+func (m *EncryptionConfiguration) validateClient(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.Client) { // not required
+		return nil
+	}
+
+	if m.Client != nil {
+		if err := m.Client.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("client")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("client")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *EncryptionConfiguration) validateGcp(formats strfmt.Registry) error {

 	if swag.IsZero(m.Gcp) { // not required
@@ -348,46 +342,6 @@ func (m *EncryptionConfiguration) validateGemalto(formats strfmt.Registry) error
 	return nil
 }

-func (m *EncryptionConfiguration) validateKmsMtls(formats strfmt.Registry) error {
-
-	if swag.IsZero(m.KmsMtls) { // not required
-		return nil
-	}
-
-	if m.KmsMtls != nil {
-		if err := m.KmsMtls.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *EncryptionConfiguration) validateMinioMtls(formats strfmt.Registry) error {
-
-	if swag.IsZero(m.MinioMtls) { // not required
-		return nil
-	}
-
-	if m.MinioMtls != nil {
-		if err := m.MinioMtls.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("minio_mtls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("minio_mtls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *EncryptionConfiguration) validateSecurityContext(formats strfmt.Registry) error {

 	if swag.IsZero(m.SecurityContext) { // not required
@@ -408,18 +362,18 @@ func (m *EncryptionConfiguration) validateSecurityContext(formats strfmt.Registr
 	return nil
 }

-func (m *EncryptionConfiguration) validateServerTLS(formats strfmt.Registry) error {
+func (m *EncryptionConfiguration) validateServer(formats strfmt.Registry) error {

-	if swag.IsZero(m.ServerTLS) { // not required
+	if swag.IsZero(m.Server) { // not required
 		return nil
 	}

-	if m.ServerTLS != nil {
-		if err := m.ServerTLS.Validate(formats); err != nil {
+	if m.Server != nil {
+		if err := m.Server.Validate(formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server_tls")
+				return ve.ValidateName("server")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server_tls")
+				return ce.ValidateName("server")
 			}
 			return err
 		}
@@ -465,6 +419,10 @@ func (m *EncryptionConfiguration) ContextValidate(ctx context.Context, formats s
 		res = append(res, err)
 	}

+	if err := m.contextValidateClient(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.contextValidateGcp(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -473,19 +431,11 @@ func (m *EncryptionConfiguration) ContextValidate(ctx context.Context, formats s
 		res = append(res, err)
 	}

-	if err := m.contextValidateKmsMtls(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateMinioMtls(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.contextValidateSecurityContext(ctx, formats); err != nil {
 		res = append(res, err)
 	}

-	if err := m.contextValidateServerTLS(ctx, formats); err != nil {
+	if err := m.contextValidateServer(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -531,6 +481,22 @@ func (m *EncryptionConfiguration) contextValidateAzure(ctx context.Context, form
 	return nil
 }

+func (m *EncryptionConfiguration) contextValidateClient(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Client != nil {
+		if err := m.Client.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("client")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("client")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *EncryptionConfiguration) contextValidateGcp(ctx context.Context, formats strfmt.Registry) error {

 	if m.Gcp != nil {
@@ -563,38 +529,6 @@ func (m *EncryptionConfiguration) contextValidateGemalto(ctx context.Context, fo
 	return nil
 }

-func (m *EncryptionConfiguration) contextValidateKmsMtls(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.KmsMtls != nil {
-		if err := m.KmsMtls.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *EncryptionConfiguration) contextValidateMinioMtls(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.MinioMtls != nil {
-		if err := m.MinioMtls.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("minio_mtls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("minio_mtls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *EncryptionConfiguration) contextValidateSecurityContext(ctx context.Context, formats strfmt.Registry) error {

 	if m.SecurityContext != nil {
@@ -611,14 +545,14 @@ func (m *EncryptionConfiguration) contextValidateSecurityContext(ctx context.Con
 	return nil
 }

-func (m *EncryptionConfiguration) contextValidateServerTLS(ctx context.Context, formats strfmt.Registry) error {
+func (m *EncryptionConfiguration) contextValidateServer(ctx context.Context, formats strfmt.Registry) error {

-	if m.ServerTLS != nil {
-		if err := m.ServerTLS.ContextValidate(ctx, formats); err != nil {
+	if m.Server != nil {
+		if err := m.Server.ContextValidate(ctx, formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server_tls")
+				return ve.ValidateName("server")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server_tls")
+				return ce.ValidateName("server")
 			}
 			return err
 		}
@@ -660,46 +594,3 @@ func (m *EncryptionConfiguration) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
-
-// EncryptionConfigurationAO1KmsMtls encryption configuration a o1 kms mtls
-//
-// swagger:model EncryptionConfigurationAO1KmsMtls
-type EncryptionConfigurationAO1KmsMtls struct {
-
-	// ca
-	Ca string `json:"ca,omitempty"`
-
-	// crt
-	Crt string `json:"crt,omitempty"`
-
-	// key
-	Key string `json:"key,omitempty"`
-}
-
-// Validate validates this encryption configuration a o1 kms mtls
-func (m *EncryptionConfigurationAO1KmsMtls) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this encryption configuration a o1 kms mtls based on context it is used
-func (m *EncryptionConfigurationAO1KmsMtls) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *EncryptionConfigurationAO1KmsMtls) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *EncryptionConfigurationAO1KmsMtls) UnmarshalBinary(b []byte) error {
-	var res EncryptionConfigurationAO1KmsMtls
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/encryption_configuration_response.go
+++ b/models/encryption_configuration_response.go
@@ -51,14 +51,8 @@ type EncryptionConfigurationResponse struct {
 	// image
 	Image string `json:"image,omitempty"`

-	// kms mtls
-	KmsMtls *EncryptionConfigurationResponseAO1KmsMtls `json:"kms_mtls,omitempty"`
-
-	// minio mtls
-	MinioMtls *CertificateInfo `json:"minio_mtls,omitempty"`
-
-	// raw
-	Raw string `json:"raw,omitempty"`
+	// mtls client
+	MtlsClient *CertificateInfo `json:"mtls_client,omitempty"`

 	// replicas
 	Replicas string `json:"replicas,omitempty"`
@@ -66,8 +60,8 @@ type EncryptionConfigurationResponse struct {
 	// security context
 	SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-	// server tls
-	ServerTLS *CertificateInfo `json:"server_tls,omitempty"`
+	// server
+	Server *CertificateInfo `json:"server,omitempty"`

 	// vault
 	Vault *VaultConfigurationResponse `json:"vault,omitempty"`
@@ -94,17 +88,13 @@ func (m *EncryptionConfigurationResponse) UnmarshalJSON(raw []byte) error {

 		Image string `json:"image,omitempty"`

-		KmsMtls *EncryptionConfigurationResponseAO1KmsMtls `json:"kms_mtls,omitempty"`
-
-		MinioMtls *CertificateInfo `json:"minio_mtls,omitempty"`
-
-		Raw string `json:"raw,omitempty"`
+		MtlsClient *CertificateInfo `json:"mtls_client,omitempty"`

 		Replicas string `json:"replicas,omitempty"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		ServerTLS *CertificateInfo `json:"server_tls,omitempty"`
+		Server *CertificateInfo `json:"server,omitempty"`

 		Vault *VaultConfigurationResponse `json:"vault,omitempty"`
 	}
@@ -122,17 +112,13 @@ func (m *EncryptionConfigurationResponse) UnmarshalJSON(raw []byte) error {

 	m.Image = dataAO1.Image

-	m.KmsMtls = dataAO1.KmsMtls
-
-	m.MinioMtls = dataAO1.MinioMtls
-
-	m.Raw = dataAO1.Raw
+	m.MtlsClient = dataAO1.MtlsClient

 	m.Replicas = dataAO1.Replicas

 	m.SecurityContext = dataAO1.SecurityContext

-	m.ServerTLS = dataAO1.ServerTLS
+	m.Server = dataAO1.Server

 	m.Vault = dataAO1.Vault

@@ -159,17 +145,13 @@ func (m EncryptionConfigurationResponse) MarshalJSON() ([]byte, error) {

 		Image string `json:"image,omitempty"`

-		KmsMtls *EncryptionConfigurationResponseAO1KmsMtls `json:"kms_mtls,omitempty"`
-
-		MinioMtls *CertificateInfo `json:"minio_mtls,omitempty"`
-
-		Raw string `json:"raw,omitempty"`
+		MtlsClient *CertificateInfo `json:"mtls_client,omitempty"`

 		Replicas string `json:"replicas,omitempty"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		ServerTLS *CertificateInfo `json:"server_tls,omitempty"`
+		Server *CertificateInfo `json:"server,omitempty"`

 		Vault *VaultConfigurationResponse `json:"vault,omitempty"`
 	}
@@ -184,17 +166,13 @@ func (m EncryptionConfigurationResponse) MarshalJSON() ([]byte, error) {

 	dataAO1.Image = m.Image

-	dataAO1.KmsMtls = m.KmsMtls
-
-	dataAO1.MinioMtls = m.MinioMtls
-
-	dataAO1.Raw = m.Raw
+	dataAO1.MtlsClient = m.MtlsClient

 	dataAO1.Replicas = m.Replicas

 	dataAO1.SecurityContext = m.SecurityContext

-	dataAO1.ServerTLS = m.ServerTLS
+	dataAO1.Server = m.Server

 	dataAO1.Vault = m.Vault

@@ -231,11 +209,7 @@ func (m *EncryptionConfigurationResponse) Validate(formats strfmt.Registry) erro
 		res = append(res, err)
 	}

-	if err := m.validateKmsMtls(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateMinioMtls(formats); err != nil {
+	if err := m.validateMtlsClient(formats); err != nil {
 		res = append(res, err)
 	}

@@ -243,7 +217,7 @@ func (m *EncryptionConfigurationResponse) Validate(formats strfmt.Registry) erro
 		res = append(res, err)
 	}

-	if err := m.validateServerTLS(formats); err != nil {
+	if err := m.validateServer(formats); err != nil {
 		res = append(res, err)
 	}

@@ -337,38 +311,18 @@ func (m *EncryptionConfigurationResponse) validateGemalto(formats strfmt.Registr
 	return nil
 }

-func (m *EncryptionConfigurationResponse) validateKmsMtls(formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) validateMtlsClient(formats strfmt.Registry) error {

-	if swag.IsZero(m.KmsMtls) { // not required
+	if swag.IsZero(m.MtlsClient) { // not required
 		return nil
 	}

-	if m.KmsMtls != nil {
-		if err := m.KmsMtls.Validate(formats); err != nil {
+	if m.MtlsClient != nil {
+		if err := m.MtlsClient.Validate(formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls")
+				return ve.ValidateName("mtls_client")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *EncryptionConfigurationResponse) validateMinioMtls(formats strfmt.Registry) error {
-
-	if swag.IsZero(m.MinioMtls) { // not required
-		return nil
-	}
-
-	if m.MinioMtls != nil {
-		if err := m.MinioMtls.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("minio_mtls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("minio_mtls")
+				return ce.ValidateName("mtls_client")
 			}
 			return err
 		}
@@ -397,18 +351,18 @@ func (m *EncryptionConfigurationResponse) validateSecurityContext(formats strfmt
 	return nil
 }

-func (m *EncryptionConfigurationResponse) validateServerTLS(formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) validateServer(formats strfmt.Registry) error {

-	if swag.IsZero(m.ServerTLS) { // not required
+	if swag.IsZero(m.Server) { // not required
 		return nil
 	}

-	if m.ServerTLS != nil {
-		if err := m.ServerTLS.Validate(formats); err != nil {
+	if m.Server != nil {
+		if err := m.Server.Validate(formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server_tls")
+				return ve.ValidateName("server")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server_tls")
+				return ce.ValidateName("server")
 			}
 			return err
 		}
@@ -462,11 +416,7 @@ func (m *EncryptionConfigurationResponse) ContextValidate(ctx context.Context, f
 		res = append(res, err)
 	}

-	if err := m.contextValidateKmsMtls(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateMinioMtls(ctx, formats); err != nil {
+	if err := m.contextValidateMtlsClient(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -474,7 +424,7 @@ func (m *EncryptionConfigurationResponse) ContextValidate(ctx context.Context, f
 		res = append(res, err)
 	}

-	if err := m.contextValidateServerTLS(ctx, formats); err != nil {
+	if err := m.contextValidateServer(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -552,30 +502,14 @@ func (m *EncryptionConfigurationResponse) contextValidateGemalto(ctx context.Con
 	return nil
 }

-func (m *EncryptionConfigurationResponse) contextValidateKmsMtls(ctx context.Context, formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) contextValidateMtlsClient(ctx context.Context, formats strfmt.Registry) error {

-	if m.KmsMtls != nil {
-		if err := m.KmsMtls.ContextValidate(ctx, formats); err != nil {
+	if m.MtlsClient != nil {
+		if err := m.MtlsClient.ContextValidate(ctx, formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls")
+				return ve.ValidateName("mtls_client")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *EncryptionConfigurationResponse) contextValidateMinioMtls(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.MinioMtls != nil {
-		if err := m.MinioMtls.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("minio_mtls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("minio_mtls")
+				return ce.ValidateName("mtls_client")
 			}
 			return err
 		}
@@ -600,14 +534,14 @@ func (m *EncryptionConfigurationResponse) contextValidateSecurityContext(ctx con
 	return nil
 }

-func (m *EncryptionConfigurationResponse) contextValidateServerTLS(ctx context.Context, formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) contextValidateServer(ctx context.Context, formats strfmt.Registry) error {

-	if m.ServerTLS != nil {
-		if err := m.ServerTLS.ContextValidate(ctx, formats); err != nil {
+	if m.Server != nil {
+		if err := m.Server.ContextValidate(ctx, formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server_tls")
+				return ve.ValidateName("server")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server_tls")
+				return ce.ValidateName("server")
 			}
 			return err
 		}
@@ -649,139 +583,3 @@ func (m *EncryptionConfigurationResponse) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
-
-// EncryptionConfigurationResponseAO1KmsMtls encryption configuration response a o1 kms mtls
-//
-// swagger:model EncryptionConfigurationResponseAO1KmsMtls
-type EncryptionConfigurationResponseAO1KmsMtls struct {
-
-	// ca
-	Ca *CertificateInfo `json:"ca,omitempty"`
-
-	// crt
-	Crt *CertificateInfo `json:"crt,omitempty"`
-}
-
-// Validate validates this encryption configuration response a o1 kms mtls
-func (m *EncryptionConfigurationResponseAO1KmsMtls) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCa(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateCrt(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *EncryptionConfigurationResponseAO1KmsMtls) validateCa(formats strfmt.Registry) error {
-	if swag.IsZero(m.Ca) { // not required
-		return nil
-	}
-
-	if m.Ca != nil {
-		if err := m.Ca.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls" + "." + "ca")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls" + "." + "ca")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *EncryptionConfigurationResponseAO1KmsMtls) validateCrt(formats strfmt.Registry) error {
-	if swag.IsZero(m.Crt) { // not required
-		return nil
-	}
-
-	if m.Crt != nil {
-		if err := m.Crt.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls" + "." + "crt")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls" + "." + "crt")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this encryption configuration response a o1 kms mtls based on the context it is used
-func (m *EncryptionConfigurationResponseAO1KmsMtls) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCa(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateCrt(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *EncryptionConfigurationResponseAO1KmsMtls) contextValidateCa(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Ca != nil {
-		if err := m.Ca.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls" + "." + "ca")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls" + "." + "ca")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *EncryptionConfigurationResponseAO1KmsMtls) contextValidateCrt(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Crt != nil {
-		if err := m.Crt.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("kms_mtls" + "." + "crt")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("kms_mtls" + "." + "crt")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *EncryptionConfigurationResponseAO1KmsMtls) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *EncryptionConfigurationResponseAO1KmsMtls) UnmarshalBinary(b []byte) error {
-	var res EncryptionConfigurationResponseAO1KmsMtls
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/environment_constants.go
+++ b/models/environment_constants.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// EnvironmentConstants environment constants
-//
-// swagger:model environmentConstants
-type EnvironmentConstants struct {
-
-	// max concurrent downloads
-	MaxConcurrentDownloads int64 `json:"maxConcurrentDownloads,omitempty"`
-
-	// max concurrent uploads
-	MaxConcurrentUploads int64 `json:"maxConcurrentUploads,omitempty"`
-}
-
-// Validate validates this environment constants
-func (m *EnvironmentConstants) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this environment constants based on context it is used
-func (m *EnvironmentConstants) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *EnvironmentConstants) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *EnvironmentConstants) UnmarshalBinary(b []byte) error {
-	var res EnvironmentConstants
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/environment_variable.go
+++ b/models/environment_variable.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// EnvironmentVariable environment variable
-//
-// swagger:model environmentVariable
-type EnvironmentVariable struct {
-
-	// key
-	Key string `json:"key,omitempty"`
-
-	// value
-	Value string `json:"value,omitempty"`
-}
-
-// Validate validates this environment variable
-func (m *EnvironmentVariable) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this environment variable based on context it is used
-func (m *EnvironmentVariable) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *EnvironmentVariable) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *EnvironmentVariable) UnmarshalBinary(b []byte) error {
-	var res EnvironmentVariable
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/format_direct_c_s_i_drives_response.go
+++ b/models/format_direct_c_s_i_drives_response.go
@@ -31,17 +31,17 @@ import (
 	"github.com/go-openapi/swag"
 )

-// FormatDirectPVDrivesResponse format direct p v drives response
+// FormatDirectCSIDrivesResponse format direct c s i drives response
 //
-// swagger:model formatDirectPVDrivesResponse
-type FormatDirectPVDrivesResponse struct {
+// swagger:model formatDirectCSIDrivesResponse
+type FormatDirectCSIDrivesResponse struct {

 	// format issues list
-	FormatIssuesList []*PvFormatErrorResponse `json:"formatIssuesList"`
+	FormatIssuesList []*CsiFormatErrorResponse `json:"formatIssuesList"`
 }

-// Validate validates this format direct p v drives response
-func (m *FormatDirectPVDrivesResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this format direct c s i drives response
+func (m *FormatDirectCSIDrivesResponse) Validate(formats strfmt.Registry) error {
 	var res []error

 	if err := m.validateFormatIssuesList(formats); err != nil {
@@ -54,7 +54,7 @@ func (m *FormatDirectPVDrivesResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }

-func (m *FormatDirectPVDrivesResponse) validateFormatIssuesList(formats strfmt.Registry) error {
+func (m *FormatDirectCSIDrivesResponse) validateFormatIssuesList(formats strfmt.Registry) error {
 	if swag.IsZero(m.FormatIssuesList) { // not required
 		return nil
 	}
@@ -80,8 +80,8 @@ func (m *FormatDirectPVDrivesResponse) validateFormatIssuesList(formats strfmt.R
 	return nil
 }

-// ContextValidate validate this format direct p v drives response based on the context it is used
-func (m *FormatDirectPVDrivesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validate this format direct c s i drives response based on the context it is used
+func (m *FormatDirectCSIDrivesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

 	if err := m.contextValidateFormatIssuesList(ctx, formats); err != nil {
@@ -94,7 +94,7 @@ func (m *FormatDirectPVDrivesResponse) ContextValidate(ctx context.Context, form
 	return nil
 }

-func (m *FormatDirectPVDrivesResponse) contextValidateFormatIssuesList(ctx context.Context, formats strfmt.Registry) error {
+func (m *FormatDirectCSIDrivesResponse) contextValidateFormatIssuesList(ctx context.Context, formats strfmt.Registry) error {

 	for i := 0; i < len(m.FormatIssuesList); i++ {

@@ -115,7 +115,7 @@ func (m *FormatDirectPVDrivesResponse) contextValidateFormatIssuesList(ctx conte
 }

 // MarshalBinary interface implementation
-func (m *FormatDirectPVDrivesResponse) MarshalBinary() ([]byte, error) {
+func (m *FormatDirectCSIDrivesResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -123,8 +123,8 @@ func (m *FormatDirectPVDrivesResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *FormatDirectPVDrivesResponse) UnmarshalBinary(b []byte) error {
-	var res FormatDirectPVDrivesResponse
+func (m *FormatDirectCSIDrivesResponse) UnmarshalBinary(b []byte) error {
+	var res FormatDirectCSIDrivesResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/gemalto_configuration.go
+++ b/models/gemalto_configuration.go
@@ -135,6 +135,9 @@ type GemaltoConfigurationKeysecure struct {
 	// endpoint
 	// Required: true
 	Endpoint *string `json:"endpoint"`
+
+	// tls
+	TLS *GemaltoConfigurationKeysecureTLS `json:"tls,omitempty"`
 }

 // Validate validates this gemalto configuration keysecure
@@ -149,6 +152,10 @@ func (m *GemaltoConfigurationKeysecure) Validate(formats strfmt.Registry) error
 		res = append(res, err)
 	}

+	if err := m.validateTLS(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -184,6 +191,25 @@ func (m *GemaltoConfigurationKeysecure) validateEndpoint(formats strfmt.Registry
 	return nil
 }

+func (m *GemaltoConfigurationKeysecure) validateTLS(formats strfmt.Registry) error {
+	if swag.IsZero(m.TLS) { // not required
+		return nil
+	}
+
+	if m.TLS != nil {
+		if err := m.TLS.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("keysecure" + "." + "tls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("keysecure" + "." + "tls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 // ContextValidate validate this gemalto configuration keysecure based on the context it is used
 func (m *GemaltoConfigurationKeysecure) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -192,6 +218,10 @@ func (m *GemaltoConfigurationKeysecure) ContextValidate(ctx context.Context, for
 		res = append(res, err)
 	}

+	if err := m.contextValidateTLS(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -214,6 +244,22 @@ func (m *GemaltoConfigurationKeysecure) contextValidateCredentials(ctx context.C
 	return nil
 }

+func (m *GemaltoConfigurationKeysecure) contextValidateTLS(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.TLS != nil {
+		if err := m.TLS.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("keysecure" + "." + "tls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("keysecure" + "." + "tls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 // MarshalBinary interface implementation
 func (m *GemaltoConfigurationKeysecure) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -307,3 +353,59 @@ func (m *GemaltoConfigurationKeysecureCredentials) UnmarshalBinary(b []byte) err
 	*m = res
 	return nil
 }
+
+// GemaltoConfigurationKeysecureTLS gemalto configuration keysecure TLS
+//
+// swagger:model GemaltoConfigurationKeysecureTLS
+type GemaltoConfigurationKeysecureTLS struct {
+
+	// ca
+	// Required: true
+	Ca *string `json:"ca"`
+}
+
+// Validate validates this gemalto configuration keysecure TLS
+func (m *GemaltoConfigurationKeysecureTLS) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateCa(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *GemaltoConfigurationKeysecureTLS) validateCa(formats strfmt.Registry) error {
+
+	if err := validate.Required("keysecure"+"."+"tls"+"."+"ca", "body", m.Ca); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ContextValidate validates this gemalto configuration keysecure TLS based on context it is used
+func (m *GemaltoConfigurationKeysecureTLS) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *GemaltoConfigurationKeysecureTLS) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *GemaltoConfigurationKeysecureTLS) UnmarshalBinary(b []byte) error {
+	var res GemaltoConfigurationKeysecureTLS
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/gemalto_configuration_response.go
+++ b/models/gemalto_configuration_response.go
@@ -135,6 +135,9 @@ type GemaltoConfigurationResponseKeysecure struct {
 	// endpoint
 	// Required: true
 	Endpoint *string `json:"endpoint"`
+
+	// tls
+	TLS *GemaltoConfigurationResponseKeysecureTLS `json:"tls,omitempty"`
 }

 // Validate validates this gemalto configuration response keysecure
@@ -149,6 +152,10 @@ func (m *GemaltoConfigurationResponseKeysecure) Validate(formats strfmt.Registry
 		res = append(res, err)
 	}

+	if err := m.validateTLS(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -184,6 +191,25 @@ func (m *GemaltoConfigurationResponseKeysecure) validateEndpoint(formats strfmt.
 	return nil
 }

+func (m *GemaltoConfigurationResponseKeysecure) validateTLS(formats strfmt.Registry) error {
+	if swag.IsZero(m.TLS) { // not required
+		return nil
+	}
+
+	if m.TLS != nil {
+		if err := m.TLS.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("keysecure" + "." + "tls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("keysecure" + "." + "tls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 // ContextValidate validate this gemalto configuration response keysecure based on the context it is used
 func (m *GemaltoConfigurationResponseKeysecure) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -192,6 +218,10 @@ func (m *GemaltoConfigurationResponseKeysecure) ContextValidate(ctx context.Cont
 		res = append(res, err)
 	}

+	if err := m.contextValidateTLS(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -214,6 +244,22 @@ func (m *GemaltoConfigurationResponseKeysecure) contextValidateCredentials(ctx c
 	return nil
 }

+func (m *GemaltoConfigurationResponseKeysecure) contextValidateTLS(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.TLS != nil {
+		if err := m.TLS.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("keysecure" + "." + "tls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("keysecure" + "." + "tls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 // MarshalBinary interface implementation
 func (m *GemaltoConfigurationResponseKeysecure) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -307,3 +353,95 @@ func (m *GemaltoConfigurationResponseKeysecureCredentials) UnmarshalBinary(b []b
 	*m = res
 	return nil
 }
+
+// GemaltoConfigurationResponseKeysecureTLS gemalto configuration response keysecure TLS
+//
+// swagger:model GemaltoConfigurationResponseKeysecureTLS
+type GemaltoConfigurationResponseKeysecureTLS struct {
+
+	// ca
+	// Required: true
+	Ca *CertificateInfo `json:"ca"`
+}
+
+// Validate validates this gemalto configuration response keysecure TLS
+func (m *GemaltoConfigurationResponseKeysecureTLS) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateCa(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *GemaltoConfigurationResponseKeysecureTLS) validateCa(formats strfmt.Registry) error {
+
+	if err := validate.Required("keysecure"+"."+"tls"+"."+"ca", "body", m.Ca); err != nil {
+		return err
+	}
+
+	if m.Ca != nil {
+		if err := m.Ca.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("keysecure" + "." + "tls" + "." + "ca")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("keysecure" + "." + "tls" + "." + "ca")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ContextValidate validate this gemalto configuration response keysecure TLS based on the context it is used
+func (m *GemaltoConfigurationResponseKeysecureTLS) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateCa(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *GemaltoConfigurationResponseKeysecureTLS) contextValidateCa(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Ca != nil {
+		if err := m.Ca.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("keysecure" + "." + "tls" + "." + "ca")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("keysecure" + "." + "tls" + "." + "ca")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *GemaltoConfigurationResponseKeysecureTLS) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *GemaltoConfigurationResponseKeysecureTLS) UnmarshalBinary(b []byte) error {
+	var res GemaltoConfigurationResponseKeysecureTLS
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/get_direct_c_s_i_drive_list_response.go
+++ b/models/get_direct_c_s_i_drive_list_response.go
@@ -31,17 +31,17 @@ import (
 	"github.com/go-openapi/swag"
 )

-// GetDirectPVDriveListResponse get direct p v drive list response
+// GetDirectCSIDriveListResponse get direct c s i drive list response
 //
-// swagger:model getDirectPVDriveListResponse
-type GetDirectPVDriveListResponse struct {
+// swagger:model getDirectCSIDriveListResponse
+type GetDirectCSIDriveListResponse struct {

 	// drives
-	Drives []*DirectPVDriveInfo `json:"drives"`
+	Drives []*DirectCSIDriveInfo `json:"drives"`
 }

-// Validate validates this get direct p v drive list response
-func (m *GetDirectPVDriveListResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this get direct c s i drive list response
+func (m *GetDirectCSIDriveListResponse) Validate(formats strfmt.Registry) error {
 	var res []error

 	if err := m.validateDrives(formats); err != nil {
@@ -54,7 +54,7 @@ func (m *GetDirectPVDriveListResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }

-func (m *GetDirectPVDriveListResponse) validateDrives(formats strfmt.Registry) error {
+func (m *GetDirectCSIDriveListResponse) validateDrives(formats strfmt.Registry) error {
 	if swag.IsZero(m.Drives) { // not required
 		return nil
 	}
@@ -80,8 +80,8 @@ func (m *GetDirectPVDriveListResponse) validateDrives(formats strfmt.Registry) e
 	return nil
 }

-// ContextValidate validate this get direct p v drive list response based on the context it is used
-func (m *GetDirectPVDriveListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validate this get direct c s i drive list response based on the context it is used
+func (m *GetDirectCSIDriveListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

 	if err := m.contextValidateDrives(ctx, formats); err != nil {
@@ -94,7 +94,7 @@ func (m *GetDirectPVDriveListResponse) ContextValidate(ctx context.Context, form
 	return nil
 }

-func (m *GetDirectPVDriveListResponse) contextValidateDrives(ctx context.Context, formats strfmt.Registry) error {
+func (m *GetDirectCSIDriveListResponse) contextValidateDrives(ctx context.Context, formats strfmt.Registry) error {

 	for i := 0; i < len(m.Drives); i++ {

@@ -115,7 +115,7 @@ func (m *GetDirectPVDriveListResponse) contextValidateDrives(ctx context.Context
 }

 // MarshalBinary interface implementation
-func (m *GetDirectPVDriveListResponse) MarshalBinary() ([]byte, error) {
+func (m *GetDirectCSIDriveListResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -123,8 +123,8 @@ func (m *GetDirectPVDriveListResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *GetDirectPVDriveListResponse) UnmarshalBinary(b []byte) error {
-	var res GetDirectPVDriveListResponse
+func (m *GetDirectCSIDriveListResponse) UnmarshalBinary(b []byte) error {
+	var res GetDirectCSIDriveListResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/get_direct_c_s_i_volume_list_response.go
+++ b/models/get_direct_c_s_i_volume_list_response.go
@@ -31,17 +31,17 @@ import (
 	"github.com/go-openapi/swag"
 )

-// GetDirectPVVolumeListResponse get direct p v volume list response
+// GetDirectCSIVolumeListResponse get direct c s i volume list response
 //
-// swagger:model getDirectPVVolumeListResponse
-type GetDirectPVVolumeListResponse struct {
+// swagger:model getDirectCSIVolumeListResponse
+type GetDirectCSIVolumeListResponse struct {

 	// volumes
-	Volumes []*DirectPVVolumeInfo `json:"volumes"`
+	Volumes []*DirectCSIVolumeInfo `json:"volumes"`
 }

-// Validate validates this get direct p v volume list response
-func (m *GetDirectPVVolumeListResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this get direct c s i volume list response
+func (m *GetDirectCSIVolumeListResponse) Validate(formats strfmt.Registry) error {
 	var res []error

 	if err := m.validateVolumes(formats); err != nil {
@@ -54,7 +54,7 @@ func (m *GetDirectPVVolumeListResponse) Validate(formats strfmt.Registry) error
 	return nil
 }

-func (m *GetDirectPVVolumeListResponse) validateVolumes(formats strfmt.Registry) error {
+func (m *GetDirectCSIVolumeListResponse) validateVolumes(formats strfmt.Registry) error {
 	if swag.IsZero(m.Volumes) { // not required
 		return nil
 	}
@@ -80,8 +80,8 @@ func (m *GetDirectPVVolumeListResponse) validateVolumes(formats strfmt.Registry)
 	return nil
 }

-// ContextValidate validate this get direct p v volume list response based on the context it is used
-func (m *GetDirectPVVolumeListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validate this get direct c s i volume list response based on the context it is used
+func (m *GetDirectCSIVolumeListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

 	if err := m.contextValidateVolumes(ctx, formats); err != nil {
@@ -94,7 +94,7 @@ func (m *GetDirectPVVolumeListResponse) ContextValidate(ctx context.Context, for
 	return nil
 }

-func (m *GetDirectPVVolumeListResponse) contextValidateVolumes(ctx context.Context, formats strfmt.Registry) error {
+func (m *GetDirectCSIVolumeListResponse) contextValidateVolumes(ctx context.Context, formats strfmt.Registry) error {

 	for i := 0; i < len(m.Volumes); i++ {

@@ -115,7 +115,7 @@ func (m *GetDirectPVVolumeListResponse) contextValidateVolumes(ctx context.Conte
 }

 // MarshalBinary interface implementation
-func (m *GetDirectPVVolumeListResponse) MarshalBinary() ([]byte, error) {
+func (m *GetDirectCSIVolumeListResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -123,8 +123,8 @@ func (m *GetDirectPVVolumeListResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *GetDirectPVVolumeListResponse) UnmarshalBinary(b []byte) error {
-	var res GetDirectPVVolumeListResponse
+func (m *GetDirectCSIVolumeListResponse) UnmarshalBinary(b []byte) error {
+	var res GetDirectCSIVolumeListResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/idp_list_configurations_response.go
+++ b/models/idp_list_configurations_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// IdpListConfigurationsResponse idp list configurations response
-//
-// swagger:model idpListConfigurationsResponse
-type IdpListConfigurationsResponse struct {
-
-	// results
-	Results []*IdpServerConfiguration `json:"results"`
-}
-
-// Validate validates this idp list configurations response
-func (m *IdpListConfigurationsResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateResults(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *IdpListConfigurationsResponse) validateResults(formats strfmt.Registry) error {
-	if swag.IsZero(m.Results) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Results); i++ {
-		if swag.IsZero(m.Results[i]) { // not required
-			continue
-		}
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this idp list configurations response based on the context it is used
-func (m *IdpListConfigurationsResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateResults(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *IdpListConfigurationsResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Results); i++ {
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *IdpListConfigurationsResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *IdpListConfigurationsResponse) UnmarshalBinary(b []byte) error {
-	var res IdpListConfigurationsResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/idp_server_configuration.go
+++ b/models/idp_server_configuration.go
@@ -1,145 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// IdpServerConfiguration idp server configuration
-//
-// swagger:model idpServerConfiguration
-type IdpServerConfiguration struct {
-
-	// enabled
-	Enabled bool `json:"enabled,omitempty"`
-
-	// info
-	Info []*IdpServerConfigurationInfo `json:"info"`
-
-	// input
-	Input string `json:"input,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// type
-	Type string `json:"type,omitempty"`
-}
-
-// Validate validates this idp server configuration
-func (m *IdpServerConfiguration) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateInfo(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *IdpServerConfiguration) validateInfo(formats strfmt.Registry) error {
-	if swag.IsZero(m.Info) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Info); i++ {
-		if swag.IsZero(m.Info[i]) { // not required
-			continue
-		}
-
-		if m.Info[i] != nil {
-			if err := m.Info[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("info" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("info" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this idp server configuration based on the context it is used
-func (m *IdpServerConfiguration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateInfo(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *IdpServerConfiguration) contextValidateInfo(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Info); i++ {
-
-		if m.Info[i] != nil {
-			if err := m.Info[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("info" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("info" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *IdpServerConfiguration) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *IdpServerConfiguration) UnmarshalBinary(b []byte) error {
-	var res IdpServerConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/idp_server_configuration_info.go
+++ b/models/idp_server_configuration_info.go
@@ -1,76 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// IdpServerConfigurationInfo idp server configuration info
-//
-// swagger:model idpServerConfigurationInfo
-type IdpServerConfigurationInfo struct {
-
-	// is cfg
-	IsCfg bool `json:"isCfg,omitempty"`
-
-	// is env
-	IsEnv bool `json:"isEnv,omitempty"`
-
-	// key
-	Key string `json:"key,omitempty"`
-
-	// value
-	Value string `json:"value,omitempty"`
-}
-
-// Validate validates this idp server configuration info
-func (m *IdpServerConfigurationInfo) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this idp server configuration info based on context it is used
-func (m *IdpServerConfigurationInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *IdpServerConfigurationInfo) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *IdpServerConfigurationInfo) UnmarshalBinary(b []byte) error {
-	var res IdpServerConfigurationInfo
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/km_delete_key_request.go
+++ b/models/km_delete_key_request.go
@@ -1,28 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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
-
-// KmDeleteKeyRequest km delete key request
-//
-// swagger:model kmDeleteKeyRequest
-type KmDeleteKeyRequest interface{}
--- a/models/kms_a_p_is_response.go
+++ b/models/kms_a_p_is_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsAPIsResponse kms a p is response
-//
-// swagger:model kmsAPIsResponse
-type KmsAPIsResponse struct {
-
-	// results
-	Results []*KmsAPI `json:"results"`
-}
-
-// Validate validates this kms a p is response
-func (m *KmsAPIsResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateResults(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsAPIsResponse) validateResults(formats strfmt.Registry) error {
-	if swag.IsZero(m.Results) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Results); i++ {
-		if swag.IsZero(m.Results[i]) { // not required
-			continue
-		}
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this kms a p is response based on the context it is used
-func (m *KmsAPIsResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateResults(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsAPIsResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Results); i++ {
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsAPIsResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsAPIsResponse) UnmarshalBinary(b []byte) error {
-	var res KmsAPIsResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_api.go
+++ b/models/kms_api.go
@@ -1,76 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsAPI kms API
-//
-// swagger:model kmsAPI
-type KmsAPI struct {
-
-	// max body
-	MaxBody int64 `json:"maxBody,omitempty"`
-
-	// method
-	Method string `json:"method,omitempty"`
-
-	// path
-	Path string `json:"path,omitempty"`
-
-	// timeout
-	Timeout int64 `json:"timeout,omitempty"`
-}
-
-// Validate validates this kms API
-func (m *KmsAPI) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms API based on context it is used
-func (m *KmsAPI) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsAPI) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsAPI) UnmarshalBinary(b []byte) error {
-	var res KmsAPI
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_assign_policy_request.go
+++ b/models/kms_assign_policy_request.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsAssignPolicyRequest kms assign policy request
-//
-// swagger:model kmsAssignPolicyRequest
-type KmsAssignPolicyRequest struct {
-
-	// identity
-	Identity string `json:"identity,omitempty"`
-}
-
-// Validate validates this kms assign policy request
-func (m *KmsAssignPolicyRequest) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms assign policy request based on context it is used
-func (m *KmsAssignPolicyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsAssignPolicyRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsAssignPolicyRequest) UnmarshalBinary(b []byte) error {
-	var res KmsAssignPolicyRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_create_key_request.go
+++ b/models/kms_create_key_request.go
@@ -1,88 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// KmsCreateKeyRequest kms create key request
-//
-// swagger:model kmsCreateKeyRequest
-type KmsCreateKeyRequest struct {
-
-	// key
-	// Required: true
-	Key *string `json:"key"`
-}
-
-// Validate validates this kms create key request
-func (m *KmsCreateKeyRequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateKey(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsCreateKeyRequest) validateKey(formats strfmt.Registry) error {
-
-	if err := validate.Required("key", "body", m.Key); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this kms create key request based on context it is used
-func (m *KmsCreateKeyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsCreateKeyRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsCreateKeyRequest) UnmarshalBinary(b []byte) error {
-	var res KmsCreateKeyRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_describe_identity_response.go
+++ b/models/kms_describe_identity_response.go
@@ -1,79 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsDescribeIdentityResponse kms describe identity response
-//
-// swagger:model kmsDescribeIdentityResponse
-type KmsDescribeIdentityResponse struct {
-
-	// admin
-	Admin bool `json:"admin,omitempty"`
-
-	// created at
-	CreatedAt string `json:"createdAt,omitempty"`
-
-	// created by
-	CreatedBy string `json:"createdBy,omitempty"`
-
-	// identity
-	Identity string `json:"identity,omitempty"`
-
-	// policy
-	Policy string `json:"policy,omitempty"`
-}
-
-// Validate validates this kms describe identity response
-func (m *KmsDescribeIdentityResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms describe identity response based on context it is used
-func (m *KmsDescribeIdentityResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsDescribeIdentityResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsDescribeIdentityResponse) UnmarshalBinary(b []byte) error {
-	var res KmsDescribeIdentityResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_describe_policy_response.go
+++ b/models/kms_describe_policy_response.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsDescribePolicyResponse kms describe policy response
-//
-// swagger:model kmsDescribePolicyResponse
-type KmsDescribePolicyResponse struct {
-
-	// created at
-	CreatedAt string `json:"createdAt,omitempty"`
-
-	// created by
-	CreatedBy string `json:"createdBy,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-}
-
-// Validate validates this kms describe policy response
-func (m *KmsDescribePolicyResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms describe policy response based on context it is used
-func (m *KmsDescribePolicyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsDescribePolicyResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsDescribePolicyResponse) UnmarshalBinary(b []byte) error {
-	var res KmsDescribePolicyResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_describe_self_identity_response.go
+++ b/models/kms_describe_self_identity_response.go
@@ -1,136 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsDescribeSelfIdentityResponse kms describe self identity response
-//
-// swagger:model kmsDescribeSelfIdentityResponse
-type KmsDescribeSelfIdentityResponse struct {
-
-	// admin
-	Admin bool `json:"admin,omitempty"`
-
-	// created at
-	CreatedAt string `json:"createdAt,omitempty"`
-
-	// created by
-	CreatedBy string `json:"createdBy,omitempty"`
-
-	// identity
-	Identity string `json:"identity,omitempty"`
-
-	// policy
-	Policy *KmsGetPolicyResponse `json:"policy,omitempty"`
-
-	// policy name
-	PolicyName string `json:"policyName,omitempty"`
-}
-
-// Validate validates this kms describe self identity response
-func (m *KmsDescribeSelfIdentityResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validatePolicy(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsDescribeSelfIdentityResponse) validatePolicy(formats strfmt.Registry) error {
-	if swag.IsZero(m.Policy) { // not required
-		return nil
-	}
-
-	if m.Policy != nil {
-		if err := m.Policy.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("policy")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("policy")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this kms describe self identity response based on the context it is used
-func (m *KmsDescribeSelfIdentityResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidatePolicy(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsDescribeSelfIdentityResponse) contextValidatePolicy(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Policy != nil {
-		if err := m.Policy.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("policy")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("policy")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsDescribeSelfIdentityResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsDescribeSelfIdentityResponse) UnmarshalBinary(b []byte) error {
-	var res KmsDescribeSelfIdentityResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_endpoint.go
+++ b/models/kms_endpoint.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsEndpoint kms endpoint
-//
-// swagger:model kmsEndpoint
-type KmsEndpoint struct {
-
-	// status
-	Status string `json:"status,omitempty"`
-
-	// url
-	URL string `json:"url,omitempty"`
-}
-
-// Validate validates this kms endpoint
-func (m *KmsEndpoint) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms endpoint based on context it is used
-func (m *KmsEndpoint) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsEndpoint) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsEndpoint) UnmarshalBinary(b []byte) error {
-	var res KmsEndpoint
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_get_policy_response.go
+++ b/models/kms_get_policy_response.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsGetPolicyResponse kms get policy response
-//
-// swagger:model kmsGetPolicyResponse
-type KmsGetPolicyResponse struct {
-
-	// allow
-	Allow []string `json:"allow"`
-
-	// deny
-	Deny []string `json:"deny"`
-}
-
-// Validate validates this kms get policy response
-func (m *KmsGetPolicyResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms get policy response based on context it is used
-func (m *KmsGetPolicyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsGetPolicyResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsGetPolicyResponse) UnmarshalBinary(b []byte) error {
-	var res KmsGetPolicyResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_identity_info.go
+++ b/models/kms_identity_info.go
@@ -1,79 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsIdentityInfo kms identity info
-//
-// swagger:model kmsIdentityInfo
-type KmsIdentityInfo struct {
-
-	// created at
-	CreatedAt string `json:"createdAt,omitempty"`
-
-	// created by
-	CreatedBy string `json:"createdBy,omitempty"`
-
-	// error
-	Error string `json:"error,omitempty"`
-
-	// identity
-	Identity string `json:"identity,omitempty"`
-
-	// policy
-	Policy string `json:"policy,omitempty"`
-}
-
-// Validate validates this kms identity info
-func (m *KmsIdentityInfo) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms identity info based on context it is used
-func (m *KmsIdentityInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsIdentityInfo) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsIdentityInfo) UnmarshalBinary(b []byte) error {
-	var res KmsIdentityInfo
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_import_key_request.go
+++ b/models/kms_import_key_request.go
@@ -1,88 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// KmsImportKeyRequest kms import key request
-//
-// swagger:model kmsImportKeyRequest
-type KmsImportKeyRequest struct {
-
-	// bytes
-	// Required: true
-	Bytes *string `json:"bytes"`
-}
-
-// Validate validates this kms import key request
-func (m *KmsImportKeyRequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateBytes(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsImportKeyRequest) validateBytes(formats strfmt.Registry) error {
-
-	if err := validate.Required("bytes", "body", m.Bytes); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this kms import key request based on context it is used
-func (m *KmsImportKeyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsImportKeyRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsImportKeyRequest) UnmarshalBinary(b []byte) error {
-	var res KmsImportKeyRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_key_info.go
+++ b/models/kms_key_info.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsKeyInfo kms key info
-//
-// swagger:model kmsKeyInfo
-type KmsKeyInfo struct {
-
-	// created at
-	CreatedAt string `json:"createdAt,omitempty"`
-
-	// created by
-	CreatedBy string `json:"createdBy,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-}
-
-// Validate validates this kms key info
-func (m *KmsKeyInfo) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms key info based on context it is used
-func (m *KmsKeyInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsKeyInfo) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsKeyInfo) UnmarshalBinary(b []byte) error {
-	var res KmsKeyInfo
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_key_status_response.go
+++ b/models/kms_key_status_response.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsKeyStatusResponse kms key status response
-//
-// swagger:model kmsKeyStatusResponse
-type KmsKeyStatusResponse struct {
-
-	// decryption err
-	DecryptionErr string `json:"decryptionErr,omitempty"`
-
-	// encryption err
-	EncryptionErr string `json:"encryptionErr,omitempty"`
-
-	// key ID
-	KeyID string `json:"keyID,omitempty"`
-}
-
-// Validate validates this kms key status response
-func (m *KmsKeyStatusResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms key status response based on context it is used
-func (m *KmsKeyStatusResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsKeyStatusResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsKeyStatusResponse) UnmarshalBinary(b []byte) error {
-	var res KmsKeyStatusResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_latency_histogram.go
+++ b/models/kms_latency_histogram.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsLatencyHistogram kms latency histogram
-//
-// swagger:model kmsLatencyHistogram
-type KmsLatencyHistogram struct {
-
-	// duration
-	Duration int64 `json:"duration,omitempty"`
-}
-
-// Validate validates this kms latency histogram
-func (m *KmsLatencyHistogram) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms latency histogram based on context it is used
-func (m *KmsLatencyHistogram) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsLatencyHistogram) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsLatencyHistogram) UnmarshalBinary(b []byte) error {
-	var res KmsLatencyHistogram
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_list_identities_response.go
+++ b/models/kms_list_identities_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsListIdentitiesResponse kms list identities response
-//
-// swagger:model kmsListIdentitiesResponse
-type KmsListIdentitiesResponse struct {
-
-	// results
-	Results []*KmsIdentityInfo `json:"results"`
-}
-
-// Validate validates this kms list identities response
-func (m *KmsListIdentitiesResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateResults(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsListIdentitiesResponse) validateResults(formats strfmt.Registry) error {
-	if swag.IsZero(m.Results) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Results); i++ {
-		if swag.IsZero(m.Results[i]) { // not required
-			continue
-		}
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this kms list identities response based on the context it is used
-func (m *KmsListIdentitiesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateResults(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsListIdentitiesResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Results); i++ {
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsListIdentitiesResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsListIdentitiesResponse) UnmarshalBinary(b []byte) error {
-	var res KmsListIdentitiesResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_list_keys_response.go
+++ b/models/kms_list_keys_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsListKeysResponse kms list keys response
-//
-// swagger:model kmsListKeysResponse
-type KmsListKeysResponse struct {
-
-	// results
-	Results []*KmsKeyInfo `json:"results"`
-}
-
-// Validate validates this kms list keys response
-func (m *KmsListKeysResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateResults(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsListKeysResponse) validateResults(formats strfmt.Registry) error {
-	if swag.IsZero(m.Results) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Results); i++ {
-		if swag.IsZero(m.Results[i]) { // not required
-			continue
-		}
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this kms list keys response based on the context it is used
-func (m *KmsListKeysResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateResults(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsListKeysResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Results); i++ {
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsListKeysResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsListKeysResponse) UnmarshalBinary(b []byte) error {
-	var res KmsListKeysResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_list_policies_response.go
+++ b/models/kms_list_policies_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsListPoliciesResponse kms list policies response
-//
-// swagger:model kmsListPoliciesResponse
-type KmsListPoliciesResponse struct {
-
-	// results
-	Results []*KmsPolicyInfo `json:"results"`
-}
-
-// Validate validates this kms list policies response
-func (m *KmsListPoliciesResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateResults(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsListPoliciesResponse) validateResults(formats strfmt.Registry) error {
-	if swag.IsZero(m.Results) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Results); i++ {
-		if swag.IsZero(m.Results[i]) { // not required
-			continue
-		}
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this kms list policies response based on the context it is used
-func (m *KmsListPoliciesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateResults(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsListPoliciesResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Results); i++ {
-
-		if m.Results[i] != nil {
-			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("results" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("results" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsListPoliciesResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsListPoliciesResponse) UnmarshalBinary(b []byte) error {
-	var res KmsListPoliciesResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_metrics_response.go
+++ b/models/kms_metrics_response.go
@@ -1,331 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// KmsMetricsResponse kms metrics response
-//
-// swagger:model kmsMetricsResponse
-type KmsMetricsResponse struct {
-
-	// audit events
-	// Required: true
-	AuditEvents *int64 `json:"auditEvents"`
-
-	// cpus
-	// Required: true
-	Cpus *int64 `json:"cpus"`
-
-	// error events
-	// Required: true
-	ErrorEvents *int64 `json:"errorEvents"`
-
-	// heap alloc
-	// Required: true
-	HeapAlloc *int64 `json:"heapAlloc"`
-
-	// heap objects
-	HeapObjects int64 `json:"heapObjects,omitempty"`
-
-	// latency histogram
-	// Required: true
-	LatencyHistogram *KmsLatencyHistogram `json:"latencyHistogram"`
-
-	// request active
-	// Required: true
-	RequestActive *int64 `json:"requestActive"`
-
-	// request err
-	// Required: true
-	RequestErr *int64 `json:"requestErr"`
-
-	// request fail
-	// Required: true
-	RequestFail *int64 `json:"requestFail"`
-
-	// request o k
-	// Required: true
-	RequestOK *int64 `json:"requestOK"`
-
-	// stack alloc
-	// Required: true
-	StackAlloc *int64 `json:"stackAlloc"`
-
-	// threads
-	// Required: true
-	Threads *int64 `json:"threads"`
-
-	// uptime
-	// Required: true
-	Uptime *int64 `json:"uptime"`
-
-	// usable c p us
-	// Required: true
-	UsableCPUs *int64 `json:"usableCPUs"`
-}
-
-// Validate validates this kms metrics response
-func (m *KmsMetricsResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAuditEvents(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateCpus(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateErrorEvents(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateHeapAlloc(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateLatencyHistogram(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateRequestActive(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateRequestErr(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateRequestFail(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateRequestOK(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateStackAlloc(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateThreads(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateUptime(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateUsableCPUs(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateAuditEvents(formats strfmt.Registry) error {
-
-	if err := validate.Required("auditEvents", "body", m.AuditEvents); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateCpus(formats strfmt.Registry) error {
-
-	if err := validate.Required("cpus", "body", m.Cpus); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateErrorEvents(formats strfmt.Registry) error {
-
-	if err := validate.Required("errorEvents", "body", m.ErrorEvents); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateHeapAlloc(formats strfmt.Registry) error {
-
-	if err := validate.Required("heapAlloc", "body", m.HeapAlloc); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateLatencyHistogram(formats strfmt.Registry) error {
-
-	if err := validate.Required("latencyHistogram", "body", m.LatencyHistogram); err != nil {
-		return err
-	}
-
-	if m.LatencyHistogram != nil {
-		if err := m.LatencyHistogram.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("latencyHistogram")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("latencyHistogram")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateRequestActive(formats strfmt.Registry) error {
-
-	if err := validate.Required("requestActive", "body", m.RequestActive); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateRequestErr(formats strfmt.Registry) error {
-
-	if err := validate.Required("requestErr", "body", m.RequestErr); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateRequestFail(formats strfmt.Registry) error {
-
-	if err := validate.Required("requestFail", "body", m.RequestFail); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateRequestOK(formats strfmt.Registry) error {
-
-	if err := validate.Required("requestOK", "body", m.RequestOK); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateStackAlloc(formats strfmt.Registry) error {
-
-	if err := validate.Required("stackAlloc", "body", m.StackAlloc); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateThreads(formats strfmt.Registry) error {
-
-	if err := validate.Required("threads", "body", m.Threads); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateUptime(formats strfmt.Registry) error {
-
-	if err := validate.Required("uptime", "body", m.Uptime); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *KmsMetricsResponse) validateUsableCPUs(formats strfmt.Registry) error {
-
-	if err := validate.Required("usableCPUs", "body", m.UsableCPUs); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validate this kms metrics response based on the context it is used
-func (m *KmsMetricsResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateLatencyHistogram(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsMetricsResponse) contextValidateLatencyHistogram(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.LatencyHistogram != nil {
-		if err := m.LatencyHistogram.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("latencyHistogram")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("latencyHistogram")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsMetricsResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsMetricsResponse) UnmarshalBinary(b []byte) error {
-	var res KmsMetricsResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_policy_info.go
+++ b/models/kms_policy_info.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsPolicyInfo kms policy info
-//
-// swagger:model kmsPolicyInfo
-type KmsPolicyInfo struct {
-
-	// created at
-	CreatedAt string `json:"createdAt,omitempty"`
-
-	// created by
-	CreatedBy string `json:"createdBy,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-}
-
-// Validate validates this kms policy info
-func (m *KmsPolicyInfo) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms policy info based on context it is used
-func (m *KmsPolicyInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsPolicyInfo) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsPolicyInfo) UnmarshalBinary(b []byte) error {
-	var res KmsPolicyInfo
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_set_policy_request.go
+++ b/models/kms_set_policy_request.go
@@ -1,94 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// KmsSetPolicyRequest kms set policy request
-//
-// swagger:model kmsSetPolicyRequest
-type KmsSetPolicyRequest struct {
-
-	// allow
-	Allow []string `json:"allow"`
-
-	// deny
-	Deny []string `json:"deny"`
-
-	// policy
-	// Required: true
-	Policy *string `json:"policy"`
-}
-
-// Validate validates this kms set policy request
-func (m *KmsSetPolicyRequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validatePolicy(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsSetPolicyRequest) validatePolicy(formats strfmt.Registry) error {
-
-	if err := validate.Required("policy", "body", m.Policy); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this kms set policy request based on context it is used
-func (m *KmsSetPolicyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsSetPolicyRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsSetPolicyRequest) UnmarshalBinary(b []byte) error {
-	var res KmsSetPolicyRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_status_response.go
+++ b/models/kms_status_response.go
@@ -1,139 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsStatusResponse kms status response
-//
-// swagger:model kmsStatusResponse
-type KmsStatusResponse struct {
-
-	// default key ID
-	DefaultKeyID string `json:"defaultKeyID,omitempty"`
-
-	// endpoints
-	Endpoints []*KmsEndpoint `json:"endpoints"`
-
-	// name
-	Name string `json:"name,omitempty"`
-}
-
-// Validate validates this kms status response
-func (m *KmsStatusResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateEndpoints(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsStatusResponse) validateEndpoints(formats strfmt.Registry) error {
-	if swag.IsZero(m.Endpoints) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Endpoints); i++ {
-		if swag.IsZero(m.Endpoints[i]) { // not required
-			continue
-		}
-
-		if m.Endpoints[i] != nil {
-			if err := m.Endpoints[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("endpoints" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("endpoints" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this kms status response based on the context it is used
-func (m *KmsStatusResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateEndpoints(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *KmsStatusResponse) contextValidateEndpoints(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Endpoints); i++ {
-
-		if m.Endpoints[i] != nil {
-			if err := m.Endpoints[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("endpoints" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("endpoints" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsStatusResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsStatusResponse) UnmarshalBinary(b []byte) error {
-	var res KmsStatusResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/kms_version_response.go
+++ b/models/kms_version_response.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// KmsVersionResponse kms version response
-//
-// swagger:model kmsVersionResponse
-type KmsVersionResponse struct {
-
-	// version
-	Version string `json:"version,omitempty"`
-}
-
-// Validate validates this kms version response
-func (m *KmsVersionResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this kms version response based on context it is used
-func (m *KmsVersionResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *KmsVersionResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *KmsVersionResponse) UnmarshalBinary(b []byte) error {
-	var res KmsVersionResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/login_details.go
+++ b/models/login_details.go
@@ -25,7 +25,6 @@ package models
 import (
 	"context"
 	"encoding/json"
-	"strconv"

 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -38,18 +37,12 @@ import (
 // swagger:model loginDetails
 type LoginDetails struct {

-	// is direct p v
-	IsDirectPV bool `json:"isDirectPV,omitempty"`
-
-	// is k8 s
-	IsK8S bool `json:"isK8S,omitempty"`
-
 	// login strategy
 	// Enum: [form redirect service-account redirect-service-account]
 	LoginStrategy string `json:"loginStrategy,omitempty"`

-	// redirect rules
-	RedirectRules []*RedirectRule `json:"redirectRules"`
+	// redirect
+	Redirect string `json:"redirect,omitempty"`
 }

 // Validate validates this login details
@@ -60,10 +53,6 @@ func (m *LoginDetails) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateRedirectRules(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -118,63 +107,8 @@ func (m *LoginDetails) validateLoginStrategy(formats strfmt.Registry) error {
 	return nil
 }

-func (m *LoginDetails) validateRedirectRules(formats strfmt.Registry) error {
-	if swag.IsZero(m.RedirectRules) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.RedirectRules); i++ {
-		if swag.IsZero(m.RedirectRules[i]) { // not required
-			continue
-		}
-
-		if m.RedirectRules[i] != nil {
-			if err := m.RedirectRules[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("redirectRules" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("redirectRules" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this login details based on the context it is used
+// ContextValidate validates this login details based on context it is used
 func (m *LoginDetails) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateRedirectRules(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *LoginDetails) contextValidateRedirectRules(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.RedirectRules); i++ {
-
-		if m.RedirectRules[i] != nil {
-			if err := m.RedirectRules[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("redirectRules" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("redirectRules" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
 	return nil
 }

--- a/models/login_request.go
+++ b/models/login_request.go
@@ -28,6 +28,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 )

 // LoginRequest login request
@@ -36,32 +37,48 @@ import (
 type LoginRequest struct {

 	// access key
-	AccessKey string `json:"accessKey,omitempty"`
+	// Required: true
+	AccessKey *string `json:"accessKey"`

 	// features
 	Features *LoginRequestFeatures `json:"features,omitempty"`

 	// secret key
-	SecretKey string `json:"secretKey,omitempty"`
-
-	// sts
-	Sts string `json:"sts,omitempty"`
+	// Required: true
+	SecretKey *string `json:"secretKey"`
 }

 // Validate validates this login request
 func (m *LoginRequest) Validate(formats strfmt.Registry) error {
 	var res []error

+	if err := m.validateAccessKey(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateFeatures(formats); err != nil {
 		res = append(res, err)
 	}

+	if err := m.validateSecretKey(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
 	return nil
 }

+func (m *LoginRequest) validateAccessKey(formats strfmt.Registry) error {
+
+	if err := validate.Required("accessKey", "body", m.AccessKey); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (m *LoginRequest) validateFeatures(formats strfmt.Registry) error {
 	if swag.IsZero(m.Features) { // not required
 		return nil
@@ -81,6 +98,15 @@ func (m *LoginRequest) validateFeatures(formats strfmt.Registry) error {
 	return nil
 }

+func (m *LoginRequest) validateSecretKey(formats strfmt.Registry) error {
+
+	if err := validate.Required("secretKey", "body", m.SecretKey); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // ContextValidate validate this login request based on the context it is used
 func (m *LoginRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
--- a/models/login_response.go
+++ b/models/login_response.go
@@ -34,9 +34,6 @@ import (
 // swagger:model loginResponse
 type LoginResponse struct {

-	// ID p refresh token
-	IDPRefreshToken string `json:"IDPRefreshToken,omitempty"`
-
 	// session Id
 	SessionID string `json:"sessionId,omitempty"`
 }
--- a/models/logout_request.go
+++ b/models/logout_request.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// LogoutRequest logout request
-//
-// swagger:model logoutRequest
-type LogoutRequest struct {
-
-	// state
-	State string `json:"state,omitempty"`
-}
-
-// Validate validates this logout request
-func (m *LogoutRequest) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this logout request based on context it is used
-func (m *LogoutRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *LogoutRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *LogoutRequest) UnmarshalBinary(b []byte) error {
-	var res LogoutRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/mount.go
+++ b/models/mount.go
@@ -1,76 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Mount mount
-//
-// swagger:model mount
-type Mount struct {
-
-	// mount path
-	MountPath string `json:"mountPath,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// read only
-	ReadOnly bool `json:"readOnly,omitempty"`
-
-	// sub path
-	SubPath string `json:"subPath,omitempty"`
-}
-
-// Validate validates this mount
-func (m *Mount) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this mount based on context it is used
-func (m *Mount) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Mount) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Mount) UnmarshalBinary(b []byte) error {
-	var res Mount
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/mp_integration.go
+++ b/models/mp_integration.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// MpIntegration mp integration
-//
-// swagger:model mpIntegration
-type MpIntegration struct {
-
-	// email
-	Email string `json:"email,omitempty"`
-
-	// is in e u
-	IsInEU bool `json:"isInEU,omitempty"`
-}
-
-// Validate validates this mp integration
-func (m *MpIntegration) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this mp integration based on context it is used
-func (m *MpIntegration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *MpIntegration) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *MpIntegration) UnmarshalBinary(b []byte) error {
-	var res MpIntegration
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_session_response.go
+++ b/models/operator_session_response.go
@@ -37,9 +37,6 @@ import (
 // swagger:model operatorSessionResponse
 type OperatorSessionResponse struct {

-	// direct p v
-	DirectPV bool `json:"directPV,omitempty"`
-
 	// features
 	Features []string `json:"features"`

--- a/models/operator_subnet_api_key.go
+++ b/models/operator_subnet_api_key.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetAPIKey operator subnet API key
-//
-// swagger:model operatorSubnetAPIKey
-type OperatorSubnetAPIKey struct {
-
-	// api key
-	APIKey string `json:"apiKey,omitempty"`
-}
-
-// Validate validates this operator subnet API key
-func (m *OperatorSubnetAPIKey) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet API key based on context it is used
-func (m *OperatorSubnetAPIKey) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetAPIKey) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetAPIKey) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetAPIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_login_m_f_a_request.go
+++ b/models/operator_subnet_login_m_f_a_request.go
@@ -1,122 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// OperatorSubnetLoginMFARequest operator subnet login m f a request
-//
-// swagger:model operatorSubnetLoginMFARequest
-type OperatorSubnetLoginMFARequest struct {
-
-	// mfa token
-	// Required: true
-	MfaToken *string `json:"mfa_token"`
-
-	// otp
-	// Required: true
-	Otp *string `json:"otp"`
-
-	// username
-	// Required: true
-	Username *string `json:"username"`
-}
-
-// Validate validates this operator subnet login m f a request
-func (m *OperatorSubnetLoginMFARequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateMfaToken(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateOtp(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateUsername(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *OperatorSubnetLoginMFARequest) validateMfaToken(formats strfmt.Registry) error {
-
-	if err := validate.Required("mfa_token", "body", m.MfaToken); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *OperatorSubnetLoginMFARequest) validateOtp(formats strfmt.Registry) error {
-
-	if err := validate.Required("otp", "body", m.Otp); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *OperatorSubnetLoginMFARequest) validateUsername(formats strfmt.Registry) error {
-
-	if err := validate.Required("username", "body", m.Username); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this operator subnet login m f a request based on context it is used
-func (m *OperatorSubnetLoginMFARequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetLoginMFARequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetLoginMFARequest) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetLoginMFARequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_login_request.go
+++ b/models/operator_subnet_login_request.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetLoginRequest operator subnet login request
-//
-// swagger:model operatorSubnetLoginRequest
-type OperatorSubnetLoginRequest struct {
-
-	// password
-	Password string `json:"password,omitempty"`
-
-	// username
-	Username string `json:"username,omitempty"`
-}
-
-// Validate validates this operator subnet login request
-func (m *OperatorSubnetLoginRequest) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet login request based on context it is used
-func (m *OperatorSubnetLoginRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetLoginRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetLoginRequest) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetLoginRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_login_response.go
+++ b/models/operator_subnet_login_response.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetLoginResponse operator subnet login response
-//
-// swagger:model operatorSubnetLoginResponse
-type OperatorSubnetLoginResponse struct {
-
-	// access token
-	AccessToken string `json:"access_token,omitempty"`
-
-	// mfa token
-	MfaToken string `json:"mfa_token,omitempty"`
-}
-
-// Validate validates this operator subnet login response
-func (m *OperatorSubnetLoginResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet login response based on context it is used
-func (m *OperatorSubnetLoginResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetLoginResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetLoginResponse) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetLoginResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_register_api_key_response.go
+++ b/models/operator_subnet_register_api_key_response.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetRegisterAPIKeyResponse operator subnet register API key response
-//
-// swagger:model operatorSubnetRegisterAPIKeyResponse
-type OperatorSubnetRegisterAPIKeyResponse struct {
-
-	// registered
-	Registered bool `json:"registered,omitempty"`
-}
-
-// Validate validates this operator subnet register API key response
-func (m *OperatorSubnetRegisterAPIKeyResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet register API key response based on context it is used
-func (m *OperatorSubnetRegisterAPIKeyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKeyResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKeyResponse) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetRegisterAPIKeyResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/permission_resource.go
+++ b/models/permission_resource.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2022 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 (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// PermissionResource permission resource
-//
-// swagger:model permissionResource
-type PermissionResource struct {
-
-	// condition operator
-	ConditionOperator string `json:"conditionOperator,omitempty"`
-
-	// prefixes
-	Prefixes []string `json:"prefixes"`
-
-	// resource
-	Resource string `json:"resource,omitempty"`
-}
-
-// Validate validates this permission resource
-func (m *PermissionResource) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this permission resource based on context it is used
-func (m *PermissionResource) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *PermissionResource) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *PermissionResource) UnmarshalBinary(b []byte) error {
-	var res PermissionResource
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/principal.go
+++ b/models/principal.go
@@ -46,14 +46,8 @@ type Principal struct {
 	// account access key
 	AccountAccessKey string `json:"accountAccessKey,omitempty"`

-	// custom style ob
-	CustomStyleOb string `json:"customStyleOb,omitempty"`
-
 	// hm
 	Hm bool `json:"hm,omitempty"`
-
-	// ob
-	Ob bool `json:"ob,omitempty"`
 }

 // Validate validates this principal
--- a/Show More
+++ b/Show More