Correcting doc links on Configuration pages

.github/workflows/console-sa-secret.yaml

@@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: console-sa-secret
-  namespace: minio-operator
-  annotations:
-    kubernetes.io/service-account.name: console-sa
-type: kubernetes.io/service-account-token

.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 "$@"

.github/workflows/jobs.yaml

@@ -24,7 +24,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ubuntu-latest
 
     strategy:
@@ -93,7 +92,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ubuntu-latest
 
     strategy:
@@ -162,7 +160,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ubuntu-latest
 
     strategy:
@@ -259,22 +256,6 @@ jobs:
           curl -L -o nancy https://github.com/sonatype-nexus-community/nancy/releases/download/${nancy_version}/nancy-${nancy_version}-linux-amd64 && chmod +x nancy
           go list -deps -json ./... | jq -s 'unique_by(.Module.Path)|.[]|select(has("Module"))|.Module' | ./nancy sleuth
 
-  semgrep-static-code-analysis:
-    name: "semgrep checks"
-    runs-on: ${{ matrix.os }}
-    container:
-      image: "returntocorp/semgrep"
-    strategy:
-      matrix:
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Check out source code
-        uses: actions/checkout@v2
-      - name: Scanning code on ${{ matrix.os }}
-        continue-on-error: false
-        run: |
-          semgrep --config semgrep.yaml $(pwd)/portal-ui --error
-
   no-warnings-and-make-assets:
     name: "React Code Has No Warnings and then Make Assets"
     runs-on: ${{ matrix.os }}
@@ -369,7 +350,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -448,7 +428,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -527,7 +506,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -607,7 +585,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     timeout-minutes: 5
     strategy:
@@ -677,7 +654,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -746,7 +722,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -808,75 +783,6 @@ jobs:
         with:
           args: '"chrome:headless" portal-ui/tests/permissions-6/ --skip-js-errors'
 
-  all-permissions-7:
-    name: Permissions Tests Part 7
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - reuse-golang-dependencies
-      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [ 1.17.x ]
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-        id: go
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        name: Yarn Cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            ./portal-ui/node_modules/
-            ./portal-ui/build/
-          key: ${{ runner.os }}-yarn-${{ hashFiles('./portal-ui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - uses: actions/cache@v2
-        id: assets-cache
-        name: Assets Cache
-        with:
-          path: |
-            ./portal-ui/build/
-          key: ${{ runner.os }}-assets-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-assets-
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ github.run_id }}
-      - name: Build Console on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make console
-      - name: Start Console, front-end app and initialize users/policies
-        run: |
-          (./console server) & (make initialize-permissions)
-      - name: Run TestCafe Tests
-        timeout-minutes: 5
-        uses: DevExpress/testcafe-action@latest
-        with:
-          args: '"chrome:headless" portal-ui/tests/permissions-7/ --skip-js-errors'
-
   all-operator-tests:
     name: Operator UI Tests
     needs:
@@ -884,7 +790,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -958,7 +863,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -996,7 +900,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -1034,7 +937,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -1072,7 +974,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -1110,7 +1011,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -1148,7 +1048,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -1186,7 +1085,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -1224,7 +1122,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -1263,52 +1160,6 @@ jobs:
             ./restapi/coverage/
           key: ${{ runner.os }}-coverage-restapi-2-${{ github.run_id }}
 
-  test-operatorapi-on-go:
-    name: Test Operatorapi on Go ${{ matrix.go-version }} and ${{ matrix.os }}
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - reuse-golang-dependencies
-      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [ 1.17.x ]
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ github.run_id }}
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make test-unit-test-operator
-
-      - uses: actions/cache@v2
-        id: coverage-cache-unittest-operatorapi
-        name: Coverage Cache unit test operatorAPI
-        with:
-          path: |
-            ./operatorapi/coverage/
-          key: ${{ runner.os }}-coverage-unittest-operatorapi-2-${{ github.run_id }}
-
   b-integration-tests:
     name: Integration Tests with Latest Distributed MinIO
     needs:
@@ -1316,7 +1167,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ubuntu-latest
 
     strategy:
@@ -1385,7 +1235,6 @@ jobs:
       - no-warnings-and-make-assets
       - reuse-golang-dependencies
       - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -1401,7 +1250,6 @@ jobs:
     needs:
       - b-integration-tests
       - test-restapi-on-go
-      - test-operatorapi-on-go
       - c-operator-api-tests
       - test-pkg-on-go
       - sso-integration
@@ -1472,14 +1320,6 @@ jobs:
             ./restapi/coverage/
           key: ${{ runner.os }}-coverage-restapi-2-${{ github.run_id }}
 
-      - uses: actions/cache@v2
-        id: coverage-cache-unittest-operatorapi
-        name: Coverage Cache unit test operatorAPI
-        with:
-          path: |
-            ./operatorapi/coverage/
-          key: ${{ runner.os }}-coverage-unittest-operatorapi-2-${{ github.run_id }}
-
       - uses: actions/cache@v2
         id: coverage-cache-pkg
         name: Coverage Cache Pkg
@@ -1499,32 +1339,17 @@ jobs:
           echo "go build gocoverage.go"
           go build gocovmerge.go
           echo "put together the outs for final coverage resolution"
-          ./gocovmerge ../integration/coverage/system.out ../replication/coverage/replication.out ../sso-integration/coverage/sso-system.out ../restapi/coverage/coverage.out ../pkg/coverage/coverage-pkg.out ../operator-integration/coverage/operator-api.out ../operatorapi/coverage/coverage-unit-test-operatorapi.out > all.out
-          echo "Download mc for Ubuntu"
-          wget -q https://dl.min.io/client/mc/release/linux-amd64/mc
-          echo "Change the permissions to execute mc command"
-          chmod +x mc
-          echo "Create the folder to put the all.out file"
-          ./mc mb --ignore-existing play/builds/
-          echo "Copy the all.out file to play bucket"
-          echo ${{ github.repository }}
-          echo ${{ github.event.number }}
-          echo ${{ github.run_id }}
-          ./mc cp all.out play/builds/${{ github.repository }}/${{ github.event.number }}/${{ github.run_id }}/
-          ./mc cp all.out play/builds/${{ github.repository }}/${{ github.event.number }}/latest/
-          go tool cover -html=all.out -o coverage.html
-          ./mc cp coverage.html play/builds/${{ github.repository }}/${{ github.event.number }}/${{ github.run_id }}/
-          ./mc cp coverage.html play/builds/${{ github.repository }}/${{ github.event.number }}/latest/
+          ./gocovmerge ../integration/coverage/system.out ../replication/coverage/replication.out ../sso-integration/coverage/sso-system.out ../restapi/coverage/coverage.out ../pkg/coverage/coverage-pkg.out ../operator-integration/coverage/operator-api.out > all.out
           echo "grep to obtain the result"
           go tool cover -func=all.out | grep total > tmp2
           result=`cat tmp2 | awk 'END {print $3}'`
           result=${result%\%}
-          threshold=50.5
-          echo "Result:"
-          echo "$result%"
+          echo "result:"
+          echo $result
+          threshold=41.2
           if (( $(echo "$result >= $threshold" |bc -l) )); then
-            echo "It is equal or greater than threshold ($threshold%), passed!"
+            echo "It is equal or greater than threshold, passed!"
           else
-            echo "It is smaller than threshold ($threshold%) value, failed!"
+            echo "It is smaller than threshold value, failed!"
             exit 1
           fi

.golangci.yml

@@ -16,17 +16,10 @@ linters:
     - ineffassign
     - gosimple
     - deadcode
-    - structcheck
-    - gomodguard
-    - gofmt
+    - unparam
     - unused
     - structcheck
-    - unconvert
-    - varcheck
-    - gocritic
-    - gofumpt
-    - tenv
-    - durationcheck
+    - goheader
 
 linters-settings:
   goheader:

.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

Makefile

@@ -131,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 \
@@ -159,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)
 
@@ -202,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)
 
@@ -242,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)

cluster/cluster.go

@@ -25,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 {

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

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)

go.mod

@@ -22,11 +22,11 @@ require (
 	github.com/minio/cli v1.22.0
 	github.com/minio/highwayhash v1.0.2
 	github.com/minio/kes v0.19.2
-	github.com/minio/madmin-go v1.3.14
-	github.com/minio/mc v0.0.0-20220512134321-aa60a8db1e4d
-	github.com/minio/minio-go/v7 v7.0.26
+	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.23
+	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
@@ -41,7 +41,6 @@ require (
 	k8s.io/api v0.23.5
 	k8s.io/apimachinery v0.23.5
 	k8s.io/client-go v0.23.5
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 )
 
 require (
@@ -105,7 +104,6 @@ require (
 	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/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect
@@ -120,9 +118,8 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
 	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.33.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/prometheus/prom2json v1.3.1 // 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
@@ -156,6 +153,7 @@ require (
 	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-20211208200746-9f7c6b3444d2 // indirect

go.sum

@@ -168,11 +168,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -477,21 +475,21 @@ github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLT
 github.com/minio/kes v0.19.2 h1:0kdMAgLMSkiDA33k8pMHC7d6erDuseuLrZF+N3017SM=
 github.com/minio/kes v0.19.2/go.mod h1:X2fMkDbAkjbSKDGOQZvyPkHxoG7nuzP6R78Jw+TzXtM=
 github.com/minio/madmin-go v1.3.5/go.mod h1:vGKGboQgGIWx4DuDUaXixjlIEZOCIp6ivJkQoiVaACc=
-github.com/minio/madmin-go v1.3.14 h1:9f9ZylP5Yn/TcplE/wowsBjb+Czt2+/NRCa2IqpNLcI=
-github.com/minio/madmin-go v1.3.14/go.mod h1:ez87VmMtsxP7DRxjKJKD4RDNW+nhO2QF9KSzwxBDQ98=
-github.com/minio/mc v0.0.0-20220512134321-aa60a8db1e4d h1:txmSSDiVFG69Hp/6Yjg5azKl96ObYL3pBQPW0i2uHIs=
-github.com/minio/mc v0.0.0-20220512134321-aa60a8db1e4d/go.mod h1:g9jrk4AQ3yLaxDJzb5D+ww6sGiDC0w1k88LUH5lDR7M=
+github.com/minio/madmin-go v1.3.12 h1:7SmK/KtT7+d3hn3VcYBqI/c4yETfXV9gRT1j+g/U1jE=
+github.com/minio/madmin-go v1.3.12/go.mod h1:ez87VmMtsxP7DRxjKJKD4RDNW+nhO2QF9KSzwxBDQ98=
+github.com/minio/mc v0.0.0-20220419155441-cc4ff3a0cc82 h1:CiTaWFwpxzjd7A3sUQ0xZEX8sWfZh3/k2qbxuPip05s=
+github.com/minio/mc v0.0.0-20220419155441-cc4ff3a0cc82/go.mod h1:h6VCl43/2AUA3RP1GWUVMqcUiXq2NWJ4+dSei+ibf70=
 github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/minio/minio-go/v7 v7.0.23/go.mod h1:ei5JjmxwHaMrgsMrn4U/+Nmg+d8MKS1U2DAn1ou4+Do=
-github.com/minio/minio-go/v7 v7.0.26 h1:D0HK+8793etZfRY/vHhDmFaP+vmT41K3K4JV9vmZCBQ=
-github.com/minio/minio-go/v7 v7.0.26/go.mod h1:x81+AX5gHSfCSqw7jxRKHvxUXMlE5uKX0Vb75Xk5yYg=
+github.com/minio/minio-go/v7 v7.0.24 h1:HPlHiET6L5gIgrHRaw1xFo1OaN4bEP/082asWh3WJtI=
+github.com/minio/minio-go/v7 v7.0.24/go.mod h1:x81+AX5gHSfCSqw7jxRKHvxUXMlE5uKX0Vb75Xk5yYg=
 github.com/minio/operator v0.0.0-20220414212219-ba4c097324b2 h1:GdjU5qV+Wv0P2Y/TVGRELapzBdph8Vyi6u9VjgvtVIs=
 github.com/minio/operator v0.0.0-20220414212219-ba4c097324b2/go.mod h1:4Bo6a+XrBFEfCiiEtB14bw8l/nT3hcvZQKrZGZu27mA=
 github.com/minio/pkg v1.1.20/go.mod h1:Xo7LQshlxGa9shKwJ7NzQbgW4s8T/Wc1cOStR/eUiMY=
-github.com/minio/pkg v1.1.23 h1:CJSoPslQCWZW3z3T79+pv9dVBDCQEK3ipiwXcoAtzY0=
-github.com/minio/pkg v1.1.23/go.mod h1:z9PfmEI804KFkF6eY4LoGe8IDVvTCsYGVuaf58Dr0WI=
+github.com/minio/pkg v1.1.21 h1:sqPIwfmlMbufFd3xiEiAdrgyle7c67YIXFf+rFtCeyA=
+github.com/minio/pkg v1.1.21/go.mod h1:z9PfmEI804KFkF6eY4LoGe8IDVvTCsYGVuaf58Dr0WI=
 github.com/minio/selfupdate v0.4.0 h1:A7t07pN4Ch1tBTIRStW0KhUVyykz+2muCqFsITQeEW8=
 github.com/minio/selfupdate v0.4.0/go.mod h1:mcDkzMgq8PRcpCRJo/NlPY7U45O5dfYl2Y0Rg7IustY=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
@@ -519,7 +517,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/montanaflynn/stats v0.6.6 h1:Duep6KMIDpY4Yo11iFsvyqJDyfzLF9+sndUKT+v64GQ=
 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
 github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 h1:kMlmsLSbjkikxQJ1IPwaM+7LJ9ltFu/fi8CRzvSnQmA=
@@ -594,17 +591,14 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.33.0 h1:rHgav/0a6+uYgGdNt3jwz8FNSesO/Hsang3O0T9A5SE=
-github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/prom2json v1.3.1 h1:OogL5hsrJpLPz3jZ4LPz4sJRTtADzViCNRQoqrzUQvk=
-github.com/prometheus/prom2json v1.3.1/go.mod h1:A8Oy9aiQx4wrJY9ya1i4nHOySGmkVp5EO0aU1iSJR+g=
 github.com/rivo/tview v0.0.0-20220216162559-96063d6082f3 h1:crs4rrYnQqsZpz/EtjezHGCu13e+3W9eqj0MzIYXir0=
 github.com/rivo/tview v0.0.0-20220216162559-96063d6082f3/go.mod h1:WIfMkQNY+oq/mWwtsjOYHIZBuwthioY2srOmljJkTnk=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -829,7 +823,6 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220421235706-1d1ef9303861 h1:yssD99+7tqHWO5Gwh81phT+67hg+KttniBr6UnEXOY8=
 golang.org/x/net v0.0.0-20220421235706-1d1ef9303861/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -846,7 +839,6 @@ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE=
 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

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")
-			}
-		})
-	}
-}

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) {

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)

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) {
 			}
 		})
 	}
+
 }

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")
 			}
+
 		})
 	}
+
 }

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,
-				)
-			}
-		})
-	}
-}

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:
@@ -130,34 +133,5 @@ func TestLogout(t *testing.T) {
 	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(response.StatusCode, 500, "Login request not rejected")
-	assert.NotNil(response, "Login response is  nil")
-	assert.Nil(err, "Login errored out")
+
 }

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) {
 			}
 		})
 	}
+
 }

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")
-			}
-		})
-	}
 }

integration/profiling_test.go

@@ -43,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,

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),
 		)
 	}
+
 }

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)
+
 }

integration/user_api_bucket_test.go

@@ -20,7 +20,6 @@ package integration
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -35,12 +34,10 @@ import (
 	"time"
 
 	"github.com/minio/console/models"
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/stretchr/testify/assert"
 )
 
-func AddBucket(name string, locking, versioning bool, quota, retention map[string]interface{}) (*http.Response, error) {
+func AddBucket(name string, locking bool, versioning bool, quota map[string]interface{}, retention map[string]interface{}) (*http.Response, error) {
 	/*
 	   This is an atomic function that we can re-use to create a bucket on any
 	   desired test.
@@ -72,7 +69,7 @@ func AddBucket(name string, locking, versioning bool, quota, retention map[strin
 	return response, err
 }
 
-func BucketGotAdded(name string, locking, versioning bool, quota, retention map[string]interface{}, assert *assert.Assertions, expected int) bool {
+func BucketGotAdded(name string, locking bool, versioning bool, quota map[string]interface{}, retention map[string]interface{}, assert *assert.Assertions, expected int) bool {
 	/*
 		The intention of this function is to return either true or false to
 		reduce the code by performing the verification in one place only.
@@ -151,7 +148,7 @@ func BucketInfo(name string) (*http.Response, error) {
 	return response, err
 }
 
-func SetBucketRetention(bucketName, mode, unit string, validity int) (*http.Response, error) {
+func SetBucketRetention(bucketName string, mode string, unit string, validity int) (*http.Response, error) {
 	/*
 		Helper function to set bucket's retention
 		PUT: {{baseUrl}}/buckets/:bucket_name/retention
@@ -202,7 +199,7 @@ func GetBucketRetention(bucketName string) (*http.Response, error) {
 	return response, err
 }
 
-func PutObjectTags(bucketName, prefix string, tags map[string]string, versionID string) (*http.Response, error) {
+func PutObjectTags(bucketName string, prefix string, tags map[string]string, versionID string) (*http.Response, error) {
 	/*
 		Helper function to put object's tags.
 		PUT: /buckets/{bucket_name}/objects/tags?prefix=prefix
@@ -270,7 +267,7 @@ func DeleteMultipleObjects(bucketName string, files []map[string]interface{}) (*
 	return response, err
 }
 
-func DownloadObject(bucketName, path string) (*http.Response, error) {
+func DownloadObject(bucketName string, path string) (*http.Response, error) {
 	/*
 	   Helper function to download an object from a bucket.
 	   GET: {{baseUrl}}/buckets/bucketName/objects/download?prefix=file
@@ -293,7 +290,7 @@ func DownloadObject(bucketName, path string) (*http.Response, error) {
 	return response, err
 }
 
-func UploadAnObject(bucketName, fileName string) (*http.Response, error) {
+func UploadAnObject(bucketName string, fileName string) (*http.Response, error) {
 	/*
 		Helper function to upload a file to a bucket for testing.
 		POST {{baseUrl}}/buckets/:bucket_name/objects/upload
@@ -302,10 +299,10 @@ func UploadAnObject(bucketName, fileName string) (*http.Response, error) {
 	boundaryStart := "------" + boundary + "\r\n"
 	contentDispositionOne := "Content-Disposition: form-data; name=\"2\"; "
 	contentDispositionTwo := "filename=\"" + fileName + "\"\r\n"
-	contentType := "Content-Type: text/plain\r\n\r\na\n\r\n"
+	contenType := "Content-Type: text/plain\r\n\r\na\n\r\n"
 	boundaryEnd := "------" + boundary + "--\r\n"
 	file := boundaryStart + contentDispositionOne + contentDispositionTwo +
-		contentType + boundaryEnd
+		contenType + boundaryEnd
 	arrayOfBytes := []byte(file)
 	requestDataBody := bytes.NewReader(arrayOfBytes)
 	request, err := http.NewRequest(
@@ -328,7 +325,7 @@ func UploadAnObject(bucketName, fileName string) (*http.Response, error) {
 	return response, err
 }
 
-func DeleteObject(bucketName, path string, recursive, allVersions bool) (*http.Response, error) {
+func DeleteObject(bucketName string, path string, recursive bool, allVersions bool) (*http.Response, error) {
 	/*
 	   Helper function to delete an object from a given bucket.
 	   DELETE:
@@ -354,7 +351,7 @@ func DeleteObject(bucketName, path string, recursive, allVersions bool) (*http.R
 	return response, err
 }
 
-func ListObjects(bucketName, prefix, withVersions string) (*http.Response, error) {
+func ListObjects(bucketName string, prefix string, withVersions string) (*http.Response, error) {
 	/*
 		Helper function to list objects in a bucket.
 		GET: {{baseUrl}}/buckets/:bucket_name/objects
@@ -374,7 +371,7 @@ func ListObjects(bucketName, prefix, withVersions string) (*http.Response, error
 	return response, err
 }
 
-func SharesAnObjectOnAUrl(bucketName, prefix, versionID, expires string) (*http.Response, error) {
+func SharesAnObjectOnAUrl(bucketName string, prefix string, versionID string, expires string) (*http.Response, error) {
 	// Helper function to share an object on a url
 	request, err := http.NewRequest(
 		"GET",
@@ -393,7 +390,7 @@ func SharesAnObjectOnAUrl(bucketName, prefix, versionID, expires string) (*http.
 	return response, err
 }
 
-func PutObjectsRetentionStatus(bucketName, prefix, versionID, mode, expires string, governanceBypass bool) (*http.Response, error) {
+func PutObjectsRetentionStatus(bucketName string, prefix string, versionID string, mode string, expires string, governanceBypass bool) (*http.Response, error) {
 	requestDataAdd := map[string]interface{}{
 		"mode":              mode,
 		"expires":           expires,
@@ -418,7 +415,7 @@ func PutObjectsRetentionStatus(bucketName, prefix, versionID, mode, expires stri
 	return response, err
 }
 
-func GetsTheMetadataOfAnObject(bucketName, prefix string) (*http.Response, error) {
+func GetsTheMetadataOfAnObject(bucketName string, prefix string) (*http.Response, error) {
 	/*
 		Gets the metadata of an object
 		GET
@@ -469,7 +466,7 @@ func PutBucketsTags(bucketName string, tags map[string]string) (*http.Response,
 	return response, err
 }
 
-func RestoreObjectToASelectedVersion(bucketName, prefix, versionID string) (*http.Response, error) {
+func RestoreObjectToASelectedVersion(bucketName string, prefix string, versionID string) (*http.Response, error) {
 	request, err := http.NewRequest(
 		"PUT",
 		"http://localhost:9090/api/v1/buckets/"+bucketName+"/objects/restore?prefix="+prefix+"&version_id="+versionID,
@@ -487,7 +484,7 @@ func RestoreObjectToASelectedVersion(bucketName, prefix, versionID string) (*htt
 	return response, err
 }
 
-func BucketSetPolicy(bucketName, access, definition string) (*http.Response, error) {
+func BucketSetPolicy(bucketName string, access string, definition string) (*http.Response, error) {
 	/*
 		Helper function to set policy on a bucket
 		Name: Bucket Set Policy
@@ -522,7 +519,7 @@ func BucketSetPolicy(bucketName, access, definition string) (*http.Response, err
 	return response, err
 }
 
-func DeleteObjectsRetentionStatus(bucketName, prefix, versionID string) (*http.Response, error) {
+func DeleteObjectsRetentionStatus(bucketName string, prefix string, versionID string) (*http.Response, error) {
 	/*
 		Helper function to Delete Object Retention Status
 		DELETE:
@@ -632,7 +629,7 @@ func GetBucketQuota(bucketName string) (*http.Response, error) {
 	return response, err
 }
 
-func PutObjectsLegalholdStatus(bucketName, prefix, status, versionID string) (*http.Response, error) {
+func PutObjectsLegalholdStatus(bucketName string, prefix string, status string, versionID string) (*http.Response, error) {
 	// Helper function to test "Put Object's legalhold status" end point
 	requestDataAdd := map[string]interface{}{
 		"status": status,
@@ -657,6 +654,7 @@ func PutObjectsLegalholdStatus(bucketName, prefix, status, versionID string) (*h
 }
 
 func TestPutObjectsLegalholdStatus(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "testputobjectslegalholdstatus"
@@ -744,9 +742,11 @@ func TestPutObjectsLegalholdStatus(t *testing.T) {
 			}
 		})
 	}
+
 }
 
 func TestGetBucketQuota(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	validBucket := "testgetbucketquota"
@@ -821,9 +821,11 @@ func TestGetBucketQuota(t *testing.T) {
 			}
 		})
 	}
+
 }
 
 func TestPutBucketQuota(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	validBucket := "testputbucketquota"
@@ -880,9 +882,11 @@ func TestPutBucketQuota(t *testing.T) {
 			}
 		})
 	}
+
 }
 
 func TestListBucketEvents(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	validBucket := "testlistbucketevents"
@@ -918,6 +922,7 @@ func TestListBucketEvents(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			restResp, restErr := ListBucketEvents(
 				tt.args.bucketName,
 			)
@@ -934,11 +939,14 @@ func TestListBucketEvents(t *testing.T) {
 					finalResponse,
 				)
 			}
+
 		})
 	}
+
 }
 
 func TestDeleteObjectsRetentionStatus(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "testdeleteobjectslegalholdstatus"
@@ -1045,9 +1053,11 @@ func TestDeleteObjectsRetentionStatus(t *testing.T) {
 			}
 		})
 	}
+
 }
 
 func TestBucketSetPolicy(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	validBucketName := "testbucketsetpolicy"
@@ -1083,6 +1093,7 @@ func TestBucketSetPolicy(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			// Set Policy
 			restResp, restErr := BucketSetPolicy(
 				tt.args.bucketName,
@@ -1102,11 +1113,14 @@ func TestBucketSetPolicy(t *testing.T) {
 					finalResponse,
 				)
 			}
+
 		})
 	}
+
 }
 
 func TestRestoreObjectToASelectedVersion(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "testrestoreobjectstoselectedversion"
@@ -1194,9 +1208,11 @@ func TestRestoreObjectToASelectedVersion(t *testing.T) {
 			}
 		})
 	}
+
 }
 
 func TestPutBucketsTags(t *testing.T) {
+
 	// Focused test for "Put Bucket's tags" endpoint
 
 	// 1. Create the bucket
@@ -1231,6 +1247,7 @@ func TestPutBucketsTags(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			// 2. Add a tag to the bucket
 			tags := make(map[string]string)
 			tags["tag2"] = "tag2"
@@ -1246,11 +1263,14 @@ func TestPutBucketsTags(t *testing.T) {
 					tt.expectedStatus, putBucketTagResponse.StatusCode,
 					inspectHTTPResponse(putBucketTagResponse))
 			}
+
 		})
 	}
+
 }
 
 func TestGetsTheMetadataOfAnObject(t *testing.T) {
+
 	// Vars
 	assert := assert.New(t)
 	bucketName := "testgetsthemetadataofanobject"
@@ -1304,6 +1324,7 @@ func TestGetsTheMetadataOfAnObject(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			// 3. Get the metadata from an object
 			getRsp, getErr := GetsTheMetadataOfAnObject(
 				bucketName, tt.args.prefix)
@@ -1319,11 +1340,14 @@ func TestGetsTheMetadataOfAnObject(t *testing.T) {
 					inspectHTTPResponse(getRsp),
 				)
 			}
+
 		})
 	}
+
 }
 
 func TestPutObjectsRetentionStatus(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "testputobjectsretentionstatus"
@@ -1412,6 +1436,7 @@ func TestPutObjectsRetentionStatus(t *testing.T) {
 			}
 		})
 	}
+
 }
 
 func TestShareObjectOnURL(t *testing.T) {
@@ -1473,6 +1498,7 @@ func TestShareObjectOnURL(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			// 3. Share the object on a URL
 			shareResponse, shareError := SharesAnObjectOnAUrl(bucketName, tt.args.prefix, versionID, "604800s")
 			assert.Nil(shareError)
@@ -1488,8 +1514,10 @@ func TestShareObjectOnURL(t *testing.T) {
 					finalResponse,
 				)
 			}
+
 		})
 	}
+
 }
 
 func TestListObjects(t *testing.T) {
@@ -1536,6 +1564,7 @@ func TestListObjects(t *testing.T) {
 	assert.True(
 		strings.Contains(finalResponse, "testlistobjecttobucket1"),
 		finalResponse)
+
 }
 
 func TestDeleteObject(t *testing.T) {
@@ -1604,6 +1633,7 @@ func TestDeleteObject(t *testing.T) {
 		strings.Contains(
 			finalResponse,
 			"testdeleteobjectfile1.txt"), finalResponse) // Gone
+
 }
 
 func TestUploadObjectToBucket(t *testing.T) {
@@ -1634,6 +1664,7 @@ func TestUploadObjectToBucket(t *testing.T) {
 	if uploadResponse != nil {
 		assert.Equal(200, uploadResponse.StatusCode, finalResponse)
 	}
+
 }
 
 func TestDownloadObject(t *testing.T) {
@@ -1700,6 +1731,7 @@ func TestDownloadObject(t *testing.T) {
 		// path/to/whatever does not exist
 		assert.Fail("File wasn't downloaded")
 	}
+
 }
 
 func TestDeleteMultipleObjects(t *testing.T) {
@@ -1774,6 +1806,7 @@ func TestDeleteMultipleObjects(t *testing.T) {
 	// 5. Verify empty list is obtained as we deleted all the objects
 	expected := "Http Response: {\"objects\":null}\n"
 	assert.Equal(expected, finalResponse, finalResponse)
+
 }
 
 func TestPutObjectTag(t *testing.T) {
@@ -1839,6 +1872,7 @@ func TestPutObjectTag(t *testing.T) {
 	assert.True(
 		strings.Contains(finalResponse, tags["tag"]),
 		finalResponse)
+
 }
 
 func TestBucketRetention(t *testing.T) {
@@ -1907,6 +1941,7 @@ func TestBucketRetention(t *testing.T) {
 	}
 	expected := "Http Response: {\"mode\":\"compliance\",\"unit\":\"years\",\"validity\":3}\n"
 	assert.Equal(expected, finalResponse, finalResponse)
+
 }
 
 func TestBucketInformationGenericErrorResponse(t *testing.T) {
@@ -1952,6 +1987,7 @@ func TestBucketInformationGenericErrorResponse(t *testing.T) {
 	// Since bucketinformation3 hasn't been created, then it is expected that
 	// tag2 is not part of the response, this is why assert.False is used.
 	assert.False(strings.Contains(finalResponse, "tag2"), finalResponse)
+
 }
 
 func TestBucketInformationSuccessfulResponse(t *testing.T) {
@@ -2002,66 +2038,51 @@ func TestBucketInformationSuccessfulResponse(t *testing.T) {
 	assert.True(
 		strings.Contains(debugResponse, "tag1"),
 		inspectHTTPResponse(bucketInfoResponse))
+
 }
 
 func TestDeleteBucket(t *testing.T) {
 	/*
 		Test to delete a bucket
 	*/
+
+	// 1. Create the bucket
 	assert := assert.New(t)
-	type args struct {
-		bucketName       string
-		createBucketName string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-	}{
-		{
-			name:           "Delete a bucket",
-			expectedStatus: 204,
-			args: args{
-				bucketName:       "testdeletebucket1",
-				createBucketName: "testdeletebucket1",
-			},
-		}, {
-			name:           "Delete invalid bucket",
-			expectedStatus: 404,
-			args: args{
-				bucketName:       "nonexistingbucket",
-				createBucketName: "",
-			},
-		},
+	if !BucketGotAdded("testdeletebucket1", false, false, nil, nil, assert, 201) {
+		return
 	}
 
-	// Initialize minio client object.
-	minioClient, err := minio.New("localhost:9000", &minio.Options{
-		Creds:  credentials.NewStaticV4("minioadmin", "minioadmin", ""),
-		Secure: false,
-	})
-	if err != nil {
-		log.Fatalln(err)
+	// 2. Delete the bucket
+	deleteBucketResponse, deleteBucketError := DeleteBucket("testdeletebucket1")
+	assert.Nil(deleteBucketError)
+	if deleteBucketError != nil {
+		log.Println(deleteBucketError)
+		return
+	}
+	if deleteBucketResponse != nil {
+		assert.Equal(
+			204, deleteBucketResponse.StatusCode, "Status Code is incorrect")
 	}
 
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Create bucket if needed for the test
-			if tt.args.createBucketName != "" {
-				if err := minioClient.MakeBucket(context.Background(), tt.args.createBucketName, minio.MakeBucketOptions{}); err != nil {
-					assert.Failf("Failed to create bucket", "Could not create bucket %s: %v", tt.args.createBucketName, err)
-				}
-			}
-
-			// Delete the bucket
-			deleteBucketResponse, deleteBucketError := DeleteBucket(tt.args.bucketName)
-			assert.Nil(deleteBucketError)
-			if deleteBucketResponse != nil {
-				assert.Equal(
-					tt.expectedStatus, deleteBucketResponse.StatusCode, "Status Code is incorrect")
-			}
-		})
+	// 3. Verify the bucket is gone by trying to put a tag
+	tags := make(map[string]string)
+	tags["tag1"] = "tag1"
+	putBucketTagResponse, putBucketTagError := PutBucketsTags(
+		"testdeletebucket1", tags)
+	if putBucketTagError != nil {
+		log.Println(putBucketTagError)
+		assert.Fail("Error adding a tag to the bucket")
+		return
 	}
+	finalResponse := inspectHTTPResponse(putBucketTagResponse)
+	if putBucketTagResponse != nil {
+		assert.Equal(
+			500, putBucketTagResponse.StatusCode,
+			finalResponse)
+	}
+	assert.True(
+		strings.Contains(finalResponse, "The specified bucket does not exist"))
+
 }
 
 func TestListBuckets(t *testing.T) {
@@ -2072,7 +2093,7 @@ func TestListBuckets(t *testing.T) {
 	assert := assert.New(t)
 
 	// 1. Create buckets
-	numberOfBuckets := 3
+	var numberOfBuckets = 3
 	for i := 1; i <= numberOfBuckets; i++ {
 		if !BucketGotAdded("testlistbuckets"+strconv.Itoa(i), false, false, nil, nil, assert, 201) {
 			return
@@ -2101,9 +2122,11 @@ func TestListBuckets(t *testing.T) {
 		assert.True(strings.Contains(string(b),
 			"testlistbuckets"+strconv.Itoa(i)))
 	}
+
 }
 
 func TestBucketsGet(t *testing.T) {
+
 	assert := assert.New(t)
 
 	client := &http.Client{
@@ -2141,9 +2164,11 @@ func TestBucketsGet(t *testing.T) {
 		assert.Greater(listBuckets.Total, int64(0), "Total buckets is 0")
 
 	}
+
 }
 
 func TestBucketVersioning(t *testing.T) {
+
 	assert := assert.New(t)
 
 	client := &http.Client{
@@ -2243,9 +2268,11 @@ func TestBucketVersioning(t *testing.T) {
 	if response != nil {
 		fmt.Println("DELETE StatusCode:", response.StatusCode)
 	}
+
 }
 
 func TestSetBucketTags(t *testing.T) {
+
 	assert := assert.New(t)
 
 	client := &http.Client{
@@ -2311,9 +2338,11 @@ func TestSetBucketTags(t *testing.T) {
 	}
 
 	assert.Equal("TAG", bucket.Details.Tags["test"], "Failed to add tag")
+
 }
 
 func TestGetBucket(t *testing.T) {
+
 	assert := assert.New(t)
 
 	client := &http.Client{
@@ -2344,9 +2373,11 @@ func TestGetBucket(t *testing.T) {
 	if response != nil {
 		assert.Equal(200, response.StatusCode, "Status Code is incorrect")
 	}
+
 }
 
 func TestAddBucket(t *testing.T) {
+
 	assert := assert.New(t)
 	type args struct {
 		bucketName string
@@ -2378,9 +2409,10 @@ func TestAddBucket(t *testing.T) {
 			}
 		})
 	}
+
 }
 
-func CreateBucketEvent(bucketName string, ignoreExisting bool, arn, prefix, suffix string, events []string) (*http.Response, error) {
+func CreateBucketEvent(bucketName string, ignoreExisting bool, arn string, prefix string, suffix string, events []string) (*http.Response, error) {
 	/*
 		Helper function to create bucket event
 		POST: /buckets/{bucket_name}/events
@@ -2424,7 +2456,7 @@ func CreateBucketEvent(bucketName string, ignoreExisting bool, arn, prefix, suff
 	return response, err
 }
 
-func DeleteBucketEvent(bucketName, arn string, events []string, prefix, suffix string) (*http.Response, error) {
+func DeleteBucketEvent(bucketName string, arn string, events []string, prefix string, suffix string) (*http.Response, error) {
 	/*
 		Helper function to test Delete Bucket Event
 		DELETE: /buckets/{bucket_name}/events/{arn}
@@ -2459,6 +2491,7 @@ func DeleteBucketEvent(bucketName, arn string, events []string, prefix, suffix s
 }
 
 func TestDeleteBucketEvent(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 
@@ -2538,9 +2571,10 @@ func TestDeleteBucketEvent(t *testing.T) {
 			efinalResponseEvent,
 		)
 	}
+
 }
 
-func SetMultiBucketReplication(accessKey, secretKey, targetURL, region, originBucket, destinationBucket, syncMode string, bandwidth, healthCheckPeriod int, prefix, tags string, replicateDeleteMarkers, replicateDeletes bool, priority int, storageClass string, replicateMetadata bool) (*http.Response, error) {
+func SetMultiBucketReplication(accessKey string, secretKey string, targetURL string, region string, originBucket string, destinationBucket string, syncMode string, bandwidth int, healthCheckPeriod int, prefix string, tags string, replicateDeleteMarkers bool, replicateDeletes bool, priority int, storageClass string, replicateMetadata bool) (*http.Response, error) {
 	/*
 		Helper function
 		URL: /buckets-replication
@@ -2682,7 +2716,7 @@ func DeleteMultipleReplicationRules(bucketName string, rules []string) (*http.Re
 	return response, err
 }
 
-func DeleteBucketReplicationRule(bucketName, ruleID string) (*http.Response, error) {
+func DeleteBucketReplicationRule(bucketName string, ruleID string) (*http.Response, error) {
 	/*
 		Helper function to delete a bucket's replication rule
 		URL: /buckets/{bucket_name}/replication/{rule_id}
@@ -2706,6 +2740,7 @@ func DeleteBucketReplicationRule(bucketName, ruleID string) (*http.Response, err
 }
 
 func TestReplication(t *testing.T) {
+
 	// Vars
 	assert := assert.New(t)
 	originBucket := "testputobjectslegalholdstatus"
@@ -2787,10 +2822,7 @@ func TestReplication(t *testing.T) {
 	}
 	finalResponse := inspectHTTPResponse(response)
 	if response != nil {
-		// https://github.com/minio/minio/pull/14972
-		// Disallow deletion of arn when active replication config
-		// no longer 204 is expected due to above change
-		assert.Equal(500, response.StatusCode, finalResponse)
+		assert.Equal(204, response.StatusCode, finalResponse)
 	}
 
 	// 6. Delete 2nd rule only with dedicated end point for single rules:
@@ -2807,10 +2839,7 @@ func TestReplication(t *testing.T) {
 	}
 	finalResponse = inspectHTTPResponse(response)
 	if response != nil {
-		// https://github.com/minio/minio/pull/14972
-		// Disallow deletion of arn when active replication config
-		// 204 is no longer expected but 500
-		assert.Equal(500, response.StatusCode, finalResponse)
+		assert.Equal(204, response.StatusCode, finalResponse)
 	}
 
 	// 7. Delete remaining Bucket Replication Rule with generic end point:
@@ -2825,10 +2854,7 @@ func TestReplication(t *testing.T) {
 	}
 	finalResponse = inspectHTTPResponse(response)
 	if response != nil {
-		// https://github.com/minio/minio/pull/14972
-		// Disallow deletion of arn when active replication config
-		// 204 is no longer expected but 500
-		assert.Equal(500, response.StatusCode, finalResponse)
+		assert.Equal(204, response.StatusCode, finalResponse)
 	}
 
 	// 8. Get replication, at this point zero rules are expected
@@ -2850,9 +2876,8 @@ func TestReplication(t *testing.T) {
 		log.Println(err)
 		assert.Nil(err)
 	}
-	expected := 3 // none got deleted due to https://github.com/minio/minio/pull/14972
-	actual := len(structBucketRepl.Rules)
-	assert.Equal(expected, actual, "Delete failed")
+
+	assert.Equal(len(structBucketRepl.Rules), 0, "Delete failed")
 }
 
 func GetBucketVersioning(bucketName string) (*http.Response, error) {
@@ -2873,7 +2898,7 @@ func ReturnsTheStatusOfObjectLockingSupportOnTheBucket(bucketName string) (*http
 	return BaseGetFunction(bucketName, endPoint)
 }
 
-func BaseGetFunction(bucketName, endPoint string) (*http.Response, error) {
+func BaseGetFunction(bucketName string, endPoint string) (*http.Response, error) {
 	request, err := http.NewRequest(
 		"GET",
 		"http://localhost:9090/api/v1/buckets/"+bucketName+"/"+endPoint, nil)
@@ -2922,6 +2947,7 @@ func TestReturnsTheStatusOfObjectLockingSupportOnTheBucket(t *testing.T) {
 		true,
 		structBucketLocking,
 	)
+
 }
 
 func SetBucketVersioning(bucketName string, versioning bool) (*http.Response, error) {
@@ -2949,6 +2975,7 @@ func SetBucketVersioning(bucketName string, versioning bool) (*http.Response, er
 }
 
 func TestSetBucketVersioning(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucket := "test-set-bucket-versioning"
@@ -2991,17 +3018,20 @@ func TestSetBucketVersioning(t *testing.T) {
 		assert.Nil(err)
 	}
 	assert.Equal(false, result.IsVersioned, result)
+
 }
 
-func EnableBucketEncryption(bucketName, encType, kmsKeyID string) (*http.Response, error) {
-	// Helper function to enable bucket encryption
-	// HTTP Verb: POST
-	// URL: /buckets/{bucket_name}/encryption/enable
-	// Body:
-	// {
-	// 	"encType":"sse-s3",
-	// 	"kmsKeyID":""
-	// }
+func EnableBucketEncryption(bucketName string, encType string, kmsKeyID string) (*http.Response, error) {
+	/*
+		Helper function to enable bucket encryption
+		HTTP Verb: POST
+		URL: /buckets/{bucket_name}/encryption/enable
+		Body:
+		{
+			"encType":"sse-s3",
+			"kmsKeyID":""
+		}
+	*/
 	requestDataAdd := map[string]interface{}{
 		"encType":  encType,
 		"kmsKeyID": kmsKeyID,
@@ -3025,6 +3055,7 @@ func EnableBucketEncryption(bucketName, encType, kmsKeyID string) (*http.Respons
 }
 
 func TestEnableBucketEncryption(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "test-enable-bucket-encryption"
@@ -3102,6 +3133,7 @@ func TestEnableBucketEncryption(t *testing.T) {
 	}
 	dereferencedPointerDetailedMessage := *result2.DetailedMessage
 	assert.Equal("error server side encryption configuration not found", dereferencedPointerDetailedMessage, dereferencedPointerDetailedMessage)
+
 }
 
 func GetBucketEncryptionInformation(bucketName string) (*http.Response, error) {
@@ -3148,23 +3180,24 @@ func DisableBucketEncryption(bucketName string) (*http.Response, error) {
 	return response, err
 }
 
-func UpdateLifecycleRule(bucketName, ltype string, disable bool, prefix, tags string, expiredObjectDeleteMarker bool, expiryDays, noncurrentversionExpirationDays int64, lifecycleID string) (*http.Response, error) {
-	// Helper function to update lifecycle rule
-	// HTTP Verb: PUT
-	// URL: /buckets/{bucket_name}/lifecycle/{lifecycle_id}
-	// Body Example:
-	// {
-	// 	"type":"expiry",
-	// 	"disable":false,
-	// 	"prefix":"",
-	// 	"tags":"",
-	// 	"expired_object_delete_marker":false,
-	// 	"expiry_days":2,
-	// 	"noncurrentversion_expiration_days":0
-	// }
-
+func UpdateLifecycleRule(bucketName string, Type string, disable bool, prefix string, tags string, expiredObjectDeleteMarker bool, expiryDays int64, noncurrentversionExpirationDays int64, lifecycleID string) (*http.Response, error) {
+	/*
+		Helper function to update lifecycle rule
+		HTTP Verb: PUT
+		URL: /buckets/{bucket_name}/lifecycle/{lifecycle_id}
+		Body Example:
+		{
+			"type":"expiry",
+			"disable":false,
+			"prefix":"",
+			"tags":"",
+			"expired_object_delete_marker":false,
+			"expiry_days":2,
+			"noncurrentversion_expiration_days":0
+		}
+	*/
 	requestDataAdd := map[string]interface{}{
-		"type":                              ltype,
+		"type":                              Type,
 		"disable":                           disable,
 		"prefix":                            prefix,
 		"tags":                              tags,
@@ -3190,26 +3223,28 @@ func UpdateLifecycleRule(bucketName, ltype string, disable bool, prefix, tags st
 }
 
 func GetBucketLifeCycle(bucketName string) (*http.Response, error) {
-	// Get Bucket Lifecycle
-	// HTTP Verb: GET
-	// URL: /buckets/{bucket_name}/lifecycle
-	// Response Example:
-	// {
-	// 	"lifecycle": [
-	// 		{
-	// 			"expiration": {
-	// 				"date": "0001-01-01T00:00:00Z",
-	// 				"days": 1
-	// 			},
-	// 			"id": "c8nmpte49b3m6uu3pac0",
-	// 			"status": "Enabled",
-	// 			"tags": null,
-	// 			"transition": {
-	// 				"date": "0001-01-01T00:00:00Z"
-	// 			}
-	// 		}
-	// 	]
-	// }
+	/*
+		Get Bucket Lifecycle
+		HTTP Verb: GET
+		URL: /buckets/{bucket_name}/lifecycle
+		Response Example:
+		{
+			"lifecycle": [
+				{
+					"expiration": {
+						"date": "0001-01-01T00:00:00Z",
+						"days": 1
+					},
+					"id": "c8nmpte49b3m6uu3pac0",
+					"status": "Enabled",
+					"tags": null,
+					"transition": {
+						"date": "0001-01-01T00:00:00Z"
+					}
+				}
+			]
+		}
+	*/
 	request, err := http.NewRequest(
 		"GET", "http://localhost:9090/api/v1/buckets/"+bucketName+"/lifecycle", nil)
 	if err != nil {
@@ -3224,22 +3259,24 @@ func GetBucketLifeCycle(bucketName string) (*http.Response, error) {
 	return response, err
 }
 
-func AddBucketLifecycle(bucketName, ltype, prefix, tags string, expiredObjectDeleteMarker bool, expiryDays, noncurrentversionExpirationDays int64) (*http.Response, error) {
-	// Helper function to add bucket lifecycle
-	// URL: /buckets/{bucket_name}/lifecycle
-	// HTTP Verb: POST
-	// Body Example:
-	// {
-	// 	"type":"expiry",
-	// 	"prefix":"",
-	// 	"tags":"",
-	// 	"expired_object_delete_marker":false,
-	// 	"expiry_days":1,
-	// 	"noncurrentversion_expiration_days":null
-	// }
+func AddBucketLifecycle(bucketName string, Type string, prefix string, tags string, expiredObjectDeleteMarker bool, expiryDays int64, noncurrentversionExpirationDays int64) (*http.Response, error) {
+	/*
+		Helper function to add bucket lifecycle
+		URL: /buckets/{bucket_name}/lifecycle
+		HTTP Verb: POST
+		Body Example:
+		{
+			"type":"expiry",
+			"prefix":"",
+			"tags":"",
+			"expired_object_delete_marker":false,
+			"expiry_days":1,
+			"noncurrentversion_expiration_days":null
+		}
+	*/
 	// Needed Parameters for API Call
 	requestDataAdd := map[string]interface{}{
-		"type":                              ltype,
+		"type":                              Type,
 		"prefix":                            prefix,
 		"tags":                              tags,
 		"expired_object_delete_marker":      expiredObjectDeleteMarker,
@@ -3269,10 +3306,12 @@ func AddBucketLifecycle(bucketName, ltype, prefix, tags string, expiredObjectDel
 	return response, err
 }
 
-func DeleteLifecycleRule(bucketName, lifecycleID string) (*http.Response, error) {
-	// Helper function to delete lifecycle rule
-	// HTTP Verb: DELETE
-	// URL: /buckets/{bucket_name}/lifecycle/{lifecycle_id}
+func DeleteLifecycleRule(bucketName string, lifecycleID string) (*http.Response, error) {
+	/*
+		Helper function to delete lifecycle rule
+		HTTP Verb: DELETE
+		URL: /buckets/{bucket_name}/lifecycle/{lifecycle_id}
+	*/
 	request, err := http.NewRequest(
 		"DELETE", "http://localhost:9090/api/v1/buckets/"+bucketName+"/lifecycle/"+lifecycleID, nil)
 	if err != nil {
@@ -3288,12 +3327,13 @@ func DeleteLifecycleRule(bucketName, lifecycleID string) (*http.Response, error)
 }
 
 func TestBucketLifeCycle(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "test-bucket-life-cycle"
 	locking := false
 	versioning := false
-	ltype := "expiry"
+	Type := "expiry"
 	prefix := ""
 	tags := ""
 	var expiryDays int64 = 1
@@ -3310,7 +3350,7 @@ func TestBucketLifeCycle(t *testing.T) {
 	// 2. Add Bucket Lifecycle
 	resp, err := AddBucketLifecycle(
 		bucketName,
-		ltype,
+		Type,
 		prefix,
 		tags,
 		expiredObjectDeleteMarker,
@@ -3354,7 +3394,7 @@ func TestBucketLifeCycle(t *testing.T) {
 	// 4. Update from 1 day expiration to 2 days expiration
 	resp, err = UpdateLifecycleRule(
 		bucketName,
-		ltype,
+		Type,
 		disable,
 		prefix,
 		tags,
@@ -3417,9 +3457,10 @@ func TestBucketLifeCycle(t *testing.T) {
 		assert.Equal(
 			404, resp.StatusCode, "Status Code is incorrect")
 	}
+
 }
 
-func SetAccessRuleWithBucket(bucketName, prefix, access string) (*http.Response, error) {
+func SetAccessRuleWithBucket(bucketName string, prefix string, access string) (*http.Response, error) {
 	/*
 		Helper function to Set Access Rule within Bucket
 		HTTP Verb: PUT
@@ -3474,7 +3515,7 @@ func ListAccessRulesWithBucket(bucketName string) (*http.Response, error) {
 	return response, err
 }
 
-func DeleteAccessRuleWithBucket(bucketName, prefix string) (*http.Response, error) {
+func DeleteAccessRuleWithBucket(bucketName string, prefix string) (*http.Response, error) {
 	/*
 		Helper function to Delete Access Rule With Bucket
 		HTTP Verb: DELETE
@@ -3504,6 +3545,7 @@ func DeleteAccessRuleWithBucket(bucketName, prefix string) (*http.Response, erro
 }
 
 func TestAccessRule(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "test-access-rule-bucket"
@@ -3595,9 +3637,10 @@ func TestAccessRule(t *testing.T) {
 	} else {
 		assert.Fail("Access Rule not deleted")
 	}
+
 }
 
-func GetBucketRewind(bucketName, date string) (*http.Response, error) {
+func GetBucketRewind(bucketName string, date string) (*http.Response, error) {
 	/*
 		Helper function to get objects in a bucket for a rewind date
 		HTTP Verb: GET
@@ -3621,6 +3664,7 @@ func GetBucketRewind(bucketName, date string) (*http.Response, error) {
 }
 
 func TestGetBucketRewind(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)
 	bucketName := "test-get-bucket-rewind"
@@ -3637,4 +3681,5 @@ func TestGetBucketRewind(t *testing.T) {
 		assert.Equal(
 			200, resp.StatusCode, inspectHTTPResponse(resp))
 	}
+
 }

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))
 	}
+
 }

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")
 			}
+
 		})
 	}
+
 }

k8s/operator-console/base/console-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: console-sa
       containers:
         - name: console
-          image: 'minio/console:v0.17.3'
+          image: 'minio/console:v0.16.0'
           imagePullPolicy: "IfNotPresent"
           env:
             - name: CONSOLE_OPERATOR_MODE

k8s/operator-console/standalone/console-deployment.yaml

@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: console
-          image: 'minio/console:v0.17.3'
+          image: 'minio/console:v0.16.0'
           imagePullPolicy: "IfNotPresent"
           env:
             - name: CONSOLE_MINIO_SERVER

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
-}

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
-}

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
-}

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
-}

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
-}

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
-}

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
-}

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
-}

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
-}

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
-}

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
-}

models/projected_volume.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"
-)
-
-// ProjectedVolume projected volume
-//
-// swagger:model projectedVolume
-type ProjectedVolume struct {
-
-	// sources
-	Sources []*ProjectedVolumeSource `json:"sources"`
-}
-
-// Validate validates this projected volume
-func (m *ProjectedVolume) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateSources(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolume) validateSources(formats strfmt.Registry) error {
-	if swag.IsZero(m.Sources) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Sources); i++ {
-		if swag.IsZero(m.Sources[i]) { // not required
-			continue
-		}
-
-		if m.Sources[i] != nil {
-			if err := m.Sources[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("sources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("sources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this projected volume based on the context it is used
-func (m *ProjectedVolume) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateSources(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolume) contextValidateSources(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Sources); i++ {
-
-		if m.Sources[i] != nil {
-			if err := m.Sources[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("sources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("sources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ProjectedVolume) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ProjectedVolume) UnmarshalBinary(b []byte) error {
-	var res ProjectedVolume
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/projected_volume_source.go

@@ -1,216 +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"
-)
-
-// ProjectedVolumeSource projected volume source
-//
-// swagger:model projectedVolumeSource
-type ProjectedVolumeSource struct {
-
-	// config map
-	ConfigMap *ConfigMap `json:"configMap,omitempty"`
-
-	// downward Api
-	DownwardAPI bool `json:"downwardApi,omitempty"`
-
-	// secret
-	Secret *Secret `json:"secret,omitempty"`
-
-	// service account token
-	ServiceAccountToken *ServiceAccountToken `json:"serviceAccountToken,omitempty"`
-}
-
-// Validate validates this projected volume source
-func (m *ProjectedVolumeSource) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateConfigMap(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateSecret(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateServiceAccountToken(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolumeSource) validateConfigMap(formats strfmt.Registry) error {
-	if swag.IsZero(m.ConfigMap) { // not required
-		return nil
-	}
-
-	if m.ConfigMap != nil {
-		if err := m.ConfigMap.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("configMap")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("configMap")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) validateSecret(formats strfmt.Registry) error {
-	if swag.IsZero(m.Secret) { // not required
-		return nil
-	}
-
-	if m.Secret != nil {
-		if err := m.Secret.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secret")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secret")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) validateServiceAccountToken(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceAccountToken) { // not required
-		return nil
-	}
-
-	if m.ServiceAccountToken != nil {
-		if err := m.ServiceAccountToken.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("serviceAccountToken")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("serviceAccountToken")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this projected volume source based on the context it is used
-func (m *ProjectedVolumeSource) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateConfigMap(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateSecret(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateServiceAccountToken(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolumeSource) contextValidateConfigMap(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.ConfigMap != nil {
-		if err := m.ConfigMap.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("configMap")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("configMap")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) contextValidateSecret(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Secret != nil {
-		if err := m.Secret.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secret")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secret")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) contextValidateServiceAccountToken(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.ServiceAccountToken != nil {
-		if err := m.ServiceAccountToken.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("serviceAccountToken")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("serviceAccountToken")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ProjectedVolumeSource) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ProjectedVolumeSource) UnmarshalBinary(b []byte) error {
-	var res ProjectedVolumeSource
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/pvc.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"
-)
-
-// Pvc pvc
-//
-// swagger:model pvc
-type Pvc struct {
-
-	// claim name
-	ClaimName string `json:"claimName,omitempty"`
-
-	// read only
-	ReadOnly bool `json:"readOnly,omitempty"`
-}
-
-// Validate validates this pvc
-func (m *Pvc) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this pvc based on context it is used
-func (m *Pvc) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Pvc) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Pvc) UnmarshalBinary(b []byte) error {
-	var res Pvc
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/secret.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"
-)
-
-// Secret secret
-//
-// swagger:model secret
-type Secret struct {
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// optional
-	Optional bool `json:"optional,omitempty"`
-}
-
-// Validate validates this secret
-func (m *Secret) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this secret based on context it is used
-func (m *Secret) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Secret) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Secret) UnmarshalBinary(b []byte) error {
-	var res Secret
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/service_account_token.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"
-)
-
-// ServiceAccountToken service account token
-//
-// swagger:model serviceAccountToken
-type ServiceAccountToken struct {
-
-	// expiration seconds
-	ExpirationSeconds int64 `json:"expirationSeconds,omitempty"`
-}
-
-// Validate validates this service account token
-func (m *ServiceAccountToken) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this service account token based on context it is used
-func (m *ServiceAccountToken) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ServiceAccountToken) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ServiceAccountToken) UnmarshalBinary(b []byte) error {
-	var res ServiceAccountToken
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/session_response.go

@@ -25,7 +25,6 @@ package models
 import (
 	"context"
 	"encoding/json"
-	"strconv"
 
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -38,9 +37,6 @@ import (
 // swagger:model sessionResponse
 type SessionResponse struct {
 
-	// allow resources
-	AllowResources []*PermissionResource `json:"allowResources"`
-
 	// distributed mode
 	DistributedMode bool `json:"distributedMode,omitempty"`
 
@@ -62,10 +58,6 @@ type SessionResponse struct {
 func (m *SessionResponse) Validate(formats strfmt.Registry) error {
 	var res []error
 
-	if err := m.validateAllowResources(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateStatus(formats); err != nil {
 		res = append(res, err)
 	}
@@ -76,32 +68,6 @@ func (m *SessionResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *SessionResponse) validateAllowResources(formats strfmt.Registry) error {
-	if swag.IsZero(m.AllowResources) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.AllowResources); i++ {
-		if swag.IsZero(m.AllowResources[i]) { // not required
-			continue
-		}
-
-		if m.AllowResources[i] != nil {
-			if err := m.AllowResources[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
 var sessionResponseTypeStatusPropEnum []interface{}
 
 func init() {
@@ -141,37 +107,8 @@ func (m *SessionResponse) validateStatus(formats strfmt.Registry) error {
 	return nil
 }
 
-// ContextValidate validate this session response based on the context it is used
+// ContextValidate validates this session response based on context it is used
 func (m *SessionResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAllowResources(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *SessionResponse) contextValidateAllowResources(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.AllowResources); i++ {
-
-		if m.AllowResources[i] != nil {
-			if err := m.AllowResources[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
 	return nil
 }
 

models/state.go

@@ -1,85 +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"
-)
-
-// State state
-//
-// swagger:model state
-type State struct {
-
-	// exit code
-	ExitCode int64 `json:"exitCode,omitempty"`
-
-	// finished
-	Finished string `json:"finished,omitempty"`
-
-	// message
-	Message string `json:"message,omitempty"`
-
-	// reason
-	Reason string `json:"reason,omitempty"`
-
-	// signal
-	Signal int64 `json:"signal,omitempty"`
-
-	// started
-	Started string `json:"started,omitempty"`
-
-	// state
-	State string `json:"state,omitempty"`
-}
-
-// Validate validates this state
-func (m *State) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this state based on context it is used
-func (m *State) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *State) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *State) UnmarshalBinary(b []byte) error {
-	var res State
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/toleration.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"
-)
-
-// Toleration toleration
-//
-// swagger:model toleration
-type Toleration struct {
-
-	// effect
-	Effect string `json:"effect,omitempty"`
-
-	// key
-	Key string `json:"key,omitempty"`
-
-	// operator
-	Operator string `json:"operator,omitempty"`
-
-	// toleration seconds
-	TolerationSeconds int64 `json:"tolerationSeconds,omitempty"`
-
-	// value
-	Value string `json:"value,omitempty"`
-}
-
-// Validate validates this toleration
-func (m *Toleration) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this toleration based on context it is used
-func (m *Toleration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Toleration) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Toleration) UnmarshalBinary(b []byte) error {
-	var res Toleration
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/user_service_account_item.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"
-)
-
-// UserServiceAccountItem user service account item
-//
-// swagger:model userServiceAccountItem
-type UserServiceAccountItem struct {
-
-	// num s as
-	NumSAs int64 `json:"numSAs,omitempty"`
-
-	// user name
-	UserName string `json:"userName,omitempty"`
-}
-
-// Validate validates this user service account item
-func (m *UserServiceAccountItem) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this user service account item based on context it is used
-func (m *UserServiceAccountItem) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *UserServiceAccountItem) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *UserServiceAccountItem) UnmarshalBinary(b []byte) error {
-	var res UserServiceAccountItem
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/user_service_account_summary.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"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// UserServiceAccountSummary user service account summary
-//
-// swagger:model userServiceAccountSummary
-type UserServiceAccountSummary struct {
-
-	// has s a
-	HasSA bool `json:"hasSA,omitempty"`
-
-	// list of users with number of service accounts
-	UserServiceAccountList []*UserServiceAccountItem `json:"userServiceAccountList"`
-}
-
-// Validate validates this user service account summary
-func (m *UserServiceAccountSummary) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateUserServiceAccountList(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *UserServiceAccountSummary) validateUserServiceAccountList(formats strfmt.Registry) error {
-	if swag.IsZero(m.UserServiceAccountList) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.UserServiceAccountList); i++ {
-		if swag.IsZero(m.UserServiceAccountList[i]) { // not required
-			continue
-		}
-
-		if m.UserServiceAccountList[i] != nil {
-			if err := m.UserServiceAccountList[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this user service account summary based on the context it is used
-func (m *UserServiceAccountSummary) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateUserServiceAccountList(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *UserServiceAccountSummary) contextValidateUserServiceAccountList(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.UserServiceAccountList); i++ {
-
-		if m.UserServiceAccountList[i] != nil {
-			if err := m.UserServiceAccountList[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *UserServiceAccountSummary) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *UserServiceAccountSummary) UnmarshalBinary(b []byte) error {
-	var res UserServiceAccountSummary
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/volume.go

@@ -1,170 +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"
-)
-
-// Volume volume
-//
-// swagger:model volume
-type Volume struct {
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// projected
-	Projected *ProjectedVolume `json:"projected,omitempty"`
-
-	// pvc
-	Pvc *Pvc `json:"pvc,omitempty"`
-}
-
-// Validate validates this volume
-func (m *Volume) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateProjected(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validatePvc(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Volume) validateProjected(formats strfmt.Registry) error {
-	if swag.IsZero(m.Projected) { // not required
-		return nil
-	}
-
-	if m.Projected != nil {
-		if err := m.Projected.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("projected")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("projected")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Volume) validatePvc(formats strfmt.Registry) error {
-	if swag.IsZero(m.Pvc) { // not required
-		return nil
-	}
-
-	if m.Pvc != nil {
-		if err := m.Pvc.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("pvc")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("pvc")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this volume based on the context it is used
-func (m *Volume) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateProjected(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidatePvc(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Volume) contextValidateProjected(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Projected != nil {
-		if err := m.Projected.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("projected")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("projected")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Volume) contextValidatePvc(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Pvc != nil {
-		if err := m.Pvc.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("pvc")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("pvc")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Volume) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Volume) UnmarshalBinary(b []byte) error {
-	var res Volume
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

operator-integration/tenant_test.go

@@ -88,7 +88,8 @@ func printEndFunc(functionName string) {
 }
 
 func initConsoleServer() (*operatorapi.Server, error) {
-	// os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
+
+	//os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
 
 	swaggerSpec, err := loads.Embedded(operatorapi.SwaggerJSON, operatorapi.FlatSwaggerJSON)
 	if err != nil {
@@ -126,40 +127,51 @@ func TestMain(m *testing.M) {
 	go func() {
 		fmt.Println("start server")
 		srv, err := initConsoleServer()
-		fmt.Println("Server has been started at this point")
 		if err != nil {
-			fmt.Println("There is an error in console server: ", err)
 			log.Println(err)
 			log.Println("init fail")
 			return
 		}
-		fmt.Println("Start serving with Serve() function")
 		srv.Serve()
-		fmt.Println("After Serve() function")
+
 	}()
 
 	fmt.Println("sleeping")
 	time.Sleep(2 * time.Second)
-	fmt.Println("after 2 seconds sleep")
 
-	fmt.Println("creating the client")
 	client := &http.Client{
 		Timeout: 2 * time.Second,
 	}
 
-	// SA_TOKEN=$(kubectl -n minio-operator  get secret console-sa-secret -o jsonpath="{.data.token}" | base64 --decode)
-	fmt.Println("Where we have the secret already: ")
+	// kubectl to get token
+	app := "kubectl"
+	arg0 := "get"
+	arg1 := "serviceaccount"
+	arg2 := "console-sa"
+	arg3 := "--namespace"
+	arg4 := "minio-operator"
+	arg5 := "-o"
+	arg6 := "jsonpath=\"{.secrets[0].name}\""
+	cmd := exec.Command(app, arg0, arg1, arg2, arg3, arg4, arg5, arg6)
+	var out bytes.Buffer
+	var stderr bytes.Buffer
+	cmd.Stdout = &out
+	cmd.Stderr = &stderr
+	err := cmd.Run()
+	if err != nil {
+		fmt.Println(fmt.Sprint(err) + ": " + stderr.String())
+		return
+	}
+	secret := out.String() // "console-sa-token-kxdw2" <-- secret
 	app2 := "kubectl"
 	argu0 := "--namespace"
 	argu1 := "minio-operator"
 	argu2 := "get"
 	argu3 := "secret"
-	argu4 := "console-sa-secret"
+	argu4 := secret[1 : len(secret)-1]
 	argu5 := "-o"
 	argu6 := "jsonpath=\"{.data.token}\""
-	fmt.Println("Prior executing second command to get the token")
 	cmd2 := exec.Command(app2, argu0, argu1, argu2, argu3, argu4, argu5, argu6)
-	fmt.Println("after executing second command to get the token")
 	var out2 bytes.Buffer
 	var stderr2 bytes.Buffer
 	cmd2.Stdout = &out2
@@ -171,14 +183,9 @@ func TestMain(m *testing.M) {
 	}
 	secret2 := out2.String()
 	secret3 := decodeBase64(secret2[1 : len(secret2)-1])
-	if secret3 == "" {
-		fmt.Println("jwt cannot be empty string")
-		os.Exit(-1)
-	}
 	requestData := map[string]string{
 		"jwt": secret3,
 	}
-	fmt.Println("requestData: ", requestData)
 
 	requestDataJSON, _ := json.Marshal(requestData)
 
@@ -193,6 +200,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
@@ -260,7 +268,7 @@ func TestListTenants(t *testing.T) {
 	}
 	TenantName := &result.Tenants[0].Name // The array has to be empty, no index accessible
 	fmt.Println(*TenantName)
-	assert.Equal("storage-kms-encrypted", *TenantName, *TenantName)
+	assert.Equal("storage-lite", *TenantName, *TenantName)
 	printEndFunc("TestListTenants")
 }
 
@@ -556,120 +564,3 @@ func TestGetPodEvents(t *testing.T) {
 			200, resp.StatusCode, "Status Code is incorrect")
 	}
 }
-
-func GetPodDescribe(nameSpace string, tenant string, podName string) (*http.Response, error) {
-	/*
-		Helper function to get events for pod
-		URL: /namespaces/{namespace}/tenants/{tenant}/pods/{podName}/events
-		HTTP Verb: GET
-	*/
-	fmt.Println(nameSpace)
-	fmt.Println(tenant)
-	fmt.Println(podName)
-	request, err := http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant+"/pods/"+podName+"/describe", 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 TestGetPodDescribe(t *testing.T) {
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-	podName := "storage-lite-pool-0-0"
-	resp, err := GetPodDescribe(namespace, tenant, podName)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	finalResponse := inspectHTTPResponse(resp)
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, finalResponse)
-	}
-	/*if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, "Status Code is incorrect")
-	}*/
-}
-
-func GetCSR(nameSpace string, tenant string) (*http.Response, error) {
-	/*
-		Helper function to get events for pod
-		URL: /namespaces/{namespace}/tenants/{tenant}/csr
-		HTTP Verb: GET
-	*/
-	request, err := http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant+"/csr/", 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 TestGetCSR(t *testing.T) {
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-	resp, err := GetCSR(namespace, tenant)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	finalResponse := inspectHTTPResponse(resp)
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, finalResponse)
-	}
-	assert.Equal(strings.Contains(finalResponse, "Automatically approved by MinIO Operator"), true, finalResponse)
-}
-
-func TestGetMultipleCSRs(t *testing.T) {
-	/*
-		We can have multiple CSRs per tenant, the idea is to support them in our API and test them here, making sure we
-		can retrieve them all, as an example I found this tenant:
-		storage-kms-encrypted  -client  -tenant-kms-encrypted-csr
-		storage-kms-encrypted  -kes     -tenant-kms-encrypted-csr
-		storage-kms-encrypted           -tenant-kms-encrypted-csr
-		Notice the nomenclature of it:
-		<tenant-name>-<*>-<namespace>-csr
-		where * is anything either nothing or something, anything.
-	*/
-	assert := assert.New(t)
-	namespace := "tenant-kms-encrypted"
-	tenant := "storage-kms-encrypted"
-	resp, err := GetCSR(namespace, tenant)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	finalResponse := inspectHTTPResponse(resp)
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, finalResponse)
-	}
-	var expectedMessages [3]string
-	expectedMessages[0] = "storage-kms-encrypted-tenant-kms-encrypted-csr"
-	expectedMessages[1] = "storage-kms-encrypted-kes-tenant-kms-encrypted-csr"
-	expectedMessages[2] = "Automatically approved by MinIO Operator"
-	for _, element := range expectedMessages {
-		assert.Equal(strings.Contains(finalResponse, element), true)
-	}
-}

operatorapi/config_test.go

@@ -1,98 +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 operatorapi
-
-import (
-	"os"
-	"testing"
-)
-
-func Test_getK8sSAToken(t *testing.T) {
-	tests := []struct {
-		name string
-		want string
-		envs map[string]string
-	}{
-		{
-			name: "Missing file, empty",
-			want: "",
-			envs: nil,
-		},
-		{
-			name: "Missing file, return env",
-			want: "x",
-			envs: map[string]string{
-				ConsoleOperatorSAToken: "x",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.envs != nil {
-				for k, v := range tt.envs {
-					os.Setenv(k, v)
-				}
-			}
-			if got := getK8sSAToken(); got != tt.want {
-				t.Errorf("getK8sSAToken() = %v, want %v", got, tt.want)
-			}
-			if tt.envs != nil {
-				for k := range tt.envs {
-					os.Unsetenv(k)
-				}
-			}
-		})
-	}
-}
-
-func Test_getMarketplace(t *testing.T) {
-	tests := []struct {
-		name string
-		want string
-		envs map[string]string
-	}{
-		{
-			name: "Nothing set",
-			want: "",
-			envs: nil,
-		},
-		{
-			name: "Value set",
-			want: "x",
-			envs: map[string]string{
-				ConsoleMarketplace: "x",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.envs != nil {
-				for k, v := range tt.envs {
-					os.Setenv(k, v)
-				}
-			}
-			if got := getMarketplace(); got != tt.want {
-				t.Errorf("getMarketplace() = %v, want %v", got, tt.want)
-			}
-			if tt.envs != nil {
-				for k := range tt.envs {
-					os.Unsetenv(k)
-				}
-			}
-		})
-	}
-}

operatorapi/configure_operator.go

@@ -52,6 +52,7 @@ func configureFlags(api *operations.OperatorAPI) {
 }
 
 func configureAPI(api *operations.OperatorAPI) http.Handler {
+
 	// Applies when the "x-token" header is set
 	api.KeyAuth = func(token string, scopes []string) (*models.Principal, error) {
 		// we are validating the session token by decrypting the claims inside, if the operation succeed that means the jwt

operatorapi/integrations.go

@@ -112,6 +112,7 @@ func gkeIntegration(clientset *kubernetes.Clientset, tenantName string, namespac
 			Name: tenantNpSvc,
 		},
 		Spec: corev1.ServiceSpec{
+
 			Selector: map[string]string{
 				"v1.min.io/instance": tenantName,
 			},
@@ -131,7 +132,7 @@ func gkeIntegration(clientset *kubernetes.Clientset, tenantName string, namespac
 		return err
 	}
 
-	// NOW FOR Console
+	//NOW FOR Console
 	// create consoleManagedCertificate
 
 	// get a nodeport port for this tenant and create a nodeport for it

operatorapi/k8s_client.go

@@ -38,7 +38,6 @@ type K8sClientI interface {
 	deleteSecret(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error
 	createSecret(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.CreateOptions) (*v1.Secret, error)
 	updateSecret(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.UpdateOptions) (*v1.Secret, error)
-	getPVC(ctx context.Context, namespace string, pvcName string, opts metav1.GetOptions) (*v1.PersistentVolumeClaim, error)
 }
 
 // Interface implementation
@@ -83,7 +82,3 @@ func (c *k8sClient) getNamespace(ctx context.Context, name string, opts metav1.G
 func (c *k8sClient) getStorageClasses(ctx context.Context, opts metav1.ListOptions) (*storagev1.StorageClassList, error) {
 	return c.client.StorageV1().StorageClasses().List(ctx, opts)
 }
-
-func (c *k8sClient) getPVC(ctx context.Context, namespace string, pvcName string, opts metav1.GetOptions) (*v1.PersistentVolumeClaim, error) {
-	return c.client.CoreV1().PersistentVolumeClaims(namespace).Get(ctx, pvcName, opts)
-}

operatorapi/logs.go

@@ -25,10 +25,8 @@ import (
 	"github.com/minio/cli"
 )
 
-var (
-	infoLog  = log.New(os.Stdout, "I: ", log.LstdFlags)
-	errorLog = log.New(os.Stdout, "E: ", log.LstdFlags)
-)
+var infoLog = log.New(os.Stdout, "I: ", log.LstdFlags)
+var errorLog = log.New(os.Stdout, "E: ", log.LstdFlags)
 
 func logInfo(msg string, data ...interface{}) {
 	infoLog.Printf(msg+"\n", data...)

operatorapi/minio_operator_mock.go

@@ -16,28 +16,5 @@
 
 package operatorapi
 
-import (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type (
-	opClientMock   struct{}
-	httpClientMock struct{}
-)
-
-func createMockPVC(pvcMockName, pvcMockNamespace string) *v1.PersistentVolumeClaim {
-	var mockVolumeMode v1.PersistentVolumeMode = "mockVolumeMode"
-	mockStorage := "mockStorage"
-
-	return &v1.PersistentVolumeClaim{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      pvcMockName,
-			Namespace: pvcMockNamespace,
-		},
-		Spec: v1.PersistentVolumeClaimSpec{
-			StorageClassName: &mockStorage,
-			VolumeMode:       &mockVolumeMode,
-		},
-	}
-}
+type opClientMock struct{}
+type httpClientMock struct{}

operatorapi/namespaces.go

@@ -34,7 +34,7 @@ import (
 
 func registerNamespaceHandlers(api *operations.OperatorAPI) {
 	// Add Namespace
-	// api.OperatorAPICreateNamespaceHandler = operator_api.CreateNamespaceHandlerFunc(func(params operator_api.CreateNamespaceParams, session *models.Principal) middleware.Responder {
+	//api.OperatorAPICreateNamespaceHandler = operator_api.CreateNamespaceHandlerFunc(func(params operator_api.CreateNamespaceParams, session *models.Principal) middleware.Responder {
 	api.OperatorAPICreateNamespaceHandler = operator_api.CreateNamespaceHandlerFunc(func(params operator_api.CreateNamespaceParams, session *models.Principal) middleware.Responder {
 		err := getNamespaceCreatedResponse(session, params)
 		if err != nil {
@@ -48,6 +48,7 @@ func getNamespaceCreatedResponse(session *models.Principal, params operator_api.
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	clientset, err := cluster.K8sClient(session.STSSessionToken)
+
 	if err != nil {
 		return xerrors.ErrorWithContext(ctx, err)
 	}

operatorapi/nodes.go

@@ -230,6 +230,7 @@ func getNodeLabelsResponse(ctx context.Context, session *models.Principal) (*mod
 }
 
 func getClusterResourcesInfo(numNodes int32, inNodesResources []NodeResourceInfo) *models.AllocatableResourcesResponse {
+
 	// purge any nodes with 0 cpu
 	var nodesResources []NodeResourceInfo
 	for _, n := range inNodesResources {

operatorapi/nodes_test.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 )
 
-func NoTestMaxAllocatableMemory(t *testing.T) {
+func Test_MaxAllocatableMemory(t *testing.T) {
 	type args struct {
 		ctx      context.Context
 		numNodes int32

operatorapi/operations/operator_api.go

@@ -82,9 +82,6 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPIDeleteTenantHandler: operator_api.DeleteTenantHandlerFunc(func(params operator_api.DeleteTenantParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.DeleteTenant has not yet been implemented")
 		}),
-		OperatorAPIDescribePodHandler: operator_api.DescribePodHandlerFunc(func(params operator_api.DescribePodParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.DescribePod has not yet been implemented")
-		}),
 		OperatorAPIDisableTenantLoggingHandler: operator_api.DisableTenantLoggingHandlerFunc(func(params operator_api.DisableTenantLoggingParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.DisableTenantLogging has not yet been implemented")
 		}),
@@ -97,9 +94,6 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPIGetMaxAllocatableMemHandler: operator_api.GetMaxAllocatableMemHandlerFunc(func(params operator_api.GetMaxAllocatableMemParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.GetMaxAllocatableMem has not yet been implemented")
 		}),
-		OperatorAPIGetPVCDescribeHandler: operator_api.GetPVCDescribeHandlerFunc(func(params operator_api.GetPVCDescribeParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.GetPVCDescribe has not yet been implemented")
-		}),
 		OperatorAPIGetPVCEventsHandler: operator_api.GetPVCEventsHandlerFunc(func(params operator_api.GetPVCEventsParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.GetPVCEvents has not yet been implemented")
 		}),
@@ -145,9 +139,6 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPIListPVCsForTenantHandler: operator_api.ListPVCsForTenantHandlerFunc(func(params operator_api.ListPVCsForTenantParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.ListPVCsForTenant has not yet been implemented")
 		}),
-		OperatorAPIListTenantCertificateSigningRequestHandler: operator_api.ListTenantCertificateSigningRequestHandlerFunc(func(params operator_api.ListTenantCertificateSigningRequestParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.ListTenantCertificateSigningRequest has not yet been implemented")
-		}),
 		OperatorAPIListTenantsHandler: operator_api.ListTenantsHandlerFunc(func(params operator_api.ListTenantsParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.ListTenants has not yet been implemented")
 		}),
@@ -287,8 +278,6 @@ type OperatorAPI struct {
 	OperatorAPIDeletePodHandler operator_api.DeletePodHandler
 	// OperatorAPIDeleteTenantHandler sets the operation handler for the delete tenant operation
 	OperatorAPIDeleteTenantHandler operator_api.DeleteTenantHandler
-	// OperatorAPIDescribePodHandler sets the operation handler for the describe pod operation
-	OperatorAPIDescribePodHandler operator_api.DescribePodHandler
 	// OperatorAPIDisableTenantLoggingHandler sets the operation handler for the disable tenant logging operation
 	OperatorAPIDisableTenantLoggingHandler operator_api.DisableTenantLoggingHandler
 	// OperatorAPIEnableTenantLoggingHandler sets the operation handler for the enable tenant logging operation
@@ -297,8 +286,6 @@ type OperatorAPI struct {
 	OperatorAPIGetAllocatableResourcesHandler operator_api.GetAllocatableResourcesHandler
 	// OperatorAPIGetMaxAllocatableMemHandler sets the operation handler for the get max allocatable mem operation
 	OperatorAPIGetMaxAllocatableMemHandler operator_api.GetMaxAllocatableMemHandler
-	// OperatorAPIGetPVCDescribeHandler sets the operation handler for the get p v c describe operation
-	OperatorAPIGetPVCDescribeHandler operator_api.GetPVCDescribeHandler
 	// OperatorAPIGetPVCEventsHandler sets the operation handler for the get p v c events operation
 	OperatorAPIGetPVCEventsHandler operator_api.GetPVCEventsHandler
 	// OperatorAPIGetParityHandler sets the operation handler for the get parity operation
@@ -329,8 +316,6 @@ type OperatorAPI struct {
 	OperatorAPIListPVCsHandler operator_api.ListPVCsHandler
 	// OperatorAPIListPVCsForTenantHandler sets the operation handler for the list p v cs for tenant operation
 	OperatorAPIListPVCsForTenantHandler operator_api.ListPVCsForTenantHandler
-	// OperatorAPIListTenantCertificateSigningRequestHandler sets the operation handler for the list tenant certificate signing request operation
-	OperatorAPIListTenantCertificateSigningRequestHandler operator_api.ListTenantCertificateSigningRequestHandler
 	// OperatorAPIListTenantsHandler sets the operation handler for the list tenants operation
 	OperatorAPIListTenantsHandler operator_api.ListTenantsHandler
 	// AuthLoginDetailHandler sets the operation handler for the login detail operation
@@ -482,9 +467,6 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPIDeleteTenantHandler == nil {
 		unregistered = append(unregistered, "operator_api.DeleteTenantHandler")
 	}
-	if o.OperatorAPIDescribePodHandler == nil {
-		unregistered = append(unregistered, "operator_api.DescribePodHandler")
-	}
 	if o.OperatorAPIDisableTenantLoggingHandler == nil {
 		unregistered = append(unregistered, "operator_api.DisableTenantLoggingHandler")
 	}
@@ -497,9 +479,6 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPIGetMaxAllocatableMemHandler == nil {
 		unregistered = append(unregistered, "operator_api.GetMaxAllocatableMemHandler")
 	}
-	if o.OperatorAPIGetPVCDescribeHandler == nil {
-		unregistered = append(unregistered, "operator_api.GetPVCDescribeHandler")
-	}
 	if o.OperatorAPIGetPVCEventsHandler == nil {
 		unregistered = append(unregistered, "operator_api.GetPVCEventsHandler")
 	}
@@ -545,9 +524,6 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPIListPVCsForTenantHandler == nil {
 		unregistered = append(unregistered, "operator_api.ListPVCsForTenantHandler")
 	}
-	if o.OperatorAPIListTenantCertificateSigningRequestHandler == nil {
-		unregistered = append(unregistered, "operator_api.ListTenantCertificateSigningRequestHandler")
-	}
 	if o.OperatorAPIListTenantsHandler == nil {
 		unregistered = append(unregistered, "operator_api.ListTenantsHandler")
 	}
@@ -748,10 +724,6 @@ func (o *OperatorAPI) initHandlerCache() {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/namespaces/{namespace}/tenants/{tenant}"] = operator_api.NewDeleteTenant(o.context, o.OperatorAPIDeleteTenantHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
-	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/pods/{podName}/describe"] = operator_api.NewDescribePod(o.context, o.OperatorAPIDescribePodHandler)
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
@@ -771,10 +743,6 @@ func (o *OperatorAPI) initHandlerCache() {
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
-	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/pvcs/{PVCName}/describe"] = operator_api.NewGetPVCDescribe(o.context, o.OperatorAPIGetPVCDescribeHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
 	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/pvcs/{PVCName}/events"] = operator_api.NewGetPVCEvents(o.context, o.OperatorAPIGetPVCEventsHandler)
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
@@ -835,10 +803,6 @@ func (o *OperatorAPI) initHandlerCache() {
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
-	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/csr"] = operator_api.NewListTenantCertificateSigningRequest(o.context, o.OperatorAPIListTenantCertificateSigningRequestHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
 	o.handlers["GET"]["/namespaces/{namespace}/tenants"] = operator_api.NewListTenants(o.context, o.OperatorAPIListTenantsHandler)
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)

operatorapi/operations/operator_api/describe_pod.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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/minio/console/models"
-)
-
-// DescribePodHandlerFunc turns a function with the right signature into a describe pod handler
-type DescribePodHandlerFunc func(DescribePodParams, *models.Principal) middleware.Responder
-
-// Handle executing the request and returning a response
-func (fn DescribePodHandlerFunc) Handle(params DescribePodParams, principal *models.Principal) middleware.Responder {
-	return fn(params, principal)
-}
-
-// DescribePodHandler interface for that can handle valid describe pod params
-type DescribePodHandler interface {
-	Handle(DescribePodParams, *models.Principal) middleware.Responder
-}
-
-// NewDescribePod creates a new http.Handler for the describe pod operation
-func NewDescribePod(ctx *middleware.Context, handler DescribePodHandler) *DescribePod {
-	return &DescribePod{Context: ctx, Handler: handler}
-}
-
-/* DescribePod swagger:route GET /namespaces/{namespace}/tenants/{tenant}/pods/{podName}/describe OperatorAPI describePod
-
-Describe Pod
-
-*/
-type DescribePod struct {
-	Context *middleware.Context
-	Handler DescribePodHandler
-}
-
-func (o *DescribePod) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
-	route, rCtx, _ := o.Context.RouteInfo(r)
-	if rCtx != nil {
-		*r = *rCtx
-	}
-	var Params = NewDescribePodParams()
-	uprinc, aCtx, err := o.Context.Authorize(r, route)
-	if err != nil {
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-	if aCtx != nil {
-		*r = *aCtx
-	}
-	var principal *models.Principal
-	if uprinc != nil {
-		principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
-	}
-
-	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-
-	res := o.Handler.Handle(Params, principal) // actually handle the request
-	o.Context.Respond(rw, r, route.Produces, route, res)
-
-}

operatorapi/operations/operator_api/describe_pod_parameters.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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/runtime/middleware"
-	"github.com/go-openapi/strfmt"
-)
-
-// NewDescribePodParams creates a new DescribePodParams object
-//
-// There are no default values defined in the spec.
-func NewDescribePodParams() DescribePodParams {
-
-	return DescribePodParams{}
-}
-
-// DescribePodParams contains all the bound params for the describe pod operation
-// typically these are obtained from a http.Request
-//
-// swagger:parameters DescribePod
-type DescribePodParams struct {
-
-	// HTTP Request Object
-	HTTPRequest *http.Request `json:"-"`
-
-	/*
-	  Required: true
-	  In: path
-	*/
-	Namespace string
-	/*
-	  Required: true
-	  In: path
-	*/
-	PodName string
-	/*
-	  Required: true
-	  In: path
-	*/
-	Tenant string
-}
-
-// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
-// for simple values it will use straight method calls.
-//
-// To ensure default values, the struct must have been initialized with NewDescribePodParams() beforehand.
-func (o *DescribePodParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
-	var res []error
-
-	o.HTTPRequest = r
-
-	rNamespace, rhkNamespace, _ := route.Params.GetOK("namespace")
-	if err := o.bindNamespace(rNamespace, rhkNamespace, route.Formats); err != nil {
-		res = append(res, err)
-	}
-
-	rPodName, rhkPodName, _ := route.Params.GetOK("podName")
-	if err := o.bindPodName(rPodName, rhkPodName, route.Formats); err != nil {
-		res = append(res, err)
-	}
-
-	rTenant, rhkTenant, _ := route.Params.GetOK("tenant")
-	if err := o.bindTenant(rTenant, rhkTenant, route.Formats); err != nil {
-		res = append(res, err)
-	}
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-// bindNamespace binds and validates parameter Namespace from path.
-func (o *DescribePodParams) bindNamespace(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.Namespace = raw
-
-	return nil
-}
-
-// bindPodName binds and validates parameter PodName from path.
-func (o *DescribePodParams) bindPodName(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.PodName = raw
-
-	return nil
-}
-
-// bindTenant binds and validates parameter Tenant from path.
-func (o *DescribePodParams) bindTenant(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.Tenant = raw
-
-	return nil
-}

operatorapi/operations/operator_api/describe_pod_responses.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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/runtime"
-
-	"github.com/minio/console/models"
-)
-
-// DescribePodOKCode is the HTTP code returned for type DescribePodOK
-const DescribePodOKCode int = 200
-
-/*DescribePodOK A successful response.
-
-swagger:response describePodOK
-*/
-type DescribePodOK struct {
-
-	/*
-	  In: Body
-	*/
-	Payload *models.DescribePodWrapper `json:"body,omitempty"`
-}
-
-// NewDescribePodOK creates DescribePodOK with default headers values
-func NewDescribePodOK() *DescribePodOK {
-
-	return &DescribePodOK{}
-}
-
-// WithPayload adds the payload to the describe pod o k response
-func (o *DescribePodOK) WithPayload(payload *models.DescribePodWrapper) *DescribePodOK {
-	o.Payload = payload
-	return o
-}
-
-// SetPayload sets the payload to the describe pod o k response
-func (o *DescribePodOK) SetPayload(payload *models.DescribePodWrapper) {
-	o.Payload = payload
-}
-
-// WriteResponse to the client
-func (o *DescribePodOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
-
-	rw.WriteHeader(200)
-	if o.Payload != nil {
-		payload := o.Payload
-		if err := producer.Produce(rw, payload); err != nil {
-			panic(err) // let the recovery middleware deal with this
-		}
-	}
-}
-
-/*DescribePodDefault Generic error response.
-
-swagger:response describePodDefault
-*/
-type DescribePodDefault struct {
-	_statusCode int
-
-	/*
-	  In: Body
-	*/
-	Payload *models.Error `json:"body,omitempty"`
-}
-
-// NewDescribePodDefault creates DescribePodDefault with default headers values
-func NewDescribePodDefault(code int) *DescribePodDefault {
-	if code <= 0 {
-		code = 500
-	}
-
-	return &DescribePodDefault{
-		_statusCode: code,
-	}
-}
-
-// WithStatusCode adds the status to the describe pod default response
-func (o *DescribePodDefault) WithStatusCode(code int) *DescribePodDefault {
-	o._statusCode = code
-	return o
-}
-
-// SetStatusCode sets the status to the describe pod default response
-func (o *DescribePodDefault) SetStatusCode(code int) {
-	o._statusCode = code
-}
-
-// WithPayload adds the payload to the describe pod default response
-func (o *DescribePodDefault) WithPayload(payload *models.Error) *DescribePodDefault {
-	o.Payload = payload
-	return o
-}
-
-// SetPayload sets the payload to the describe pod default response
-func (o *DescribePodDefault) SetPayload(payload *models.Error) {
-	o.Payload = payload
-}
-
-// WriteResponse to the client
-func (o *DescribePodDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
-
-	rw.WriteHeader(o._statusCode)
-	if o.Payload != nil {
-		payload := o.Payload
-		if err := producer.Produce(rw, payload); err != nil {
-			panic(err) // let the recovery middleware deal with this
-		}
-	}
-}

operatorapi/operations/operator_api/describe_pod_urlbuilder.go

@@ -1,132 +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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the generate command
-
-import (
-	"errors"
-	"net/url"
-	golangswaggerpaths "path"
-	"strings"
-)
-
-// DescribePodURL generates an URL for the describe pod operation
-type DescribePodURL struct {
-	Namespace string
-	PodName   string
-	Tenant    string
-
-	_basePath string
-	// avoid unkeyed usage
-	_ struct{}
-}
-
-// WithBasePath sets the base path for this url builder, only required when it's different from the
-// base path specified in the swagger spec.
-// When the value of the base path is an empty string
-func (o *DescribePodURL) WithBasePath(bp string) *DescribePodURL {
-	o.SetBasePath(bp)
-	return o
-}
-
-// SetBasePath sets the base path for this url builder, only required when it's different from the
-// base path specified in the swagger spec.
-// When the value of the base path is an empty string
-func (o *DescribePodURL) SetBasePath(bp string) {
-	o._basePath = bp
-}
-
-// Build a url path and query string
-func (o *DescribePodURL) Build() (*url.URL, error) {
-	var _result url.URL
-
-	var _path = "/namespaces/{namespace}/tenants/{tenant}/pods/{podName}/describe"
-
-	namespace := o.Namespace
-	if namespace != "" {
-		_path = strings.Replace(_path, "{namespace}", namespace, -1)
-	} else {
-		return nil, errors.New("namespace is required on DescribePodURL")
-	}
-
-	podName := o.PodName
-	if podName != "" {
-		_path = strings.Replace(_path, "{podName}", podName, -1)
-	} else {
-		return nil, errors.New("podName is required on DescribePodURL")
-	}
-
-	tenant := o.Tenant
-	if tenant != "" {
-		_path = strings.Replace(_path, "{tenant}", tenant, -1)
-	} else {
-		return nil, errors.New("tenant is required on DescribePodURL")
-	}
-
-	_basePath := o._basePath
-	if _basePath == "" {
-		_basePath = "/api/v1"
-	}
-	_result.Path = golangswaggerpaths.Join(_basePath, _path)
-
-	return &_result, nil
-}
-
-// Must is a helper function to panic when the url builder returns an error
-func (o *DescribePodURL) Must(u *url.URL, err error) *url.URL {
-	if err != nil {
-		panic(err)
-	}
-	if u == nil {
-		panic("url can't be nil")
-	}
-	return u
-}
-
-// String returns the string representation of the path with query string
-func (o *DescribePodURL) String() string {
-	return o.Must(o.Build()).String()
-}
-
-// BuildFull builds a full url with scheme, host, path and query string
-func (o *DescribePodURL) BuildFull(scheme, host string) (*url.URL, error) {
-	if scheme == "" {
-		return nil, errors.New("scheme is required for a full url on DescribePodURL")
-	}
-	if host == "" {
-		return nil, errors.New("host is required for a full url on DescribePodURL")
-	}
-
-	base, err := o.Build()
-	if err != nil {
-		return nil, err
-	}
-
-	base.Scheme = scheme
-	base.Host = host
-	return base, nil
-}
-
-// StringFull returns the string representation of a complete url
-func (o *DescribePodURL) StringFull(scheme, host string) string {
-	return o.Must(o.BuildFull(scheme, host)).String()
-}

operatorapi/operations/operator_api/get_p_v_c_describe.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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/minio/console/models"
-)
-
-// GetPVCDescribeHandlerFunc turns a function with the right signature into a get p v c describe handler
-type GetPVCDescribeHandlerFunc func(GetPVCDescribeParams, *models.Principal) middleware.Responder
-
-// Handle executing the request and returning a response
-func (fn GetPVCDescribeHandlerFunc) Handle(params GetPVCDescribeParams, principal *models.Principal) middleware.Responder {
-	return fn(params, principal)
-}
-
-// GetPVCDescribeHandler interface for that can handle valid get p v c describe params
-type GetPVCDescribeHandler interface {
-	Handle(GetPVCDescribeParams, *models.Principal) middleware.Responder
-}
-
-// NewGetPVCDescribe creates a new http.Handler for the get p v c describe operation
-func NewGetPVCDescribe(ctx *middleware.Context, handler GetPVCDescribeHandler) *GetPVCDescribe {
-	return &GetPVCDescribe{Context: ctx, Handler: handler}
-}
-
-/* GetPVCDescribe swagger:route GET /namespaces/{namespace}/tenants/{tenant}/pvcs/{PVCName}/describe OperatorAPI getPVCDescribe
-
-Get Describe output for PVC
-
-*/
-type GetPVCDescribe struct {
-	Context *middleware.Context
-	Handler GetPVCDescribeHandler
-}
-
-func (o *GetPVCDescribe) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
-	route, rCtx, _ := o.Context.RouteInfo(r)
-	if rCtx != nil {
-		*r = *rCtx
-	}
-	var Params = NewGetPVCDescribeParams()
-	uprinc, aCtx, err := o.Context.Authorize(r, route)
-	if err != nil {
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-	if aCtx != nil {
-		*r = *aCtx
-	}
-	var principal *models.Principal
-	if uprinc != nil {
-		principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
-	}
-
-	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-
-	res := o.Handler.Handle(Params, principal) // actually handle the request
-	o.Context.Respond(rw, r, route.Produces, route, res)
-
-}

operatorapi/operations/operator_api/get_p_v_c_describe_parameters.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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/runtime/middleware"
-	"github.com/go-openapi/strfmt"
-)
-
-// NewGetPVCDescribeParams creates a new GetPVCDescribeParams object
-//
-// There are no default values defined in the spec.
-func NewGetPVCDescribeParams() GetPVCDescribeParams {
-
-	return GetPVCDescribeParams{}
-}
-
-// GetPVCDescribeParams contains all the bound params for the get p v c describe operation
-// typically these are obtained from a http.Request
-//
-// swagger:parameters GetPVCDescribe
-type GetPVCDescribeParams struct {
-
-	// HTTP Request Object
-	HTTPRequest *http.Request `json:"-"`
-
-	/*
-	  Required: true
-	  In: path
-	*/
-	PVCName string
-	/*
-	  Required: true
-	  In: path
-	*/
-	Namespace string
-	/*
-	  Required: true
-	  In: path
-	*/
-	Tenant string
-}
-
-// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
-// for simple values it will use straight method calls.
-//
-// To ensure default values, the struct must have been initialized with NewGetPVCDescribeParams() beforehand.
-func (o *GetPVCDescribeParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
-	var res []error
-
-	o.HTTPRequest = r
-
-	rPVCName, rhkPVCName, _ := route.Params.GetOK("PVCName")
-	if err := o.bindPVCName(rPVCName, rhkPVCName, route.Formats); err != nil {
-		res = append(res, err)
-	}
-
-	rNamespace, rhkNamespace, _ := route.Params.GetOK("namespace")
-	if err := o.bindNamespace(rNamespace, rhkNamespace, route.Formats); err != nil {
-		res = append(res, err)
-	}
-
-	rTenant, rhkTenant, _ := route.Params.GetOK("tenant")
-	if err := o.bindTenant(rTenant, rhkTenant, route.Formats); err != nil {
-		res = append(res, err)
-	}
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-// bindPVCName binds and validates parameter PVCName from path.
-func (o *GetPVCDescribeParams) bindPVCName(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.PVCName = raw
-
-	return nil
-}
-
-// bindNamespace binds and validates parameter Namespace from path.
-func (o *GetPVCDescribeParams) bindNamespace(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.Namespace = raw
-
-	return nil
-}
-
-// bindTenant binds and validates parameter Tenant from path.
-func (o *GetPVCDescribeParams) bindTenant(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.Tenant = raw
-
-	return nil
-}

operatorapi/operations/operator_api/get_p_v_c_describe_responses.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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/runtime"
-
-	"github.com/minio/console/models"
-)
-
-// GetPVCDescribeOKCode is the HTTP code returned for type GetPVCDescribeOK
-const GetPVCDescribeOKCode int = 200
-
-/*GetPVCDescribeOK A successful response.
-
-swagger:response getPVCDescribeOK
-*/
-type GetPVCDescribeOK struct {
-
-	/*
-	  In: Body
-	*/
-	Payload *models.DescribePVCWrapper `json:"body,omitempty"`
-}
-
-// NewGetPVCDescribeOK creates GetPVCDescribeOK with default headers values
-func NewGetPVCDescribeOK() *GetPVCDescribeOK {
-
-	return &GetPVCDescribeOK{}
-}
-
-// WithPayload adds the payload to the get p v c describe o k response
-func (o *GetPVCDescribeOK) WithPayload(payload *models.DescribePVCWrapper) *GetPVCDescribeOK {
-	o.Payload = payload
-	return o
-}
-
-// SetPayload sets the payload to the get p v c describe o k response
-func (o *GetPVCDescribeOK) SetPayload(payload *models.DescribePVCWrapper) {
-	o.Payload = payload
-}
-
-// WriteResponse to the client
-func (o *GetPVCDescribeOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
-
-	rw.WriteHeader(200)
-	if o.Payload != nil {
-		payload := o.Payload
-		if err := producer.Produce(rw, payload); err != nil {
-			panic(err) // let the recovery middleware deal with this
-		}
-	}
-}
-
-/*GetPVCDescribeDefault Generic error response.
-
-swagger:response getPVCDescribeDefault
-*/
-type GetPVCDescribeDefault struct {
-	_statusCode int
-
-	/*
-	  In: Body
-	*/
-	Payload *models.Error `json:"body,omitempty"`
-}
-
-// NewGetPVCDescribeDefault creates GetPVCDescribeDefault with default headers values
-func NewGetPVCDescribeDefault(code int) *GetPVCDescribeDefault {
-	if code <= 0 {
-		code = 500
-	}
-
-	return &GetPVCDescribeDefault{
-		_statusCode: code,
-	}
-}
-
-// WithStatusCode adds the status to the get p v c describe default response
-func (o *GetPVCDescribeDefault) WithStatusCode(code int) *GetPVCDescribeDefault {
-	o._statusCode = code
-	return o
-}
-
-// SetStatusCode sets the status to the get p v c describe default response
-func (o *GetPVCDescribeDefault) SetStatusCode(code int) {
-	o._statusCode = code
-}
-
-// WithPayload adds the payload to the get p v c describe default response
-func (o *GetPVCDescribeDefault) WithPayload(payload *models.Error) *GetPVCDescribeDefault {
-	o.Payload = payload
-	return o
-}
-
-// SetPayload sets the payload to the get p v c describe default response
-func (o *GetPVCDescribeDefault) SetPayload(payload *models.Error) {
-	o.Payload = payload
-}
-
-// WriteResponse to the client
-func (o *GetPVCDescribeDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
-
-	rw.WriteHeader(o._statusCode)
-	if o.Payload != nil {
-		payload := o.Payload
-		if err := producer.Produce(rw, payload); err != nil {
-			panic(err) // let the recovery middleware deal with this
-		}
-	}
-}

operatorapi/operations/operator_api/get_p_v_c_describe_urlbuilder.go

@@ -1,132 +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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the generate command
-
-import (
-	"errors"
-	"net/url"
-	golangswaggerpaths "path"
-	"strings"
-)
-
-// GetPVCDescribeURL generates an URL for the get p v c describe operation
-type GetPVCDescribeURL struct {
-	PVCName   string
-	Namespace string
-	Tenant    string
-
-	_basePath string
-	// avoid unkeyed usage
-	_ struct{}
-}
-
-// WithBasePath sets the base path for this url builder, only required when it's different from the
-// base path specified in the swagger spec.
-// When the value of the base path is an empty string
-func (o *GetPVCDescribeURL) WithBasePath(bp string) *GetPVCDescribeURL {
-	o.SetBasePath(bp)
-	return o
-}
-
-// SetBasePath sets the base path for this url builder, only required when it's different from the
-// base path specified in the swagger spec.
-// When the value of the base path is an empty string
-func (o *GetPVCDescribeURL) SetBasePath(bp string) {
-	o._basePath = bp
-}
-
-// Build a url path and query string
-func (o *GetPVCDescribeURL) Build() (*url.URL, error) {
-	var _result url.URL
-
-	var _path = "/namespaces/{namespace}/tenants/{tenant}/pvcs/{PVCName}/describe"
-
-	pVCName := o.PVCName
-	if pVCName != "" {
-		_path = strings.Replace(_path, "{PVCName}", pVCName, -1)
-	} else {
-		return nil, errors.New("pVCName is required on GetPVCDescribeURL")
-	}
-
-	namespace := o.Namespace
-	if namespace != "" {
-		_path = strings.Replace(_path, "{namespace}", namespace, -1)
-	} else {
-		return nil, errors.New("namespace is required on GetPVCDescribeURL")
-	}
-
-	tenant := o.Tenant
-	if tenant != "" {
-		_path = strings.Replace(_path, "{tenant}", tenant, -1)
-	} else {
-		return nil, errors.New("tenant is required on GetPVCDescribeURL")
-	}
-
-	_basePath := o._basePath
-	if _basePath == "" {
-		_basePath = "/api/v1"
-	}
-	_result.Path = golangswaggerpaths.Join(_basePath, _path)
-
-	return &_result, nil
-}
-
-// Must is a helper function to panic when the url builder returns an error
-func (o *GetPVCDescribeURL) Must(u *url.URL, err error) *url.URL {
-	if err != nil {
-		panic(err)
-	}
-	if u == nil {
-		panic("url can't be nil")
-	}
-	return u
-}
-
-// String returns the string representation of the path with query string
-func (o *GetPVCDescribeURL) String() string {
-	return o.Must(o.Build()).String()
-}
-
-// BuildFull builds a full url with scheme, host, path and query string
-func (o *GetPVCDescribeURL) BuildFull(scheme, host string) (*url.URL, error) {
-	if scheme == "" {
-		return nil, errors.New("scheme is required for a full url on GetPVCDescribeURL")
-	}
-	if host == "" {
-		return nil, errors.New("host is required for a full url on GetPVCDescribeURL")
-	}
-
-	base, err := o.Build()
-	if err != nil {
-		return nil, err
-	}
-
-	base.Scheme = scheme
-	base.Host = host
-	return base, nil
-}
-
-// StringFull returns the string representation of a complete url
-func (o *GetPVCDescribeURL) StringFull(scheme, host string) string {
-	return o.Must(o.BuildFull(scheme, host)).String()
-}

operatorapi/operations/operator_api/list_tenant_certificate_signing_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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/minio/console/models"
-)
-
-// ListTenantCertificateSigningRequestHandlerFunc turns a function with the right signature into a list tenant certificate signing request handler
-type ListTenantCertificateSigningRequestHandlerFunc func(ListTenantCertificateSigningRequestParams, *models.Principal) middleware.Responder
-
-// Handle executing the request and returning a response
-func (fn ListTenantCertificateSigningRequestHandlerFunc) Handle(params ListTenantCertificateSigningRequestParams, principal *models.Principal) middleware.Responder {
-	return fn(params, principal)
-}
-
-// ListTenantCertificateSigningRequestHandler interface for that can handle valid list tenant certificate signing request params
-type ListTenantCertificateSigningRequestHandler interface {
-	Handle(ListTenantCertificateSigningRequestParams, *models.Principal) middleware.Responder
-}
-
-// NewListTenantCertificateSigningRequest creates a new http.Handler for the list tenant certificate signing request operation
-func NewListTenantCertificateSigningRequest(ctx *middleware.Context, handler ListTenantCertificateSigningRequestHandler) *ListTenantCertificateSigningRequest {
-	return &ListTenantCertificateSigningRequest{Context: ctx, Handler: handler}
-}
-
-/* ListTenantCertificateSigningRequest swagger:route GET /namespaces/{namespace}/tenants/{tenant}/csr OperatorAPI listTenantCertificateSigningRequest
-
-List Tenant Certificate Signing Request
-
-*/
-type ListTenantCertificateSigningRequest struct {
-	Context *middleware.Context
-	Handler ListTenantCertificateSigningRequestHandler
-}
-
-func (o *ListTenantCertificateSigningRequest) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
-	route, rCtx, _ := o.Context.RouteInfo(r)
-	if rCtx != nil {
-		*r = *rCtx
-	}
-	var Params = NewListTenantCertificateSigningRequestParams()
-	uprinc, aCtx, err := o.Context.Authorize(r, route)
-	if err != nil {
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-	if aCtx != nil {
-		*r = *aCtx
-	}
-	var principal *models.Principal
-	if uprinc != nil {
-		principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
-	}
-
-	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-
-	res := o.Handler.Handle(Params, principal) // actually handle the request
-	o.Context.Respond(rw, r, route.Produces, route, res)
-
-}

operatorapi/operations/operator_api/list_tenant_certificate_signing_request_parameters.go

@@ -1,112 +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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/runtime/middleware"
-	"github.com/go-openapi/strfmt"
-)
-
-// NewListTenantCertificateSigningRequestParams creates a new ListTenantCertificateSigningRequestParams object
-//
-// There are no default values defined in the spec.
-func NewListTenantCertificateSigningRequestParams() ListTenantCertificateSigningRequestParams {
-
-	return ListTenantCertificateSigningRequestParams{}
-}
-
-// ListTenantCertificateSigningRequestParams contains all the bound params for the list tenant certificate signing request operation
-// typically these are obtained from a http.Request
-//
-// swagger:parameters ListTenantCertificateSigningRequest
-type ListTenantCertificateSigningRequestParams struct {
-
-	// HTTP Request Object
-	HTTPRequest *http.Request `json:"-"`
-
-	/*
-	  Required: true
-	  In: path
-	*/
-	Namespace string
-	/*
-	  Required: true
-	  In: path
-	*/
-	Tenant string
-}
-
-// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
-// for simple values it will use straight method calls.
-//
-// To ensure default values, the struct must have been initialized with NewListTenantCertificateSigningRequestParams() beforehand.
-func (o *ListTenantCertificateSigningRequestParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
-	var res []error
-
-	o.HTTPRequest = r
-
-	rNamespace, rhkNamespace, _ := route.Params.GetOK("namespace")
-	if err := o.bindNamespace(rNamespace, rhkNamespace, route.Formats); err != nil {
-		res = append(res, err)
-	}
-
-	rTenant, rhkTenant, _ := route.Params.GetOK("tenant")
-	if err := o.bindTenant(rTenant, rhkTenant, route.Formats); err != nil {
-		res = append(res, err)
-	}
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-// bindNamespace binds and validates parameter Namespace from path.
-func (o *ListTenantCertificateSigningRequestParams) bindNamespace(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.Namespace = raw
-
-	return nil
-}
-
-// bindTenant binds and validates parameter Tenant from path.
-func (o *ListTenantCertificateSigningRequestParams) bindTenant(rawData []string, hasKey bool, formats strfmt.Registry) error {
-	var raw string
-	if len(rawData) > 0 {
-		raw = rawData[len(rawData)-1]
-	}
-
-	// Required: true
-	// Parameter is provided by construction from the route
-	o.Tenant = raw
-
-	return nil
-}

operatorapi/operations/operator_api/list_tenant_certificate_signing_request_responses.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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/runtime"
-
-	"github.com/minio/console/models"
-)
-
-// ListTenantCertificateSigningRequestOKCode is the HTTP code returned for type ListTenantCertificateSigningRequestOK
-const ListTenantCertificateSigningRequestOKCode int = 200
-
-/*ListTenantCertificateSigningRequestOK A successful response.
-
-swagger:response listTenantCertificateSigningRequestOK
-*/
-type ListTenantCertificateSigningRequestOK struct {
-
-	/*
-	  In: Body
-	*/
-	Payload *models.CsrElements `json:"body,omitempty"`
-}
-
-// NewListTenantCertificateSigningRequestOK creates ListTenantCertificateSigningRequestOK with default headers values
-func NewListTenantCertificateSigningRequestOK() *ListTenantCertificateSigningRequestOK {
-
-	return &ListTenantCertificateSigningRequestOK{}
-}
-
-// WithPayload adds the payload to the list tenant certificate signing request o k response
-func (o *ListTenantCertificateSigningRequestOK) WithPayload(payload *models.CsrElements) *ListTenantCertificateSigningRequestOK {
-	o.Payload = payload
-	return o
-}
-
-// SetPayload sets the payload to the list tenant certificate signing request o k response
-func (o *ListTenantCertificateSigningRequestOK) SetPayload(payload *models.CsrElements) {
-	o.Payload = payload
-}
-
-// WriteResponse to the client
-func (o *ListTenantCertificateSigningRequestOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
-
-	rw.WriteHeader(200)
-	if o.Payload != nil {
-		payload := o.Payload
-		if err := producer.Produce(rw, payload); err != nil {
-			panic(err) // let the recovery middleware deal with this
-		}
-	}
-}
-
-/*ListTenantCertificateSigningRequestDefault Generic error response.
-
-swagger:response listTenantCertificateSigningRequestDefault
-*/
-type ListTenantCertificateSigningRequestDefault struct {
-	_statusCode int
-
-	/*
-	  In: Body
-	*/
-	Payload *models.Error `json:"body,omitempty"`
-}
-
-// NewListTenantCertificateSigningRequestDefault creates ListTenantCertificateSigningRequestDefault with default headers values
-func NewListTenantCertificateSigningRequestDefault(code int) *ListTenantCertificateSigningRequestDefault {
-	if code <= 0 {
-		code = 500
-	}
-
-	return &ListTenantCertificateSigningRequestDefault{
-		_statusCode: code,
-	}
-}
-
-// WithStatusCode adds the status to the list tenant certificate signing request default response
-func (o *ListTenantCertificateSigningRequestDefault) WithStatusCode(code int) *ListTenantCertificateSigningRequestDefault {
-	o._statusCode = code
-	return o
-}
-
-// SetStatusCode sets the status to the list tenant certificate signing request default response
-func (o *ListTenantCertificateSigningRequestDefault) SetStatusCode(code int) {
-	o._statusCode = code
-}
-
-// WithPayload adds the payload to the list tenant certificate signing request default response
-func (o *ListTenantCertificateSigningRequestDefault) WithPayload(payload *models.Error) *ListTenantCertificateSigningRequestDefault {
-	o.Payload = payload
-	return o
-}
-
-// SetPayload sets the payload to the list tenant certificate signing request default response
-func (o *ListTenantCertificateSigningRequestDefault) SetPayload(payload *models.Error) {
-	o.Payload = payload
-}
-
-// WriteResponse to the client
-func (o *ListTenantCertificateSigningRequestDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
-
-	rw.WriteHeader(o._statusCode)
-	if o.Payload != nil {
-		payload := o.Payload
-		if err := producer.Produce(rw, payload); err != nil {
-			panic(err) // let the recovery middleware deal with this
-		}
-	}
-}

operatorapi/operations/operator_api/list_tenant_certificate_signing_request_urlbuilder.go

@@ -1,124 +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 operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the generate command
-
-import (
-	"errors"
-	"net/url"
-	golangswaggerpaths "path"
-	"strings"
-)
-
-// ListTenantCertificateSigningRequestURL generates an URL for the list tenant certificate signing request operation
-type ListTenantCertificateSigningRequestURL struct {
-	Namespace string
-	Tenant    string
-
-	_basePath string
-	// avoid unkeyed usage
-	_ struct{}
-}
-
-// WithBasePath sets the base path for this url builder, only required when it's different from the
-// base path specified in the swagger spec.
-// When the value of the base path is an empty string
-func (o *ListTenantCertificateSigningRequestURL) WithBasePath(bp string) *ListTenantCertificateSigningRequestURL {
-	o.SetBasePath(bp)
-	return o
-}
-
-// SetBasePath sets the base path for this url builder, only required when it's different from the
-// base path specified in the swagger spec.
-// When the value of the base path is an empty string
-func (o *ListTenantCertificateSigningRequestURL) SetBasePath(bp string) {
-	o._basePath = bp
-}
-
-// Build a url path and query string
-func (o *ListTenantCertificateSigningRequestURL) Build() (*url.URL, error) {
-	var _result url.URL
-
-	var _path = "/namespaces/{namespace}/tenants/{tenant}/csr"
-
-	namespace := o.Namespace
-	if namespace != "" {
-		_path = strings.Replace(_path, "{namespace}", namespace, -1)
-	} else {
-		return nil, errors.New("namespace is required on ListTenantCertificateSigningRequestURL")
-	}
-
-	tenant := o.Tenant
-	if tenant != "" {
-		_path = strings.Replace(_path, "{tenant}", tenant, -1)
-	} else {
-		return nil, errors.New("tenant is required on ListTenantCertificateSigningRequestURL")
-	}
-
-	_basePath := o._basePath
-	if _basePath == "" {
-		_basePath = "/api/v1"
-	}
-	_result.Path = golangswaggerpaths.Join(_basePath, _path)
-
-	return &_result, nil
-}
-
-// Must is a helper function to panic when the url builder returns an error
-func (o *ListTenantCertificateSigningRequestURL) Must(u *url.URL, err error) *url.URL {
-	if err != nil {
-		panic(err)
-	}
-	if u == nil {
-		panic("url can't be nil")
-	}
-	return u
-}
-
-// String returns the string representation of the path with query string
-func (o *ListTenantCertificateSigningRequestURL) String() string {
-	return o.Must(o.Build()).String()
-}
-
-// BuildFull builds a full url with scheme, host, path and query string
-func (o *ListTenantCertificateSigningRequestURL) BuildFull(scheme, host string) (*url.URL, error) {
-	if scheme == "" {
-		return nil, errors.New("scheme is required for a full url on ListTenantCertificateSigningRequestURL")
-	}
-	if host == "" {
-		return nil, errors.New("host is required for a full url on ListTenantCertificateSigningRequestURL")
-	}
-
-	base, err := o.Build()
-	if err != nil {
-		return nil, err
-	}
-
-	base.Scheme = scheme
-	base.Host = host
-	return base, nil
-}
-
-// StringFull returns the string representation of a complete url
-func (o *ListTenantCertificateSigningRequestURL) StringFull(scheme, host string) string {
-	return o.Must(o.BuildFull(scheme, host)).String()
-}

operatorapi/parity.go

@@ -42,6 +42,7 @@ func registerParityHandlers(api *operations.OperatorAPI) {
 
 func GetParityInfo(nodes int64, disksPerNode int64) (models.ParityResponse, error) {
 	parityVals, err := utils.PossibleParityValues(fmt.Sprintf(`http://minio{1...%d}/export/set{1...%d}`, nodes, disksPerNode))
+
 	if err != nil {
 		return nil, err
 	}

operatorapi/proxy.go

@@ -99,8 +99,8 @@ func serveProxy(responseWriter http.ResponseWriter, req *http.Request) {
 
 	tenantURL := fmt.Sprintf("%s://%s.%s.svc.%s%s", tenantSchema, tenant.ConsoleCIServiceName(), tenant.Namespace, v2.GetClusterDomain(), tenantPort)
 	// for development
-	// tenantURL = "http://localhost:9091"
-	// tenantURL = "https://localhost:9443"
+	//tenantURL = "http://localhost:9091"
+	//tenantURL = "https://localhost:9443"
 
 	h := sha1.New()
 	h.Write([]byte(nsTenant))
@@ -201,7 +201,7 @@ func serveProxy(responseWriter http.ResponseWriter, req *http.Request) {
 		return
 	}
 	tenantBase := fmt.Sprintf("/api/%s/%s/%s", proxyMethod, tenant.Namespace, tenant.Name)
-	targetURL.Path = strings.ReplaceAll(req.URL.Path, tenantBase, "")
+	targetURL.Path = strings.Replace(req.URL.Path, tenantBase, "", -1)
 
 	proxiedCookie := &http.Cookie{
 		Name:     "token",
@@ -219,6 +219,7 @@ func serveProxy(responseWriter http.ResponseWriter, req *http.Request) {
 	default:
 		handleHTTPRequest(responseWriter, req, proxyCookieJar, tenantBase, targetURL)
 	}
+
 }
 
 func handleHTTPRequest(responseWriter http.ResponseWriter, req *http.Request, proxyCookieJar *cookiejar.Jar, tenantBase string, targetURL *url2.URL) {
@@ -226,13 +227,11 @@ func handleHTTPRequest(responseWriter http.ResponseWriter, req *http.Request, pr
 		// FIXME: use restapi.GetConsoleHTTPClient()
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	}
-	client := &http.Client{
-		Transport: tr,
-		Jar:       proxyCookieJar,
+	client := &http.Client{Transport: tr,
+		Jar: proxyCookieJar,
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
-		},
-	}
+		}}
 
 	// are we proxying something with cp=y? (console proxy) then add cpb (console proxy base) so the console
 	// on the other side updates the <base href="" /> to this value overriding sub path or root

operatorapi/resource_quota.go

@@ -41,6 +41,7 @@ func registerResourceQuotaHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewGetResourceQuotaDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewGetResourceQuotaOK().WithPayload(resp)
+
 	})
 }
 

operatorapi/resource_quota_test.go

@@ -18,12 +18,13 @@ package operatorapi
 
 import (
 	"context"
-	"errors"
 	"reflect"
 	"testing"
 
 	storagev1 "k8s.io/api/storage/v1"
 
+	"errors"
+
 	"github.com/minio/console/models"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -32,11 +33,9 @@ import (
 
 type k8sClientMock struct{}
 
-var (
-	k8sclientGetResourceQuotaMock func(ctx context.Context, namespace, resource string, opts metav1.GetOptions) (*v1.ResourceQuota, error)
-	k8sclientGetNameSpaceMock     func(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Namespace, error)
-	k8sclientStorageClassesMock   func(ctx context.Context, opts metav1.ListOptions) (*storagev1.StorageClassList, error)
-)
+var k8sclientGetResourceQuotaMock func(ctx context.Context, namespace, resource string, opts metav1.GetOptions) (*v1.ResourceQuota, error)
+var k8sclientGetNameSpaceMock func(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Namespace, error)
+var k8sclientStorageClassesMock func(ctx context.Context, opts metav1.ListOptions) (*storagev1.StorageClassList, error)
 
 // mock functions
 func (c k8sClientMock) getResourceQuota(ctx context.Context, namespace, resource string, opts metav1.GetOptions) (*v1.ResourceQuota, error) {

operatorapi/tenant_add.go

@@ -132,7 +132,7 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre
 		tenantConfigurationENV["MINIO_STORAGE_CLASS_STANDARD"] = fmt.Sprintf("EC:%d", tenantReq.ErasureCodingParity)
 	}
 
-	// Construct a MinIO Instance with everything we are getting from parameters
+	//Construct a MinIO Instance with everything we are getting from parameters
 	minInst := miniov2.Tenant{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   tenantName,
@@ -149,8 +149,7 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre
 	var tenantExternalIDPConfigured bool
 	if tenantReq.Idp != nil {
 		// Enable IDP (Active Directory) for MinIO
-		switch {
-		case tenantReq.Idp.ActiveDirectory != nil:
+		if tenantReq.Idp.ActiveDirectory != nil {
 			tenantExternalIDPConfigured = true
 			serverAddress := *tenantReq.Idp.ActiveDirectory.URL
 			tlsSkipVerify := tenantReq.Idp.ActiveDirectory.SkipTLSVerification
@@ -210,7 +209,8 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre
 			}
 			// attach the users to the tenant
 			minInst.Spec.Users = users
-		case tenantReq.Idp.Oidc != nil:
+
+		} else if tenantReq.Idp.Oidc != nil {
 			tenantExternalIDPConfigured = true
 			// Enable IDP (OIDC) for MinIO
 			configurationURL := *tenantReq.Idp.Oidc.ConfigurationURL
@@ -228,7 +228,7 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre
 				scopes = "openid,profile,email"
 			}
 			tenantConfigurationENV["MINIO_IDENTITY_OPENID_SCOPES"] = scopes
-		case len(tenantReq.Idp.Keys) > 0:
+		} else if len(tenantReq.Idp.Keys) > 0 {
 			// Create the secret any built-in user passed if no external IDP was configured
 			for i := 0; i < len(tenantReq.Idp.Keys); i++ {
 				userSecretName := fmt.Sprintf("%s-user-%d", tenantName, i)
@@ -382,7 +382,7 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre
 	// Is Log Search enabled? (present in the parameters) if so configure
 	if tenantReq.LogSearchConfiguration != nil {
 
-		// Default class name for Log search
+		//Default class name for Log search
 		diskSpaceFromAPI := int64(5) * humanize.GiByte // Default is 5Gi
 		logSearchImage := ""
 		logSearchPgImage := ""

operatorapi/tenant_get.go

@@ -64,13 +64,22 @@ func getTenantDetailsResponse(session *models.Principal, params operator_api.Ten
 	}
 
 	// detect if AD/LDAP is enabled
-	ldapEnabled := tenantConfiguration["MINIO_IDENTITY_LDAP_SERVER_ADDR"] != ""
+	ldapEnabled := false
+	if string(tenantConfiguration["MINIO_IDENTITY_LDAP_SERVER_ADDR"]) != "" {
+		ldapEnabled = true
+	}
 
 	// detect if OpenID is enabled
-	oidcEnabled := tenantConfiguration["MINIO_IDENTITY_OPENID_CONFIG_URL"] != ""
+	oidcEnabled := false
+	if string(tenantConfiguration["MINIO_IDENTITY_OPENID_CONFIG_URL"]) != "" {
+		oidcEnabled = true
+	}
 
 	// detect if encryption is enabled
-	info.EncryptionEnabled = minTenant.HasKESEnabled() || tenantConfiguration["MINIO_KMS_SECRET_KEY"] != ""
+	if minTenant.HasKESEnabled() || string(tenantConfiguration["MINIO_KMS_SECRET_KEY"]) != "" {
+		info.EncryptionEnabled = true
+	}
+
 	info.LogEnabled = minTenant.HasLogEnabled()
 	info.MonitoringEnabled = minTenant.HasPrometheusEnabled()
 	info.IdpAdEnabled = ldapEnabled
@@ -94,13 +103,13 @@ func getTenantDetailsResponse(session *models.Principal, params operator_api.Ten
 
 	// get tenant service
 	minTenant.EnsureDefaults()
-	// minio service
+	//minio service
 	minSvc, err := k8sClient.getService(ctx, minTenant.Namespace, minTenant.MinIOCIServiceName(), metav1.GetOptions{})
 	if err != nil {
 		// we can tolerate this errors
 		errors.LogError("Unable to get MinIO service name: %v, continuing", err)
 	}
-	// console service
+	//console service
 	conSvc, err := k8sClient.getService(ctx, minTenant.Namespace, minTenant.ConsoleCIServiceName(), metav1.GetOptions{})
 	if err != nil {
 		// we can tolerate this errors
@@ -108,14 +117,13 @@ func getTenantDetailsResponse(session *models.Principal, params operator_api.Ten
 	}
 
 	schema := "http"
-	consoleSchema := schema
+	consoleSchema := "http"
 	consolePort := fmt.Sprintf(":%d", miniov2.ConsolePort)
 	if minTenant.TLS() {
 		schema = "https"
-		consoleSchema = schema
+		consoleSchema = "https"
 		consolePort = fmt.Sprintf(":%d", miniov2.ConsoleTLSPort)
 	}
-
 	var minioEndpoint string
 	var consoleEndpoint string
 	if minSvc != nil && len(minSvc.Status.LoadBalancer.Ingress) > 0 {
@@ -128,7 +136,6 @@ func getTenantDetailsResponse(session *models.Principal, params operator_api.Ten
 		}
 
 	}
-
 	if conSvc != nil && len(conSvc.Status.LoadBalancer.Ingress) > 0 {
 		if conSvc.Status.LoadBalancer.Ingress[0].IP != "" {
 			consoleEndpoint = fmt.Sprintf("%s://%s%s", consoleSchema, conSvc.Status.LoadBalancer.Ingress[0].IP, consolePort)
@@ -137,10 +144,11 @@ func getTenantDetailsResponse(session *models.Principal, params operator_api.Ten
 			consoleEndpoint = fmt.Sprintf("%s://%s%s", consoleSchema, conSvc.Status.LoadBalancer.Ingress[0].Hostname, consolePort)
 		}
 	}
-
-	info.Endpoints = &models.TenantEndpoints{
-		Console: consoleEndpoint,
-		Minio:   minioEndpoint,
+	if minioEndpoint != "" || consoleEndpoint != "" {
+		info.Endpoints = &models.TenantEndpoints{
+			Console: consoleEndpoint,
+			Minio:   minioEndpoint,
+		}
 	}
 
 	var domains models.DomainsConfiguration

operatorapi/tenants.go

@@ -44,13 +44,11 @@ import (
 
 	"github.com/minio/console/pkg/auth/utils"
 
-	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
+
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/duration"
-	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/utils/strings/slices"
 
 	corev1 "k8s.io/api/core/v1"
 
@@ -92,6 +90,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewListTenantsDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewListTenantsOK().WithPayload(resp)
+
 	})
 	// List Tenants by namespace
 	api.OperatorAPIListTenantsHandler = operator_api.ListTenantsHandlerFunc(func(params operator_api.ListTenantsParams, session *models.Principal) middleware.Responder {
@@ -100,6 +99,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewListTenantsDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewListTenantsOK().WithPayload(resp)
+
 	})
 	// Detail Tenant
 	api.OperatorAPITenantDetailsHandler = operator_api.TenantDetailsHandlerFunc(func(params operator_api.TenantDetailsParams, session *models.Principal) middleware.Responder {
@@ -108,6 +108,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewTenantDetailsDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewTenantDetailsOK().WithPayload(resp)
+
 	})
 
 	// Tenant Security details
@@ -117,6 +118,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewTenantSecurityDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewTenantSecurityOK().WithPayload(resp)
+
 	})
 
 	// Update Tenant Security configuration
@@ -126,6 +128,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewUpdateTenantSecurityDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewUpdateTenantSecurityNoContent()
+
 	})
 
 	// Tenant identity provider details
@@ -135,6 +138,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewTenantIdentityProviderDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewTenantIdentityProviderOK().WithPayload(resp)
+
 	})
 
 	// Update Tenant identity provider configuration
@@ -144,6 +148,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewUpdateTenantIdentityProviderDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewUpdateTenantIdentityProviderNoContent()
+
 	})
 
 	// Delete Tenant
@@ -153,6 +158,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewDeleteTenantDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewDeleteTenantNoContent()
+
 	})
 
 	// Delete Pod
@@ -162,6 +168,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 			return operator_api.NewDeletePodDefault(int(err.Code)).WithPayload(err)
 		}
 		return operator_api.NewDeletePodNoContent()
+
 	})
 
 	// Update Tenant
@@ -249,15 +256,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 		return operator_api.NewGetPodEventsOK().WithPayload(payload)
 	})
 
-	api.OperatorAPIDescribePodHandler = operator_api.DescribePodHandlerFunc(func(params operator_api.DescribePodParams, session *models.Principal) middleware.Responder {
-		payload, err := getDescribePodResponse(session, params)
-		if err != nil {
-			return operator_api.NewDescribePodDefault(int(err.Code)).WithPayload(err)
-		}
-		return operator_api.NewDescribePodOK().WithPayload(payload)
-	})
-
-	// Get tenant monitoring info
+	//Get tenant monitoring info
 	api.OperatorAPIGetTenantMonitoringHandler = operator_api.GetTenantMonitoringHandlerFunc(func(params operator_api.GetTenantMonitoringParams, session *models.Principal) middleware.Responder {
 		payload, err := getTenantMonitoringResponse(session, params)
 		if err != nil {
@@ -265,7 +264,7 @@ func registerTenantHandlers(api *operations.OperatorAPI) {
 		}
 		return operator_api.NewGetTenantMonitoringOK().WithPayload(payload)
 	})
-	// Set configuration fields for Prometheus monitoring on a tenant
+	//Set configuration fields for Prometheus monitoring on a tenant
 	api.OperatorAPISetTenantMonitoringHandler = operator_api.SetTenantMonitoringHandlerFunc(func(params operator_api.SetTenantMonitoringParams, session *models.Principal) middleware.Responder {
 		_, err := setTenantMonitoringResponse(session, params)
 		if err != nil {
@@ -394,8 +393,8 @@ func deleteTenantAction(
 	operatorClient OperatorClientI,
 	clientset v1.CoreV1Interface,
 	tenant *miniov2.Tenant,
-	deletePvcs bool,
-) error {
+	deletePvcs bool) error {
+
 	err := operatorClient.TenantDelete(ctx, tenant.Namespace, tenant.Name, metav1.DeleteOptions{})
 	if err != nil {
 		// try to delete pvc even if the tenant doesn't exist anymore but only if deletePvcs is set to true,
@@ -539,7 +538,7 @@ func getTenantInfo(tenant *miniov2.Tenant) *models.Tenant {
 	for _, p := range tenant.Spec.Pools {
 		pools = append(pools, parseTenantPool(&p))
 		poolSize := int64(p.Servers) * int64(p.VolumesPerServer) * p.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value()
-		totalSize += poolSize
+		totalSize = totalSize + poolSize
 	}
 	var deletion string
 	if tenant.ObjectMeta.DeletionTimestamp != nil {
@@ -587,13 +586,6 @@ func parseCertificate(name string, rawCert []byte) (*models.CertificateInfo, err
 	}, nil
 }
 
-var secretTypePublicKeyNameMap = map[string]string{
-	"kubernetes.io/tls":        "tls.crt",
-	"cert-manager.io/v1":       "tls.crt",
-	"cert-manager.io/v1alpha2": "tls.crt",
-	// Add newer secretTypes and their corresponding values in future
-}
-
 // parseTenantCertificates convert public key pem certificates stored in k8s secrets for a given Tenant into x509 certificates
 func parseTenantCertificates(ctx context.Context, clientSet K8sClientI, namespace string, secrets []*miniov2.LocalCertificateReference) ([]*models.CertificateInfo, error) {
 	var certificates []*models.CertificateInfo
@@ -605,11 +597,9 @@ func parseTenantCertificates(ctx context.Context, clientSet K8sClientI, namespac
 		if err != nil {
 			return nil, err
 		}
-
-		if v, ok := secretTypePublicKeyNameMap[secret.Type]; ok {
-			publicKey = v
+		if secret.Type == "kubernetes.io/tls" || secret.Type == "cert-manager.io/v1alpha2" {
+			publicKey = "tls.crt"
 		}
-
 		// Extract public key from certificate TLS secret
 		if rawCert, ok := keyPair.Data[publicKey]; ok {
 			var blocks []byte
@@ -853,6 +843,7 @@ func updateTenantIdentityProvider(ctx context.Context, operatorClient OperatorCl
 }
 
 func getTenantIdentityProviderResponse(session *models.Principal, params operator_api.TenantIdentityProviderParams) (*models.IdpConfiguration, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -883,6 +874,7 @@ func getTenantIdentityProviderResponse(session *models.Principal, params operato
 }
 
 func getUpdateTenantIdentityProviderResponse(session *models.Principal, params operator_api.UpdateTenantIdentityProviderParams) *models.Error {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -907,6 +899,7 @@ func getUpdateTenantIdentityProviderResponse(session *models.Principal, params o
 }
 
 func getTenantSecurityResponse(session *models.Principal, params operator_api.TenantSecurityParams) (*models.TenantSecurityResponse, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -936,6 +929,7 @@ func getTenantSecurityResponse(session *models.Principal, params operator_api.Te
 }
 
 func getUpdateTenantSecurityResponse(session *models.Principal, params operator_api.UpdateTenantSecurityParams) *models.Error {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -997,7 +991,7 @@ func updateTenantSecurity(ctx context.Context, operatorClient OperatorClientI, c
 		}
 		newMinIOExternalCaCertSecret = append(newMinIOExternalCaCertSecret, certificate)
 	}
-	// Create new Certificate Secrets for MinIO
+	//Create new Certificate Secrets for MinIO
 	secretName := fmt.Sprintf("%s-%s", minInst.Name, strings.ToLower(utils.RandomCharString(5)))
 	externalCertSecretName := fmt.Sprintf("%s-external-certificates", secretName)
 	externalCertSecrets, err := createOrReplaceExternalCertSecrets(ctx, client, minInst.Namespace, params.Body.CustomCertificates.Minio, externalCertSecretName, minInst.Name)
@@ -1064,11 +1058,11 @@ func listTenants(ctx context.Context, operatorClient OperatorClientI, namespace
 		var instanceCount int64
 		var volumeCount int64
 		for _, pool := range tenant.Spec.Pools {
-			instanceCount += int64(pool.Servers)
-			volumeCount += int64(pool.Servers * pool.VolumesPerServer)
+			instanceCount = instanceCount + int64(pool.Servers)
+			volumeCount = volumeCount + int64(pool.Servers*pool.VolumesPerServer)
 			if pool.VolumeClaimTemplate != nil {
 				poolSize := int64(pool.VolumesPerServer) * int64(pool.Servers) * pool.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value()
-				totalSize += poolSize
+				totalSize = totalSize + poolSize
 			}
 		}
 
@@ -1309,6 +1303,7 @@ func getTenantAddPoolResponse(session *models.Principal, params operator_api.Ten
 
 // getTenantUsageResponse returns the usage of a tenant
 func getTenantUsageResponse(session *models.Principal, params operator_api.GetTenantUsageParams) (*models.TenantUsage, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -1359,6 +1354,7 @@ func getTenantUsageResponse(session *models.Principal, params operator_api.GetTe
 
 // getTenantLogsResponse returns the logs of a tenant
 func getTenantLogsResponse(session *models.Principal, params operator_api.GetTenantLogsParams) (*models.TenantLogs, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -1455,6 +1451,7 @@ func getTenantLogsResponse(session *models.Principal, params operator_api.GetTen
 
 // setTenantLogsResponse returns the logs of a tenant
 func setTenantLogsResponse(session *models.Principal, params operator_api.SetTenantLogsParams) (bool, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -1472,21 +1469,21 @@ func setTenantLogsResponse(session *models.Principal, params operator_api.SetTen
 		return false, restapi.ErrorWithContext(ctx, err, restapi.ErrUnableToGetTenantUsage)
 	}
 
-	labels := make(map[string]string)
+	var labels = make(map[string]string)
 	for i := 0; i < len(params.Data.Labels); i++ {
 		if params.Data.Labels[i] != nil {
 			labels[params.Data.Labels[i].Key] = params.Data.Labels[i].Value
 		}
 	}
 	minTenant.Spec.Log.Labels = labels
-	annotations := make(map[string]string)
+	var annotations = make(map[string]string)
 	for i := 0; i < len(params.Data.Annotations); i++ {
 		if params.Data.Annotations[i] != nil {
 			annotations[params.Data.Annotations[i].Key] = params.Data.Annotations[i].Value
 		}
 	}
 	minTenant.Spec.Log.Annotations = annotations
-	nodeSelector := make(map[string]string)
+	var nodeSelector = make(map[string]string)
 	for i := 0; i < len(params.Data.NodeSelector); i++ {
 		if params.Data.NodeSelector[i] != nil {
 			nodeSelector[params.Data.NodeSelector[i].Key] = params.Data.NodeSelector[i].Value
@@ -1517,21 +1514,21 @@ func setTenantLogsResponse(session *models.Principal, params operator_api.SetTen
 	if minTenant.Spec.Log.Db != nil {
 		modified = true
 	}
-	dbLabels := make(map[string]string)
+	var dbLabels = make(map[string]string)
 	for i := 0; i < len(params.Data.DbLabels); i++ {
 		if params.Data.DbLabels[i] != nil {
 			dbLabels[params.Data.DbLabels[i].Key] = params.Data.DbLabels[i].Value
 		}
 		modified = true
 	}
-	dbAnnotations := make(map[string]string)
+	var dbAnnotations = make(map[string]string)
 	for i := 0; i < len(params.Data.DbAnnotations); i++ {
 		if params.Data.DbAnnotations[i] != nil {
 			dbAnnotations[params.Data.DbAnnotations[i].Key] = params.Data.DbAnnotations[i].Value
 		}
 		modified = true
 	}
-	dbNodeSelector := make(map[string]string)
+	var dbNodeSelector = make(map[string]string)
 	for i := 0; i < len(params.Data.DbNodeSelector); i++ {
 		if params.Data.DbNodeSelector[i] != nil {
 			dbNodeSelector[params.Data.DbNodeSelector[i].Key] = params.Data.DbNodeSelector[i].Value
@@ -1571,7 +1568,7 @@ func setTenantLogsResponse(session *models.Principal, params operator_api.SetTen
 	}
 	if modified {
 		if minTenant.Spec.Log.Db == nil {
-			// Default class name for Log search
+			//Default class name for Log search
 			diskSpaceFromAPI := int64(5) * humanize.GiByte // Default is 5Gi
 			logSearchStorageClass := "standard"
 
@@ -1621,6 +1618,7 @@ func setTenantLogsResponse(session *models.Principal, params operator_api.SetTen
 
 // enableTenantLoggingResponse enables Tenant Logging
 func enableTenantLoggingResponse(session *models.Principal, params operator_api.EnableTenantLoggingParams) (bool, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -1639,7 +1637,7 @@ func enableTenantLoggingResponse(session *models.Principal, params operator_api.
 	}
 	minTenant.EnsureDefaults()
 
-	// Default class name for Log search
+	//Default class name for Log search
 	diskSpaceFromAPI := int64(5) * humanize.GiByte // Default is 5Gi
 	logSearchStorageClass := "standard"
 
@@ -1681,6 +1679,7 @@ func enableTenantLoggingResponse(session *models.Principal, params operator_api.
 
 // disableTenantLoggingResponse disables Tenant Logging
 func disableTenantLoggingResponse(session *models.Principal, params operator_api.DisableTenantLoggingParams) (bool, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -1740,8 +1739,7 @@ func getTenantPodsResponse(session *models.Principal, params operator_api.GetTen
 			TimeCreated: pod.CreationTimestamp.Unix(),
 			PodIP:       pod.Status.PodIP,
 			Restarts:    restarts,
-			Node:        pod.Spec.NodeName,
-		})
+			Node:        pod.Spec.NodeName})
 	}
 	return retval, nil
 }
@@ -1793,293 +1791,7 @@ func getPodEventsResponse(session *models.Principal, params operator_api.GetPodE
 	return retval, nil
 }
 
-func getDescribePodResponse(session *models.Principal, params operator_api.DescribePodParams) (*models.DescribePodWrapper, *models.Error) {
-	ctx := context.Background()
-	clientset, err := cluster.K8sClient(session.STSSessionToken)
-	if err != nil {
-		return nil, restapi.ErrorWithContext(ctx, err)
-	}
-	pod, err := clientset.CoreV1().Pods(params.Namespace).Get(ctx, params.PodName, metav1.GetOptions{})
-	if err != nil {
-		return nil, restapi.ErrorWithContext(ctx, err)
-	}
-	retval := &models.DescribePodWrapper{
-		Name:              pod.Name,
-		Namespace:         pod.Namespace,
-		PriorityClassName: pod.Spec.PriorityClassName,
-		NodeName:          pod.Spec.NodeName,
-	}
-	if pod.Spec.Priority != nil {
-		retval.Priority = int64(*pod.Spec.Priority)
-	}
-	if pod.Status.StartTime != nil {
-		retval.StartTime = pod.Status.StartTime.Time.String()
-	}
-	labelArray := make([]*models.Label, len(pod.Labels))
-	i := 0
-	for key := range pod.Labels {
-		labelArray[i] = &models.Label{Key: key, Value: pod.Labels[key]}
-		i++
-	}
-	retval.Labels = labelArray
-	annotationArray := make([]*models.Annotation, len(pod.Annotations))
-	i = 0
-	for key := range pod.Annotations {
-		annotationArray[i] = &models.Annotation{Key: key, Value: pod.Annotations[key]}
-		i++
-	}
-	retval.Annotations = annotationArray
-	if pod.DeletionTimestamp != nil {
-		retval.DeletionTimestamp = translateTimestampSince(*pod.DeletionTimestamp)
-		retval.DeletionGracePeriodSeconds = *pod.DeletionGracePeriodSeconds
-	}
-	retval.Phase = string(pod.Status.Phase)
-	retval.Reason = pod.Status.Reason
-	retval.Message = pod.Status.Message
-	retval.PodIP = pod.Status.PodIP
-	retval.ControllerRef = metav1.GetControllerOf(pod).String()
-	retval.Containers = make([]*models.Container, len(pod.Spec.Containers))
-	statusMap := map[string]corev1.ContainerStatus{}
-	statusKeys := make([]string, len(pod.Status.ContainerStatuses))
-	for i, status := range pod.Status.ContainerStatuses {
-		statusMap[status.Name] = status
-		statusKeys[i] = status.Name
-
-	}
-	for i := range pod.Spec.Containers {
-		retval.Containers[i] = &models.Container{
-			Name:      pod.Spec.Containers[i].Name,
-			Image:     pod.Spec.Containers[i].Image,
-			Ports:     describeContainerPorts(pod.Spec.Containers[i].Ports),
-			HostPorts: describeContainerHostPorts(pod.Spec.Containers[i].Ports),
-			Args:      pod.Spec.Containers[i].Args,
-		}
-		if slices.Contains(statusKeys, pod.Spec.Containers[i].Name) {
-			retval.Containers[i].ContainerID = statusMap[pod.Spec.Containers[i].Name].ContainerID
-			retval.Containers[i].ImageID = statusMap[pod.Spec.Containers[i].Name].ImageID
-			retval.Containers[i].Ready = statusMap[pod.Spec.Containers[i].Name].Ready
-			retval.Containers[i].RestartCount = int64(statusMap[pod.Spec.Containers[i].Name].RestartCount)
-			retval.Containers[i].State, retval.Containers[i].LastState = describeStatus(statusMap[pod.Spec.Containers[i].Name])
-		}
-		retval.Containers[i].EnvironmentVariables = make([]*models.EnvironmentVariable, len(pod.Spec.Containers[0].Env))
-		for j := range pod.Spec.Containers[i].Env {
-			retval.Containers[i].EnvironmentVariables[j] = &models.EnvironmentVariable{
-				Key:   pod.Spec.Containers[i].Env[j].Name,
-				Value: pod.Spec.Containers[i].Env[j].Value,
-			}
-		}
-		retval.Containers[i].Mounts = make([]*models.Mount, len(pod.Spec.Containers[i].VolumeMounts))
-		for j := range pod.Spec.Containers[i].VolumeMounts {
-			retval.Containers[i].Mounts[j] = &models.Mount{
-				Name:      pod.Spec.Containers[i].VolumeMounts[j].Name,
-				MountPath: pod.Spec.Containers[i].VolumeMounts[j].MountPath,
-				SubPath:   pod.Spec.Containers[i].VolumeMounts[j].SubPath,
-				ReadOnly:  pod.Spec.Containers[i].VolumeMounts[j].ReadOnly,
-			}
-		}
-	}
-	retval.Conditions = make([]*models.Condition, len(pod.Status.Conditions))
-	for i := range pod.Status.Conditions {
-		retval.Conditions[i] = &models.Condition{
-			Type:   string(pod.Status.Conditions[i].Type),
-			Status: string(pod.Status.Conditions[i].Status),
-		}
-	}
-	retval.Volumes = make([]*models.Volume, len(pod.Spec.Volumes))
-	for i := range pod.Spec.Volumes {
-		retval.Volumes[i] = &models.Volume{
-			Name: pod.Spec.Volumes[i].Name,
-		}
-		if pod.Spec.Volumes[i].PersistentVolumeClaim != nil {
-			retval.Volumes[i].Pvc = &models.Pvc{
-				ReadOnly:  pod.Spec.Volumes[i].PersistentVolumeClaim.ReadOnly,
-				ClaimName: pod.Spec.Volumes[i].PersistentVolumeClaim.ClaimName,
-			}
-		} else if pod.Spec.Volumes[i].Projected != nil {
-			retval.Volumes[i].Projected = &models.ProjectedVolume{}
-			retval.Volumes[i].Projected.Sources = make([]*models.ProjectedVolumeSource, len(pod.Spec.Volumes[i].Projected.Sources))
-			for j := range pod.Spec.Volumes[i].Projected.Sources {
-				retval.Volumes[i].Projected.Sources[j] = &models.ProjectedVolumeSource{}
-				if pod.Spec.Volumes[i].Projected.Sources[j].Secret != nil {
-					retval.Volumes[i].Projected.Sources[j].Secret = &models.Secret{
-						Name:     pod.Spec.Volumes[i].Projected.Sources[j].Secret.Name,
-						Optional: pod.Spec.Volumes[i].Projected.Sources[j].Secret.Optional != nil,
-					}
-				}
-				if pod.Spec.Volumes[i].Projected.Sources[j].DownwardAPI != nil {
-					retval.Volumes[i].Projected.Sources[j].DownwardAPI = true
-				}
-				if pod.Spec.Volumes[i].Projected.Sources[j].ConfigMap != nil {
-					retval.Volumes[i].Projected.Sources[j].ConfigMap = &models.ConfigMap{
-						Name:     pod.Spec.Volumes[i].Projected.Sources[j].ConfigMap.Name,
-						Optional: pod.Spec.Volumes[i].Projected.Sources[j].ConfigMap.Optional != nil,
-					}
-				}
-				if pod.Spec.Volumes[i].Projected.Sources[j].ServiceAccountToken != nil {
-					retval.Volumes[i].Projected.Sources[j].ServiceAccountToken = &models.ServiceAccountToken{ExpirationSeconds: *pod.Spec.Volumes[i].Projected.Sources[j].ServiceAccountToken.ExpirationSeconds}
-				}
-			}
-		}
-	}
-	retval.QosClass = string(getPodQOS(pod))
-	nodeSelectorArray := make([]*models.NodeSelector, len(pod.Spec.NodeSelector))
-	i = 0
-	for key := range pod.Spec.NodeSelector {
-		nodeSelectorArray[i] = &models.NodeSelector{Key: key, Value: pod.Spec.NodeSelector[key]}
-		i++
-	}
-	retval.NodeSelector = nodeSelectorArray
-	retval.Tolerations = make([]*models.Toleration, len(pod.Spec.Tolerations))
-	for i := range pod.Spec.Tolerations {
-		retval.Tolerations[i] = &models.Toleration{
-			Effect:            string(pod.Spec.Tolerations[i].Effect),
-			Key:               pod.Spec.Tolerations[i].Key,
-			Value:             pod.Spec.Tolerations[i].Value,
-			Operator:          string(pod.Spec.Tolerations[i].Operator),
-			TolerationSeconds: *pod.Spec.Tolerations[i].TolerationSeconds,
-		}
-	}
-	return retval, nil
-}
-
-func describeStatus(status corev1.ContainerStatus) (*models.State, *models.State) {
-	retval := &models.State{}
-	last := &models.State{}
-	state := status.State
-	lastState := status.LastTerminationState
-	switch {
-	case state.Running != nil:
-		retval.State = "Running"
-		retval.Started = state.Running.StartedAt.Time.Format(time.RFC1123Z)
-	case state.Waiting != nil:
-		retval.State = "Waiting"
-		retval.Reason = state.Waiting.Reason
-	case state.Terminated != nil:
-		retval.State = "Terminated"
-		retval.Message = state.Terminated.Message
-		retval.ExitCode = int64(state.Terminated.ExitCode)
-		retval.Signal = int64(state.Terminated.Signal)
-		retval.Started = state.Terminated.StartedAt.Time.Format(time.RFC1123Z)
-		retval.Finished = state.Terminated.FinishedAt.Time.Format(time.RFC1123Z)
-		switch {
-		case lastState.Running != nil:
-			last.State = "Running"
-			last.Started = lastState.Running.StartedAt.Time.Format(time.RFC1123Z)
-		case lastState.Waiting != nil:
-			last.State = "Waiting"
-			last.Reason = lastState.Waiting.Reason
-		case lastState.Terminated != nil:
-			last.State = "Terminated"
-			last.Message = lastState.Terminated.Message
-			last.ExitCode = int64(lastState.Terminated.ExitCode)
-			last.Signal = int64(lastState.Terminated.Signal)
-			last.Started = lastState.Terminated.StartedAt.Time.Format(time.RFC1123Z)
-			last.Finished = lastState.Terminated.FinishedAt.Time.Format(time.RFC1123Z)
-		default:
-			last.State = "Waiting"
-		}
-	default:
-		retval.State = "Waiting"
-	}
-	return retval, last
-}
-
-func describeContainerPorts(cPorts []corev1.ContainerPort) []string {
-	ports := make([]string, 0, len(cPorts))
-	for _, cPort := range cPorts {
-		ports = append(ports, fmt.Sprintf("%d/%s", cPort.ContainerPort, cPort.Protocol))
-	}
-	return ports
-}
-
-func describeContainerHostPorts(cPorts []corev1.ContainerPort) []string {
-	ports := make([]string, 0, len(cPorts))
-	for _, cPort := range cPorts {
-		ports = append(ports, fmt.Sprintf("%d/%s", cPort.HostPort, cPort.Protocol))
-	}
-	return ports
-}
-
-func getPodQOS(pod *corev1.Pod) corev1.PodQOSClass {
-	requests := corev1.ResourceList{}
-	limits := corev1.ResourceList{}
-	zeroQuantity := resource.MustParse("0")
-	isGuaranteed := true
-	allContainers := []corev1.Container{}
-	allContainers = append(allContainers, pod.Spec.Containers...)
-	allContainers = append(allContainers, pod.Spec.InitContainers...)
-	for _, container := range allContainers {
-		// process requests
-		for name, quantity := range container.Resources.Requests {
-			if !isSupportedQoSComputeResource(name) {
-				continue
-			}
-			if quantity.Cmp(zeroQuantity) == 1 {
-				delta := quantity.DeepCopy()
-				if _, exists := requests[name]; !exists {
-					requests[name] = delta
-				} else {
-					delta.Add(requests[name])
-					requests[name] = delta
-				}
-			}
-		}
-		// process limits
-		qosLimitsFound := sets.NewString()
-		for name, quantity := range container.Resources.Limits {
-			if !isSupportedQoSComputeResource(name) {
-				continue
-			}
-			if quantity.Cmp(zeroQuantity) == 1 {
-				qosLimitsFound.Insert(string(name))
-				delta := quantity.DeepCopy()
-				if _, exists := limits[name]; !exists {
-					limits[name] = delta
-				} else {
-					delta.Add(limits[name])
-					limits[name] = delta
-				}
-			}
-		}
-
-		if !qosLimitsFound.HasAll(string(corev1.ResourceMemory), string(corev1.ResourceCPU)) {
-			isGuaranteed = false
-		}
-	}
-	if len(requests) == 0 && len(limits) == 0 {
-		return corev1.PodQOSBestEffort
-	}
-	// Check is requests match limits for all resources.
-	if isGuaranteed {
-		for name, req := range requests {
-			if lim, exists := limits[name]; !exists || lim.Cmp(req) != 0 {
-				isGuaranteed = false
-				break
-			}
-		}
-	}
-	if isGuaranteed &&
-		len(requests) == len(limits) {
-		return corev1.PodQOSGuaranteed
-	}
-	return corev1.PodQOSBurstable
-}
-
-var supportedQoSComputeResources = sets.NewString(string(corev1.ResourceCPU), string(corev1.ResourceMemory))
-
-func isSupportedQoSComputeResource(name corev1.ResourceName) bool {
-	return supportedQoSComputeResources.Has(string(name))
-}
-
-func translateTimestampSince(timestamp metav1.Time) string {
-	if timestamp.IsZero() {
-		return "<unknown>"
-	}
-
-	return duration.HumanDuration(time.Since(timestamp.Time))
-}
-
-// get values for prometheus metrics
+//get values for prometheus metrics
 func getTenantMonitoringResponse(session *models.Principal, params operator_api.GetTenantMonitoringParams) (*models.TenantMonitoringInfo, *models.Error) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
@@ -2170,10 +1882,12 @@ func getTenantMonitoringResponse(session *models.Principal, params operator_api.
 	}
 
 	return monitoringInfo, nil
+
 }
 
-// sets tenant Prometheus monitoring cofiguration fields to values provided
+//sets tenant Prometheus monitoring cofiguration fields to values provided
 func setTenantMonitoringResponse(session *models.Principal, params operator_api.SetTenantMonitoringParams) (bool, *models.Error) {
+
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 
@@ -2209,19 +1923,19 @@ func setTenantMonitoringResponse(session *models.Principal, params operator_api.
 		return true, nil
 	}
 
-	labels := make(map[string]string)
+	var labels = make(map[string]string)
 	for i := 0; i < len(params.Data.Labels); i++ {
 		if params.Data.Labels[i] != nil {
 			labels[params.Data.Labels[i].Key] = params.Data.Labels[i].Value
 		}
 	}
-	annotations := make(map[string]string)
+	var annotations = make(map[string]string)
 	for i := 0; i < len(params.Data.Annotations); i++ {
 		if params.Data.Annotations[i] != nil {
 			annotations[params.Data.Annotations[i].Key] = params.Data.Annotations[i].Value
 		}
 	}
-	nodeSelector := make(map[string]string)
+	var nodeSelector = make(map[string]string)
 	for i := 0; i < len(params.Data.NodeSelector); i++ {
 		if params.Data.NodeSelector[i] != nil {
 			nodeSelector[params.Data.NodeSelector[i].Key] = params.Data.NodeSelector[i].Value
@@ -2269,6 +1983,7 @@ func setTenantMonitoringResponse(session *models.Principal, params operator_api.
 	}
 
 	return true, nil
+
 }
 
 // parseTenantPoolRequest parse pool request and returns the equivalent
@@ -2739,8 +2454,8 @@ func updateTenantPools(
 	operatorClient OperatorClientI,
 	namespace string,
 	tenantName string,
-	poolsReq []*models.Pool,
-) (*miniov2.Tenant, error) {
+	poolsReq []*models.Pool) (*miniov2.Tenant, error) {
+
 	minInst, err := operatorClient.TenantGet(ctx, namespace, tenantName, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
@@ -2787,7 +2502,7 @@ func getTenantYAML(session *models.Principal, params operator_api.GetTenantYAMLP
 	}
 	// remove managed fields
 	tenant.ManagedFields = []metav1.ManagedFieldsEntry{}
-	// yb, err := yaml.Marshal(tenant)
+	//yb, err := yaml.Marshal(tenant)
 	j8sJSONSerializer := k8sJson.NewSerializerWithOptions(
 		k8sJson.DefaultMetaFactory, nil, nil,
 		k8sJson.SerializerOptions{
@@ -2908,6 +2623,7 @@ func getUpdateDomainsResponse(session *models.Principal, params operator_api.Upd
 }
 
 func updateTenantDomains(ctx context.Context, operatorClient OperatorClientI, namespace string, tenantName string, domainConfig *models.DomainsConfiguration) error {
+
 	minTenant, err := getTenant(ctx, operatorClient, namespace, tenantName)
 	if err != nil {
 		return err

operatorapi/tenants_helper.go

@@ -23,7 +23,6 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"strconv"
 	"time"
@@ -32,6 +31,8 @@ import (
 
 	"github.com/minio/console/operatorapi/operations/operator_api"
 
+	"errors"
+
 	"github.com/minio/console/cluster"
 	"github.com/minio/console/models"
 	"github.com/minio/console/pkg/kes"
@@ -428,6 +429,7 @@ func tenantEncryptionInfo(ctx context.Context, operatorClient OperatorClientI, c
 									}
 								}
 							}
+
 						}
 					}
 					encryptConfig.Gemalto = gemaltoConfig
@@ -686,14 +688,13 @@ func createOrReplaceKesConfigurationSecrets(ctx context.Context, clientSet K8sCl
 	}
 	// miniov2 will mount the mTLSCertificates in the following paths
 	// therefore we set these values in the KES yaml kesConfiguration
-	mTLSClientCrtPath := "/tmp/kes/client.crt"
-	mTLSClientKeyPath := "/tmp/kes/client.key"
-	mTLSClientCaPath := "/tmp/kes/ca.crt"
+	var mTLSClientCrtPath = "/tmp/kes/client.crt"
+	var mTLSClientKeyPath = "/tmp/kes/client.key"
+	var mTLSClientCaPath = "/tmp/kes/ca.crt"
 	// map to hold mTLSCertificates for KES mTLS against Vault
 	mTLSCertificates := map[string][]byte{}
 	// if encryption is enabled and encryption is configured to use Vault
-	switch {
-	case encryptionCfg.Vault != nil:
+	if encryptionCfg.Vault != nil {
 		ping := 10 // default ping
 		if encryptionCfg.Vault.Status != nil {
 			ping = int(encryptionCfg.Vault.Status.Ping)
@@ -749,7 +750,7 @@ func createOrReplaceKesConfigurationSecrets(ctx context.Context, clientSet K8sCl
 				kesConfig.Keys.Vault.TLS.CAPath = mTLSClientCaPath
 			}
 		}
-	case encryptionCfg.Aws != nil:
+	} else if encryptionCfg.Aws != nil {
 		// Initialize AWS
 		kesConfig.Keys.Aws = &kes.Aws{
 			SecretsManager: &kes.AwsSecretManager{},
@@ -768,7 +769,7 @@ func createOrReplaceKesConfigurationSecrets(ctx context.Context, clientSet K8sCl
 				}
 			}
 		}
-	case encryptionCfg.Gemalto != nil:
+	} else if encryptionCfg.Gemalto != nil {
 		// Initialize Gemalto
 		kesConfig.Keys.Gemalto = &kes.Gemalto{
 			KeySecure: &kes.GemaltoKeySecure{},
@@ -798,7 +799,7 @@ func createOrReplaceKesConfigurationSecrets(ctx context.Context, clientSet K8sCl
 				}
 			}
 		}
-	case encryptionCfg.Gcp != nil:
+	} else if encryptionCfg.Gcp != nil {
 		// Initialize GCP
 		kesConfig.Keys.Gcp = &kes.Gcp{
 			SecretManager: &kes.GcpSecretManager{},
@@ -817,7 +818,7 @@ func createOrReplaceKesConfigurationSecrets(ctx context.Context, clientSet K8sCl
 				}
 			}
 		}
-	case encryptionCfg.Azure != nil:
+	} else if encryptionCfg.Azure != nil {
 		// Initialize Azure
 		kesConfig.Keys.Azure = &kes.Azure{
 			KeyVault: &kes.AzureKeyVault{},

operatorapi/tenants_helper_test.go

@@ -30,12 +30,10 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var (
-	DeletePodCollectionMock func(ctx context.Context, namespace string, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error
-	DeleteSecretMock        func(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error
-	CreateSecretMock        func(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.CreateOptions) (*v1.Secret, error)
-	UpdateSecretMock        func(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.UpdateOptions) (*v1.Secret, error)
-)
+var DeletePodCollectionMock func(ctx context.Context, namespace string, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error
+var DeleteSecretMock func(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error
+var CreateSecretMock func(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.CreateOptions) (*v1.Secret, error)
+var UpdateSecretMock func(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.UpdateOptions) (*v1.Secret, error)
 
 func (c k8sClientMock) deletePodCollection(ctx context.Context, namespace string, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error {
 	return DeletePodCollectionMock(ctx, namespace, opts, listOpts)

operatorapi/tenants_test.go

@@ -45,21 +45,17 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 )
 
-var (
-	opClientTenantDeleteMock func(ctx context.Context, namespace string, tenantName string, options metav1.DeleteOptions) error
-	opClientTenantGetMock    func(ctx context.Context, namespace string, tenantName string, options metav1.GetOptions) (*miniov2.Tenant, error)
-	opClientTenantPatchMock  func(ctx context.Context, namespace string, tenantName string, pt types.PatchType, data []byte, options metav1.PatchOptions) (*miniov2.Tenant, error)
-	opClientTenantUpdateMock func(ctx context.Context, tenant *miniov2.Tenant, opts metav1.UpdateOptions) (*miniov2.Tenant, error)
-)
+var opClientTenantDeleteMock func(ctx context.Context, namespace string, tenantName string, options metav1.DeleteOptions) error
+var opClientTenantGetMock func(ctx context.Context, namespace string, tenantName string, options metav1.GetOptions) (*miniov2.Tenant, error)
+var opClientTenantPatchMock func(ctx context.Context, namespace string, tenantName string, pt types.PatchType, data []byte, options metav1.PatchOptions) (*miniov2.Tenant, error)
+var opClientTenantUpdateMock func(ctx context.Context, tenant *miniov2.Tenant, opts metav1.UpdateOptions) (*miniov2.Tenant, error)
 
-var (
-	opClientTenantListMock  func(ctx context.Context, namespace string, opts metav1.ListOptions) (*miniov2.TenantList, error)
-	httpClientGetMock       func(url string) (resp *http.Response, err error)
-	httpClientPostMock      func(url, contentType string, body io.Reader) (resp *http.Response, err error)
-	httpClientDoMock        func(req *http.Request) (*http.Response, error)
-	k8sclientGetSecretMock  func(ctx context.Context, namespace, secretName string, opts metav1.GetOptions) (*corev1.Secret, error)
-	k8sclientGetServiceMock func(ctx context.Context, namespace, serviceName string, opts metav1.GetOptions) (*corev1.Service, error)
-)
+var opClientTenantListMock func(ctx context.Context, namespace string, opts metav1.ListOptions) (*miniov2.TenantList, error)
+var httpClientGetMock func(url string) (resp *http.Response, err error)
+var httpClientPostMock func(url, contentType string, body io.Reader) (resp *http.Response, err error)
+var httpClientDoMock func(req *http.Request) (*http.Response, error)
+var k8sclientGetSecretMock func(ctx context.Context, namespace, secretName string, opts metav1.GetOptions) (*corev1.Secret, error)
+var k8sclientGetServiceMock func(ctx context.Context, namespace, serviceName string, opts metav1.GetOptions) (*corev1.Service, error)
 
 // mock function of TenantDelete()
 func (ac opClientMock) TenantDelete(ctx context.Context, namespace string, tenantName string, options metav1.DeleteOptions) error {
@@ -293,7 +289,7 @@ func Test_TenantInfoTenantAdminClient(t *testing.T) {
 	}
 }
 
-func NoTestTenantInfo(t *testing.T) {
+func Test_TenantInfo(t *testing.T) {
 	testTimeStamp := metav1.Now()
 	type args struct {
 		minioTenant *miniov2.Tenant
@@ -762,8 +758,7 @@ func Test_TenantAddPool(t *testing.T) {
 				},
 			},
 			wantErr: false,
-		},
-		{
+		}, {
 			name: "Add pool, error size",
 			args: args{
 				ctx:            context.Background(),

operatorapi/version.go

@@ -49,8 +49,7 @@ func getVersionResponse(params user_api.CheckMinIOVersionParams) (*models.CheckO
 	ver, err := utils.GetLatestMinIOImage(&xhttp.Client{
 		Client: &http.Client{
 			Timeout: 15 * time.Second,
-		},
-	})
+		}})
 	if err != nil {
 		return nil, errors.ErrorWithContext(ctx, err)
 	}

operatorapi/volumes.go

@@ -30,13 +30,13 @@ import (
 	"github.com/minio/console/models"
 	"github.com/minio/console/operatorapi/operations"
 	"github.com/minio/console/operatorapi/operations/operator_api"
-	v1 "k8s.io/api/certificates/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func registerVolumesHandlers(api *operations.OperatorAPI) {
 	api.OperatorAPIListPVCsHandler = operator_api.ListPVCsHandlerFunc(func(params operator_api.ListPVCsParams, session *models.Principal) middleware.Responder {
 		payload, err := getPVCsResponse(session, params)
+
 		if err != nil {
 			return operator_api.NewListPVCsDefault(int(err.Code)).WithPayload(err)
 		}
@@ -46,6 +46,7 @@ func registerVolumesHandlers(api *operations.OperatorAPI) {
 
 	api.OperatorAPIListPVCsForTenantHandler = operator_api.ListPVCsForTenantHandlerFunc(func(params operator_api.ListPVCsForTenantParams, session *models.Principal) middleware.Responder {
 		payload, err := getPVCsForTenantResponse(session, params)
+
 		if err != nil {
 			return operator_api.NewListPVCsForTenantDefault(int(err.Code)).WithPayload(err)
 		}
@@ -53,15 +54,6 @@ func registerVolumesHandlers(api *operations.OperatorAPI) {
 		return operator_api.NewListPVCsForTenantOK().WithPayload(payload)
 	})
 
-	api.OperatorAPIListTenantCertificateSigningRequestHandler = operator_api.ListTenantCertificateSigningRequestHandlerFunc(func(params operator_api.ListTenantCertificateSigningRequestParams, session *models.Principal) middleware.Responder {
-		payload, err := getTenantCSResponse(session, params)
-		if err != nil {
-			return operator_api.NewListTenantCertificateSigningRequestDefault(int(err.Code)).WithPayload(err)
-		}
-
-		return operator_api.NewListTenantCertificateSigningRequestOK().WithPayload(payload)
-	})
-
 	api.OperatorAPIDeletePVCHandler = operator_api.DeletePVCHandlerFunc(func(params operator_api.DeletePVCParams, session *models.Principal) middleware.Responder {
 		err := getDeletePVCResponse(session, params)
 		if err != nil {
@@ -72,6 +64,7 @@ func registerVolumesHandlers(api *operations.OperatorAPI) {
 
 	api.OperatorAPIGetPVCEventsHandler = operator_api.GetPVCEventsHandlerFunc(func(params operator_api.GetPVCEventsParams, session *models.Principal) middleware.Responder {
 		payload, err := getPVCEventsResponse(session, params)
+
 		if err != nil {
 			return operator_api.NewGetPVCEventsDefault(int(err.Code)).WithPayload(err)
 		}
@@ -79,19 +72,13 @@ func registerVolumesHandlers(api *operations.OperatorAPI) {
 		return operator_api.NewGetPVCEventsOK().WithPayload(payload)
 	})
 
-	api.OperatorAPIGetPVCDescribeHandler = operator_api.GetPVCDescribeHandlerFunc(func(params operator_api.GetPVCDescribeParams, session *models.Principal) middleware.Responder {
-		payload, err := getPVCDescribeResponse(session, params)
-		if err != nil {
-			return operator_api.NewGetPVCDescribeDefault(int(err.Code)).WithPayload(err)
-		}
-		return operator_api.NewGetPVCDescribeOK().WithPayload(payload)
-	})
 }
 
 func getPVCsResponse(session *models.Principal, params operator_api.ListPVCsParams) (*models.ListPVCsResponse, *models.Error) {
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	clientset, err := cluster.K8sClient(session.STSSessionToken)
+
 	if err != nil {
 		return nil, errors.ErrorWithContext(ctx, err)
 	}
@@ -139,6 +126,7 @@ func getPVCsForTenantResponse(session *models.Principal, params operator_api.Lis
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	clientset, err := cluster.K8sClient(session.STSSessionToken)
+
 	if err != nil {
 		return nil, errors.ErrorWithContext(ctx, err)
 	}
@@ -230,115 +218,3 @@ func getPVCEventsResponse(session *models.Principal, params operator_api.GetPVCE
 	})
 	return retval, nil
 }
-
-func getTenantCSResponse(session *models.Principal, params operator_api.ListTenantCertificateSigningRequestParams) (*models.CsrElements, *models.Error) {
-	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
-	defer cancel()
-	clientset, err := cluster.K8sClient(session.STSSessionToken)
-	if err != nil {
-		return nil, errors.ErrorWithContext(ctx, err)
-	}
-
-	// Get CSRs by Label "v1.min.io/tenant=" + params.Tenant
-	listByTenantLabel := metav1.ListOptions{LabelSelector: "v1.min.io/tenant=" + params.Tenant}
-	listResult, listError := clientset.CertificatesV1().CertificateSigningRequests().List(ctx, listByTenantLabel)
-	if listError != nil {
-		return nil, errors.ErrorWithContext(ctx, listError)
-	}
-
-	// Get CSR by label "v1.min.io/kes=" + params.Tenant + "-kes"
-	listByKESLabel := metav1.ListOptions{LabelSelector: "v1.min.io/kes=" + params.Tenant + "-kes"}
-	listKESResult, listKESError := clientset.CertificatesV1().CertificateSigningRequests().List(ctx, listByKESLabel)
-	if listKESError != nil {
-		return nil, errors.ErrorWithContext(ctx, listKESError)
-	}
-
-	var listOfCSRs []v1.CertificateSigningRequest
-	for index := 0; index < len(listResult.Items); index++ {
-		listOfCSRs = append(listOfCSRs, listResult.Items[index])
-	}
-	for index := 0; index < len(listKESResult.Items); index++ {
-		listOfCSRs = append(listOfCSRs, listKESResult.Items[index])
-	}
-
-	var arrayElements []*models.CsrElement
-	for index := 0; index < len(listOfCSRs); index++ {
-		csrResult := listOfCSRs[index]
-		annotations := []*models.Annotation{}
-		for k, v := range csrResult.ObjectMeta.Annotations {
-			annotations = append(annotations, &models.Annotation{Key: k, Value: v})
-		}
-		var DeletionGracePeriodSeconds int64
-		DeletionGracePeriodSeconds = 0
-		if csrResult.ObjectMeta.DeletionGracePeriodSeconds != nil {
-			DeletionGracePeriodSeconds = *csrResult.ObjectMeta.DeletionGracePeriodSeconds
-		}
-		messages := ""
-		// A CSR.Status can contain multiple Conditions
-		for i := 0; i < len(csrResult.Status.Conditions); i++ {
-			messages = messages + " " + csrResult.Status.Conditions[i].Message
-		}
-		retval := &models.CsrElement{
-			Name:                       csrResult.ObjectMeta.Name,
-			Annotations:                annotations,
-			DeletionGracePeriodSeconds: DeletionGracePeriodSeconds,
-			GenerateName:               csrResult.ObjectMeta.GenerateName,
-			Generation:                 csrResult.ObjectMeta.Generation,
-			Namespace:                  csrResult.ObjectMeta.Namespace,
-			ResourceVersion:            csrResult.ObjectMeta.ResourceVersion,
-			Status:                     messages,
-		}
-		arrayElements = append(arrayElements, retval)
-	}
-	result := &models.CsrElements{CsrElement: arrayElements}
-	return result, nil
-}
-
-func getPVCDescribeResponse(session *models.Principal, params operator_api.GetPVCDescribeParams) (*models.DescribePVCWrapper, *models.Error) {
-	clientSet, err := cluster.K8sClient(session.STSSessionToken)
-	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
-	defer cancel()
-	if err != nil {
-		return nil, errors.ErrorWithContext(ctx, err)
-	}
-	k8sClient := k8sClient{client: clientSet}
-	return getPVCDescribe(ctx, params.Namespace, params.PVCName, &k8sClient)
-}
-
-func getPVCDescribe(ctx context.Context, namespace string, pvcName string, clientSet K8sClientI) (*models.DescribePVCWrapper, *models.Error) {
-	pvc, err := clientSet.getPVC(ctx, namespace, pvcName, metav1.GetOptions{})
-	if err != nil {
-		return nil, errors.ErrorWithContext(ctx, err)
-	}
-	accessModes := []string{}
-	for _, a := range pvc.Status.AccessModes {
-		accessModes = append(accessModes, string(a))
-	}
-	return &models.DescribePVCWrapper{
-		Name:         pvc.Name,
-		Namespace:    pvc.Namespace,
-		StorageClass: *pvc.Spec.StorageClassName,
-		Status:       string(pvc.Status.Phase),
-		Volume:       pvc.Spec.VolumeName,
-		Labels:       castLabels(pvc.Labels),
-		Annotations:  castAnnotations(pvc.Annotations),
-		Finalizers:   pvc.Finalizers,
-		Capacity:     pvc.Status.Capacity.Storage().String(),
-		AccessModes:  accessModes,
-		VolumeMode:   string(*pvc.Spec.VolumeMode),
-	}, nil
-}
-
-func castLabels(labelsToCast map[string]string) (labels []*models.Label) {
-	for k, v := range labelsToCast {
-		labels = append(labels, &models.Label{Key: k, Value: v})
-	}
-	return labels
-}
-
-func castAnnotations(annotationsToCast map[string]string) (annotations []*models.Annotation) {
-	for k, v := range annotationsToCast {
-		annotations = append(annotations, &models.Annotation{Key: k, Value: v})
-	}
-	return annotations
-}

operatorapi/volumes_test.go

@@ -1,81 +0,0 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package operatorapi
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-var (
-	getPVCWithError  = true
-	pvcMockName      = "mockName"
-	pvcMockNamespace = "mockNamespace"
-)
-
-func (c k8sClientMock) getPVC(ctx context.Context, namespace string, pvcName string, opts metav1.GetOptions) (*v1.PersistentVolumeClaim, error) {
-	if getPVCWithError {
-		return nil, errors.New("Mock error during getPVC")
-	}
-	return createMockPVC(pvcMockName, pvcMockNamespace), nil
-}
-
-var testCasesGetPVCDescribe = []struct {
-	name          string
-	errorExpected bool
-}{
-	{
-		name:          "Successful getPVCDescribe",
-		errorExpected: false,
-	},
-	{
-		name:          "Error getPVCDescribe",
-		errorExpected: true,
-	},
-}
-
-func TestGetPVCDescribe(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	kClient := k8sClientMock{}
-	for _, tt := range testCasesGetPVCDescribe {
-		t.Run(tt.name, func(t *testing.T) {
-			getPVCWithError = tt.errorExpected
-			pvc, err := getPVCDescribe(ctx, pvcMockNamespace, pvcMockName, kClient)
-			if err != nil {
-				if tt.errorExpected {
-					return
-				}
-				t.Errorf("getPVCDescribe() error = %v, errorExpected %v", err, tt.errorExpected)
-			}
-			if pvc == nil {
-				t.Errorf("getPVCDescribe() expected type: *v1.PersistentVolumeClaim, got: nil")
-				return
-			}
-			if pvc.Name != pvcMockName {
-				t.Errorf("Expected pvc name %s got %s", pvc.Name, pvcMockName)
-			}
-			if pvc.Namespace != pvcMockNamespace {
-				t.Errorf("Expected pvc namespace %s got %s", pvc.Namespace, pvcMockNamespace)
-			}
-		})
-	}
-}

pkg/auth/idp/oauth2/provider.go

@@ -41,7 +41,7 @@ import (
 type Configuration interface {
 	Exchange(ctx context.Context, code string, opts ...xoauth2.AuthCodeOption) (*xoauth2.Token, error)
 	AuthCodeURL(state string, opts ...xoauth2.AuthCodeOption) string
-	PasswordCredentialsToken(ctx context.Context, username, password string) (*xoauth2.Token, error)
+	PasswordCredentialsToken(ctx context.Context, username string, password string) (*xoauth2.Token, error)
 	Client(ctx context.Context, t *xoauth2.Token) *http.Client
 	TokenSource(ctx context.Context, t *xoauth2.Token) xoauth2.TokenSource
 }
@@ -76,7 +76,7 @@ func (ac Config) AuthCodeURL(state string, opts ...xoauth2.AuthCodeOption) strin
 	return ac.AuthCodeURL(state, opts...)
 }
 
-func (ac Config) PasswordCredentialsToken(ctx context.Context, username, password string) (*xoauth2.Token, error) {
+func (ac Config) PasswordCredentialsToken(ctx context.Context, username string, password string) (*xoauth2.Token, error) {
 	return ac.PasswordCredentialsToken(ctx, username, password)
 }
 

pkg/auth/idp/oauth2/provider_test.go

@@ -27,13 +27,11 @@ import (
 
 type Oauth2configMock struct{}
 
-var (
-	oauth2ConfigExchangeMock                 func(ctx context.Context, code string, opts ...oauth2.AuthCodeOption) (*oauth2.Token, error)
-	oauth2ConfigAuthCodeURLMock              func(state string, opts ...oauth2.AuthCodeOption) string
-	oauth2ConfigPasswordCredentialsTokenMock func(ctx context.Context, username, password string) (*oauth2.Token, error)
-	oauth2ConfigClientMock                   func(ctx context.Context, t *oauth2.Token) *http.Client
-	oauth2ConfigokenSourceMock               func(ctx context.Context, t *oauth2.Token) oauth2.TokenSource
-)
+var oauth2ConfigExchangeMock func(ctx context.Context, code string, opts ...oauth2.AuthCodeOption) (*oauth2.Token, error)
+var oauth2ConfigAuthCodeURLMock func(state string, opts ...oauth2.AuthCodeOption) string
+var oauth2ConfigPasswordCredentialsTokenMock func(ctx context.Context, username string, password string) (*oauth2.Token, error)
+var oauth2ConfigClientMock func(ctx context.Context, t *oauth2.Token) *http.Client
+var oauth2ConfigokenSourceMock func(ctx context.Context, t *oauth2.Token) oauth2.TokenSource
 
 func (ac Oauth2configMock) Exchange(ctx context.Context, code string, opts ...oauth2.AuthCodeOption) (*oauth2.Token, error) {
 	return oauth2ConfigExchangeMock(ctx, code, opts...)
@@ -43,7 +41,7 @@ func (ac Oauth2configMock) AuthCodeURL(state string, opts ...oauth2.AuthCodeOpti
 	return oauth2ConfigAuthCodeURLMock(state, opts...)
 }
 
-func (ac Oauth2configMock) PasswordCredentialsToken(ctx context.Context, username, password string) (*oauth2.Token, error) {
+func (ac Oauth2configMock) PasswordCredentialsToken(ctx context.Context, username string, password string) (*oauth2.Token, error) {
 	return oauth2ConfigPasswordCredentialsTokenMock(ctx, username, password)
 }
 

pkg/auth/token.go

@@ -233,7 +233,7 @@ func encrypt(plaintext, associatedData []byte) ([]byte, error) {
 // Decrypts a blob of data using AEAD scheme AES-GCM if the executing CPU
 // provides AES hardware support, otherwise will use ChaCha20-Poly1305with
 // and a pbkdf2 derived key
-func decrypt(ciphertext, associatedData []byte) ([]byte, error) {
+func decrypt(ciphertext []byte, associatedData []byte) ([]byte, error) {
 	var (
 		algorithm [1]byte
 		iv        [16]byte
@@ -257,7 +257,7 @@ func decrypt(ciphertext, associatedData []byte) ([]byte, error) {
 		mac := hmac.New(sha256.New, derivedKey())
 		mac.Write(iv[:])
 		sealingKey := mac.Sum(nil)
-		block, err := aes.NewCipher(sealingKey)
+		block, err := aes.NewCipher(sealingKey[:])
 		if err != nil {
 			return nil, err
 		}

pkg/auth/token_test.go

@@ -29,11 +29,8 @@ var creds = &credentials.Value{
 	SessionToken:    "fakeSessionToken",
 	SignerType:      0,
 }
-
-var (
-	goodToken = ""
-	badToken  = "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjoiRDMwYWE0ekQ1bWtFaFRyWm5yOWM3NWh0Yko0MkROOWNDZVQ5RHVHUkg1U25SR3RyTXZNOXBMdnlFSVJAAAE5eWxxekhYMXllck8xUXpzMlZzRVFKeUF2ZmpOaDkrTVdoUURWZ2FhK2R5emxzSjNpK0k1dUdoeW5DNWswUW83WEY0UWszY0RtUTdUQUVROVFEbWRKdjBkdVB5L25hQk5vM3dIdlRDZHFNRDJZN3kycktJbmVUbUlFNmVveW9EWmprcW5tckVoYmMrTlhTRU81WjZqa1kwZ1E2eXZLaWhUZGxBRS9zS1lBNlc4Q1R1cm1MU0E0b0dIcGtldFZWU0VXMHEzNU9TU1VaczRXNkxHdGMxSTFWVFZLWUo3ZTlHR2REQ3hMWGtiZHQwcjl0RDNMWUhWRndra0dSZit5ZHBzS1Y3L1Jtbkp3SHNqNVVGV0w5WGVHUkZVUjJQclJTN2plVzFXeGZuYitVeXoxNVpOMzZsZ01GNnBlWFd1LzJGcEtrb2Z2QzNpY2x5Rmp0SE45ZkxYTVpVSFhnV2lsQWVSa3oiLCJhdWQiOiJodHRwOi8vbG9jYWxob3N0OjkwMDAiLCJleHAiOjE1ODc1MTY1NzEsInN1YiI6ImZmYmY4YzljLTJlMjYtNGMwYS1iMmI0LTYyMmVhM2I1YjZhYiJ9.P392RUwzsrBeJOO3fS1xMZcF-lWiDvWZ5hM7LZOyFMmoG5QLccDU5eAPSm8obzPoznX1b7eCFLeEmKK-vKgjiQ"
-)
+var goodToken = ""
+var badToken = "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjoiRDMwYWE0ekQ1bWtFaFRyWm5yOWM3NWh0Yko0MkROOWNDZVQ5RHVHUkg1U25SR3RyTXZNOXBMdnlFSVJAAAE5eWxxekhYMXllck8xUXpzMlZzRVFKeUF2ZmpOaDkrTVdoUURWZ2FhK2R5emxzSjNpK0k1dUdoeW5DNWswUW83WEY0UWszY0RtUTdUQUVROVFEbWRKdjBkdVB5L25hQk5vM3dIdlRDZHFNRDJZN3kycktJbmVUbUlFNmVveW9EWmprcW5tckVoYmMrTlhTRU81WjZqa1kwZ1E2eXZLaWhUZGxBRS9zS1lBNlc4Q1R1cm1MU0E0b0dIcGtldFZWU0VXMHEzNU9TU1VaczRXNkxHdGMxSTFWVFZLWUo3ZTlHR2REQ3hMWGtiZHQwcjl0RDNMWUhWRndra0dSZit5ZHBzS1Y3L1Jtbkp3SHNqNVVGV0w5WGVHUkZVUjJQclJTN2plVzFXeGZuYitVeXoxNVpOMzZsZ01GNnBlWFd1LzJGcEtrb2Z2QzNpY2x5Rmp0SE45ZkxYTVpVSFhnV2lsQWVSa3oiLCJhdWQiOiJodHRwOi8vbG9jYWxob3N0OjkwMDAiLCJleHAiOjE1ODc1MTY1NzEsInN1YiI6ImZmYmY4YzljLTJlMjYtNGMwYS1iMmI0LTYyMmVhM2I1YjZhYiJ9.P392RUwzsrBeJOO3fS1xMZcF-lWiDvWZ5hM7LZOyFMmoG5QLccDU5eAPSm8obzPoznX1b7eCFLeEmKK-vKgjiQ"
 
 func TestNewJWTWithClaimsForClient(t *testing.T) {
 	funcAssert := assert.New(t)

pkg/auth/utils/utils_test.go

@@ -38,9 +38,9 @@ func TestRandomCharString(t *testing.T) {
 func TestComputeHmac256(t *testing.T) {
 	funcAssert := assert.New(t)
 	// Test-1 : ComputeHmac256() should return the right Hmac256 string based on a derived key
-	derivedKey := pbkdf2.Key([]byte("secret"), []byte("salt"), 4096, 32, sha1.New)
-	message := "hello world"
-	expectedHmac := "5r32q7W+0hcBnqzQwJJUDzVGoVivXGSodTcHSqG/9Q8="
+	var derivedKey = pbkdf2.Key([]byte("secret"), []byte("salt"), 4096, 32, sha1.New)
+	var message = "hello world"
+	var expectedHmac = "5r32q7W+0hcBnqzQwJJUDzVGoVivXGSodTcHSqG/9Q8="
 	hmac := ComputeHmac256(message, derivedKey)
 	funcAssert.Equal(hmac, expectedHmac)
 }

pkg/certs/certs.go

@@ -119,7 +119,7 @@ func ParsePublicCertFile(certFile string) (x509Certs []*x509.Certificate, err er
 
 // MkdirAllIgnorePerm attempts to create all directories, ignores any permission denied errors.
 func MkdirAllIgnorePerm(path string) error {
-	err := os.MkdirAll(path, 0o700)
+	err := os.MkdirAll(path, 0700)
 	if err != nil {
 		// It is possible in kubernetes like deployments this directory
 		// is already mounted and is not writable, ignore any write errors.
@@ -250,7 +250,7 @@ func GetTLSConfig() (x509Certs []*x509.Certificate, manager *xcerts.Manager, err
 		return nil, nil, err
 	}
 
-	// Console has support for multiple certificates. It expects the following structure:
+	//Console has support for multiple certificates. It expects the following structure:
 	// certs/
 	//  │
 	//  ├─ public.crt
@@ -266,8 +266,8 @@ func GetTLSConfig() (x509Certs []*x509.Certificate, manager *xcerts.Manager, err
 	//     └─ private.key
 	//  ...
 	//
-	// Therefore, we read all filenames in the cert directory and check
-	// for each directory whether it contains a public.crt and private.key.
+	//Therefore, we read all filenames in the cert directory and check
+	//for each directory whether it contains a public.crt and private.key.
 	// If so, we try to add it to certificate manager.
 	root, err := os.Open(GlobalCertsDir.Get())
 	if err != nil {

pkg/logger/audit.go

@@ -144,7 +144,7 @@ func GetAuditEntry(ctx context.Context) *audit.Entry {
 		}
 		r = &audit.Entry{
 			Version: audit.Version,
-			// DeploymentID: globalDeploymentID,
+			//DeploymentID: globalDeploymentID,
 			Time: time.Now().UTC(),
 		}
 		SetAuditEntry(ctx, r)

pkg/logger/logger.go

@@ -144,7 +144,7 @@ func uniqueEntries(paths []string) []string {
 // and GOROOT directories. Also append github.com/minio/minio
 // This is done to clean up the filename, when stack trace is
 // displayed when an errors happens.
-func Init(goPath, goRoot string) {
+func Init(goPath string, goRoot string) {
 	var goPathList []string
 	var goRootList []string
 	var defaultgoPathList []string

pkg/logger/message/audit/entry_test.go

@@ -59,6 +59,7 @@ func TestNewEntry(t *testing.T) {
 }
 
 func TestToEntry(t *testing.T) {
+
 	req := httptest.NewRequest(http.MethodGet, "/api/v1/tenants?test=xyz", nil)
 	req.Header.Set("Authorization", "xyz")
 	req.Header.Set("ETag", "\"ABCDE\"")
@@ -90,6 +91,7 @@ func TestToEntry(t *testing.T) {
 			},
 			postFunc: func() {
 				os.Unsetenv("CONSOLE_OPERATOR_MODE")
+
 			},
 			name: "constructs an audit entry from a http request",
 			args: args{

pkg/logger/target/http/http.go

@@ -105,7 +105,8 @@ func (h *Target) Init() error {
 	xhttp.DrainBody(resp.Body)
 
 	if !acceptedResponseStatusCode(resp.StatusCode) {
-		if resp.StatusCode == http.StatusForbidden {
+		switch resp.StatusCode {
+		case http.StatusForbidden:
 			return fmt.Errorf("%s returned '%s', please check if your auth token is correctly set",
 				h.config.Endpoint, resp.Status)
 		}

pkg/subnet/config_test.go

@@ -34,6 +34,7 @@ mr/cKCUyBL7rcAvg0zNq1vcSrUSGlAmY3SEDCu3GOKnjG/U4E7+p957ocWSV+mQU
 )
 
 func TestGetLicenseInfoFromJWT(t *testing.T) {
+
 	mockLicense, _ := GetLicenseInfoFromJWT(license, publicKeys)
 
 	type args struct {

pkg/subnet/const.go

@@ -16,13 +16,15 @@
 
 package subnet
 
-var OfflinePublicKeys = []string{
-	`-----BEGIN PUBLIC KEY-----
+var (
+	OfflinePublicKeys = []string{
+		`-----BEGIN PUBLIC KEY-----
 MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEaK31xujr6/rZ7ZfXZh3SlwovjC+X8wGq
 qkltaKyTLRENd4w3IRktYYCRgzpDLPn/nrf7snV/ERO5qcI7fkEES34IVEr+2Uff
 JkO2PfyyAYEO/5dBlPh1Undu9WQl6J7B
 -----END PUBLIC KEY-----`, // https://subnet.min.io/downloads/license-pubkey.pem
-}
+	}
+)
 
 const (
 	// Constants for subnet configuration

pkg/utils/parity.go

@@ -56,7 +56,7 @@ var isValidSetSize = func(count uint64) bool {
 // input argument patterns, the symmetry calculation is to ensure that
 // we also use uniform number of drives common across all ellipses patterns.
 func possibleSetCountsWithSymmetry(setCounts []uint64, argPatterns []ellipses.ArgPattern) []uint64 {
-	newSetCounts := make(map[uint64]struct{})
+	var newSetCounts = make(map[uint64]struct{})
 	for _, ss := range setCounts {
 		var symmetry bool
 		for _, argPattern := range argPatterns {
@@ -177,7 +177,7 @@ func getTotalSizes(argPatterns []ellipses.ArgPattern) []uint64 {
 	for _, argPattern := range argPatterns {
 		var totalSize uint64 = 1
 		for _, p := range argPattern {
-			totalSize *= uint64(len(p.Seq))
+			totalSize = totalSize * uint64(len(p.Seq))
 		}
 		totalSizes = append(totalSizes, totalSize)
 	}
@@ -206,7 +206,7 @@ func PossibleParityValues(args ...string) ([]string, error) {
 // of endpoints following the ellipses pattern, this is what is used
 // by the object layer for initializing itself.
 func parseEndpointSet(args ...string) (setIndexes [][]uint64, err error) {
-	argPatterns := make([]ellipses.ArgPattern, len(args))
+	var argPatterns = make([]ellipses.ArgPattern, len(args))
 	for i, arg := range args {
 		patterns, err := ellipses.FindEllipsesPatterns(arg)
 		if err != nil {