update all other dependent packages

.dockerignore

@@ -1,7 +1,6 @@
 node_modules/
 dist/
 target/
-console
-!console/
+mcs
+!mcs/
 portal-ui/node_modules/
-.git/

.github/workflows/codeql.yml

@@ -0,0 +1,52 @@
+name: "Code scanning - action"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 19 * * 0'
+
+jobs:
+  CodeQL-Build:
+
+    # CodeQL runs on ubuntu-latest and windows-latest
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/go.yml

@@ -0,0 +1,36 @@
+name: Go
+
+on:
+  pull_request:
+    branches:
+    - master
+  push:
+    branches:
+    - master
+
+jobs:
+  build:
+    name: Test on Go ${{ matrix.go-version }} and ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go-version: [1.13.x, 1.14.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
+
+      - name: Build on ${{ matrix.os }}
+        env:
+          GO111MODULE: on
+          GOOS: linux
+        run: |
+          make verifiers
+          make test
+          make mcs

.github/workflows/jobs.yaml

@@ -1,622 +0,0 @@
-name: Workflow
-
-on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - master
-
-# This ensures that previous jobs for the PR are canceled when the PR is
-# updated.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
-jobs:
-  lint-job:
-    name: Checking Lint
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make verifiers
-
-  no-warnings-and-make-assets:
-    name: "React Code Has No Warnings and then Make Assets"
-    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: '17'
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Check out operator as a nested repository
-        uses: actions/checkout@v2
-        with:
-          repository: minio/operator
-          path: operator
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - 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/
-          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-
-
-      - name: Install Dependencies
-        working-directory: ./portal-ui
-        continue-on-error: false
-        run: |
-          yarn install
-      - name: Check for Warnings in build output
-        working-directory: ./portal-ui
-        continue-on-error: false
-        run: |
-          ./check-warnings.sh
-
-  compile-job:
-    name: Compiles on Go ${{ matrix.go-version }} and ${{ matrix.os }}
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make console
-
-  cross-compile-1:
-    name: Cross compile
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make crosscompile arg1="'linux/ppc64le linux/mips64'"
-
-  cross-compile-2:
-    name: Cross compile 2
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make crosscompile arg1="'linux/arm64 linux/s390x'"
-
-  cross-compile-3:
-    name: Cross compile 3
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make crosscompile arg1="'darwin/amd64 freebsd/amd64'"
-
-  cross-compile-4:
-    name: Cross compile 4
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make crosscompile arg1="'windows/amd64 linux/arm'"
-
-  cross-compile-5:
-    name: Cross compile 5
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make crosscompile arg1="'linux/386 netbsd/amd64'"
-
-  test-pkg-on-go:
-    name: Test Pkg on Go ${{ matrix.go-version }} and ${{ matrix.os }}
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make test-pkg
-
-  test-restapi-on-go:
-    name: Test Restapi on Go ${{ matrix.go-version }} and ${{ matrix.os }}
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make test
-
-  integration-tests:
-    name: Integration Tests with Latest Distributed MinIO
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        go-version: [ 1.17.x ]
-
-    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
-
-      # To build minio image, we need to clone the repository first
-      - name: clone https://github.com/minio/minio
-        uses: actions/checkout@master
-        with:
-
-          # Repository name with owner. For example, actions/checkout
-          # Default: ${{ github.repository }}
-          repository: minio/minio
-          
-          # Relative path under $GITHUB_WORKSPACE to place the repository
-          # To have two repositories under the same test
-          path: 'minio_repository'
-
-      - name: Build on ${{ matrix.os }}
-        run: |
-          echo "The idea is to build minio image from downloaded repository";
-          cd $GITHUB_WORKSPACE/minio_repository;
-          echo "Get git version to build MinIO Image";
-          VERSION=`git rev-parse HEAD`;
-          echo $VERSION;
-          echo "Create minio image";
-          make docker VERSION=$VERSION;
-          echo "Jumping back to console repository to run the integration test"
-          cd $GITHUB_WORKSPACE;
-          echo "We are going to use the built image on test-integration";
-          VERSION="minio/minio:$VERSION";
-          echo $VERSION;
-          make test-integration MINIO_VERSION=$VERSION;
-
-  react-tests:
-    name: React Tests
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install modules
-        working-directory: ./portal-ui
-        run: yarn
-      - name: Run tests
-        working-directory: ./portal-ui
-        run: yarn test
-
-  operator-tests:
-    name: Operator Tests
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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: '17'
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Check out operator as a nested repository
-        uses: actions/checkout@v2
-        with:
-          repository: minio/operator
-          path: operator
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - 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/
-          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-
-
-      - name: Build Console on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make console
-
-      # Runs a set of commands using the runners shell
-      - name: Start Kind for Operator UI
-        run: |
-          "${GITHUB_WORKSPACE}/portal-ui/tests/scripts/operator.sh"
-
-      - name: Run TestCafe Tests
-        uses: DevExpress/testcafe-action@latest
-        with:
-          args: '"chrome:headless" portal-ui/tests/operator/ --skip-js-errors -c 3'
-
-  permissions:
-    name: Permissions Tests
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - coverage
-    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: '17'
-      - 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-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - 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-
-
-      - 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
-        uses: DevExpress/testcafe-action@latest
-        with:
-          args: '"chrome:headless" portal-ui/tests/permissions/ --skip-js-errors -c 3'
-
-      - name: Clean up users & policies
-        run: |
-          make cleanup-permissions
-
-  coverage:
-    name: "Coverage Limit Check"
-    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: '17'
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Check out gocovmerge as a nested repository
-        uses: actions/checkout@v2
-        with:
-          repository: wadey/gocovmerge
-          path: gocovmerge
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Get coverage
-        run: |
-          cd restapi
-          go test -coverprofile=coverage.out
-          cd ../integration
-          go test -coverpkg=../restapi -c -tags testrunmain .
-          docker network create --subnet=173.18.0.0/29 mynet123
-          docker run -v /data1 -v /data2 -v /data3 -v /data4 --net=mynet123 -d --name minio --rm -p 9000:9000 "quay.io/minio/minio:latest" server /data{1...4}
-          docker run --net=mynet123 --ip=173.18.0.3 --name pgsqlcontainer --rm -p 5432:5432 -e POSTGRES_PASSWORD=password -d postgres
-          ./integration.test -test.run "^Test*" -test.coverprofile=system.out
-          echo "change directory to gocovmerge"
-          cd ../gocovmerge
-          echo "download golang x tools"
-          go mod download golang.org/x/tools
-          echo "go mod tidy compat mode"
-          go mod tidy -compat=1.17
-          echo "go build gocoverage.go"
-          go build gocovmerge.go 
-          echo "put together the outs for final coverage resolution"
-          ./gocovmerge ../integration/system.out ../restapi/coverage.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%\%}
-          echo "result:"
-          echo $result
-          threshold=40
-          if (( $(echo "$result > $threshold" |bc -l) )); then
-            echo "greater than threshold, passed!"
-          else
-            echo "smaller than threshold, failed!"
-            exit 1
-          fi

.gitignore

@@ -19,15 +19,11 @@ vendor/
 
 # Ignore executables
 target/
-console
-!console/
+mcs
+!mcs/
 
 dist/
 
-# Ignore node_modules
-
-portal-ui/node_modules/
-
 # Ignore tls cert and key
 private.key
 public.crt
@@ -35,5 +31,4 @@ public.crt
 # Ignore VsCode files
 .vscode/
 *.code-workspace
-*~
-.eslintcache
+*~

.golangci.yml

@@ -12,36 +12,17 @@ linters:
     - goimports
     - misspell
     - govet
-    - revive
+    - golint
     - ineffassign
     - gosimple
     - deadcode
     - unparam
     - unused
     - structcheck
-    - goheader
-
-linters-settings:
-  goheader:
-    values:
-      regexp:
-        copyright-holder: Copyright \(c\) (20\d\d\-20\d\d)|2021|({{year}})
-    template-path: .license.tmpl
 
 service:
-  golangci-lint-version: 1.43.0 # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.21.0 # use the fixed version to not introduce new linters unexpectedly
 
-issues:
-  exclude-use-default: false
-  exclude:
-      - should have a package comment
-      # TODO(y4m4): Remove once all exported ident. have comments!      
-      - comment on exported function
-      - comment on exported type
-      - should have comment
-      - use leading k in Go names
-      - comment on exported const
 run:
   skip-dirs:
     - pkg/clientgen
-    - pkg/apis/networking.gke.io

.goreleaser.yml

@@ -1,195 +1,75 @@
 # This is an example goreleaser.yaml file with some sane defaults.
 # Make sure to check the documentation at http://goreleaser.com
-project_name: console
-
-release:
-   name_template: "Release version {{.Tag}}"
-   github:
-    owner: minio
-    name: console
-   extra_files:
-     - glob: "*.minisig"
+project_name: mcs
 
 before:
   hooks:
     # you may remove this if you don't use vgo
-    - go mod tidy -compat=1.17
-
+    - go mod tidy
 builds:
   -
     goos:
+      - freebsd
+      - windows
       - linux
       - darwin
-      - windows
     goarch:
       - amd64
-      - ppc64le
-      - s390x
       - arm64
-    ignore:
-      - goos: darwin
-        goarch: arm
-      - goos: windows
-        goarch: arm64
-      - goos: windows
-        goarch: arm
-
     env:
       - CGO_ENABLED=0
-
-    main: ./cmd/console/
-
+    main: ./cmd/mcs/
     flags:
       - -trimpath
-      - --tags=kqueue,operator
-
+      - --tags=kqueue
     ldflags:
-      - -s -w -X github.com/minio/console/pkg.ReleaseTag={{.Tag}} -X github.com/minio/console/pkg.CommitID={{.FullCommit}} -X github.com/minio/console/pkg.Version={{.Version}} -X github.com/minio/console/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/console/pkg.ReleaseTime={{.Date}}
-
+      - -s -w -X github.com/minio/mcs/pkg.ReleaseTag={{.Tag}} -X github.com/minio/mcs/pkg.CommitID={{.FullCommit}} -X github.com/minio/mcs/pkg.Version={{.Version}} -X github.com/minio/mcs/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/mcs/pkg.ReleaseTime={{.Date}}
 archives:
   -
-    name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
-    format: binary
     replacements:
-      arm: arm
-
-signs:
-  -
-    signature: "${artifact}.minisig"
-    cmd: "sh"
-    args:
-      - '-c'
-      - 'minisign -s /media/${USER}/minio/minisign.key -Sm ${artifact} < /media/${USER}/minio/minisign-passphrase'
-    artifacts: all
-
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      freebsd: FreeBSD
+      amd64: x86_64
+    format_overrides:
+      - goos: windows
+        format: zip
+    files:
+      - README.md
+      - LICENSE
+checksum:
+  name_template: 'checksums.txt'
 snapshot:
-  name_template: v0.0.0@{{.ShortCommit}}
-
+  name_template: 'snapshot-{{ time "2006-01-02" }}'
 changelog:
   sort: asc
-
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
 nfpms:
   -
-    vendor: MinIO, Inc.
-    homepage: https://github.com/minio/console
-    maintainer: MinIO Development <dev@min.io>
+    vendor: MinIO Inc.
+    homepage: https://github.com/minio/mcs
+    maintainer: MinIO <minio@minio.io>
     description: MinIO Console Server
     license: GNU Affero General Public License v3.0
     formats:
       - deb
       - rpm
-    contents:
-      # Basic file that applies to all packagers
-      - src: systemd/console.service
-        dst: /etc/systemd/system/minio-console.service
-
+    replacements:
+      darwin: Darwin
+      linux: Linux
+      freebsd: FreeBSD
+      amd64: x86_64
 dockers:
-- image_templates:
-  - "minio/console:{{ .Tag }}-amd64"
-  use: buildx
-  goarch: amd64
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/amd64"
-  - "--build-arg=TAG={{ .Tag }}"
-- image_templates:
-  - "minio/console:{{ .Tag }}-ppc64le"
-  use: buildx
-  goarch: ppc64le
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/ppc64le"
-  - "--build-arg=TAG={{ .Tag }}"
-- image_templates:
-  - "minio/console:{{ .Tag }}-s390x"
-  use: buildx
-  goarch: s390x
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/s390x"
-  - "--build-arg=TAG={{ .Tag }}"
-- image_templates:
-  - "minio/console:{{ .Tag }}-arm64"
-  use: buildx
-  goarch: arm64
-  goos: linux
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/arm64"
-  - "--build-arg=TAG={{ .Tag }}"
-- image_templates:
-  - "quay.io/minio/console:{{ .Tag }}-amd64"
-  use: buildx
-  goarch: amd64
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/amd64"
-  - "--build-arg=TAG={{ .Tag }}"
-- image_templates:
-  - "quay.io/minio/console:{{ .Tag }}-ppc64le"
-  use: buildx
-  goarch: ppc64le
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/ppc64le"
-  - "--build-arg=TAG={{ .Tag }}"
-- image_templates:
-  - "quay.io/minio/console:{{ .Tag }}-s390x"
-  use: buildx
-  goarch: s390x
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/s390x"
-  - "--build-arg=TAG={{ .Tag }}"
-- image_templates:
-  - "quay.io/minio/console:{{ .Tag }}-arm64"
-  use: buildx
-  goarch: arm64
-  goos: linux
-  dockerfile: Dockerfile.release
-  extra_files:
-    - LICENSE
-    - CREDITS
-  build_flag_templates:
-  - "--platform=linux/arm64"
-  - "--build-arg=TAG={{ .Tag }}"
-docker_manifests:
-- name_template: minio/console:{{ .Tag }}
-  image_templates:
-  - minio/console:{{ .Tag }}-amd64
-  - minio/console:{{ .Tag }}-arm64
-  - minio/console:{{ .Tag }}-ppc64le
-  - minio/console:{{ .Tag }}-s390x
-- name_template: quay.io/minio/console:{{ .Tag }}
-  image_templates:
-  - quay.io/minio/console:{{ .Tag }}-amd64
-  - quay.io/minio/console:{{ .Tag }}-arm64
-  - quay.io/minio/console:{{ .Tag }}-ppc64le
-  - quay.io/minio/console:{{ .Tag }}-s390x
-- name_template: minio/console:latest
-  image_templates:
-  - minio/console:{{ .Tag }}-amd64
-  - minio/console:{{ .Tag }}-arm64
-  - minio/console:{{ .Tag }}-ppc64le
-  - minio/console:{{ .Tag }}-s390x
+  -
+    # GOOS of the built binary that should be used.
+    goos: linux
+    # GOARCH of the built binary that should be used.
+    goarch: amd64
+    dockerfile: Dockerfile.release
+    image_templates:
+      - "minio/mcs:{{ .Tag }}"
+      - "minio/mcs:latest"

.license.tmpl

@@ -1,15 +0,0 @@
-This file is part of MinIO Console Server
-{{copyright-holder}} 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/>.

CONTRIBUTING.md

@@ -20,7 +20,7 @@ make swagger-gen
 
 This will update all the necessary code.
 
-`./restapi/configure_console.go` is a file that contains the handlers to be used by the application, here is the only place where we need to update our code to support the new apis. This file is not affected when running the swagger generator and it is safe to edit.
+`./restapi/configure_mcs.go` is a file that contains the handlers to be used by the application, here is the only place where we need to update our code to support the new apis. This file is not affected when running the swagger generator and it is safe to edit.
 
 ## Unit Tests
 `./restapi/handlers_test.go` needs to be updated with the proper tests for the new api.
@@ -47,7 +47,7 @@ $ git push origin my-new-feature
 Pull requests can be created via GitHub. Refer to [this document](https://help.github.com/articles/creating-a-pull-request/) for detailed steps on how to create a pull request. After a Pull Request gets peer reviewed and approved, it will be merged.
 
 ## FAQs
-### How does ``console`` manages dependencies?
+### How does ``mcs`` manages dependencies?
 ``MinIO`` uses `go mod` to manage its dependencies.
 - Run `go get foo/bar` in the source folder to add the dependency to `go.mod` file.
 
@@ -55,5 +55,5 @@ To remove a dependency
 - Edit your code and remove the import reference.
 - Run `go mod tidy` in the source folder to remove dependency from `go.mod` file.
 
-### What are the coding guidelines for console?
-``console`` is fully conformant with Golang style. Refer: [Effective Go](https://github.com/golang/go/wiki/CodeReviewComments) article from Golang project. If you observe offending code, please feel free to send a pull request or ping us on [Slack](https://slack.min.io).
+### What are the coding guidelines for mcs?
+``mcs`` is fully conformant with Golang style. Refer: [Effective Go](https://github.com/golang/go/wiki/CodeReviewComments) article from Golang project. If you observe offending code, please feel free to send a pull request or ping us on [Slack](https://slack.min.io).

DEVELOPMENT.md

@@ -1,4 +1,4 @@
-# LDAP authentication with Console
+# LDAP authentication with MCS
 
 ## Setup
 
@@ -11,11 +11,44 @@ $ docker run --rm -p 389:389 -p 636:636 --name my-openldap-container --detach os
 Run the `billy.ldif` file using `ldapadd` command to create a new user and assign it to a group.
 
 ```
-$ docker cp console/docs/ldap/billy.ldif my-openldap-container:/container/service/slapd/assets/test/billy.ldif
-$ docker exec my-openldap-container ldapadd -x -D "cn=admin,dc=example,dc=org" -w admin -f /container/service/slapd/assets/test/billy.ldif -H ldap://localhost
+$ cat > billy.ldif << EOF
+# LDIF fragment to create group branch under root
+dn: uid=billy,dc=example,dc=org
+uid: billy
+cn: billy
+sn: 3
+objectClass: top
+objectClass: posixAccount
+objectClass: inetOrgPerson
+loginShell: /bin/bash
+homeDirectory: /home/billy
+uidNumber: 14583102
+gidNumber: 14564100
+userPassword: {SSHA}j3lBh1Seqe4rqF1+NuWmjhvtAni1JC5A
+mail: billy@example.org
+gecos: Billy User
+# Create base group
+dn: ou=groups,dc=example,dc=org
+objectclass:organizationalunit
+ou: groups
+description: generic groups branch
+# create mcsAdmin group (this already exists on minio and have a policy of s3::*)
+dn: cn=mcsAdmin,ou=groups,dc=example,dc=org
+objectClass: top
+objectClass: posixGroup
+gidNumber: 678
+# Assing group to new user
+dn: cn=mcsAdmin,ou=groups,dc=example,dc=org
+changetype: modify
+add: memberuid
+memberuid: billy
+EOF
+
+$ docker cp billy.ldif my-openldap-container:/container/service/slapd/assets/test/billy.ldif
+$ docker exec my-openldap-container ldapadd -x -D "cn=admin,dc=example,dc=org" -w admin -f /container/service/slapd/assets/test/billy.ldif -H ldap://localhost -ZZ
 ```
 
-Query the ldap server to check the user billy was created correctly and got assigned to the consoleAdmin group, you should get a list 
+Query the ldap server to check the user billy was created correctly and got assigned to the mcsAdmin group, you should get a list 
 containing ldap users and groups.
 
 ```
@@ -40,9 +73,9 @@ Re-enter new password:
 Enter LDAP Password:
 ```
 
-### Add the consoleAdmin policy to user billy on MinIO
+### Add the mcsAdmin policy to user billy on MinIO
 ```
-$ cat > consoleAdmin.json << EOF
+$ cat > mcsAdmin.json << EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -66,8 +99,8 @@ $ cat > consoleAdmin.json << EOF
   ]
 }
 EOF
-$ mc admin policy add myminio consoleAdmin consoleAdmin.json
-$ mc admin policy set myminio consoleAdmin user="uid=billy,dc=example,dc=org"
+$ mc admin policy add myminio mcsAdmin mcsAdmin.json
+$ mc admin policy set myminio mcsAdmin user=billy
 ```
 
 ## Run MinIO
@@ -83,9 +116,12 @@ export MINIO_IDENTITY_LDAP_SERVER_INSECURE=on
 ./minio server ~/Data
 ```
 
-## Run Console
+## Run MCS
 
 ```
-export CONSOLE_LDAP_ENABLED=on
-./console server
+export MCS_ACCESS_KEY=minio
+export MCS_SECRET_KEY=minio123
+...
+export MCS_LDAP_ENABLED=on
+./mcs server
 ```

Dockerfile

@@ -1,42 +1,26 @@
-FROM node:17 as uilayer
-
-WORKDIR /app
-
-COPY ./portal-ui/package.json ./
-COPY ./portal-ui/yarn.lock ./
-RUN yarn install
-
-COPY ./portal-ui .
-
-RUN make build-static
-
-USER node
-
-FROM golang:1.17 as golayer
+FROM golang:1.13
 
 RUN apt-get update -y && apt-get install -y ca-certificates
 
-ADD go.mod /go/src/github.com/minio/console/go.mod
-ADD go.sum /go/src/github.com/minio/console/go.sum
-WORKDIR /go/src/github.com/minio/console/
+ADD go.mod /go/src/github.com/minio/mcs/go.mod
+ADD go.sum /go/src/github.com/minio/mcs/go.sum
+WORKDIR /go/src/github.com/minio/mcs/
 
 # Get dependencies - will also be cached if we won't change mod/sum
 RUN go mod download
 
-ADD . /go/src/github.com/minio/console/
-WORKDIR /go/src/github.com/minio/console/
+ADD . /go/src/github.com/minio/mcs/
+WORKDIR /go/src/github.com/minio/mcs/
 
 ENV CGO_ENABLED=0
 
-COPY --from=uilayer /app/build /go/src/github.com/minio/console/portal-ui/build
-RUN go build --tags=kqueue,operator -ldflags "-w -s" -a -o console ./cmd/console
+RUN go build -ldflags "-w -s" -a -o mcs ./cmd/mcs
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
+FROM scratch
 MAINTAINER MinIO Development "dev@min.io"
 EXPOSE 9090
 
+COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=0 /go/src/github.com/minio/mcs/mcs .
 
-COPY --from=golayer /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=golayer /go/src/github.com/minio/console/console .
-
-ENTRYPOINT ["/console"]
+CMD ["/mcs"]

Dockerfile.assets

@@ -1,13 +0,0 @@
-FROM node:17 as uilayer
-
-WORKDIR /app
-
-COPY ./portal-ui/package.json ./
-COPY ./portal-ui/yarn.lock ./
-RUN yarn install
-
-COPY ./portal-ui .
-
-RUN yarn install && make build-static
-
-USER node

Dockerfile.release

@@ -1,23 +1,6 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
-
-ARG TAG
-
-COPY CREDITS /licenses/CREDITS
-COPY LICENSE /licenses/LICENSE
-
-LABEL name="MinIO" \
-      vendor="MinIO Inc <dev@min.io>" \
-      maintainer="MinIO Inc <dev@min.io>" \
-      version="${TAG}" \
-      release="${TAG}" \
-      summary="A graphical user interface for MinIO" \
-      description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads."
-
-RUN \
-     microdnf update --nodocs && \
-     microdnf install ca-certificates --nodocs
-
+FROM scratch
+MAINTAINER MinIO Development "dev@min.io"
 EXPOSE 9090
-COPY console /console
+COPY mcs /mcs
 
-ENTRYPOINT ["/console"]
+ENTRYPOINT ["/mcs"]

Makefile

@@ -3,124 +3,62 @@ GOPATH := $(shell go env GOPATH)
 # Sets the build version based on the output of the following command, if we are building for a tag, that's the build else it uses the current git branch as the build
 BUILD_VERSION:=$(shell git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null || git rev-parse --abbrev-ref HEAD 2>/dev/null)
 BUILD_TIME:=$(shell date 2>/dev/null)
-TAG ?= "minio/console:$(BUILD_VERSION)-dev"
-MINIO_VERSION ?= "quay.io/minio/minio:latest"
+TAG ?= "minio/m3:$(VERSION)-dev"
 
-default: console
+default: mcs
 
-.PHONY: console
-console:
-	@echo "Building Console binary to './console'"
-	@(GO111MODULE=on CGO_ENABLED=0 go build -trimpath --tags=kqueue,operator --ldflags "-s -w" -o console ./cmd/console)
+.PHONY: mcs
+mcs:
+	@echo "Building mcs binary to './mcs'"
+	@(GO111MODULE=on CGO_ENABLED=0 go build -trimpath --tags=kqueue --ldflags "-s -w" -o mcs ./cmd/mcs)
 
 k8sdev:
 	@docker build -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' .
 	@kind load docker-image $(TAG)
-	@echo "Done, now restart your console deployment"
+	@echo "Done, now restart your mcs deployment"
 
 getdeps:
 	@mkdir -p ${GOPATH}/bin
-	@which golangci-lint 1>/dev/null || (echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.43.0)
+	@which golangci-lint 1>/dev/null || (echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.27.0)
 
 verifiers: getdeps fmt lint
 
 fmt:
 	@echo "Running $@ check"
-	@GO111MODULE=on gofmt -d restapi/
-	@GO111MODULE=on gofmt -d pkg/
 	@GO111MODULE=on gofmt -d cmd/
-	@GO111MODULE=on gofmt -d cluster/
-
-crosscompile:
-	@(env bash $(PWD)/cross-compile.sh $(arg1))
+	@GO111MODULE=on gofmt -d pkg/
 
 lint:
 	@echo "Running $@ check"
 	@GO111MODULE=on ${GOPATH}/bin/golangci-lint cache clean
 	@GO111MODULE=on ${GOPATH}/bin/golangci-lint run --timeout=5m --config ./.golangci.yml
 
-install: console
-	@echo "Installing console binary to '$(GOPATH)/bin/console'"
-	@mkdir -p $(GOPATH)/bin && cp -f $(PWD)/console $(GOPATH)/bin/console
-	@echo "Installation successful. To learn more, try \"console --help\"."
+install: mcs
+	@echo "Installing mcs binary to '$(GOPATH)/bin/mcs'"
+	@mkdir -p $(GOPATH)/bin && cp -f $(PWD)/mcs $(GOPATH)/bin/mcs
+	@echo "Installation successful. To learn more, try \"mcs --help\"."
 
-swagger-gen: clean-swagger swagger-console swagger-operator
-	@echo "Done Generating swagger server code from yaml"
-
-clean-swagger:
-	@echo "cleaning"
+swagger-gen:
+	@echo "Generating swagger server code from yaml"
 	@rm -rf models
 	@rm -rf restapi/operations
-	@rm -rf operatorapi/operations
-
-swagger-console:
-	@echo "Generating swagger server code from yaml"
-	@swagger generate server -A console --main-package=management --server-package=restapi --exclude-main -P models.Principal -f ./swagger-console.yml -r NOTICE
-
-swagger-operator:
-	@echo "Generating swagger server code from yaml"
-	@swagger generate server -A operator --main-package=operator --server-package=operatorapi --exclude-main -P models.Principal -f ./swagger-operator.yml -r NOTICE
+	@swagger generate server -A mcs --main-package=mcs --exclude-main -P models.Principal -f ./swagger.yml -r NOTICE
 
 assets:
-	@(cd portal-ui; yarn install --prefer-offline; make build-static; yarn prettier --write . --loglevel warn; cd ..)
-
-test-integration:
-	@echo "create docker network to communicate containers MinIO & PostgreSQL"
-	@(docker network create --subnet=173.18.0.0/29 mynet123)
-	@echo "docker run with MinIO Version below:"
-	@echo $(MINIO_VERSION)
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 --net=mynet123 -d --name minio --rm -p 9000:9000 $(MINIO_VERSION) server /data{1...4} && sleep 5)
-	@(docker run --net=mynet123 --ip=173.18.0.3 --name pgsqlcontainer --rm -p 5432:5432 -e POSTGRES_PASSWORD=password -d postgres && sleep 5)
-	@(GO111MODULE=on go test -race -v github.com/minio/console/integration/...)
-	@(docker stop minio)
-
-test-operator:
-	@(env bash $(PWD)/portal-ui/tests/scripts/operator.sh)
-	@(docker stop minio)
-
-test-permissions:
-	@(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)
-	@(docker stop minio)
-
-test-apply-permissions:
-	@(env bash $(PWD)/portal-ui/tests/scripts/initialize-env.sh)
-
-test-start-docker-minio:
-	@(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})
-
-initialize-operator:
-	@echo "Done initializing operator test"
-
-initialize-permissions: test-start-docker-minio test-apply-permissions
-	@echo "Done initializing permissions test"
-
-cleanup-permissions:
-	@(env bash $(PWD)/portal-ui/tests/scripts/cleanup-env.sh)
-	@(docker stop minio)
+	@(cd portal-ui; yarn install; make build-static; cd ..)
 
 test:
-	@(GO111MODULE=on go test -race -v github.com/minio/console/restapi/...)
-
-test-pkg:
-	@(GO111MODULE=on go test -race -v github.com/minio/console/pkg/...)
+	@(GO111MODULE=on go test -race -v github.com/minio/mcs/restapi/...)
+	@(GO111MODULE=on go test -race -v github.com/minio/mcs/pkg/...)
 
 coverage:
-	@(GO111MODULE=on go test -v -coverprofile=coverage.out github.com/minio/console/restapi/... && go tool cover -html=coverage.out && open coverage.html)
+	@(GO111MODULE=on go test -v -coverprofile=coverage.out github.com/minio/mcs/restapi/... && go tool cover -html=coverage.out && open coverage.html)
 
 clean:
 	@echo "Cleaning up all the generated files"
 	@find . -name '*.test' | xargs rm -fv
 	@find . -name '*~' | xargs rm -fv
-	@rm -vf console
+	@rm -vf mcs
 
 docker:
-	@docker buildx build --output=type=docker --platform linux/amd64 -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' .
-
-release: swagger-gen
-	@echo "Generating Release: $(RELEASE)"
-	@make assets
-	@yq -i e '.spec.template.spec.containers[0].image |= "minio/console:$(RELEASE)"' k8s/operator-console/base/console-deployment.yaml
-	@yq -i e 'select(.kind == "Deployment").spec.template.spec.containers[0].image |= "minio/console:$(RELEASE)"' k8s/operator-console/standalone/console-deployment.yaml
-	@git add -u .
-	@git add portal-ui/build/
+	@docker build -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' .

NOTICE

@@ -1,5 +1,5 @@
 This file is part of MinIO Console Server
-Copyright (c) 2021 MinIO, Inc.
+Copyright (c) 2020 MinIO, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by

README.md

@@ -1,83 +1,28 @@
 # MinIO Console
 
-![build](https://github.com/minio/console/workflows/Go/badge.svg) ![license](https://img.shields.io/badge/license-AGPL%20V3-blue)
-
 A graphical user interface for [MinIO](https://github.com/minio/minio)
 
-| Dashboard                     | Creating a bucket             |
-| -------------                 | -------------                 |
-| ![Dashboard](images/pic1.png) | ![Dashboard](images/pic2.png) |
 
-<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
-**Table of Contents**
-
-- [MinIO Console](#minio-console)
-    - [Install](#install)
-        - [Binary Releases](#binary-releases)
-        - [Docker](#docker)
-        - [Build from source](#build-from-source)
-    - [Setup](#setup)
-        - [1. Create a user `console` using `mc`](#1-create-a-user-console-using-mc)
-        - [2. Create a policy for `console` with admin access to all resources (for testing)](#2-create-a-policy-for-console-with-admin-access-to-all-resources-for-testing)
-        - [3. Set the policy for the new `console` user](#3-set-the-policy-for-the-new-console-user)
-    - [Start Console service:](#start-console-service)
-    - [Start Console service with TLS:](#start-console-service-with-tls)
-    - [Connect Console to a Minio using TLS and a self-signed certificate](#connect-console-to-a-minio-using-tls-and-a-self-signed-certificate)
-- [Contribute to console Project](#contribute-to-console-project)
-
-<!-- markdown-toc end -->
-
-## Install
-
-### Binary Releases
-
-| OS      | ARCH    | Binary                                                                                               |
-|:-------:|:-------:|:----------------------------------------------------------------------------------------------------:|
-| Linux   | amd64   | [linux-amd64](https://github.com/minio/console/releases/latest/download/console-linux-amd64)         |
-| Linux   | arm64   | [linux-arm64](https://github.com/minio/console/releases/latest/download/console-linux-arm64)         |
-| Linux   | ppc64le | [linux-ppc64le](https://github.com/minio/console/releases/latest/download/console-linux-ppc64le)     |
-| Linux   | s390x   | [linux-s390x](https://github.com/minio/console/releases/latest/download/console-linux-s390x)         |
-| Apple   | amd64   | [darwin-amd64](https://github.com/minio/console/releases/latest/download/console-darwin-amd64)       |
-| Windows | amd64   | [windows-amd64](https://github.com/minio/console/releases/latest/download/console-windows-amd64.exe) |
-
-You can also verify the binary with [minisign](https://jedisct1.github.io/minisign/) by downloading the corresponding [`.minisig`](https://github.com/minio/console/releases/latest) signature file. Then run:
-```
-minisign -Vm console-<OS>-<ARCH> -P RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav
-```
-
-### Docker
-
-Pull the latest release via:
-```
-docker pull minio/console
-```
-
-### Build from source
-> You will need a working Go environment. Therefore, please follow [How to install Go](https://golang.org/doc/install).
-> Minimum version required is go1.17
-
-```
-go install github.com/minio/console/cmd/console@latest
-```
+| Dashboard  | Adding A User |
+| ------------- | ------------- |
+| ![Dashboard](images/pic1.png)  | ![Dashboard](images/pic2.png) |
 
 ## Setup
 
-All `console` needs is a MinIO user with admin privileges and URL pointing to your MinIO deployment.
-
+All `mcs` needs is a MinIO user with admin privileges and URL pointing to your MinIO deployment.
 > Note: We don't recommend using MinIO's Operator Credentials
 
-### 1. Create a user `console` using `mc`
-
-```bash
-mc admin user add myminio/
-Enter Access Key: console
-Enter Secret Key: xxxxxxxx
+1. Create a user for `mcs` using `mc`. 
+```
+$ set +o history
+$ mc admin user add myminio mcs YOURMCSSECRET
+$ set -o history
 ```
 
-### 2. Create a policy for `console` with admin access to all resources (for testing)
+2. Create a policy for `mcs` with access to everything (for testing and debugging)
 
-```sh
-cat > admin.json << EOF
+```
+$ cat > mcsAdmin.json << EOF
 {
 	"Version": "2012-10-17",
 	"Statement": [{
@@ -100,21 +45,19 @@ cat > admin.json << EOF
 	]
 }
 EOF
+$ mc admin policy add myminio mcsAdmin mcsAdmin.json
 ```
 
-```sh
-mc admin policy add myminio/ consoleAdmin admin.json
+3. Set the policy for the new `mcs` user
+
+```
+$ mc admin policy set myminio mcsAdmin user=mcs
 ```
 
-### 3. Set the policy for the new `console` user
 
-```sh
-mc admin policy set myminio consoleAdmin user=console
+### Note
+Additionally, you can create policies to limit the privileges for `mcs` users, for example, if you want the user to only have access to dashboard, buckets, notifications and watch page, the policy should look like this:
 ```
-
-> NOTE: Additionally, you can create policies to limit the privileges for other `console` users, for example, if you want the user to only have access to dashboard, buckets, notifications and watch page, the policy should look like this:
-
-```json
 {
 	"Version": "2012-10-17",
 	"Statement": [{
@@ -154,69 +97,34 @@ mc admin policy set myminio consoleAdmin user=console
 }
 ```
 
-## Start Console service:
-
-Before running console service, following environment settings must be supplied
-```sh
-# Salt to encrypt JWT payload
-export CONSOLE_PBKDF_PASSPHRASE=SECRET
-
-# Required to encrypt JWT payload
-export CONSOLE_PBKDF_SALT=SECRET
-
-# MinIO Endpoint
-export CONSOLE_MINIO_SERVER=http://localhost:9000
-```
-
-Now start the console service.
-```
-./console server
-2021-01-19 02:36:08.893735 I | 2021/01/19 02:36:08 server.go:129: Serving console at http://localhost:9090
-```
-
-By default `console` runs on port `9090` this can be changed with `--port` of your choice.
-
-## Start Console service with TLS:
-
-Copy your `public.crt` and `private.key` to `~/.console/certs`, then:
-
-```sh
-./console server
-2021-01-19 02:36:08.893735 I | 2021/01/19 02:36:08 server.go:129: Serving console at http://[::]:9090
-2021-01-19 02:36:08.893735 I | 2021/01/19 02:36:08 server.go:129: Serving console at https://[::]:9443
-```
-
-For advanced users, `console` has support for multiple certificates to service clients through multiple domains.
-
-Following tree structure is expected for supporting multiple domains:
-```sh
- certs/
-  │
-  ├─ public.crt
-  ├─ private.key
-  │
-  ├─ example.com/
-  │   │
-  │   ├─ public.crt
-  │   └─ private.key
-  └─ foobar.org/
-     │
-     ├─ public.crt
-     └─ private.key
-  ...
+## Run MCS server
+To run the server:
 
 ```
+export MCS_HMAC_JWT_SECRET=YOURJWTSIGNINGSECRET
 
-## Connect Console to a Minio using TLS and a self-signed certificate
+#required to encrypt jwet payload
+export MCS_PBKDF_PASSPHRASE=SECRET
 
-Copy the MinIO `ca.crt` under `~/.console/certs/CAs`, then:
+#required to encrypt jwet payload
+export MCS_PBKDF_SALT=SECRET
 
-```sh
-export CONSOLE_MINIO_SERVER=https://localhost:9000
-./console server
+export MCS_ACCESS_KEY=mcs
+export MCS_SECRET_KEY=YOURMCSSECRET
+export MCS_MINIO_SERVER=http://localhost:9000
+./mcs server
+```
+
+## Connect MCS to a Minio using TLS and a self-signed certificate
+
+```
+...
+export MCS_MINIO_SERVER_TLS_ROOT_CAS=<certificate_file_name>
+export MCS_MINIO_SERVER=https://localhost:9000
+./mcs server
 ```
 
 You can verify that the apis work by doing the request on `localhost:9090/api/v1/...`
 
-# Contribute to console Project
-Please follow console [Contributor's Guide](https://github.com/minio/console/blob/master/CONTRIBUTING.md)
+# Contribute to mcs Project
+Please follow mcs [Contributor's Guide](https://github.com/minio/mcs/blob/master/CONTRIBUTING.md)

SECURITY.md

@@ -2,12 +2,12 @@
 
 ## Supported Versions
 
-We always provide security updates for the [latest release](https://github.com/minio/console/releases/latest).
+We always provide security updates for the [latest release](https://github.com/minio/mcs/releases/latest).
 Whenever there is a security update you just need to upgrade to the latest version.
 
 ## Reporting a Vulnerability
 
-All security bugs in [minio/console](https://github,com/minio/console) (or other minio/* repositories)
+All security bugs in [minio/mcs](https://github,com/minio/mcs) (or other minio/* repositories)
 should be reported by email to security@min.io. Your email will be acknowledged within 48 hours,
 and you'll receive a more detailed response to your email within 72 hours indicating the next steps
 in handling your report.
@@ -18,13 +18,13 @@ you need access credentials for a successful exploit).
 
 If you have not received a reply to your email within 48 hours or you have not heard from the security team
 for the past five days please contact the security team directly:
-  - Primary security coordinator: lenin@min.io
-  - Secondary coordinator: security@min.io
-  - If you receive no response: dev@min.io
+   - Primary security coordinator: lenin@min.io
+   - Secondary coordinator: daniel@min.io, cesar@min.io
+   - If you receive no response: dev@min.io
 
 ### Disclosure Process
 
-MinIO Console uses the following disclosure process:
+MinIO uses the following disclosure process:
 
 1. Once the security report is received one member of the security team tries to verify and reproduce
    the issue and determines the impact it has.
@@ -33,8 +33,8 @@ MinIO Console uses the following disclosure process:
 3. Code is audited to find any potential similar problems.
 4. Fixes are prepared for the latest release.
 5. On the date that the fixes are applied a security advisory will be published on https://blog.min.io.
-   Please inform us in your report email whether MinIO Console should mention your contribution w.r.t. fixing
-   the security issue. By default MinIO Console will **not** publish this information to protect your privacy.
+   Please inform us in your report email whether MinIO should mention your contribution w.r.t. fixing
+   the security issue. By default MinIO will **not** publish this information to protect your privacy.
 
 This process can take some time, especially when coordination is required with maintainers of other projects.
 Every effort will be made to handle the bug in as timely a manner as possible, however it's important that we

VULNERABILITY_REPORT.md

@@ -1,38 +0,0 @@
-## Vulnerability Management Policy
-
-This document formally describes the process of addressing and managing a
-reported vulnerability that has been found in the MinIO Console server code base,
-any directly connected ecosystem component or a direct / indirect dependency
-of the code base.
-
-### Scope
-
-The vulnerability management policy described in this document covers the
-process of investigating, assessing and resolving a vulnerability report
-opened by a MinIO Console employee or an external third party.
-
-Therefore, it lists pre-conditions and actions that should be performed to
-resolve and fix a reported vulnerability.
-
-### Vulnerability Management Process
-
-The vulnerability management process requires that the vulnerability report
-contains the following information:
-
- - The project / component that contains the reported vulnerability.
- - A description of the vulnerability. In particular, the type of the
-   reported vulnerability and how it might be exploited. Alternatively,
-   a well-established vulnerability identifier, e.g. CVE number, can be
-   used instead.
-
-Based on the description mentioned above, a MinIO Console engineer or security team
-member investigates:
-
- - Whether the reported vulnerability exists.
- - The conditions that are required such that the vulnerability can be exploited.
- - The steps required to fix the vulnerability.
-
-In general, if the vulnerability exists in one of the MinIO Console code bases
-itself - not in a code dependency - then MinIO Console will, if possible, fix
-the vulnerability or implement reasonable countermeasures such that the
-vulnerability cannot be exploited anymore.

cluster/cluster.go

@@ -1,5 +1,5 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2019 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by

cluster/config.go

@@ -1,5 +1,5 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2019 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
@@ -26,11 +26,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/minio/pkg/env"
+	"github.com/minio/minio/pkg/env"
 )
 
 var (
 	errCantDetermineMinIOImage = errors.New("can't determine MinIO Image")
+	errCantDetermineMCImage    = errors.New("can't determine MC Image")
 )
 
 func GetK8sAPIServer() string {
@@ -38,19 +39,19 @@ func GetK8sAPIServer() string {
 	// if console is not running inside k8s by default will look for the k8s api server on localhost:8001 (kubectl proxy)
 	// NOTE: using kubectl proxy is for local development only, since every request send to localhost:8001 will bypass service account authentication
 	// more info here: https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#directly-accessing-the-rest-api
-	// you can override this using CONSOLE_K8S_API_SERVER, ie use the k8s cluster from `kubectl config view`
+	// you can override this using MCS_K8S_API_SERVER, ie use the k8s cluster from `kubectl config view`
 	host, port := env.Get("KUBERNETES_SERVICE_HOST", ""), env.Get("KUBERNETES_SERVICE_PORT", "")
 	apiServerAddress := "http://localhost:8001"
 	if host != "" && port != "" {
 		apiServerAddress = "https://" + net.JoinHostPort(host, port)
 	}
-	return env.Get(ConsoleK8sAPIServer, apiServerAddress)
+	return env.Get(McsK8sAPIServer, apiServerAddress)
 }
 
-// If CONSOLE_K8S_API_SERVER_TLS_ROOT_CA is true console will load the certificate into the
+// If MCS_K8S_API_SERVER_TLS_ROOT_CA is true mcs will load the certificate into the
 // http.client rootCAs pool, this is useful for testing an k8s ApiServer or when working with self-signed certificates
 func getK8sAPIServerTLSRootCA() string {
-	return strings.TrimSpace(env.Get(ConsoleK8SAPIServerTLSRootCA, ""))
+	return strings.TrimSpace(env.Get(McsK8SAPIServerTLSRootCA, ""))
 }
 
 // GetNsFromFile assumes console is running inside a k8s pod and extract the current namespace from the
@@ -63,8 +64,13 @@ func GetNsFromFile() string {
 	return string(dat)
 }
 
-// Namespace will run only once at console startup
-var Namespace = GetNsFromFile()
+// This operation will run only once at console startup
+var namespace = GetNsFromFile()
+
+// Returns the namespace in which the controller is installed
+func GetNs() string {
+	return env.Get(McsNamespace, namespace)
+}
 
 // getLatestMinIOImage returns the latest docker image for MinIO if found on the internet
 func getLatestMinIOImage(client HTTPClientI) (*string, error) {
@@ -92,7 +98,7 @@ func getLatestMinIOImage(client HTTPClientI) (*string, error) {
 var latestMinIOImage, errLatestMinIOImage = getLatestMinIOImage(
 	&HTTPClient{
 		Client: &http.Client{
-			Timeout: 15 * time.Second,
+			Timeout: 4 * time.Second,
 		},
 	})
 
@@ -100,7 +106,7 @@ var latestMinIOImage, errLatestMinIOImage = getLatestMinIOImage(
 // a preferred image to be used (configured via ENVIRONMENT VARIABLES) GetMinioImage will return that
 // if not, GetMinioImage will try to obtain the image URL for the latest version of MinIO and return that
 func GetMinioImage() (*string, error) {
-	image := strings.TrimSpace(env.Get(ConsoleMinioImage, ""))
+	image := strings.TrimSpace(env.Get(McsMinioImage, ""))
 	// if there is a preferred image configured by the user we'll always return that
 	if image != "" {
 		return &image, nil
@@ -119,3 +125,44 @@ func GetLatestMinioImage(client HTTPClientI) (*string, error) {
 	}
 	return latestMinIOImage, nil
 }
+
+// getLatestMCImage returns the latest docker image for MC if found on the internet
+func getLatestMCImage() (*string, error) {
+	// Create an http client with a 4 second timeout
+	client := http.Client{
+		Timeout: 4 * time.Second,
+	}
+	resp, err := client.Get("https://dl.min.io/client/mc/release/linux-amd64/")
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	var re = regexp.MustCompile(`(?m)\.\/mc\.(RELEASE.*?Z)"`)
+	// look for a single match
+	matches := re.FindAllStringSubmatch(string(body), 1)
+	for i := range matches {
+		release := matches[i][1]
+		dockerImage := fmt.Sprintf("minio/mc:%s", release)
+		return &dockerImage, nil
+	}
+	return nil, errCantDetermineMCImage
+}
+
+var latestMCImage, errLatestMCImage = getLatestMCImage()
+
+func GetMCImage() (*string, error) {
+	image := strings.TrimSpace(env.Get(McsMCImage, ""))
+	// if there is a preferred image configured by the user we'll always return that
+	if image != "" {
+		return &image, nil
+	}
+	if errLatestMCImage != nil {
+		return nil, errLatestMCImage
+	}
+	return latestMCImage, nil
+}

cluster/const.go

@@ -1,5 +1,5 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2019 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
@@ -17,8 +17,9 @@
 package cluster
 
 const (
-	ConsoleK8sAPIServer          = "CONSOLE_K8S_API_SERVER"
-	ConsoleK8SAPIServerTLSRootCA = "CONSOLE_K8S_API_SERVER_TLS_ROOT_CA"
-	ConsoleMinioImage            = "CONSOLE_MINIO_IMAGE"
-	ConsoleMCImage               = "CONSOLE_MC_IMAGE"
+	McsK8sAPIServer          = "MCS_K8S_API_SERVER"
+	McsK8SAPIServerTLSRootCA = "MCS_K8S_API_SERVER_TLS_ROOT_CA"
+	McsMinioImage            = "MCS_MINIO_IMAGE"
+	McsMCImage               = "MCS_MC_IMAGE"
+	McsNamespace             = "MCS_NAMESPACE"
 )

cluster/http_client.go

@@ -1,5 +1,5 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -17,7 +17,6 @@
 package cluster
 
 import (
-	"io"
 	"net/http"
 )
 
@@ -26,8 +25,6 @@ import (
 // that are used within this project.
 type HTTPClientI interface {
 	Get(url string) (resp *http.Response, err error)
-	Post(url, contentType string, body io.Reader) (resp *http.Response, err error)
-	Do(req *http.Request) (*http.Response, error)
 }
 
 // HTTPClient Interface implementation
@@ -41,13 +38,3 @@ type HTTPClient struct {
 func (c *HTTPClient) Get(url string) (resp *http.Response, err error) {
 	return c.Client.Get(url)
 }
-
-// Post implements http.Client.Post()
-func (c *HTTPClient) Post(url, contentType string, body io.Reader) (resp *http.Response, err error) {
-	return c.Client.Post(url, contentType, body)
-}
-
-// Do implement http.Client.Do()
-func (c *HTTPClient) Do(req *http.Request) (*http.Response, error) {
-	return c.Client.Do(req)
-}

cmd/console/app_commands.go

@@ -1,83 +0,0 @@
-//go:build operator
-// +build operator
-
-// 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 main
-
-import (
-	"os"
-	"strconv"
-	"time"
-
-	"github.com/minio/cli"
-	"github.com/minio/console/restapi"
-)
-
-var appCmds = []cli.Command{
-	serverCmd,
-	updateCmd,
-	operatorCmd,
-}
-
-// StartServer starts the console service
-func StartServer(ctx *cli.Context) error {
-	if os.Getenv("CONSOLE_OPERATOR_MODE") != "" && os.Getenv("CONSOLE_OPERATOR_MODE") == "on" {
-		return startOperatorServer(ctx)
-	}
-
-	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)
-	}
-
-	var rctx restapi.Context
-	if err := rctx.Load(ctx); err != nil {
-		restapi.LogError("argument validation failed: %v", err)
-		return err
-	}
-
-	server, err := buildServer()
-	if err != nil {
-		restapi.LogError("Unable to initialize console server: %v", err)
-		return err
-	}
-
-	server.Host = rctx.Host
-	server.Port = rctx.HTTPPort
-	// set conservative timesout for uploads
-	server.ReadTimeout = 1 * time.Hour
-	// no timeouts for response for downloads
-	server.WriteTimeout = 0
-	restapi.Port = strconv.Itoa(server.Port)
-	restapi.Hostname = server.Host
-
-	if len(restapi.GlobalPublicCerts) > 0 {
-		// If TLS certificates are provided enforce the HTTPS schema, meaning console will redirect
-		// plain HTTP connections to HTTPS server
-		server.EnabledListeners = []string{"http", "https"}
-		server.TLSPort = rctx.HTTPSPort
-		// Need to store tls-port, tls-host un config variables so secure.middleware can read from there
-		restapi.TLSPort = strconv.Itoa(server.TLSPort)
-		restapi.Hostname = rctx.Host
-		restapi.TLSRedirect = rctx.TLSRedirect
-	}
-
-	defer server.Shutdown()
-
-	return server.Serve()
-}

cmd/console/app_commands_noop.go

@@ -1,77 +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/>.
-
-//go:build !operator
-// +build !operator
-
-package main
-
-import (
-	"strconv"
-	"time"
-
-	"github.com/minio/cli"
-	"github.com/minio/console/restapi"
-)
-
-var appCmds = []cli.Command{
-	serverCmd,
-	updateCmd,
-}
-
-// StartServer starts the console service
-func StartServer(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)
-	}
-
-	var rctx restapi.Context
-	if err := rctx.Load(ctx); err != nil {
-		restapi.LogError("argument validation failed: %v", err)
-		return err
-	}
-
-	server, err := buildServer()
-	if err != nil {
-		restapi.LogError("Unable to initialize console server: %v", err)
-		return err
-	}
-
-	server.Host = rctx.Host
-	server.Port = rctx.HTTPPort
-	// set conservative timesout for uploads
-	server.ReadTimeout = 1 * time.Hour
-	// no timeouts for response for downloads
-	server.WriteTimeout = 0
-	restapi.Port = strconv.Itoa(server.Port)
-	restapi.Hostname = server.Host
-
-	if len(restapi.GlobalPublicCerts) > 0 {
-		// If TLS certificates are provided enforce the HTTPS schema, meaning console will redirect
-		// plain HTTP connections to HTTPS server
-		server.EnabledListeners = []string{"http", "https"}
-		server.TLSPort = rctx.HTTPSPort
-		// Need to store tls-port, tls-host un config variables so secure.middleware can read from there
-		restapi.TLSPort = strconv.Itoa(server.TLSPort)
-		restapi.Hostname = rctx.Host
-		restapi.TLSRedirect = rctx.TLSRedirect
-	}
-
-	defer server.Shutdown()
-
-	return server.Serve()
-}

cmd/console/operator.go

@@ -1,229 +0,0 @@
-//go:build operator
-// +build operator
-
-// 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 main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"strconv"
-	"syscall"
-	"time"
-
-	"github.com/minio/console/restapi"
-
-	"github.com/go-openapi/loads"
-	"github.com/jessevdk/go-flags"
-	"github.com/minio/cli"
-	"github.com/minio/console/operatorapi"
-	"github.com/minio/console/operatorapi/operations"
-	"github.com/minio/console/pkg/certs"
-)
-
-// starts the server
-var operatorCmd = cli.Command{
-	Name:    "operator",
-	Aliases: []string{"opr"},
-	Usage:   "Start MinIO Operator UI server",
-	Action:  startOperatorServer,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "host",
-			Value: restapi.GetHostname(),
-			Usage: "bind to a specific HOST, HOST can be an IP or hostname",
-		},
-		cli.IntFlag{
-			Name:  "port",
-			Value: restapi.GetPort(),
-			Usage: "bind to specific HTTP port",
-		},
-		// This is kept here for backward compatibility,
-		// hostname's do not have HTTP or HTTPs
-		// hostnames are opaque so using --host
-		// works for both HTTP and HTTPS setup.
-		cli.StringFlag{
-			Name:   "tls-host",
-			Value:  restapi.GetHostname(),
-			Hidden: true,
-		},
-		cli.StringFlag{
-			Name:  "certs-dir",
-			Value: certs.GlobalCertsCADir.Get(),
-			Usage: "path to certs directory",
-		},
-		cli.IntFlag{
-			Name:  "tls-port",
-			Value: restapi.GetTLSPort(),
-			Usage: "bind to specific HTTPS port",
-		},
-		cli.StringFlag{
-			Name:  "tls-redirect",
-			Value: restapi.GetTLSRedirect(),
-			Usage: "toggle HTTP->HTTPS redirect",
-		},
-		cli.StringFlag{
-			Name:   "tls-certificate",
-			Value:  "",
-			Usage:  "path to TLS public certificate",
-			Hidden: true,
-		},
-		cli.StringFlag{
-			Name:   "tls-key",
-			Value:  "",
-			Usage:  "path to TLS private key",
-			Hidden: true,
-		},
-		cli.StringFlag{
-			Name:   "tls-ca",
-			Value:  "",
-			Usage:  "path to TLS Certificate Authority",
-			Hidden: true,
-		},
-	},
-}
-
-func buildOperatorServer() (*operatorapi.Server, error) {
-	swaggerSpec, err := loads.Embedded(operatorapi.SwaggerJSON, operatorapi.FlatSwaggerJSON)
-	if err != nil {
-		return nil, err
-	}
-
-	api := operations.NewOperatorAPI(swaggerSpec)
-	api.Logger = operatorapi.LogInfo
-	server := operatorapi.NewServer(api)
-
-	parser := flags.NewParser(server, flags.Default)
-	parser.ShortDescription = "MinIO Console Server"
-	parser.LongDescription = swaggerSpec.Spec().Info.Description
-
-	server.ConfigureFlags()
-
-	// register all APIs
-	server.ConfigureAPI()
-
-	for _, optsGroup := range api.CommandLineOptionsGroups {
-		_, err := parser.AddGroup(optsGroup.ShortDescription, optsGroup.LongDescription, optsGroup.Options)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if _, err := parser.Parse(); err != nil {
-		return nil, err
-	}
-
-	return server, nil
-}
-
-func loadOperatorAllCerts(ctx *cli.Context) error {
-	var err error
-	// Set all certs and CAs directories path
-	certs.GlobalCertsDir, _, err = certs.NewConfigDirFromCtx(ctx, "certs-dir", certs.DefaultCertsDir.Get)
-	if err != nil {
-		return err
-	}
-
-	certs.GlobalCertsCADir = &certs.ConfigDir{Path: filepath.Join(certs.GlobalCertsDir.Get(), certs.CertsCADir)}
-	// check if certs and CAs directories exists or can be created
-	if err = certs.MkdirAllIgnorePerm(certs.GlobalCertsCADir.Get()); err != nil {
-		return fmt.Errorf("unable to create certs CA directory at %s: failed with %w", certs.GlobalCertsCADir.Get(), err)
-	}
-
-	// load the certificates and the CAs
-	operatorapi.GlobalRootCAs, operatorapi.GlobalPublicCerts, operatorapi.GlobalTLSCertsManager, err = certs.GetAllCertificatesAndCAs()
-	if err != nil {
-		return fmt.Errorf("unable to load certificates at %s: failed with %w", certs.GlobalCertsDir.Get(), err)
-	}
-
-	{
-		// TLS flags from swagger server, used to support VMware vsphere operator version.
-		swaggerServerCertificate := ctx.String("tls-certificate")
-		swaggerServerCertificateKey := ctx.String("tls-key")
-		swaggerServerCACertificate := ctx.String("tls-ca")
-		// load tls cert and key from swagger server tls-certificate and tls-key flags
-		if swaggerServerCertificate != "" && swaggerServerCertificateKey != "" {
-			if err = operatorapi.GlobalTLSCertsManager.AddCertificate(swaggerServerCertificate, swaggerServerCertificateKey); err != nil {
-				return err
-			}
-			x509Certs, err := certs.ParsePublicCertFile(swaggerServerCertificate)
-			if err == nil {
-				operatorapi.GlobalPublicCerts = append(operatorapi.GlobalPublicCerts, x509Certs...)
-			}
-		}
-
-		// load ca cert from swagger server tls-ca flag
-		if swaggerServerCACertificate != "" {
-			caCert, caCertErr := ioutil.ReadFile(swaggerServerCACertificate)
-			if caCertErr == nil {
-				operatorapi.GlobalRootCAs.AppendCertsFromPEM(caCert)
-			}
-		}
-	}
-
-	if restapi.GlobalTLSCertsManager != nil {
-		restapi.GlobalTLSCertsManager.ReloadOnSignal(syscall.SIGHUP)
-	}
-
-	return nil
-}
-
-// StartServer starts the console service
-func startOperatorServer(ctx *cli.Context) error {
-	if err := loadOperatorAllCerts(ctx); err != nil {
-		// Log this as a warning and continue running console without TLS certificates
-		operatorapi.LogError("Unable to load certs: %v", err)
-	}
-
-	var rctx operatorapi.Context
-	if err := rctx.Load(ctx); err != nil {
-		operatorapi.LogError("argument validation failed: %v", err)
-		return err
-	}
-
-	server, err := buildOperatorServer()
-	if err != nil {
-		operatorapi.LogError("Unable to initialize console server: %v", err)
-		return err
-	}
-
-	server.Host = rctx.Host
-	server.Port = rctx.HTTPPort
-	// set conservative timesout for uploads
-	server.ReadTimeout = 1 * time.Hour
-	// no timeouts for response for downloads
-	server.WriteTimeout = 0
-	operatorapi.Port = strconv.Itoa(server.Port)
-	operatorapi.Hostname = server.Host
-
-	if len(operatorapi.GlobalPublicCerts) > 0 {
-		// If TLS certificates are provided enforce the HTTPS schema, meaning console will redirect
-		// plain HTTP connections to HTTPS server
-		server.EnabledListeners = []string{"http", "https"}
-		server.TLSPort = rctx.HTTPSPort
-		// Need to store tls-port, tls-host un config variables so secure.middleware can read from there
-		operatorapi.TLSPort = strconv.Itoa(server.TLSPort)
-		operatorapi.Hostname = rctx.Host
-		operatorapi.TLSRedirect = rctx.TLSRedirect
-	}
-
-	defer server.Shutdown()
-
-	return server.Serve()
-}

cmd/console/server.go

@@ -1,178 +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 main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"syscall"
-
-	"github.com/go-openapi/loads"
-	"github.com/jessevdk/go-flags"
-	"github.com/minio/cli"
-	"github.com/minio/console/pkg/certs"
-	"github.com/minio/console/restapi"
-	"github.com/minio/console/restapi/operations"
-)
-
-// starts the server
-var serverCmd = cli.Command{
-	Name:    "server",
-	Aliases: []string{"srv"},
-	Usage:   "Start MinIO Console server",
-	Action:  StartServer,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "host",
-			Value: restapi.GetHostname(),
-			Usage: "bind to a specific HOST, HOST can be an IP or hostname",
-		},
-		cli.IntFlag{
-			Name:  "port",
-			Value: restapi.GetPort(),
-			Usage: "bind to specific HTTP port",
-		},
-		// This is kept here for backward compatibility,
-		// hostname's do not have HTTP or HTTPs
-		// hostnames are opaque so using --host
-		// works for both HTTP and HTTPS setup.
-		cli.StringFlag{
-			Name:   "tls-host",
-			Value:  restapi.GetHostname(),
-			Hidden: true,
-		},
-		cli.StringFlag{
-			Name:  "certs-dir",
-			Value: certs.GlobalCertsCADir.Get(),
-			Usage: "path to certs directory",
-		},
-		cli.IntFlag{
-			Name:  "tls-port",
-			Value: restapi.GetTLSPort(),
-			Usage: "bind to specific HTTPS port",
-		},
-		cli.StringFlag{
-			Name:  "tls-redirect",
-			Value: restapi.GetTLSRedirect(),
-			Usage: "toggle HTTP->HTTPS redirect",
-		},
-		cli.StringFlag{
-			Name:   "tls-certificate",
-			Value:  "",
-			Usage:  "path to TLS public certificate",
-			Hidden: true,
-		},
-		cli.StringFlag{
-			Name:   "tls-key",
-			Value:  "",
-			Usage:  "path to TLS private key",
-			Hidden: true,
-		},
-		cli.StringFlag{
-			Name:   "tls-ca",
-			Value:  "",
-			Usage:  "path to TLS Certificate Authority",
-			Hidden: true,
-		},
-	},
-}
-
-func buildServer() (*restapi.Server, error) {
-	swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
-	if err != nil {
-		return nil, err
-	}
-
-	api := operations.NewConsoleAPI(swaggerSpec)
-	api.Logger = restapi.LogInfo
-	server := restapi.NewServer(api)
-
-	parser := flags.NewParser(server, flags.Default)
-	parser.ShortDescription = "MinIO Console Server"
-	parser.LongDescription = swaggerSpec.Spec().Info.Description
-
-	server.ConfigureFlags()
-
-	// register all APIs
-	server.ConfigureAPI()
-
-	for _, optsGroup := range api.CommandLineOptionsGroups {
-		_, err := parser.AddGroup(optsGroup.ShortDescription, optsGroup.LongDescription, optsGroup.Options)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if _, err := parser.Parse(); err != nil {
-		return nil, err
-	}
-
-	return server, nil
-}
-
-func loadAllCerts(ctx *cli.Context) error {
-	var err error
-	// Set all certs and CAs directories path
-	certs.GlobalCertsDir, _, err = certs.NewConfigDirFromCtx(ctx, "certs-dir", certs.DefaultCertsDir.Get)
-	if err != nil {
-		return err
-	}
-
-	certs.GlobalCertsCADir = &certs.ConfigDir{Path: filepath.Join(certs.GlobalCertsDir.Get(), certs.CertsCADir)}
-	// check if certs and CAs directories exists or can be created
-	if err = certs.MkdirAllIgnorePerm(certs.GlobalCertsCADir.Get()); err != nil {
-		return fmt.Errorf("unable to create certs CA directory at %s: failed with %w", certs.GlobalCertsCADir.Get(), err)
-	}
-
-	// load the certificates and the CAs
-	restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager, err = certs.GetAllCertificatesAndCAs()
-	if err != nil {
-		return fmt.Errorf("unable to load certificates at %s: failed with %w", certs.GlobalCertsDir.Get(), err)
-	}
-
-	{
-		// TLS flags from swagger server, used to support VMware vsphere operator version.
-		swaggerServerCertificate := ctx.String("tls-certificate")
-		swaggerServerCertificateKey := ctx.String("tls-key")
-		swaggerServerCACertificate := ctx.String("tls-ca")
-		// load tls cert and key from swagger server tls-certificate and tls-key flags
-		if swaggerServerCertificate != "" && swaggerServerCertificateKey != "" {
-			if err = restapi.GlobalTLSCertsManager.AddCertificate(swaggerServerCertificate, swaggerServerCertificateKey); err != nil {
-				return err
-			}
-			x509Certs, err := certs.ParsePublicCertFile(swaggerServerCertificate)
-			if err == nil {
-				restapi.GlobalPublicCerts = append(restapi.GlobalPublicCerts, x509Certs...)
-			}
-		}
-
-		// load ca cert from swagger server tls-ca flag
-		if swaggerServerCACertificate != "" {
-			caCert, caCertErr := ioutil.ReadFile(swaggerServerCACertificate)
-			if caCertErr == nil {
-				restapi.GlobalRootCAs.AppendCertsFromPEM(caCert)
-			}
-		}
-	}
-
-	if restapi.GlobalTLSCertsManager != nil {
-		restapi.GlobalTLSCertsManager.ReloadOnSignal(syscall.SIGHUP)
-	}
-
-	return nil
-}

cmd/console/update.go

@@ -1,154 +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 main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/blang/semver/v4"
-	"github.com/cheggaaa/pb/v3"
-	"github.com/minio/cli"
-	"github.com/minio/console/pkg"
-	"github.com/minio/selfupdate"
-)
-
-func getUpdateTransport(timeout time.Duration) http.RoundTripper {
-	var updateTransport http.RoundTripper = &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout:   timeout,
-			KeepAlive: timeout,
-			DualStack: true,
-		}).DialContext,
-		IdleConnTimeout:       timeout,
-		TLSHandshakeTimeout:   timeout,
-		ExpectContinueTimeout: timeout,
-		DisableCompression:    true,
-	}
-	return updateTransport
-}
-
-func getUpdateReaderFromURL(u string, transport http.RoundTripper) (io.ReadCloser, int64, error) {
-	clnt := &http.Client{
-		Transport: transport,
-	}
-	req, err := http.NewRequest(http.MethodGet, u, nil)
-	if err != nil {
-		return nil, -1, err
-	}
-
-	resp, err := clnt.Do(req)
-	if err != nil {
-		return nil, -1, err
-	}
-	return resp.Body, resp.ContentLength, nil
-}
-
-const defaultPubKey = "RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav"
-
-func getLatestRelease(tr http.RoundTripper) (string, error) {
-	releaseURL := "https://api.github.com/repos/minio/console/releases/latest"
-
-	body, _, err := getUpdateReaderFromURL(releaseURL, tr)
-	if err != nil {
-		return "", fmt.Errorf("unable to access github release URL %w", err)
-	}
-	defer body.Close()
-
-	lm := make(map[string]interface{})
-	if err = json.NewDecoder(body).Decode(&lm); err != nil {
-		return "", err
-	}
-	rel, ok := lm["tag_name"].(string)
-	if !ok {
-		return "", errors.New("unable to find latest release tag")
-	}
-	return rel, nil
-}
-
-// update console in-place
-var updateCmd = cli.Command{
-	Name:   "update",
-	Usage:  "update console to latest release",
-	Action: updateInplace,
-}
-
-func updateInplace(ctx *cli.Context) error {
-	transport := getUpdateTransport(30 * time.Second)
-	rel, err := getLatestRelease(transport)
-	if err != nil {
-		return err
-	}
-
-	latest, err := semver.Make(strings.TrimPrefix(rel, "v"))
-	if err != nil {
-		return err
-	}
-
-	current, err := semver.Make(pkg.Version)
-	if err != nil {
-		return err
-	}
-
-	if current.GTE(latest) {
-		fmt.Printf("You are already running the latest version v%v.\n", pkg.Version)
-		return nil
-	}
-
-	consoleBin := fmt.Sprintf("https://github.com/minio/console/releases/download/%s/console-%s-%s", rel, runtime.GOOS, runtime.GOARCH)
-	reader, length, err := getUpdateReaderFromURL(consoleBin, transport)
-	if err != nil {
-		return fmt.Errorf("unable to fetch binary from %s: %w", consoleBin, err)
-	}
-
-	minisignPubkey := os.Getenv("CONSOLE_MINISIGN_PUBKEY")
-	if minisignPubkey == "" {
-		minisignPubkey = defaultPubKey
-	}
-
-	v := selfupdate.NewVerifier()
-	if err = v.LoadFromURL(consoleBin+".minisig", minisignPubkey, transport); err != nil {
-		return fmt.Errorf("unable to fetch binary signature for %s: %w", consoleBin, err)
-	}
-	opts := selfupdate.Options{
-		Verifier: v,
-	}
-
-	tmpl := `{{ red "Downloading:" }} {{bar . (red "[") (green "=") (red "]")}} {{speed . | rndcolor }}`
-	bar := pb.ProgressBarTemplate(tmpl).Start64(length)
-	barReader := bar.NewProxyReader(reader)
-	if err = selfupdate.Apply(barReader, opts); err != nil {
-		bar.Finish()
-		if rerr := selfupdate.RollbackError(err); rerr != nil {
-			return rerr
-		}
-		return err
-	}
-
-	bar.Finish()
-	fmt.Printf("Updated 'console' to latest release %s\n", rel)
-	return nil
-}

cmd/mcs/main.go

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,38 +23,44 @@ import (
 	"sort"
 	"time"
 
+	"github.com/minio/mcs/pkg"
+
+	"github.com/minio/minio/pkg/console"
+	"github.com/minio/minio/pkg/trie"
+	"github.com/minio/minio/pkg/words"
+
 	"github.com/minio/cli"
-	"github.com/minio/console/pkg"
-	"github.com/minio/pkg/console"
-	"github.com/minio/pkg/trie"
-	"github.com/minio/pkg/words"
 )
 
-// Help template for Console.
-var consoleHelpTemplate = `NAME:
- {{.Name}} - {{.Usage}}
+// Help template for mcs.
+var mcsHelpTemplate = `NAME:
+  {{.Name}} - {{.Usage}}
 
 DESCRIPTION:
- {{.Description}}
+  {{.Description}}
 
 USAGE:
- {{.HelpName}} {{if .VisibleFlags}}[FLAGS] {{end}}COMMAND{{if .VisibleFlags}}{{end}} [ARGS...]
+  {{.HelpName}} {{if .VisibleFlags}}[FLAGS] {{end}}COMMAND{{if .VisibleFlags}}{{end}} [ARGS...]
 
 COMMANDS:
- {{range .VisibleCommands}}{{join .Names ", "}}{{ "\t" }}{{.Usage}}
- {{end}}{{if .VisibleFlags}}
+  {{range .VisibleCommands}}{{join .Names ", "}}{{ "\t" }}{{.Usage}}
+  {{end}}{{if .VisibleFlags}}
 FLAGS:
- {{range .VisibleFlags}}{{.}}
- {{end}}{{end}}
+  {{range .VisibleFlags}}{{.}}
+  {{end}}{{end}}
 VERSION:
- {{.Version}}
+  {{.Version}}
 `
 
+var appCmds = []cli.Command{
+	serverCmd,
+}
+
 func newApp(name string) *cli.App {
-	// Collection of console commands currently supported are.
+	// Collection of mcs commands currently supported are.
 	var commands []cli.Command
 
-	// Collection of console commands currently supported in a trie tree.
+	// Collection of mcs commands currently supported in a trie tree.
 	commandsTree := trie.NewTrie()
 
 	// registerCommand registers a cli command.
@@ -70,19 +76,21 @@ func newApp(name string) *cli.App {
 
 	findClosestCommands := func(command string) []string {
 		var closestCommands []string
-		closestCommands = append(closestCommands, commandsTree.PrefixMatch(command)...)
+		for _, value := range commandsTree.PrefixMatch(command) {
+			closestCommands = append(closestCommands, value.(string))
+		}
 
 		sort.Strings(closestCommands)
 		// Suggest other close commands - allow missed, wrongly added and
 		// even transposed characters
 		for _, value := range commandsTree.Walk(commandsTree.Root()) {
-			if sort.SearchStrings(closestCommands, value) < len(closestCommands) {
+			if sort.SearchStrings(closestCommands, value.(string)) < len(closestCommands) {
 				continue
 			}
 			// 2 is arbitrary and represents the max
 			// allowed number of typed errors
-			if words.DamerauLevenshteinDistance(command, value) < 2 {
-				closestCommands = append(closestCommands, value)
+			if words.DamerauLevenshteinDistance(command, value.(string)) < 2 {
+				closestCommands = append(closestCommands, value.(string))
 			}
 		}
 
@@ -100,13 +108,13 @@ func newApp(name string) *cli.App {
 	app.Author = "MinIO, Inc."
 	app.Usage = "MinIO Console Server"
 	app.Description = `MinIO Console Server`
-	app.Copyright = "(c) 2021 MinIO, Inc."
+	app.Copyright = "(c) 2020 MinIO, Inc."
 	app.Compiled, _ = time.Parse(time.RFC3339, pkg.ReleaseTime)
 	app.Commands = commands
 	app.HideHelpCommand = true // Hide `help, h` command, we already have `minio --help`.
-	app.CustomAppHelpTemplate = consoleHelpTemplate
+	app.CustomAppHelpTemplate = mcsHelpTemplate
 	app.CommandNotFound = func(ctx *cli.Context, command string) {
-		console.Printf("‘%s’ is not a console sub-command. See ‘console --help’.\n", command)
+		console.Printf("‘%s’ is not a mcs sub-command. See ‘mcs --help’.\n", command)
 		closestCommands := findClosestCommands(command)
 		if len(closestCommands) > 0 {
 			console.Println()

cmd/mcs/server.go

@@ -0,0 +1,132 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/go-openapi/loads"
+	"github.com/jessevdk/go-flags"
+	"github.com/minio/cli"
+	"github.com/minio/mcs/restapi"
+	"github.com/minio/mcs/restapi/operations"
+)
+
+// starts the server
+var serverCmd = cli.Command{
+	Name:    "server",
+	Aliases: []string{"srv"},
+	Usage:   "starts mcs server",
+	Action:  startServer,
+	Flags: []cli.Flag{
+		cli.StringFlag{
+			Name:  "host",
+			Value: restapi.GetHostname(),
+			Usage: "HTTP server hostname",
+		},
+		cli.IntFlag{
+			Name:  "port",
+			Value: restapi.GetPort(),
+			Usage: "HTTP Server port",
+		},
+		cli.StringFlag{
+			Name:  "tls-host",
+			Value: restapi.GetSSLHostname(),
+			Usage: "HTTPS server hostname",
+		},
+		cli.IntFlag{
+			Name:  "tls-port",
+			Value: restapi.GetSSLPort(),
+			Usage: "HTTPS server port",
+		},
+		cli.StringFlag{
+			Name:  "tls-certificate",
+			Value: "",
+			Usage: "filename of public cert",
+		},
+		cli.StringFlag{
+			Name:  "tls-key",
+			Value: "",
+			Usage: "filename of private key",
+		},
+	},
+}
+
+// starts the controller
+func startServer(ctx *cli.Context) error {
+	swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	api := operations.NewMcsAPI(swaggerSpec)
+	server := restapi.NewServer(api)
+	defer server.Shutdown()
+
+	parser := flags.NewParser(server, flags.Default)
+	parser.ShortDescription = "MinIO Console Server"
+	parser.LongDescription = swaggerSpec.Spec().Info.Description
+	server.ConfigureFlags()
+	for _, optsGroup := range api.CommandLineOptionsGroups {
+		_, err := parser.AddGroup(optsGroup.ShortDescription, optsGroup.LongDescription, optsGroup.Options)
+		if err != nil {
+			log.Fatalln(err)
+		}
+	}
+
+	if _, err := parser.Parse(); err != nil {
+		code := 1
+		if fe, ok := err.(*flags.Error); ok {
+			if fe.Type == flags.ErrHelp {
+				code = 0
+			}
+		}
+		os.Exit(code)
+	}
+
+	server.Host = ctx.String("host")
+	server.Port = ctx.Int("port")
+
+	restapi.Hostname = ctx.String("host")
+	restapi.Port = fmt.Sprintf("%v", ctx.Int("port"))
+
+	tlsCertificatePath := ctx.String("tls-certificate")
+	tlsCertificateKeyPath := ctx.String("tls-key")
+
+	if tlsCertificatePath != "" && tlsCertificateKeyPath != "" {
+		server.TLSCertificate = flags.Filename(tlsCertificatePath)
+		server.TLSCertificateKey = flags.Filename(tlsCertificateKeyPath)
+		// If TLS certificates are provided enforce the HTTPS schema, meaning mcs will redirect
+		// plain HTTP connections to HTTPS server
+		server.EnabledListeners = []string{"http", "https"}
+		server.TLSPort = ctx.Int("tls-port")
+		server.TLSHost = ctx.String("tls-host")
+		// Need to store tls-port, tls-host un config variables so secure.middleware can read from there
+		restapi.TLSPort = fmt.Sprintf("%v", ctx.Int("tls-port"))
+		restapi.TLSHostname = ctx.String("tls-host")
+		restapi.TLSRedirect = "on"
+	}
+
+	server.ConfigureAPI()
+
+	if err := server.Serve(); err != nil {
+		log.Fatalln(err)
+	}
+	return nil
+}

cross-compile.sh

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

docs/console_operator_mode.md

@@ -1,39 +0,0 @@
-# Running Console in Operator mode
-
-`Console` will authenticate against `Kubernetes`using bearer tokens via HTTP `Authorization` header. The user will provide this token once
-in the login form, Console will validate it against Kubernetes (list apis) and if valid will generate and return a new Console sessions 
-with encrypted claims (the user Service account token will be inside the session encrypted token
-
-# Kubernetes
-
-The provided `JWT token` corresponds to the `Kubernetes service account` that `Console` will use to run tasks on behalf of the
-user, ie: list, create, edit, delete tenants, storage class, etc.
-
-
-# Development
-
-If console is running inside a k8s pod `KUBERNETES_SERVICE_HOST` and `KUBERNETES_SERVICE_PORT` will contain the k8s api server apiServerAddress
-if console is not running inside k8s by default will look for the k8s api server on `localhost:8001` (kubectl proxy)
-
-If you are running console in your local environment and wish to make request to `Kubernetes` you can set `CONSOLE_K8S_API_SERVER`, if
-the environment variable is not present by default `Console` will use `"http://localhost:8001"`, additionally you will need to set the
-`CONSOLE_OPERATOR_MODE=on` variable to make Console display the Operator UI.
-
-NOTE: using `kubectl` proxy is for local development only, since every request send to localhost:8001 will bypass service account authentication
-more info here: https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#directly-accessing-the-rest-api
-you can override this using `CONSOLE_K8S_API_SERVER`, ie use the k8s cluster from `kubectl config view`
-
-## Extract the Service account token and use it with Console
-
-For local development you can use the jwt associated to the `console-sa` service account, you can get the token running
-the following command in your terminal:
-
-```
-kubectl get secret $(kubectl get serviceaccount console-sa -o jsonpath="{.secrets[0].name}") -o jsonpath="{.data.token}" | base64 --decode
-```
-
-Then run the Console server
-
-```
-CONSOLE_OPERATOR_MODE=on ./console server
-```

docs/ldap/billy.ldif

@@ -1,35 +0,0 @@
-# LDIF fragment to create group branch under root
-dn: uid=billy,dc=example,dc=org
-uid: billy
-cn: billy
-sn: 3
-objectClass: top
-objectClass: posixAccount
-objectClass: inetOrgPerson
-loginShell: /bin/bash
-homeDirectory: /home/billy
-uidNumber: 14583102
-gidNumber: 14564100
-userPassword: {SSHA}j3lBh1Seqe4rqF1+NuWmjhvtAni1JC5A
-mail: billy@example.org
-gecos: Billy User
-
-# Create base group
-dn: ou=groups,dc=example,dc=org
-objectclass:organizationalunit
-ou: groups
-description: generic groups branch
-
-# create consoleAdmin group (this already exists on minio and have a policy of s3::*)
-dn: cn=consoleAdmin,ou=groups,dc=example,dc=org
-objectClass: top
-objectClass: posixGroup
-gidNumber: 678
-
-# Assing group to new user
-dn: cn=consoleAdmin,ou=groups,dc=example,dc=org
-changetype: modify
-add: memberuid
-memberuid: billy
-
-

docs/mcs_operator_mode.md

@@ -0,0 +1,39 @@
+# Running MCS in Operator mode
+
+`MCS` will authenticate against `Kubernetes`using bearer tokens via HTTP `Authorization` header. The user will provide this token once
+in the login form, MCS will validate it against Kubernetes (list apis) and if valid will generate and return a new MCS sessions 
+with encrypted claims (the user Service account token will be inside the JWT in the data field)
+
+# Kubernetes
+
+The provided `JWT token` corresponds to the `Kubernetes service account` that `MCS` will use to run tasks on behalf of the
+user, ie: list, create, edit, delete tenants, storage class, etc.
+
+
+# Development
+
+If console is running inside a k8s pod `KUBERNETES_SERVICE_HOST` and `KUBERNETES_SERVICE_PORT` will contain the k8s api server apiServerAddress
+if console is not running inside k8s by default will look for the k8s api server on `localhost:8001` (kubectl proxy)
+
+If you are running mcs in your local environment and wish to make request to `Kubernetes` you can set `MCS_K8S_API_SERVER`, if
+the environment variable is not present by default `MCS` will use `"http://localhost:8001"`, additionally you will need to set the
+`MCS_OPERATOR_MODE=on` variable to make MCS display the Operator UI.
+
+NOTE: using `kubectl` proxy is for local development only, since every request send to localhost:8001 will bypass service account authentication
+more info here: https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#directly-accessing-the-rest-api
+you can override this using `MCS_K8S_API_SERVER`, ie use the k8s cluster from `kubectl config view`
+
+## Extract the Service account token and use it with MCS
+
+For local development you can use the jwt associated to the `mcs-sa` service account, you can get the token running
+the following command in your terminal:
+
+```
+kubectl get secret $(kubectl get serviceaccount mcs-sa -o jsonpath="{.secrets[0].name}") -o jsonpath="{.data.token}" | base64 --decode
+```
+
+Then run the mcs server
+
+```
+MCS_OPERATOR_MODE=on ./mcs server
+```

go.mod

@@ -1,163 +1,34 @@
-module github.com/minio/console
+module github.com/minio/mcs
 
-go 1.17
+go 1.13
 
 require (
-	github.com/blang/semver/v4 v4.0.0
-	github.com/cheggaaa/pb/v3 v3.0.6
-	github.com/dustin/go-humanize v1.0.0
-	github.com/go-openapi/errors v0.20.2
-	github.com/go-openapi/loads v0.21.0
-	github.com/go-openapi/runtime v0.21.1
-	github.com/go-openapi/spec v0.20.4
-	github.com/go-openapi/strfmt v0.21.1
-	github.com/go-openapi/swag v0.19.15
-	github.com/go-openapi/validate v0.20.3
-	github.com/golang-jwt/jwt/v4 v4.1.0
+	github.com/coreos/go-oidc v2.2.1+incompatible
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/elazarl/go-bindata-assetfs v1.0.0
+	github.com/go-openapi/errors v0.19.6
+	github.com/go-openapi/loads v0.19.5
+	github.com/go-openapi/runtime v0.19.19
+	github.com/go-openapi/spec v0.19.8
+	github.com/go-openapi/strfmt v0.19.5
+	github.com/go-openapi/swag v0.19.9
+	github.com/go-openapi/validate v0.19.10
 	github.com/gorilla/websocket v1.4.2
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/klauspost/compress v1.13.6
+	github.com/json-iterator/go v1.1.10
 	github.com/minio/cli v1.22.0
-	github.com/minio/kes v0.11.0
-	github.com/minio/madmin-go v1.3.4
-	github.com/minio/mc v0.0.0-20220204044644-e048c85d71a7
-	github.com/minio/minio-go/v7 v7.0.23
-	github.com/minio/operator v0.0.0-20220110040724-a5d59a342b7f
-	github.com/minio/pkg v1.1.16
-	github.com/minio/selfupdate v0.4.0
-	github.com/mitchellh/go-homedir v1.1.0
-	github.com/rs/xid v1.3.0
-	github.com/secure-io/sio-go v0.3.1
-	github.com/stretchr/testify v1.7.0
-	github.com/tidwall/gjson v1.12.1
-	github.com/unrolled/secure v1.0.9
-	golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
-	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
-	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.21.1
-	k8s.io/apimachinery v0.21.1
-	k8s.io/client-go v0.21.1
+	github.com/minio/mc v0.0.0-20200725183142-90d22b271f60
+	github.com/minio/minio v0.0.0-20200725154241-abbf6ce6ccf8
+	github.com/minio/minio-go/v7 v7.0.2-0.20200722162308-e0105ca08252
+	github.com/minio/operator v0.0.0-20200725185636-4a625e4fbb31
+	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
+	github.com/satori/go.uuid v1.2.0
+	github.com/stretchr/testify v1.6.1
+	github.com/unrolled/secure v1.0.7
+	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+	k8s.io/api v0.18.0
+	k8s.io/apimachinery v0.18.0
+	k8s.io/client-go v0.18.0
 )
-
-require (
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/VividCortex/ewma v1.1.1 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/charmbracelet/bubbles v0.10.0 // indirect
-	github.com/charmbracelet/bubbletea v0.19.3 // indirect
-	github.com/charmbracelet/lipgloss v0.4.1-0.20220204041308-bf2912e703f6 // indirect
-	github.com/cheggaaa/pb v1.0.29 // indirect
-	github.com/containerd/console v1.0.2 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/evanphx/json-patch v4.9.0+incompatible // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/fatih/structs v1.1.0 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/analysis v0.21.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/goccy/go-json v0.8.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gnostic v0.5.1 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
-	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.0 // indirect
-	github.com/lestrrat-go/httpcc v1.0.0 // indirect
-	github.com/lestrrat-go/iter v1.0.1 // indirect
-	github.com/lestrrat-go/jwx v1.2.14 // indirect
-	github.com/lestrrat-go/option v1.0.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-ieproxy v0.0.1 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/minio/argon2 v1.0.0 // indirect
-	github.com/minio/colorjson v1.0.1 // indirect
-	github.com/minio/filepath v1.0.0 // indirect
-	github.com/minio/md5-simd v1.1.2 // indirect
-	github.com/minio/sha256-simd v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.1 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
-	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/philhofer/fwd v1.1.1 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pkg/profile v1.6.0 // indirect
-	github.com/pkg/xattr v0.4.4 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/posener/complete v1.2.3 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/shirou/gopsutil/v3 v3.21.12 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/tinylib/msgp v1.1.6 // indirect
-	github.com/tklauser/go-sysconf v0.3.9 // indirect
-	github.com/tklauser/numcpus v0.3.0 // indirect
-	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.1 // indirect
-	go.mongodb.org/mongo-driver v1.7.5 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb // indirect
-	google.golang.org/grpc v1.43.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/h2non/filetype.v1 v1.0.5 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.66.3 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/klog/v2 v2.8.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
-	k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
-	maze.io/x/duration v0.0.0-20160924141736-faac084b6075 // indirect
-	sigs.k8s.io/controller-runtime v0.8.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
-)
-
-replace google.golang.org/grpc => google.golang.org/grpc v1.29.1

hack/update-codegen.sh

@@ -1,4 +1,18 @@
 #!/bin/bash
+#
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 set -o errexit
 set -o nounset
@@ -6,9 +20,12 @@ set -o pipefail
 
 SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
 
-GO111MODULE=off go get -d k8s.io/code-generator/...
+go get -d k8s.io/code-generator/...
 
-REPOSITORY=github.com/minio/console
+# Checkout code-generator to compatible version
+#(cd $GOPATH/src/k8s.io/code-generator && git checkout origin/release-1.14 -B release-1.14)
+
+REPOSITORY=github.com/minio/mcs
 $GOPATH/src/k8s.io/code-generator/generate-groups.sh all \
   $REPOSITORY/pkg/clientgen $REPOSITORY/pkg/apis networking.gke.io:v1beta2 \
   --go-header-file $SCRIPT_ROOT/hack/header.go.txt

integration/admin_api_integration_test.go

@@ -1,168 +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/>.
-
-// These tests are for AdminAPI Tag based on swagger-console.yml
-
-package integration
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/minio/console/models"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func RestartService() (*http.Response, error) {
-	/*
-		Helper function to restart service
-		HTTP Verb: POST
-		URL: /api/v1/service/restart
-	*/
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/service/restart",
-		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: 2000 * time.Second, // increased timeout since restart takes time, more than other APIs.
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func NotifyPostgres() (*http.Response, error) {
-	/*
-		Helper function to add Postgres Notification
-		HTTP Verb: PUT
-		URL: api/v1/configs/notify_postgres
-		Body:
-		{
-			"key_values":[
-				{
-					"key":"connection_string",
-					"value":"user=postgres password=password host=localhost dbname=postgres port=5432 sslmode=disable"
-				},
-				{
-					"key":"table",
-					"value":"accountsssss"
-				},
-				{
-					"key":"format",
-					"value":"namespace"
-				},
-				{
-					"key":"queue_limit",
-					"value":"10000"
-				},
-				{
-					"key":"comment",
-					"value":"comment"
-				}
-			]
-		}
-	*/
-	Body := models.SetConfigRequest{
-		KeyValues: []*models.ConfigurationKV{
-			{
-				Key:   "connection_string",
-				Value: "user=postgres password=password host=173.18.0.3 dbname=postgres port=5432 sslmode=disable",
-			},
-			{
-				Key:   "table",
-				Value: "accountsssss",
-			},
-			{
-				Key:   "format",
-				Value: "namespace",
-			},
-			{
-				Key:   "queue_limit",
-				Value: "10000",
-			},
-			{
-				Key:   "comment",
-				Value: "comment",
-			},
-		},
-	}
-
-	requestDataJSON, _ := json.Marshal(Body)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"PUT",
-		"http://localhost:9090/api/v1/configs/notify_postgres",
-		requestDataBody,
-	)
-	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 TestNotifyPostgres(t *testing.T) {
-
-	// Variables
-	assert := assert.New(t)
-
-	// Test
-	response, err := NotifyPostgres()
-	finalResponse := inspectHTTPResponse(response)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		assert.Fail(finalResponse)
-		return
-	}
-	if response != nil {
-		assert.Equal(200, response.StatusCode, finalResponse)
-	}
-}
-
-func TestRestartService(t *testing.T) {
-	assert := assert.New(t)
-	restartResponse, restartError := RestartService()
-	assert.Nil(restartError)
-	if restartError != nil {
-		log.Println(restartError)
-		return
-	}
-	addObjRsp := inspectHTTPResponse(restartResponse)
-	if restartResponse != nil {
-		assert.Equal(
-			204,
-			restartResponse.StatusCode,
-			addObjRsp,
-		)
-	}
-}

integration/buckets_test.go

@@ -1,193 +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 integration
-
-import (
-	"bytes"
-	b64 "encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/go-openapi/loads"
-	"github.com/minio/console/restapi"
-	"github.com/minio/console/restapi/operations"
-)
-
-var token string
-
-func encodeBase64(fileName string) string {
-	/*
-		Helper function to encode in base64 the file name so we can get the path
-	*/
-	path := b64.StdEncoding.EncodeToString([]byte(fileName))
-	return path
-}
-
-func inspectHTTPResponse(httpResponse *http.Response) string {
-	/*
-		Helper function to inspect the content of a HTTP response.
-	*/
-	b, err := io.ReadAll(httpResponse.Body)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	return "Http Response: " + string(b)
-}
-
-func printMessage(message string) {
-	/*
-		Helper function to print HTTP response.
-	*/
-	fmt.Println(message)
-}
-
-func initConsoleServer() (*restapi.Server, error) {
-
-	//os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
-
-	swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
-	if err != nil {
-		return nil, err
-	}
-
-	noLog := func(string, ...interface{}) {
-		// nothing to log
-	}
-
-	// Initialize MinIO loggers
-	restapi.LogInfo = noLog
-	restapi.LogError = noLog
-
-	api := operations.NewConsoleAPI(swaggerSpec)
-	api.Logger = noLog
-
-	server := restapi.NewServer(api)
-	// register all APIs
-	server.ConfigureAPI()
-
-	//restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager = globalRootCAs, globalPublicCerts, globalTLSCerts
-
-	consolePort, _ := strconv.Atoi("9090")
-
-	server.Host = "0.0.0.0"
-	server.Port = consolePort
-	restapi.Port = "9090"
-	restapi.Hostname = "0.0.0.0"
-
-	return server, nil
-}
-
-func TestMain(m *testing.M) {
-
-	// start console server
-	go func() {
-		fmt.Println("start server")
-		srv, err := initConsoleServer()
-		if err != nil {
-			log.Println(err)
-			log.Println("init fail")
-			return
-		}
-		srv.Serve()
-
-	}()
-
-	fmt.Println("sleeping")
-	time.Sleep(2 * time.Second)
-
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	// get login credentials
-
-	requestData := map[string]string{
-		"accessKey": "minioadmin",
-		"secretKey": "minioadmin",
-	}
-
-	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)
-
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	if response != nil {
-		for _, cookie := range response.Cookies() {
-			if cookie.Name == "token" {
-				token = cookie.Value
-				break
-			}
-		}
-	}
-
-	if token == "" {
-		log.Println("authentication token not found in cookies response")
-		return
-	}
-
-	code := m.Run()
-
-	requestDataAdd := map[string]interface{}{
-		"name": "test1",
-	}
-
-	requestDataJSON, _ = json.Marshal(requestDataAdd)
-
-	requestDataBody = bytes.NewReader(requestDataJSON)
-
-	// get list of buckets
-	request, err = http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test1", 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 {
-		fmt.Println("DELETE StatusCode:", response.StatusCode)
-	}
-
-	os.Exit(code)
-}

integration/login_test.go

@@ -1,71 +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 integration
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/minio/console/models"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestLoginStrategy(t *testing.T) {
-	assert := assert.New(t)
-
-	// image for now:
-	// minio: 9000
-	// console: 9090
-
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	// copy query params
-	request, err := http.NewRequest("GET", "http://localhost:9090/api/v1/login", nil)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	response, err := client.Do(request)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	if response != nil {
-		bodyBytes, _ := ioutil.ReadAll(response.Body)
-
-		loginDetails := models.LoginDetails{}
-
-		err = json.Unmarshal(bodyBytes, &loginDetails)
-		if err != nil {
-			log.Println(err)
-		}
-		assert.Nil(err)
-
-		assert.Equal(models.LoginDetailsLoginStrategyForm, loginDetails.LoginStrategy, "Login Details don't match")
-
-	}
-
-}

integration/service_account_test.go

@@ -1,198 +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"
-
-	iampolicy "github.com/minio/pkg/iam/policy"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAddServiceAccount(t *testing.T) {
-	/*
-		This is an atomic API Test to add a user service account, the intention
-		is simple, add a user and make sure the response is 201 meaning that the
-		user got added successfully.
-		After test completion, it is expected that user is removed, so other
-		tests like users.ts can run over clean data and we don't collide against
-		it.
-	*/
-
-	assert := assert.New(t)
-
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-
-	// Add service account
-	fmt.Println(".......................TestServiceAccountPolicy(): Create Data to add user")
-	requestDataAddServiceAccount := map[string]interface{}{
-		"accessKey": "testuser1",
-		"secretKey": "password",
-	}
-
-	fmt.Println("..............................TestServiceAccountPolicy(): Prepare the POST")
-	requestDataJSON, _ := json.Marshal(requestDataAddServiceAccount)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"POST", "http://localhost:9090/api/v1/service-account-credentials", requestDataBody)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-
-	fmt.Println(".................................TestServiceAccountPolicy(): Make the POST")
-	response, err := client.Do(request)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	fmt.Println("..................................TestServiceAccountPolicy(): Verification")
-	fmt.Println(".................................TestServiceAccountPolicy(): POST response")
-	fmt.Println(response)
-	fmt.Println("....................................TestServiceAccountPolicy(): POST error")
-	fmt.Println(err)
-	if response != nil {
-		fmt.Println("POST StatusCode:", response.StatusCode)
-		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
-	}
-
-	requestDataPolicy := map[string]interface{}{"policy": `
-  {
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Action": [
-        "s3:GetBucketLocation",
-        "s3:GetObject"
-      ],
-      "Resource": [
-        "arn:aws:s3:::*"
-      ]
-    }
-  ]
-}`,
-	}
-	fmt.Println("..............................TestServiceAccountPolicy(): Prepare the PUT")
-	requestDataJSON, _ = json.Marshal(requestDataPolicy)
-	requestDataBody = bytes.NewReader(requestDataJSON)
-	request, err = http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", requestDataBody)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-
-	fmt.Println(".................................TestServiceAccountPolicy(): Make the PUT")
-	response, err = client.Do(request)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	fmt.Println("..................................TestServiceAccountPolicy(): Verification")
-	fmt.Println(".................................TestServiceAccountPolicy(): PUT response")
-	fmt.Println(response)
-	fmt.Println("....................................TestServiceAccountPolicy(): PUT error")
-	fmt.Println(err)
-	if response != nil {
-		fmt.Println("POST StatusCode:", response.StatusCode)
-		assert.Equal(200, response.StatusCode, "Status Code is incorrect")
-	}
-
-	fmt.Println("...................................TestServiceAccountPolicy(): Check policy")
-
-	// Test policy
-	fmt.Println(".......................TestAddUserServiceAccount(): Create Data to add user")
-	request, err = http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", nil)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-
-	fmt.Println(".................................TestAddServiceAccount(): Make the POST")
-	response, err = client.Do(request)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	fmt.Println("..................................TestAddServiceAccount(): Verification")
-	fmt.Println(".................................TestAddServiceAccount(): POST response")
-	fmt.Println(response)
-	fmt.Println("....................................TestAddServiceAccount(): POST error")
-	fmt.Println(err)
-	if response != nil {
-		fmt.Println("POST StatusCode:", response.StatusCode)
-		assert.Equal(200, response.StatusCode, "Status Code is incorrect")
-		buf := new(bytes.Buffer)
-		buf.ReadFrom(response.Body)
-		var actual *iampolicy.Policy
-		var expected *iampolicy.Policy
-		json.Unmarshal(buf.Bytes(), actual)
-		policy, err := json.Marshal(requestDataAddServiceAccount["policy"])
-		if err != nil {
-			log.Println(err)
-			return
-		}
-		json.Unmarshal(policy, expected)
-		assert.Equal(expected, actual)
-	}
-
-	fmt.Println("...................................TestServiceAccountPolicy(): Remove service account")
-
-	// {{baseUrl}}/user?name=proident velit
-	// Investiga como se borra en el browser.
-	request, err = http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/service-accounts/testuser1", nil)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-
-	fmt.Println("...............................TestServiceAccountPolicy(): Make the DELETE")
-	response, err = client.Do(request)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	fmt.Println("..................................TestServiceAccountPolicy(): Verification")
-	fmt.Println("...............................TestServiceAccountPolicy(): DELETE response")
-	fmt.Println(response)
-	fmt.Println("..................................TestServiceAccountPolicy(): DELETE error")
-	fmt.Println(err)
-	if response != nil {
-		fmt.Println("DELETE StatusCode:", response.StatusCode)
-		assert.Equal(204, response.StatusCode, "has to be 204 when delete user")
-	}
-
-}

integration/users_test.go

@@ -1,974 +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"
-	"io"
-	"log"
-	"net/http"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-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.
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-
-	fmt.Println(".......................TestAddUser(): Create Data to add user")
-	requestDataAdd := map[string]interface{}{
-		"accessKey": accessKey,
-		"secretKey": secretKey,
-		"groups":    groups,
-		"policies":  policies,
-	}
-
-	fmt.Println("..............................TestAddUser(): Prepare the POST")
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"POST", "http://localhost:9090/api/v1/users", requestDataBody)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-
-	fmt.Println(".................................TestAddUser(): Make the POST")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func DeleteUser(userName string) (*http.Response, error) {
-	/*
-		This is an atomic function to delete user and can be reused across
-		different functions.
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	fmt.Println("...................................TestAddUser(): Remove user")
-	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user?name="+userName, nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-
-	fmt.Println("...............................TestAddUser(): Make the DELETE")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func ListUsers(offset string, limit string) (*http.Response, error) {
-	/*
-		This is an atomic function to list users.
-		{{baseUrl}}/users?offset=-5480083&limit=-5480083
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	fmt.Println("...................................TestAddUser(): Remove user")
-	request, err := http.NewRequest(
-		"GET",
-		"http://localhost:9090/api/v1/users?offset="+offset+"&limit="+limit,
-		nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-
-	fmt.Println("...............................TestAddUser(): Make the DELETE")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func GetUserInformation(userName string) (*http.Response, error) {
-	/*
-		Helper function to get user information via API:
-		{{baseUrl}}/user?name=proident velit
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	request, err := http.NewRequest(
-		"GET",
-		"http://localhost:9090/api/v1/user?name="+userName,
-		nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func UpdateUserInformation(name string, status string, groups []string) (*http.Response, error) {
-	/*
-		Helper function to update user information:
-		PUT: {{baseUrl}}/user?name=proident velit
-		Body:
-		{
-			"status": "nisi voluptate amet ea",
-			"groups": [
-				"ipsum eu cupidatat",
-				"aliquip non nulla"
-			]
-		}
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	requestDataAdd := map[string]interface{}{
-		"status": status,
-		"groups": groups,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/user?name="+name, requestDataBody)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func RemoveUser(name string) (*http.Response, error) {
-	/*
-		Helper function to remove user.
-		DELETE: {{baseUrl}}/user?name=proident velit
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user?name="+name, nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, error) {
-	/*
-		Helper function to update groups for a user
-		PUT: {{baseUrl}}/user/groups?name=username
-		{
-			"groups":[
-				"groupone",
-				"grouptwo"
-			]
-		}
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	requestDataAdd := map[string]interface{}{
-		"groups": groups,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"PUT",
-		"http://localhost:9090/api/v1/user/groups?name="+userName,
-		requestDataBody,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func CreateServiceAccountForUser(userName string, policy string) (*http.Response, error) {
-	/*
-		Helper function to Create Service Account for user
-		POST: api/v1/user/username/service-accounts
-		{
-			"policy": "ad magna"
-		}
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	requestDataAdd := map[string]interface{}{
-		"policy": policy,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/user/"+userName+"/service-accounts",
-		requestDataBody,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-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,
-	}
-	requestDataAdd := map[string]interface{}{
-		"policy":    policy,
-		"accessKey": accessKey,
-		"secretKey": secretKey,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/user/"+userName+"/service-account-credentials",
-		requestDataBody,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func ReturnsAListOfServiceAccountsForAUser(userName string) (*http.Response, error) {
-	/*
-		Helper function to return a list of service accounts for a user.
-		GET: {{baseUrl}}/user/:name/service-accounts
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	request, err := http.NewRequest(
-		"GET",
-		"http://localhost:9090/api/v1/user/"+userName+"/service-accounts",
-		nil,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-func AddGroup(group string, members []string) (*http.Response, error) {
-	/*
-		Helper function to add a group.
-	*/
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-	requestDataAdd := map[string]interface{}{
-		"group":   group,
-		"members": members,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/groups",
-		requestDataBody,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	response, err := client.Do(request)
-	return response, err
-}
-
-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
-		{
-			"users": [
-				"magna id",
-				"enim sit tempor incididunt"
-			],
-			"groups": [
-				"nisi est esse",
-				"fugiat eu"
-			]
-		}
-	*/
-	requestDataAdd := map[string]interface{}{
-		"users":  users,
-		"groups": groups,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"PUT",
-		"http://localhost:9090/api/v1/users-groups-bulk",
-		requestDataBody,
-	)
-	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 TestAddUser(t *testing.T) {
-	/*
-		This is an API Test to add a user via api/v1/users, the intention
-		is simple, add a user and make sure the response is 201 meaning that the
-		user got added successfully.
-		After test completion, it is expected that user is removed, so other
-		tests like users.ts can run over clean data and we don't collide against
-		it.
-	*/
-
-	assert := assert.New(t)
-
-	// With no groups & no policies
-	var groups = []string{}
-	var policies = []string{}
-
-	fmt.Println(".................................TestAddUser(): Make the POST")
-	response, err := AddUser("accessKey", "secretKey", groups, policies)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	fmt.Println("..................................TestAddUser(): Verification")
-	fmt.Println(".................................TestAddUser(): POST response")
-	fmt.Println(response)
-	fmt.Println("....................................TestAddUser(): POST error")
-	fmt.Println(err)
-	if response != nil {
-		fmt.Println("POST StatusCode:", response.StatusCode)
-		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
-	}
-
-	response, err = DeleteUser("accessKey")
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	fmt.Println("..................................TestAddUser(): Verification")
-	fmt.Println("...............................TestAddUser(): DELETE response")
-	fmt.Println(response)
-	fmt.Println("..................................TestAddUser(): DELETE error")
-	fmt.Println(err)
-	if response != nil {
-		fmt.Println("DELETE StatusCode:", response.StatusCode)
-		assert.Equal(204, response.StatusCode, "has to be 204 when delete user")
-	}
-
-}
-
-func TestListUsers(t *testing.T) {
-	/*
-		This test is intended to list users via API.
-		1. First, it creates the users
-		2. Then, it lists the users <------ 200 is expected when listing them.
-		3. Finally, it deletes the users
-	*/
-
-	assert := assert.New(t)
-
-	// With no groups & no policies
-	var groups = []string{}
-	var policies = []string{}
-
-	// 1. Create the users
-	numberOfUsers := 5
-	for i := 1; i < numberOfUsers; i++ {
-		fmt.Println("............................TestListUsers(): Adding users")
-		fmt.Println(strconv.Itoa(i) + "accessKey" + strconv.Itoa(i))
-		response, err := AddUser(
-			strconv.Itoa(i)+"accessKey"+strconv.Itoa(i),
-			"secretKey"+strconv.Itoa(i), groups, policies)
-		if err != nil {
-			log.Println(err)
-			return
-		}
-		fmt.Println("............................TestListUsers(): Verification")
-		fmt.Println("...........................TestListUsers(): POST response")
-		fmt.Println(response)
-		fmt.Println("..............................TestListUsers(): POST error")
-		fmt.Println(err)
-		if response != nil {
-			fmt.Println("POST StatusCode:", response.StatusCode)
-			assert.Equal(201, response.StatusCode,
-				"Status Code is incorrect on index: "+strconv.Itoa(i))
-		}
-
-		b, err := io.ReadAll(response.Body)
-		if err != nil {
-			log.Fatalln(err)
-		}
-		fmt.Println(string(b))
-	}
-
-	// 2. List the users
-	listResponse, listError := ListUsers("-5480083", "-5480083")
-	if listError != nil {
-		log.Fatalln(listError)
-	}
-	if listResponse != nil {
-		fmt.Println("POST StatusCode:", listResponse.StatusCode)
-		assert.Equal(200, listResponse.StatusCode,
-			"TestListUsers(): Status Code is incorrect when listing users")
-	}
-	b, err := io.ReadAll(listResponse.Body)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	fmt.Println(string(b))
-
-	// 3. Delete the users
-	for i := 1; i < numberOfUsers; i++ {
-		response, err := DeleteUser(
-			strconv.Itoa(i) + "accessKey" + strconv.Itoa(i))
-		if err != nil {
-			log.Println(err)
-			return
-		}
-		fmt.Println("............................TestListUsers(): Verification")
-		fmt.Println(".........................TestListUsers(): DELETE response")
-		fmt.Println(response)
-		fmt.Println("............................TestListUsers(): DELETE error")
-		fmt.Println(err)
-		if response != nil {
-			fmt.Println("DELETE StatusCode:", response.StatusCode)
-			assert.Equal(204,
-				response.StatusCode, "has to be 204 when delete user")
-		}
-	}
-}
-
-func TestGetUserInfo(t *testing.T) {
-	/*
-		Test to get the user information via API.
-	*/
-
-	// 1. Create the user
-	fmt.Println("TestGetUserInfo(): 1. Create the user")
-	assert := assert.New(t)
-	var groups = []string{}
-	var policies = []string{}
-	response, err := AddUser("accessKey", "secretKey", groups, policies)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if response != nil {
-		fmt.Println("POST StatusCode:", response.StatusCode)
-		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
-	}
-
-	// 2. Get user information
-	fmt.Println("TestGetUserInfo(): 2. Get user information")
-	response, err = GetUserInformation("accessKey")
-	if err != nil {
-		log.Println(err)
-		assert.Fail("There was an error in the response")
-		return
-	}
-
-	// 3. Verify user information
-	fmt.Println("TestGetUserInfo(): 3. Verify user information")
-	if response != nil {
-		fmt.Println("POST StatusCode:", response.StatusCode)
-		assert.Equal(200, response.StatusCode, "Status Code is incorrect")
-	}
-	b, err := io.ReadAll(response.Body)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	fmt.Println(string(b))
-	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) {
-	/*
-		Update User Information Test with Successful Response
-	*/
-
-	assert := assert.New(t)
-
-	// 1. Create an active user
-	var groups = []string{}
-	var policies = []string{}
-	addUserResponse, addUserError := AddUser(
-		"updateuser", "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")
-	}
-
-	// 2. Deactivate the user
-	// '{"status":"disabled","groups":[]}'
-	updateUserResponse, UpdateUserError := UpdateUserInformation(
-		"updateuser", "disabled", groups)
-
-	// 3. Verify user got deactivated
-	if UpdateUserError != nil {
-		log.Println(UpdateUserError)
-		return
-	}
-	if updateUserResponse != nil {
-		fmt.Println("StatusCode:", updateUserResponse.StatusCode)
-		assert.Equal(
-			200, updateUserResponse.StatusCode, "Status Code is incorrect")
-	}
-	b, err := io.ReadAll(updateUserResponse.Body)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	assert.True(strings.Contains(string(b), "disabled"))
-
-}
-
-func TestUpdateUserInfoGenericErrorResponse(t *testing.T) {
-	/*
-		Update User Information Test with Generic Error Response
-	*/
-
-	assert := assert.New(t)
-
-	// 1. Create an active user
-	var groups = []string{}
-	var policies = []string{}
-	addUserResponse, addUserError := AddUser(
-		"updateusererror", "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")
-	}
-
-	// 2. Deactivate the user with wrong status
-	updateUserResponse, UpdateUserError := UpdateUserInformation(
-		"updateusererror", "inactive", groups)
-
-	// 3. Verify user got deactivated
-	if UpdateUserError != nil {
-		log.Println(UpdateUserError)
-		assert.Fail("There was an error while updating user info")
-		return
-	}
-	if updateUserResponse != nil {
-		fmt.Println("StatusCode:", updateUserResponse.StatusCode)
-		assert.Equal(
-			500, updateUserResponse.StatusCode, "Status Code is incorrect")
-	}
-	b, err := io.ReadAll(updateUserResponse.Body)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	assert.True(strings.Contains(string(b), "status not valid"))
-
-}
-
-func TestRemoveUserSuccessfulResponse(t *testing.T) {
-	/*
-		To test removing a user from API
-	*/
-	assert := assert.New(t)
-
-	// 1. Create an active user
-	var groups = []string{}
-	var policies = []string{}
-	addUserResponse, addUserError := AddUser(
-		"testremoveuser1", "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")
-	}
-
-	// 2. Remove the user
-	removeUserResponse, removeUserError := RemoveUser("testremoveuser1")
-	if removeUserError != nil {
-		log.Println(removeUserError)
-		return
-	}
-	if removeUserResponse != nil {
-		fmt.Println("StatusCode:", removeUserResponse.StatusCode)
-		assert.Equal(
-			204, removeUserResponse.StatusCode, "Status Code is incorrect")
-	}
-
-	// 3. Verify the user got removed
-	getUserInfoResponse, getUserInfoError := GetUserInformation(
-		"testremoveuser1")
-	if getUserInfoError != nil {
-		log.Println(getUserInfoError)
-		assert.Fail("There was an error in the response")
-		return
-	}
-	if getUserInfoResponse != nil {
-		fmt.Println("StatusCode:", getUserInfoResponse.StatusCode)
-		assert.Equal(
-			404, getUserInfoResponse.StatusCode, "Status Code is incorrect")
-	}
-	finalResponse := inspectHTTPResponse(getUserInfoResponse)
-	printMessage(finalResponse)
-	assert.True(strings.Contains(
-		finalResponse, "The specified user does not exist"), finalResponse)
-
-}
-
-func TestUpdateGroupsForAUser(t *testing.T) {
-	/*
-		To test Update Groups For a User End Point.
-	*/
-	// 1. Create the user
-	numberOfGroups := 3
-	groupName := "updategroupforausergroup"
-	userName := "updategroupsforauser1"
-	assert := assert.New(t)
-	var groups = []string{}
-	var policies = []string{}
-	response, err := AddUser(userName, "secretKey", groups, policies)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if response != nil {
-		fmt.Println("StatusCode:", response.StatusCode)
-		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
-	}
-
-	// 2. Update the groups of the created user with newGroups
-	var newGroups = make([]string, 3)
-	for i := 0; i < numberOfGroups; i++ {
-		newGroups[i] = groupName + strconv.Itoa(i)
-	}
-	response, err = UpdateGroupsForAUser(userName, newGroups)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if response != nil {
-		fmt.Println("StatusCode:", response.StatusCode)
-		assert.Equal(200, response.StatusCode, "Status Code is incorrect")
-	}
-
-	// 3. Verify the newGroups were updated accordingly
-	getUserInfoResponse, getUserInfoErr := GetUserInformation(userName)
-	if getUserInfoErr != nil {
-		log.Println(getUserInfoErr)
-		assert.Fail("There was an error in the response")
-		return
-	}
-	if getUserInfoResponse != nil {
-		fmt.Println("StatusCode:", getUserInfoResponse.StatusCode)
-		assert.Equal(
-			200, getUserInfoResponse.StatusCode, "Status Code is incorrect")
-	}
-	finalResponse := inspectHTTPResponse(getUserInfoResponse)
-	for i := 0; i < numberOfGroups; i++ {
-		assert.True(strings.Contains(
-			finalResponse, groupName+strconv.Itoa(i)), finalResponse)
-	}
-}
-
-func TestCreateServiceAccountForUser(t *testing.T) {
-	/*
-		To test creation of service account for a user.
-	*/
-
-	// Test's variables
-	userName := "testcreateserviceaccountforuser1"
-	assert := assert.New(t)
-	policy := ""
-	serviceAccountLengthInBytes := 40 // As observed, update as needed
-
-	// 1. Create the user
-	var groups = []string{}
-	var policies = []string{}
-	response, err := AddUser(userName, "secretKey", groups, policies)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if response != nil {
-		fmt.Println("StatusCode:", response.StatusCode)
-		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
-	}
-
-	// 2. Create the service account for the user
-	createServiceAccountResponse,
-		createServiceAccountError := CreateServiceAccountForUser(
-		userName,
-		policy,
-	)
-	if createServiceAccountError != nil {
-		log.Println(createServiceAccountError)
-		assert.Fail("Error in createServiceAccountError")
-	}
-	if createServiceAccountResponse != nil {
-		fmt.Println("StatusCode:", createServiceAccountResponse.StatusCode)
-		assert.Equal(
-			201, createServiceAccountResponse.StatusCode,
-			inspectHTTPResponse(createServiceAccountResponse),
-		)
-	}
-
-	// 3. Verify the service account for the user
-	listOfAccountsResponse,
-		listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
-	if listOfAccountsError != nil {
-		log.Println(listOfAccountsError)
-		assert.Fail("Error in listOfAccountsError")
-	}
-	finalResponse := inspectHTTPResponse(listOfAccountsResponse)
-	if listOfAccountsResponse != nil {
-		fmt.Println("StatusCode:", listOfAccountsResponse.StatusCode)
-		assert.Equal(
-			200, listOfAccountsResponse.StatusCode,
-			finalResponse,
-		)
-	}
-	assert.Equal(len(finalResponse), serviceAccountLengthInBytes, finalResponse)
-}
-
-func TestCreateServiceAccountForUserWithCredentials(t *testing.T) {
-	/*
-		To test creation of service account for a user.
-	*/
-
-	// Test's variables
-	userName := "testcreateserviceaccountforuserwithcredentials1"
-	assert := assert.New(t)
-	policy := ""
-	serviceAccountLengthInBytes := 40 // As observed, update as needed
-
-	// 1. Create the user
-	var groups = []string{}
-	var policies = []string{}
-	var secretKey = "testcreateserviceaccountforuserwithcrede"
-	response, err := AddUser(userName, "secretKey", groups, policies)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if response != nil {
-		fmt.Println("StatusCode:", response.StatusCode)
-		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
-	}
-
-	// Table driven testing part
-	type args struct {
-		accessKey string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-	}{
-		{
-			name:           "Service Account With Valid Credentials",
-			expectedStatus: 201,
-			args: args{
-				accessKey: "testcreateserviceacc",
-			},
-		},
-		{
-			name:           "Service Account With Invalid Credentials",
-			expectedStatus: 500,
-			args: args{
-				accessKey: "tooooooooooooooooooooolongggggggggggggggggg",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// 2. Create the service account for the user
-			createServiceAccountWithCredentialsResponse,
-				createServiceAccountWithCredentialsError := CreateServiceAccountForUserWithCredentials(
-				userName,
-				policy,
-				tt.args.accessKey,
-				secretKey,
-			)
-			if createServiceAccountWithCredentialsError != nil {
-				log.Println(createServiceAccountWithCredentialsError)
-				assert.Fail("Error in createServiceAccountWithCredentialsError")
-			}
-			if createServiceAccountWithCredentialsResponse != nil {
-				fmt.Println("StatusCode:", createServiceAccountWithCredentialsResponse.StatusCode)
-				assert.Equal(
-					tt.expectedStatus, // different status expected per table's row
-					createServiceAccountWithCredentialsResponse.StatusCode,
-					inspectHTTPResponse(createServiceAccountWithCredentialsResponse),
-				)
-			}
-
-			// 3. Verify the service account for the user
-			listOfAccountsResponse,
-				listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
-			if listOfAccountsError != nil {
-				log.Println(listOfAccountsError)
-				assert.Fail("Error in listOfAccountsError")
-			}
-			finalResponse := inspectHTTPResponse(listOfAccountsResponse)
-			if listOfAccountsResponse != nil {
-				fmt.Println("StatusCode:", listOfAccountsResponse.StatusCode)
-				assert.Equal(
-					200, listOfAccountsResponse.StatusCode,
-					finalResponse,
-				)
-			}
-			assert.Equal(len(finalResponse), serviceAccountLengthInBytes, finalResponse)
-		})
-	}
-}
-
-func TestUsersGroupsBulk(t *testing.T) {
-	/*
-		To test UsersGroupsBulk End Point
-	*/
-
-	// Vars
-	assert := assert.New(t)
-	numberOfUsers := 5
-	numberOfGroups := 1
-	//var groups = []string{}
-	var policies = []string{}
-	username := "testusersgroupbulk"
-	groupName := "testusersgroupsbulkgroupone"
-	var members = []string{}
-	users := make([]string, numberOfUsers)
-	groups := make([]string, numberOfGroups)
-
-	// 1. Create some users
-	for i := 0; i < numberOfUsers; i++ {
-		users[i] = username + strconv.Itoa(i)
-		response, err := AddUser(
-			users[i],
-			"secretKey"+strconv.Itoa(i), []string{}, policies)
-		if err != nil {
-			log.Println(err)
-			return
-		}
-		if response != nil {
-			fmt.Println("POST StatusCode:", response.StatusCode)
-			assert.Equal(201, response.StatusCode,
-				"Status Code is incorrect on index: "+strconv.Itoa(i))
-		}
-	}
-
-	// 2. Create a group with no members
-	responseAddGroup, errorAddGroup := AddGroup(groupName, members)
-	if errorAddGroup != nil {
-		log.Println(errorAddGroup)
-		return
-	}
-	finalResponse := inspectHTTPResponse(responseAddGroup)
-	if responseAddGroup != nil {
-		fmt.Println("POST StatusCode:", responseAddGroup.StatusCode)
-		assert.Equal(
-			201,
-			responseAddGroup.StatusCode,
-			finalResponse,
-		)
-	}
-
-	// 3. Add users to the group
-	groups[0] = groupName
-	responseUsersGroupsBulk, errorUsersGroupsBulk := UsersGroupsBulk(
-		users,
-		groups,
-	)
-	if errorUsersGroupsBulk != nil {
-		log.Println(errorUsersGroupsBulk)
-		return
-	}
-	finalResponse = inspectHTTPResponse(responseUsersGroupsBulk)
-	if responseUsersGroupsBulk != nil {
-		fmt.Println("POST StatusCode:", responseUsersGroupsBulk.StatusCode)
-		assert.Equal(
-			200,
-			responseUsersGroupsBulk.StatusCode,
-			finalResponse,
-		)
-	}
-
-	// 4. Verify users got added to the group
-	for i := 0; i < numberOfUsers; i++ {
-		responseGetUserInfo, errGetUserInfo := GetUserInformation(
-			username + strconv.Itoa(i),
-		)
-		if errGetUserInfo != nil {
-			log.Println(errGetUserInfo)
-			assert.Fail("There was an error in the response")
-			return
-		}
-		finalResponse = inspectHTTPResponse(responseGetUserInfo)
-		if responseGetUserInfo != nil {
-			assert.Equal(200, responseGetUserInfo.StatusCode, finalResponse)
-		}
-		// Make sure the user belongs to the created group
-		assert.True(strings.Contains(string(finalResponse), groupName))
-	}
-}

k8s/boilerplate.go.txt

@@ -1,5 +1,5 @@
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by

k8s/console/base/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+# beginning of customizations
+resources:
+  - mcs-service-account.yaml
+  - mcs-cluster-role.yaml
+  - mcs-cluster-role-binding.yaml
+  - mcs-configmap.yaml
+  - mcs-service.yaml
+  - mcs-deployment.yaml
+  - minio-operator.yaml

k8s/console/base/mcs-cluster-role-binding.yaml

@@ -1,12 +1,12 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: console-sa-binding
+  name: mcs-sa-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: console-sa-role
+  name: mcs-sa-role
 subjects:
   - kind: ServiceAccount
-    name: console-sa
+    name: mcs-sa
     namespace: default

k8s/console/base/mcs-cluster-role.yaml

@@ -0,0 +1,77 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: mcs-sa-role
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+      - secrets
+      - pods
+      - services
+      - events
+      - resourcequotas
+    verbs:
+      - get
+      - watch
+      - create
+      - list
+      - patch
+  - apiGroups:
+      - "storage.k8s.io"
+    resources:
+      - storageclasses
+    verbs:
+      - get
+      - watch
+      - create
+      - list
+      - patch
+  - apiGroups:
+      - apps
+    resources:
+      - statefulsets
+      - deployments
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - batch
+    resources:
+      - jobs
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - "certificates.k8s.io"
+    resources:
+      - "certificatesigningrequests"
+      - "certificatesigningrequests/approval"
+      - "certificatesigningrequests/status"
+    verbs:
+      - update
+      - create
+      - get
+  - apiGroups:
+      - minio.min.io
+    resources:
+      - "*"
+    verbs:
+      - "*"
+  - apiGroups:
+      - min.io
+    resources:
+      - "*"
+    verbs:
+      - "*"

k8s/console/base/mcs-configmap.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mcs-env
+data:
+  MCS_PORT: "9090"
+  MCS_TLS_PORT: "9443"

k8s/console/base/mcs-deployment.yaml

@@ -0,0 +1,27 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mcs
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mcs
+  template:
+    metadata:
+      labels:
+        app: mcs
+    spec:
+      serviceAccountName: mcs-sa
+      containers:
+        - name: mcs
+          image: minio/mcs:latest
+          imagePullPolicy: "IfNotPresent"
+          args:
+            - /mcs
+            - server
+          ports:
+            - containerPort: 9090
+              name: http
+            - containerPort: 9433
+              name: https

k8s/console/base/mcs-service-account.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: console-sa
+  name: mcs-sa
   namespace: default

k8s/console/base/mcs-service.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: console
+  name: mcs
   labels:
-    name: console
+    name: mcs
 spec:
   ports:
     - port: 9090
@@ -11,4 +11,4 @@ spec:
     - port: 9443
       name: https
   selector:
-    app: console
+    app: mcs

k8s/console/base/minio-operator.yaml

@@ -0,0 +1,282 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: minio-operator
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: tenants.minio.min.io
+spec:
+  group: minio.min.io
+  scope: Namespaced
+  names:
+    kind: Tenant
+    singular: tenant
+    plural: tenants
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        # openAPIV3Schema is the schema for validating custom objects.
+        # Refer https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#specifying-a-structural-schema
+        # for more details
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+              properties:
+                metadata:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                image:
+                  type: string
+                serviceName:
+                  type: string
+                serviceAccountName:
+                  type: string
+                zones:
+                  type: array
+                  items:
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                    properties:
+                      name:
+                        type: string
+                      servers:
+                        type: integer
+                      volumesPerServer:
+                        type: integer
+                      volumeClaimTemplate:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      resources:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      nodeSelector:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      affinity:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      tolerations:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                mountPath:
+                  type: string
+                podManagementPolicy:
+                  type: string
+                  enum: [Parallel,OrderedReady]
+                  default: Parallel
+                requestAutoCert:
+                  type: boolean
+                  default: false
+                certConfig:
+                  type: object
+                  properties:
+                    commonName:
+                      type: string
+                    organizationName:
+                      type: array
+                      items:
+                        type: string
+                    dnsNames:
+                      type: array
+                      items:
+                        type: string
+                version:
+                  type: string
+                mountpath:
+                  type: string
+                subpath:
+                  type: string
+                nodeSelector:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                credsSecret:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                env:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                console:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                  properties:
+                    metadata:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    image:
+                      type: string
+                    replicas:
+                      type: integer
+                      default: 2
+                    consoleSecret:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                    resources:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    env:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                kes:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                  properties:
+                    metadata:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    image:
+                      type: string
+                    replicas:
+                      type: integer
+                      default: 2
+                    kesSecret:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                liveness:
+                  type: object
+                  properties:
+                    initialDelaySeconds:
+                      type: integer
+                    periodSeconds:
+                      type: integer
+                    timeoutSeconds:
+                      type: integer
+            status:
+              type: object
+              properties:
+                currentState:
+                  type: string
+      subresources:
+        # status enables the status subresource.
+        status: {}
+      additionalPrinterColumns:
+        - name: Current State
+          type: string
+          jsonPath: ".status.currentState"
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: minio-operator
+  namespace: default
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: minio-operator-role
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+      - secrets
+      - pods
+      - services
+      - events
+    verbs:
+      - get
+      - watch
+      - create
+      - list
+      - delete
+  - apiGroups:
+      - apps
+    resources:
+      - statefulsets
+      - deployments
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - batch
+    resources:
+      - jobs
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - certificates.k8s.io
+    resources:
+      - certificatesigningrequests
+      - certificatesigningrequests/approval
+      - certificatesigningrequests/status
+    verbs:
+      - update
+      - create
+      - get
+      - delete
+  - apiGroups:
+      - certificates.k8s.io
+    resourceNames:
+      - kubernetes.io/legacy-unknown
+    resources:
+      - signers
+    verbs:
+      - approve
+      - sign
+  - apiGroups:
+      - minio.min.io
+    resources:
+      - '*'
+    verbs:
+      - '*'
+  - apiGroups:
+      - min.io
+    resources:
+      - '*'
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: minio-operator-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: minio-operator-role
+subjects:
+  - kind: ServiceAccount
+    name: minio-operator
+    namespace: default
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: minio-operator
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: minio-operator
+  template:
+    metadata:
+      labels:
+        name: minio-operator
+    spec:
+      containers:
+        - image: minio/k8s-operator:v3.0.1
+          imagePullPolicy: IfNotPresent
+          name: minio-operator
+      serviceAccountName: minio-operator

k8s/create-kind.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
 # setup environment variables based on flags to see if we should build the docker containers again
-CONSOLE_DOCKER="true"
+MCS_DOCKER="true"
 
 # evaluate flags
-# `-m` for console
+# `-m` for mcs
 
 
 while getopts ":m:" opt; do
   case $opt in
     m)
-	  CONSOLE_DOCKER="$OPTARG"
+	  MCS_DOCKER="$OPTARG"
       ;;
     \?)
       echo "Invalid option: -$OPTARG" >&2
@@ -34,11 +34,11 @@ echo "install metrics server"
 kubectl apply -f metrics-dev.yaml
 
 # Whether or not to build the m3 container and load it to kind or just load it
-if [[ $CONSOLE_DOCKER == "true" ]]; then
+if [[ $MCS_DOCKER == "true" ]]; then
 	# Build mkube
-  make --directory=".." k8sdev TAG=minio/console:latest
+  make --directory=".." k8sdev TAG=minio/mcs:latest
 else
-	kind load docker-image minio/console:latest
+	kind load docker-image minio/mcs:latest
 fi
 
 echo "done"

k8s/getoperator.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+# Get's the latest deployment file from MinIO Operator
+curl https://raw.githubusercontent.com/minio/operator/master/minio-operator.yaml > operator-console/base/minio-operator.yaml

k8s/operator-console/base/console-cluster-role.yaml

@@ -1,234 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: console-sa-role
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-    verbs:
-      - get
-      - watch
-      - create
-      - list
-      - patch
-      - update
-      - deletecollection
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-      - services
-      - events
-      - resourcequotas
-      - nodes
-    verbs:
-      - get
-      - watch
-      - create
-      - list
-      - patch
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-    verbs:
-      - get
-      - watch
-      - create
-      - list
-      - patch
-      - delete
-      - deletecollection
-  - apiGroups:
-      - ""
-    resources:
-      - persistentvolumeclaims
-    verbs:
-      - deletecollection
-      - list
-      - get
-      - watch
-      - update
-  - apiGroups:
-      - "storage.k8s.io"
-    resources:
-      - storageclasses
-    verbs:
-      - get
-      - watch
-      - create
-      - list
-      - patch
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets
-      - deployments
-    verbs:
-      - get
-      - create
-      - list
-      - patch
-      - watch
-      - update
-      - delete
-  - apiGroups:
-      - batch
-    resources:
-      - jobs
-    verbs:
-      - get
-      - create
-      - list
-      - patch
-      - watch
-      - update
-      - delete
-  - apiGroups:
-      - "certificates.k8s.io"
-    resources:
-      - "certificatesigningrequests"
-      - "certificatesigningrequests/approval"
-      - "certificatesigningrequests/status"
-    verbs:
-      - update
-      - create
-      - get
-  - apiGroups:
-      - minio.min.io
-    resources:
-      - "*"
-    verbs:
-      - "*"
-  - apiGroups:
-      - min.io
-    resources:
-      - "*"
-    verbs:
-      - "*"
-  - apiGroups:
-    - ""
-    resources:
-    - persistentvolumes
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - delete
-  - apiGroups:
-    - ""
-    resources:
-    - persistentvolumeclaims
-    verbs:
-    - get
-    - list
-    - watch
-    - update
-  - apiGroups:
-    - ""
-    resources:
-    - events
-    verbs:
-    - create
-    - list
-    - watch
-    - update
-    - patch
-  - apiGroups:
-    - snapshot.storage.k8s.io
-    resources:
-    - volumesnapshots
-    verbs:
-    - get
-    - list
-  - apiGroups:
-    - snapshot.storage.k8s.io
-    resources:
-    - volumesnapshotcontents
-    verbs:
-    - get
-    - list
-  - apiGroups:
-    - storage.k8s.io
-    resources:
-    - csinodes
-    verbs:
-    - get
-    - list
-    - watch
-  - apiGroups:
-    - storage.k8s.io
-    resources:
-    - volumeattachments
-    verbs:
-    - get
-    - list
-    - watch
-  - apiGroups:
-    - ""
-    resources:
-    - endpoints
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - delete
-  - apiGroups:
-    - coordination.k8s.io
-    resources:
-    - leases
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - delete
-  - apiGroups:
-    - direct.csi.min.io
-    resources:
-    - volumes
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - delete
-  - apiGroups:
-    - apiextensions.k8s.io
-    resources:
-    - customresourcedefinitions
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - delete
-  - apiGroups:
-    - direct.csi.min.io
-    resources:
-    - directcsidrives
-    - directcsivolumes
-    verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - delete
-  - apiGroups:
-    - ""
-    resources:
-    - pod
-    - pods/log
-    verbs:
-    - get
-    - list
-    - watch

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

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: console-env
-data:
-  CONSOLE_PORT: "9090"
-  CONSOLE_TLS_PORT: "9443"

k8s/operator-console/base/kustomization.yaml

@@ -2,9 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 # beginning of customizations
 resources:
-  - console-service-account.yaml
-  - console-cluster-role.yaml
-  - console-cluster-role-binding.yaml
-  - console-configmap.yaml
-  - console-service.yaml
-  - console-deployment.yaml
+  - mcs-service-account.yaml
+  - mcs-cluster-role.yaml
+  - mcs-cluster-role-binding.yaml
+  - mcs-configmap.yaml
+  - mcs-service.yaml
+  - mcs-deployment.yaml
+  - minio-operator.yaml

k8s/operator-console/base/mcs-cluster-role-binding.yaml

@@ -0,0 +1,12 @@
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: mcs-sa-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: mcs-sa-role
+subjects:
+  - kind: ServiceAccount
+    name: mcs-sa
+    namespace: default

k8s/operator-console/base/mcs-cluster-role.yaml

@@ -0,0 +1,77 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: mcs-sa-role
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+      - secrets
+      - pods
+      - services
+      - events
+      - resourcequotas
+    verbs:
+      - get
+      - watch
+      - create
+      - list
+      - patch
+  - apiGroups:
+      - "storage.k8s.io"
+    resources:
+      - storageclasses
+    verbs:
+      - get
+      - watch
+      - create
+      - list
+      - patch
+  - apiGroups:
+      - apps
+    resources:
+      - statefulsets
+      - deployments
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - batch
+    resources:
+      - jobs
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - "certificates.k8s.io"
+    resources:
+      - "certificatesigningrequests"
+      - "certificatesigningrequests/approval"
+      - "certificatesigningrequests/status"
+    verbs:
+      - update
+      - create
+      - get
+  - apiGroups:
+      - minio.min.io
+    resources:
+      - "*"
+    verbs:
+      - "*"
+  - apiGroups:
+      - min.io
+    resources:
+      - "*"
+    verbs:
+      - "*"

k8s/operator-console/base/mcs-configmap.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mcs-env
+data:
+  MCS_PORT: "9090"
+  MCS_TLS_PORT: "9443"

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

@@ -1,26 +1,27 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: console
+  name: mcs
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: console
+      app: mcs
   template:
     metadata:
       labels:
-        app: console
+        app: mcs
     spec:
-      serviceAccountName: console-sa
+      serviceAccountName: mcs-sa
       containers:
-        - name: console
-          image: 'minio/console:v0.15.0'
+        - name: mcs
+          image: minio/mcs:latest
           imagePullPolicy: "IfNotPresent"
           env:
-            - name: CONSOLE_OPERATOR_MODE
+            - name: MCS_OPERATOR_MODE
               value: "on"
           args:
+            - /mcs
             - server
           ports:
             - containerPort: 9090

k8s/operator-console/base/mcs-service-account.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: mcs-sa
+  namespace: default

k8s/operator-console/base/mcs-service.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mcs
+  labels:
+    name: mcs
+spec:
+  ports:
+    - port: 9090
+      name: http
+    - port: 9443
+      name: https
+  selector:
+    app: mcs

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

@@ -0,0 +1,282 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: minio-operator
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: tenants.minio.min.io
+spec:
+  group: minio.min.io
+  scope: Namespaced
+  names:
+    kind: Tenant
+    singular: tenant
+    plural: tenants
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        # openAPIV3Schema is the schema for validating custom objects.
+        # Refer https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#specifying-a-structural-schema
+        # for more details
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+              properties:
+                metadata:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                image:
+                  type: string
+                serviceName:
+                  type: string
+                serviceAccountName:
+                  type: string
+                zones:
+                  type: array
+                  items:
+                    type: object
+                    x-kubernetes-preserve-unknown-fields: true
+                    properties:
+                      name:
+                        type: string
+                      servers:
+                        type: integer
+                      volumesPerServer:
+                        type: integer
+                      volumeClaimTemplate:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      resources:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      nodeSelector:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      affinity:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      tolerations:
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                mountPath:
+                  type: string
+                podManagementPolicy:
+                  type: string
+                  enum: [Parallel,OrderedReady]
+                  default: Parallel
+                requestAutoCert:
+                  type: boolean
+                  default: false
+                certConfig:
+                  type: object
+                  properties:
+                    commonName:
+                      type: string
+                    organizationName:
+                      type: array
+                      items:
+                        type: string
+                    dnsNames:
+                      type: array
+                      items:
+                        type: string
+                version:
+                  type: string
+                mountpath:
+                  type: string
+                subpath:
+                  type: string
+                nodeSelector:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                credsSecret:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                env:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                console:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                  properties:
+                    metadata:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    image:
+                      type: string
+                    replicas:
+                      type: integer
+                      default: 2
+                    consoleSecret:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                    resources:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    env:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                kes:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                  properties:
+                    metadata:
+                      type: object
+                      x-kubernetes-preserve-unknown-fields: true
+                    image:
+                      type: string
+                    replicas:
+                      type: integer
+                      default: 2
+                    kesSecret:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                liveness:
+                  type: object
+                  properties:
+                    initialDelaySeconds:
+                      type: integer
+                    periodSeconds:
+                      type: integer
+                    timeoutSeconds:
+                      type: integer
+            status:
+              type: object
+              properties:
+                currentState:
+                  type: string
+      subresources:
+        # status enables the status subresource.
+        status: {}
+      additionalPrinterColumns:
+        - name: Current State
+          type: string
+          jsonPath: ".status.currentState"
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: minio-operator
+  namespace: default
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: minio-operator-role
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+      - secrets
+      - pods
+      - services
+      - events
+    verbs:
+      - get
+      - watch
+      - create
+      - list
+      - delete
+  - apiGroups:
+      - apps
+    resources:
+      - statefulsets
+      - deployments
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - batch
+    resources:
+      - jobs
+    verbs:
+      - get
+      - create
+      - list
+      - patch
+      - watch
+      - update
+      - delete
+  - apiGroups:
+      - certificates.k8s.io
+    resources:
+      - certificatesigningrequests
+      - certificatesigningrequests/approval
+      - certificatesigningrequests/status
+    verbs:
+      - update
+      - create
+      - get
+      - delete
+  - apiGroups:
+      - certificates.k8s.io
+    resourceNames:
+      - kubernetes.io/legacy-unknown
+    resources:
+      - signers
+    verbs:
+      - approve
+      - sign
+  - apiGroups:
+      - minio.min.io
+    resources:
+      - '*'
+    verbs:
+      - '*'
+  - apiGroups:
+      - min.io
+    resources:
+      - '*'
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: minio-operator-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: minio-operator-role
+subjects:
+  - kind: ServiceAccount
+    name: minio-operator
+    namespace: default
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: minio-operator
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: minio-operator
+  template:
+    metadata:
+      labels:
+        name: minio-operator
+    spec:
+      containers:
+        - image: minio/k8s-operator:v3.0.1
+          imagePullPolicy: IfNotPresent
+          name: minio-operator
+      serviceAccountName: minio-operator

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

@@ -1,46 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: console
-  namespace: default
-  labels:
-    name: console
-spec:
-  ports:
-    - port: 9090
-      name: http
-    - port: 9443
-      name: https
-  selector:
-    app: console-standalone
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: console
-  namespace: default
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: console-standalone
-  template:
-    metadata:
-      labels:
-        app: console-standalone
-    spec:
-      containers:
-        - name: console
-          image: 'minio/console:v0.15.0'
-          imagePullPolicy: "IfNotPresent"
-          env:
-            - name: CONSOLE_MINIO_SERVER
-              value: "https://minio.default.svc.cluster.local"
-          args:
-            - server
-          ports:
-            - containerPort: 9090
-              name: http
-            - containerPort: 9433
-              name: https

k8s/tools.go

@@ -1,5 +1,5 @@
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// This file is part of MinIO Kubernetes Cloud
+// Copyright (c) 2019 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
@@ -14,7 +14,7 @@
 // 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 k8s - this package imports things required by build scripts, to force `go mod` to see them as dependencies
+// This package imports things required by build scripts, to force `go mod` to see them as dependencies
 package k8s
 
-// import _ "k8s.io/code-generator"
+//import _ "k8s.io/code-generator"

k8s/update-codegen.sh

@@ -26,8 +26,8 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
 #                  k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
 #                  instead of the $GOPATH directly. For normal projects this can be dropped.
 bash "${CODEGEN_PKG}"/generate-groups.sh "all" \
-  github.com/minio/console/pkg/generated \
-  github.com/minio/console/pkg/apis \
+  github.com/minio/mcs/pkg/generated \
+  github.com/minio/mcs/pkg/apis \
   mkube:v1 \
   --go-header-file "${SCRIPT_ROOT}"/k8s/boilerplate.go.txt
 

models/access_rule.go

@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// AccessRule access rule
-//
-// swagger:model accessRule
-type AccessRule struct {
-
-	// access
-	Access string `json:"access,omitempty"`
-
-	// prefix
-	Prefix string `json:"prefix,omitempty"`
-}
-
-// Validate validates this access rule
-func (m *AccessRule) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this access rule based on context it is used
-func (m *AccessRule) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AccessRule) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AccessRule) UnmarshalBinary(b []byte) error {
-	var res AccessRule
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/account_change_password_request.go

@@ -1,105 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// AccountChangePasswordRequest account change password request
-//
-// swagger:model accountChangePasswordRequest
-type AccountChangePasswordRequest struct {
-
-	// current secret key
-	// Required: true
-	CurrentSecretKey *string `json:"current_secret_key"`
-
-	// new secret key
-	// Required: true
-	NewSecretKey *string `json:"new_secret_key"`
-}
-
-// Validate validates this account change password request
-func (m *AccountChangePasswordRequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCurrentSecretKey(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateNewSecretKey(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AccountChangePasswordRequest) validateCurrentSecretKey(formats strfmt.Registry) error {
-
-	if err := validate.Required("current_secret_key", "body", m.CurrentSecretKey); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *AccountChangePasswordRequest) validateNewSecretKey(formats strfmt.Registry) error {
-
-	if err := validate.Required("new_secret_key", "body", m.NewSecretKey); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this account change password request based on context it is used
-func (m *AccountChangePasswordRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AccountChangePasswordRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AccountChangePasswordRequest) UnmarshalBinary(b []byte) error {
-	var res AccountChangePasswordRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/add_bucket_lifecycle.go

@@ -1,152 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-	"encoding/json"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// AddBucketLifecycle add bucket lifecycle
-//
-// swagger:model addBucketLifecycle
-type AddBucketLifecycle struct {
-
-	// Non required, toggle to disable or enable rule
-	Disable bool `json:"disable,omitempty"`
-
-	// Non required, toggle to disable or enable rule
-	ExpiredObjectDeleteMarker bool `json:"expired_object_delete_marker,omitempty"`
-
-	// Required in case of expiry_date or transition fields are not set. it defines an expiry days for ILM
-	ExpiryDays int32 `json:"expiry_days,omitempty"`
-
-	// Non required, can be set in case of expiration is enabled
-	NoncurrentversionExpirationDays int32 `json:"noncurrentversion_expiration_days,omitempty"`
-
-	// Non required, can be set in case of transition is enabled
-	NoncurrentversionTransitionDays int32 `json:"noncurrentversion_transition_days,omitempty"`
-
-	// Non required, can be set in case of transition is enabled
-	NoncurrentversionTransitionStorageClass string `json:"noncurrentversion_transition_storage_class,omitempty"`
-
-	// Non required field, it matches a prefix to perform ILM operations on it
-	Prefix string `json:"prefix,omitempty"`
-
-	// Required only in case of transition is set. it refers to a tier
-	StorageClass string `json:"storage_class,omitempty"`
-
-	// Non required field, tags to match ILM files
-	Tags string `json:"tags,omitempty"`
-
-	// Required in case of transition_date or expiry fields are not set. it defines a transition days for ILM
-	TransitionDays int32 `json:"transition_days,omitempty"`
-
-	// ILM Rule type (Expiry or transition)
-	// Enum: [expiry transition]
-	Type string `json:"type,omitempty"`
-}
-
-// Validate validates this add bucket lifecycle
-func (m *AddBucketLifecycle) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateType(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-var addBucketLifecycleTypeTypePropEnum []interface{}
-
-func init() {
-	var res []string
-	if err := json.Unmarshal([]byte(`["expiry","transition"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		addBucketLifecycleTypeTypePropEnum = append(addBucketLifecycleTypeTypePropEnum, v)
-	}
-}
-
-const (
-
-	// AddBucketLifecycleTypeExpiry captures enum value "expiry"
-	AddBucketLifecycleTypeExpiry string = "expiry"
-
-	// AddBucketLifecycleTypeTransition captures enum value "transition"
-	AddBucketLifecycleTypeTransition string = "transition"
-)
-
-// prop value enum
-func (m *AddBucketLifecycle) validateTypeEnum(path, location string, value string) error {
-	if err := validate.EnumCase(path, location, value, addBucketLifecycleTypeTypePropEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *AddBucketLifecycle) validateType(formats strfmt.Registry) error {
-	if swag.IsZero(m.Type) { // not required
-		return nil
-	}
-
-	// value enum
-	if err := m.validateTypeEnum("type", "body", m.Type); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this add bucket lifecycle based on context it is used
-func (m *AddBucketLifecycle) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AddBucketLifecycle) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AddBucketLifecycle) UnmarshalBinary(b []byte) error {
-	var res AddBucketLifecycle
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/add_bucket_replication.go

@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// AddBucketReplication add bucket replication
-//
-// swagger:model addBucketReplication
-type AddBucketReplication struct {
-
-	// arn
-	Arn string `json:"arn,omitempty"`
-
-	// destination bucket
-	DestinationBucket string `json:"destination_bucket,omitempty"`
-}
-
-// Validate validates this add bucket replication
-func (m *AddBucketReplication) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this add bucket replication based on context it is used
-func (m *AddBucketReplication) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AddBucketReplication) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AddBucketReplication) UnmarshalBinary(b []byte) error {
-	var res AddBucketReplication
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/add_group_request.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,6 @@ package models
 // 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"
@@ -81,11 +79,6 @@ func (m *AddGroupRequest) validateMembers(formats strfmt.Registry) error {
 	return nil
 }
 
-// ContextValidate validates this add group request based on context it is used
-func (m *AddGroupRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *AddGroupRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {

models/add_multi_bucket_lifecycle.go

@@ -1,168 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-	"encoding/json"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// AddMultiBucketLifecycle add multi bucket lifecycle
-//
-// swagger:model addMultiBucketLifecycle
-type AddMultiBucketLifecycle struct {
-
-	// buckets
-	// Required: true
-	Buckets []string `json:"buckets"`
-
-	// Non required, toggle to disable or enable rule
-	ExpiredObjectDeleteMarker bool `json:"expired_object_delete_marker,omitempty"`
-
-	// Required in case of expiry_date or transition fields are not set. it defines an expiry days for ILM
-	ExpiryDays int32 `json:"expiry_days,omitempty"`
-
-	// Non required, can be set in case of expiration is enabled
-	NoncurrentversionExpirationDays int32 `json:"noncurrentversion_expiration_days,omitempty"`
-
-	// Non required, can be set in case of transition is enabled
-	NoncurrentversionTransitionDays int32 `json:"noncurrentversion_transition_days,omitempty"`
-
-	// Non required, can be set in case of transition is enabled
-	NoncurrentversionTransitionStorageClass string `json:"noncurrentversion_transition_storage_class,omitempty"`
-
-	// Non required field, it matches a prefix to perform ILM operations on it
-	Prefix string `json:"prefix,omitempty"`
-
-	// Required only in case of transition is set. it refers to a tier
-	StorageClass string `json:"storage_class,omitempty"`
-
-	// Non required field, tags to match ILM files
-	Tags string `json:"tags,omitempty"`
-
-	// Required in case of transition_date or expiry fields are not set. it defines a transition days for ILM
-	TransitionDays int32 `json:"transition_days,omitempty"`
-
-	// ILM Rule type (Expiry or transition)
-	// Required: true
-	// Enum: [expiry transition]
-	Type *string `json:"type"`
-}
-
-// Validate validates this add multi bucket lifecycle
-func (m *AddMultiBucketLifecycle) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateBuckets(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateType(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AddMultiBucketLifecycle) validateBuckets(formats strfmt.Registry) error {
-
-	if err := validate.Required("buckets", "body", m.Buckets); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-var addMultiBucketLifecycleTypeTypePropEnum []interface{}
-
-func init() {
-	var res []string
-	if err := json.Unmarshal([]byte(`["expiry","transition"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		addMultiBucketLifecycleTypeTypePropEnum = append(addMultiBucketLifecycleTypeTypePropEnum, v)
-	}
-}
-
-const (
-
-	// AddMultiBucketLifecycleTypeExpiry captures enum value "expiry"
-	AddMultiBucketLifecycleTypeExpiry string = "expiry"
-
-	// AddMultiBucketLifecycleTypeTransition captures enum value "transition"
-	AddMultiBucketLifecycleTypeTransition string = "transition"
-)
-
-// prop value enum
-func (m *AddMultiBucketLifecycle) validateTypeEnum(path, location string, value string) error {
-	if err := validate.EnumCase(path, location, value, addMultiBucketLifecycleTypeTypePropEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *AddMultiBucketLifecycle) validateType(formats strfmt.Registry) error {
-
-	if err := validate.Required("type", "body", m.Type); err != nil {
-		return err
-	}
-
-	// value enum
-	if err := m.validateTypeEnum("type", "body", *m.Type); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this add multi bucket lifecycle based on context it is used
-func (m *AddMultiBucketLifecycle) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AddMultiBucketLifecycle) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AddMultiBucketLifecycle) UnmarshalBinary(b []byte) error {
-	var res AddMultiBucketLifecycle
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/add_policy_request.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,6 @@ package models
 // 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"
@@ -81,11 +79,6 @@ func (m *AddPolicyRequest) validatePolicy(formats strfmt.Registry) error {
 	return nil
 }
 
-// ContextValidate validates this add policy request based on context it is used
-func (m *AddPolicyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *AddPolicyRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {

models/add_service_account_policy_request.go

@@ -1,88 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// AddServiceAccountPolicyRequest add service account policy request
-//
-// swagger:model addServiceAccountPolicyRequest
-type AddServiceAccountPolicyRequest struct {
-
-	// policy
-	// Required: true
-	Policy *string `json:"policy"`
-}
-
-// Validate validates this add service account policy request
-func (m *AddServiceAccountPolicyRequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validatePolicy(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AddServiceAccountPolicyRequest) validatePolicy(formats strfmt.Registry) error {
-
-	if err := validate.Required("policy", "body", m.Policy); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this add service account policy request based on context it is used
-func (m *AddServiceAccountPolicyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AddServiceAccountPolicyRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AddServiceAccountPolicyRequest) UnmarshalBinary(b []byte) error {
-	var res AddServiceAccountPolicyRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/add_user_request.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,6 @@ package models
 // 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"
@@ -44,10 +42,6 @@ type AddUserRequest struct {
 	// Required: true
 	Groups []string `json:"groups"`
 
-	// policies
-	// Required: true
-	Policies []string `json:"policies"`
-
 	// secret key
 	// Required: true
 	SecretKey *string `json:"secretKey"`
@@ -65,10 +59,6 @@ func (m *AddUserRequest) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
-	if err := m.validatePolicies(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateSecretKey(formats); err != nil {
 		res = append(res, err)
 	}
@@ -97,15 +87,6 @@ func (m *AddUserRequest) validateGroups(formats strfmt.Registry) error {
 	return nil
 }
 
-func (m *AddUserRequest) validatePolicies(formats strfmt.Registry) error {
-
-	if err := validate.Required("policies", "body", m.Policies); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (m *AddUserRequest) validateSecretKey(formats strfmt.Registry) error {
 
 	if err := validate.Required("secretKey", "body", m.SecretKey); err != nil {
@@ -115,11 +96,6 @@ func (m *AddUserRequest) validateSecretKey(formats strfmt.Registry) error {
 	return nil
 }
 
-// ContextValidate validates this add user request based on context it is used
-func (m *AddUserRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *AddUserRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {

models/admin_info_response.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,10 +23,6 @@ package models
 // 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"
 )
@@ -42,144 +38,12 @@ type AdminInfoResponse struct {
 	// objects
 	Objects int64 `json:"objects,omitempty"`
 
-	// prometheus not ready
-	PrometheusNotReady bool `json:"prometheusNotReady,omitempty"`
-
-	// servers
-	Servers []*ServerProperties `json:"servers"`
-
 	// usage
 	Usage int64 `json:"usage,omitempty"`
-
-	// widgets
-	Widgets []*Widget `json:"widgets"`
 }
 
 // Validate validates this admin info response
 func (m *AdminInfoResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateServers(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateWidgets(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AdminInfoResponse) validateServers(formats strfmt.Registry) error {
-	if swag.IsZero(m.Servers) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Servers); i++ {
-		if swag.IsZero(m.Servers[i]) { // not required
-			continue
-		}
-
-		if m.Servers[i] != nil {
-			if err := m.Servers[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("servers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("servers" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *AdminInfoResponse) validateWidgets(formats strfmt.Registry) error {
-	if swag.IsZero(m.Widgets) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Widgets); i++ {
-		if swag.IsZero(m.Widgets[i]) { // not required
-			continue
-		}
-
-		if m.Widgets[i] != nil {
-			if err := m.Widgets[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("widgets" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("widgets" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this admin info response based on the context it is used
-func (m *AdminInfoResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateServers(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateWidgets(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AdminInfoResponse) contextValidateServers(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Servers); i++ {
-
-		if m.Servers[i] != nil {
-			if err := m.Servers[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("servers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("servers" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *AdminInfoResponse) contextValidateWidgets(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Widgets); i++ {
-
-		if m.Widgets[i] != nil {
-			if err := m.Widgets[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("widgets" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("widgets" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
 	return nil
 }
 

models/allocatable_resources_response.go

@@ -1,173 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// AllocatableResourcesResponse allocatable resources response
-//
-// swagger:model allocatableResourcesResponse
-type AllocatableResourcesResponse struct {
-
-	// cpu priority
-	CPUPriority *NodeMaxAllocatableResources `json:"cpu_priority,omitempty"`
-
-	// mem priority
-	MemPriority *NodeMaxAllocatableResources `json:"mem_priority,omitempty"`
-
-	// min allocatable cpu
-	MinAllocatableCPU int64 `json:"min_allocatable_cpu,omitempty"`
-
-	// min allocatable mem
-	MinAllocatableMem int64 `json:"min_allocatable_mem,omitempty"`
-}
-
-// Validate validates this allocatable resources response
-func (m *AllocatableResourcesResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCPUPriority(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateMemPriority(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AllocatableResourcesResponse) validateCPUPriority(formats strfmt.Registry) error {
-	if swag.IsZero(m.CPUPriority) { // not required
-		return nil
-	}
-
-	if m.CPUPriority != nil {
-		if err := m.CPUPriority.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("cpu_priority")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("cpu_priority")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *AllocatableResourcesResponse) validateMemPriority(formats strfmt.Registry) error {
-	if swag.IsZero(m.MemPriority) { // not required
-		return nil
-	}
-
-	if m.MemPriority != nil {
-		if err := m.MemPriority.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("mem_priority")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("mem_priority")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this allocatable resources response based on the context it is used
-func (m *AllocatableResourcesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCPUPriority(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateMemPriority(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AllocatableResourcesResponse) contextValidateCPUPriority(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.CPUPriority != nil {
-		if err := m.CPUPriority.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("cpu_priority")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("cpu_priority")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *AllocatableResourcesResponse) contextValidateMemPriority(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.MemPriority != nil {
-		if err := m.MemPriority.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("mem_priority")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("mem_priority")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AllocatableResourcesResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AllocatableResourcesResponse) UnmarshalBinary(b []byte) error {
-	var res AllocatableResourcesResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/annotation.go

@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// Annotation annotation
-//
-// swagger:model annotation
-type Annotation struct {
-
-	// key
-	Key string `json:"key,omitempty"`
-
-	// value
-	Value string `json:"value,omitempty"`
-}
-
-// Validate validates this annotation
-func (m *Annotation) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this annotation based on context it is used
-func (m *Annotation) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Annotation) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Annotation) UnmarshalBinary(b []byte) error {
-	var res Annotation
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/arns_response.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,6 @@ package models
 // 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"
 )
@@ -43,11 +41,6 @@ func (m *ArnsResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }
 
-// ContextValidate validates this arns response based on context it is used
-func (m *ArnsResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *ArnsResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {

models/aws_configuration.go

@@ -1,329 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// AwsConfiguration aws configuration
-//
-// swagger:model awsConfiguration
-type AwsConfiguration struct {
-
-	// secretsmanager
-	// Required: true
-	Secretsmanager *AwsConfigurationSecretsmanager `json:"secretsmanager"`
-}
-
-// Validate validates this aws configuration
-func (m *AwsConfiguration) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateSecretsmanager(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AwsConfiguration) validateSecretsmanager(formats strfmt.Registry) error {
-
-	if err := validate.Required("secretsmanager", "body", m.Secretsmanager); err != nil {
-		return err
-	}
-
-	if m.Secretsmanager != nil {
-		if err := m.Secretsmanager.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secretsmanager")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secretsmanager")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this aws configuration based on the context it is used
-func (m *AwsConfiguration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateSecretsmanager(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AwsConfiguration) contextValidateSecretsmanager(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Secretsmanager != nil {
-		if err := m.Secretsmanager.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secretsmanager")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secretsmanager")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AwsConfiguration) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AwsConfiguration) UnmarshalBinary(b []byte) error {
-	var res AwsConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
-
-// AwsConfigurationSecretsmanager aws configuration secretsmanager
-//
-// swagger:model AwsConfigurationSecretsmanager
-type AwsConfigurationSecretsmanager struct {
-
-	// credentials
-	// Required: true
-	Credentials *AwsConfigurationSecretsmanagerCredentials `json:"credentials"`
-
-	// endpoint
-	// Required: true
-	Endpoint *string `json:"endpoint"`
-
-	// kmskey
-	Kmskey string `json:"kmskey,omitempty"`
-
-	// region
-	// Required: true
-	Region *string `json:"region"`
-}
-
-// Validate validates this aws configuration secretsmanager
-func (m *AwsConfigurationSecretsmanager) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCredentials(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateEndpoint(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateRegion(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AwsConfigurationSecretsmanager) validateCredentials(formats strfmt.Registry) error {
-
-	if err := validate.Required("secretsmanager"+"."+"credentials", "body", m.Credentials); err != nil {
-		return err
-	}
-
-	if m.Credentials != nil {
-		if err := m.Credentials.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secretsmanager" + "." + "credentials")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secretsmanager" + "." + "credentials")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *AwsConfigurationSecretsmanager) validateEndpoint(formats strfmt.Registry) error {
-
-	if err := validate.Required("secretsmanager"+"."+"endpoint", "body", m.Endpoint); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *AwsConfigurationSecretsmanager) validateRegion(formats strfmt.Registry) error {
-
-	if err := validate.Required("secretsmanager"+"."+"region", "body", m.Region); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validate this aws configuration secretsmanager based on the context it is used
-func (m *AwsConfigurationSecretsmanager) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCredentials(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AwsConfigurationSecretsmanager) contextValidateCredentials(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Credentials != nil {
-		if err := m.Credentials.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secretsmanager" + "." + "credentials")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secretsmanager" + "." + "credentials")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AwsConfigurationSecretsmanager) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AwsConfigurationSecretsmanager) UnmarshalBinary(b []byte) error {
-	var res AwsConfigurationSecretsmanager
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
-
-// AwsConfigurationSecretsmanagerCredentials aws configuration secretsmanager credentials
-//
-// swagger:model AwsConfigurationSecretsmanagerCredentials
-type AwsConfigurationSecretsmanagerCredentials struct {
-
-	// accesskey
-	// Required: true
-	Accesskey *string `json:"accesskey"`
-
-	// secretkey
-	// Required: true
-	Secretkey *string `json:"secretkey"`
-
-	// token
-	Token string `json:"token,omitempty"`
-}
-
-// Validate validates this aws configuration secretsmanager credentials
-func (m *AwsConfigurationSecretsmanagerCredentials) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAccesskey(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateSecretkey(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AwsConfigurationSecretsmanagerCredentials) validateAccesskey(formats strfmt.Registry) error {
-
-	if err := validate.Required("secretsmanager"+"."+"credentials"+"."+"accesskey", "body", m.Accesskey); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *AwsConfigurationSecretsmanagerCredentials) validateSecretkey(formats strfmt.Registry) error {
-
-	if err := validate.Required("secretsmanager"+"."+"credentials"+"."+"secretkey", "body", m.Secretkey); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this aws configuration secretsmanager credentials based on context it is used
-func (m *AwsConfigurationSecretsmanagerCredentials) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AwsConfigurationSecretsmanagerCredentials) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AwsConfigurationSecretsmanagerCredentials) UnmarshalBinary(b []byte) error {
-	var res AwsConfigurationSecretsmanagerCredentials
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/azure_configuration.go

@@ -1,321 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// AzureConfiguration azure configuration
-//
-// swagger:model azureConfiguration
-type AzureConfiguration struct {
-
-	// keyvault
-	// Required: true
-	Keyvault *AzureConfigurationKeyvault `json:"keyvault"`
-}
-
-// Validate validates this azure configuration
-func (m *AzureConfiguration) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateKeyvault(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AzureConfiguration) validateKeyvault(formats strfmt.Registry) error {
-
-	if err := validate.Required("keyvault", "body", m.Keyvault); err != nil {
-		return err
-	}
-
-	if m.Keyvault != nil {
-		if err := m.Keyvault.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keyvault")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keyvault")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this azure configuration based on the context it is used
-func (m *AzureConfiguration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateKeyvault(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AzureConfiguration) contextValidateKeyvault(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Keyvault != nil {
-		if err := m.Keyvault.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keyvault")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keyvault")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AzureConfiguration) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AzureConfiguration) UnmarshalBinary(b []byte) error {
-	var res AzureConfiguration
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
-
-// AzureConfigurationKeyvault azure configuration keyvault
-//
-// swagger:model AzureConfigurationKeyvault
-type AzureConfigurationKeyvault struct {
-
-	// credentials
-	Credentials *AzureConfigurationKeyvaultCredentials `json:"credentials,omitempty"`
-
-	// endpoint
-	// Required: true
-	Endpoint *string `json:"endpoint"`
-}
-
-// Validate validates this azure configuration keyvault
-func (m *AzureConfigurationKeyvault) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCredentials(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateEndpoint(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AzureConfigurationKeyvault) validateCredentials(formats strfmt.Registry) error {
-	if swag.IsZero(m.Credentials) { // not required
-		return nil
-	}
-
-	if m.Credentials != nil {
-		if err := m.Credentials.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keyvault" + "." + "credentials")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keyvault" + "." + "credentials")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *AzureConfigurationKeyvault) validateEndpoint(formats strfmt.Registry) error {
-
-	if err := validate.Required("keyvault"+"."+"endpoint", "body", m.Endpoint); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validate this azure configuration keyvault based on the context it is used
-func (m *AzureConfigurationKeyvault) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCredentials(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AzureConfigurationKeyvault) contextValidateCredentials(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Credentials != nil {
-		if err := m.Credentials.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keyvault" + "." + "credentials")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keyvault" + "." + "credentials")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AzureConfigurationKeyvault) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AzureConfigurationKeyvault) UnmarshalBinary(b []byte) error {
-	var res AzureConfigurationKeyvault
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
-
-// AzureConfigurationKeyvaultCredentials azure configuration keyvault credentials
-//
-// swagger:model AzureConfigurationKeyvaultCredentials
-type AzureConfigurationKeyvaultCredentials struct {
-
-	// client id
-	// Required: true
-	ClientID *string `json:"client_id"`
-
-	// client secret
-	// Required: true
-	ClientSecret *string `json:"client_secret"`
-
-	// tenant id
-	// Required: true
-	TenantID *string `json:"tenant_id"`
-}
-
-// Validate validates this azure configuration keyvault credentials
-func (m *AzureConfigurationKeyvaultCredentials) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateClientID(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateClientSecret(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateTenantID(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *AzureConfigurationKeyvaultCredentials) validateClientID(formats strfmt.Registry) error {
-
-	if err := validate.Required("keyvault"+"."+"credentials"+"."+"client_id", "body", m.ClientID); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *AzureConfigurationKeyvaultCredentials) validateClientSecret(formats strfmt.Registry) error {
-
-	if err := validate.Required("keyvault"+"."+"credentials"+"."+"client_secret", "body", m.ClientSecret); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *AzureConfigurationKeyvaultCredentials) validateTenantID(formats strfmt.Registry) error {
-
-	if err := validate.Required("keyvault"+"."+"credentials"+"."+"tenant_id", "body", m.TenantID); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this azure configuration keyvault credentials based on context it is used
-func (m *AzureConfigurationKeyvaultCredentials) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AzureConfigurationKeyvaultCredentials) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AzureConfigurationKeyvaultCredentials) UnmarshalBinary(b []byte) error {
-	var res AzureConfigurationKeyvaultCredentials
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,9 +23,6 @@ package models
 // Editing this file might prove futile when you re-run the swagger generate command
 
 import (
-	"context"
-	"encoding/json"
-
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
@@ -38,28 +35,16 @@ import (
 type Bucket struct {
 
 	// access
-	Access *BucketAccess `json:"access,omitempty"`
+	Access BucketAccess `json:"access,omitempty"`
 
 	// creation date
 	CreationDate string `json:"creation_date,omitempty"`
 
-	// definition
-	Definition string `json:"definition,omitempty"`
-
-	// details
-	Details *BucketDetails `json:"details,omitempty"`
-
 	// name
 	// Required: true
 	// Min Length: 3
 	Name *string `json:"name"`
 
-	// objects
-	Objects int64 `json:"objects,omitempty"`
-
-	// rw access
-	RwAccess *BucketRwAccess `json:"rw_access,omitempty"`
-
 	// size
 	Size int64 `json:"size,omitempty"`
 }
@@ -72,18 +57,10 @@ func (m *Bucket) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}
 
-	if err := m.validateDetails(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateName(formats); err != nil {
 		res = append(res, err)
 	}
 
-	if err := m.validateRwAccess(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -91,38 +68,16 @@ func (m *Bucket) Validate(formats strfmt.Registry) error {
 }
 
 func (m *Bucket) validateAccess(formats strfmt.Registry) error {
+
 	if swag.IsZero(m.Access) { // not required
 		return nil
 	}
 
-	if m.Access != nil {
-		if err := m.Access.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("access")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("access")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Bucket) validateDetails(formats strfmt.Registry) error {
-	if swag.IsZero(m.Details) { // not required
-		return nil
-	}
-
-	if m.Details != nil {
-		if err := m.Details.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("details")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("details")
-			}
-			return err
+	if err := m.Access.Validate(formats); err != nil {
+		if ve, ok := err.(*errors.Validation); ok {
+			return ve.ValidateName("access")
 		}
+		return err
 	}
 
 	return nil
@@ -134,102 +89,13 @@ func (m *Bucket) validateName(formats strfmt.Registry) error {
 		return err
 	}
 
-	if err := validate.MinLength("name", "body", *m.Name, 3); err != nil {
+	if err := validate.MinLength("name", "body", string(*m.Name), 3); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (m *Bucket) validateRwAccess(formats strfmt.Registry) error {
-	if swag.IsZero(m.RwAccess) { // not required
-		return nil
-	}
-
-	if m.RwAccess != nil {
-		if err := m.RwAccess.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("rw_access")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("rw_access")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this bucket based on the context it is used
-func (m *Bucket) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAccess(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateDetails(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateRwAccess(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Bucket) contextValidateAccess(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Access != nil {
-		if err := m.Access.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("access")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("access")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Bucket) contextValidateDetails(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Details != nil {
-		if err := m.Details.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("details")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("details")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Bucket) contextValidateRwAccess(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.RwAccess != nil {
-		if err := m.RwAccess.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("rw_access")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("rw_access")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *Bucket) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -247,237 +113,3 @@ func (m *Bucket) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
-
-// BucketDetails bucket details
-//
-// swagger:model BucketDetails
-type BucketDetails struct {
-
-	// locking
-	Locking bool `json:"locking,omitempty"`
-
-	// quota
-	Quota *BucketDetailsQuota `json:"quota,omitempty"`
-
-	// replication
-	Replication bool `json:"replication,omitempty"`
-
-	// tags
-	Tags map[string]string `json:"tags,omitempty"`
-
-	// versioning
-	Versioning bool `json:"versioning,omitempty"`
-
-	// versioning suspended
-	VersioningSuspended bool `json:"versioningSuspended,omitempty"`
-}
-
-// Validate validates this bucket details
-func (m *BucketDetails) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateQuota(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketDetails) validateQuota(formats strfmt.Registry) error {
-	if swag.IsZero(m.Quota) { // not required
-		return nil
-	}
-
-	if m.Quota != nil {
-		if err := m.Quota.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("details" + "." + "quota")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("details" + "." + "quota")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this bucket details based on the context it is used
-func (m *BucketDetails) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateQuota(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketDetails) contextValidateQuota(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Quota != nil {
-		if err := m.Quota.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("details" + "." + "quota")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("details" + "." + "quota")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketDetails) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketDetails) UnmarshalBinary(b []byte) error {
-	var res BucketDetails
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
-
-// BucketDetailsQuota bucket details quota
-//
-// swagger:model BucketDetailsQuota
-type BucketDetailsQuota struct {
-
-	// quota
-	Quota int64 `json:"quota,omitempty"`
-
-	// type
-	// Enum: [hard]
-	Type string `json:"type,omitempty"`
-}
-
-// Validate validates this bucket details quota
-func (m *BucketDetailsQuota) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateType(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-var bucketDetailsQuotaTypeTypePropEnum []interface{}
-
-func init() {
-	var res []string
-	if err := json.Unmarshal([]byte(`["hard"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		bucketDetailsQuotaTypeTypePropEnum = append(bucketDetailsQuotaTypeTypePropEnum, v)
-	}
-}
-
-const (
-
-	// BucketDetailsQuotaTypeHard captures enum value "hard"
-	BucketDetailsQuotaTypeHard string = "hard"
-)
-
-// prop value enum
-func (m *BucketDetailsQuota) validateTypeEnum(path, location string, value string) error {
-	if err := validate.EnumCase(path, location, value, bucketDetailsQuotaTypeTypePropEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *BucketDetailsQuota) validateType(formats strfmt.Registry) error {
-	if swag.IsZero(m.Type) { // not required
-		return nil
-	}
-
-	// value enum
-	if err := m.validateTypeEnum("details"+"."+"quota"+"."+"type", "body", m.Type); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this bucket details quota based on context it is used
-func (m *BucketDetailsQuota) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketDetailsQuota) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketDetailsQuota) UnmarshalBinary(b []byte) error {
-	var res BucketDetailsQuota
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
-
-// BucketRwAccess bucket rw access
-//
-// swagger:model BucketRwAccess
-type BucketRwAccess struct {
-
-	// read
-	Read bool `json:"read,omitempty"`
-
-	// write
-	Write bool `json:"write,omitempty"`
-}
-
-// Validate validates this bucket rw access
-func (m *BucketRwAccess) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this bucket rw access based on context it is used
-func (m *BucketRwAccess) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketRwAccess) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketRwAccess) UnmarshalBinary(b []byte) error {
-	var res BucketRwAccess
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_access.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,7 +23,6 @@ package models
 // Editing this file might prove futile when you re-run the swagger generate command
 
 import (
-	"context"
 	"encoding/json"
 
 	"github.com/go-openapi/errors"
@@ -36,15 +35,6 @@ import (
 // swagger:model bucketAccess
 type BucketAccess string
 
-func NewBucketAccess(value BucketAccess) *BucketAccess {
-	return &value
-}
-
-// Pointer returns a pointer to a freshly-allocated BucketAccess.
-func (m BucketAccess) Pointer() *BucketAccess {
-	return &m
-}
-
 const (
 
 	// BucketAccessPRIVATE captures enum value "PRIVATE"
@@ -91,8 +81,3 @@ func (m BucketAccess) Validate(formats strfmt.Registry) error {
 	}
 	return nil
 }
-
-// ContextValidate validates this bucket access based on context it is used
-func (m BucketAccess) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}

models/bucket_encryption_info.go

@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketEncryptionInfo bucket encryption info
-//
-// swagger:model bucketEncryptionInfo
-type BucketEncryptionInfo struct {
-
-	// algorithm
-	Algorithm string `json:"algorithm,omitempty"`
-
-	// kms master key ID
-	KmsMasterKeyID string `json:"kmsMasterKeyID,omitempty"`
-}
-
-// Validate validates this bucket encryption info
-func (m *BucketEncryptionInfo) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this bucket encryption info based on context it is used
-func (m *BucketEncryptionInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketEncryptionInfo) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketEncryptionInfo) UnmarshalBinary(b []byte) error {
-	var res BucketEncryptionInfo
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_encryption_request.go

@@ -1,124 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketEncryptionRequest bucket encryption request
-//
-// swagger:model bucketEncryptionRequest
-type BucketEncryptionRequest struct {
-
-	// enc type
-	EncType *BucketEncryptionType `json:"encType,omitempty"`
-
-	// kms key ID
-	KmsKeyID string `json:"kmsKeyID,omitempty"`
-}
-
-// Validate validates this bucket encryption request
-func (m *BucketEncryptionRequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateEncType(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketEncryptionRequest) validateEncType(formats strfmt.Registry) error {
-	if swag.IsZero(m.EncType) { // not required
-		return nil
-	}
-
-	if m.EncType != nil {
-		if err := m.EncType.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("encType")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("encType")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this bucket encryption request based on the context it is used
-func (m *BucketEncryptionRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateEncType(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketEncryptionRequest) contextValidateEncType(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.EncType != nil {
-		if err := m.EncType.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("encType")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("encType")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketEncryptionRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketEncryptionRequest) UnmarshalBinary(b []byte) error {
-	var res BucketEncryptionRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_encryption_type.go

@@ -1,95 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-	"encoding/json"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/validate"
-)
-
-// BucketEncryptionType bucket encryption type
-//
-// swagger:model bucketEncryptionType
-type BucketEncryptionType string
-
-func NewBucketEncryptionType(value BucketEncryptionType) *BucketEncryptionType {
-	return &value
-}
-
-// Pointer returns a pointer to a freshly-allocated BucketEncryptionType.
-func (m BucketEncryptionType) Pointer() *BucketEncryptionType {
-	return &m
-}
-
-const (
-
-	// BucketEncryptionTypeSseDashS3 captures enum value "sse-s3"
-	BucketEncryptionTypeSseDashS3 BucketEncryptionType = "sse-s3"
-
-	// BucketEncryptionTypeSseDashKms captures enum value "sse-kms"
-	BucketEncryptionTypeSseDashKms BucketEncryptionType = "sse-kms"
-)
-
-// for schema
-var bucketEncryptionTypeEnum []interface{}
-
-func init() {
-	var res []BucketEncryptionType
-	if err := json.Unmarshal([]byte(`["sse-s3","sse-kms"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		bucketEncryptionTypeEnum = append(bucketEncryptionTypeEnum, v)
-	}
-}
-
-func (m BucketEncryptionType) validateBucketEncryptionTypeEnum(path, location string, value BucketEncryptionType) error {
-	if err := validate.EnumCase(path, location, value, bucketEncryptionTypeEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Validate validates this bucket encryption type
-func (m BucketEncryptionType) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	// value enum
-	if err := m.validateBucketEncryptionTypeEnum("", "body", m); err != nil {
-		return err
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-// ContextValidate validates this bucket encryption type based on context it is used
-func (m BucketEncryptionType) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}

models/bucket_event_request.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,6 @@ package models
 // 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"
@@ -68,38 +66,6 @@ func (m *BucketEventRequest) validateConfiguration(formats strfmt.Registry) erro
 		if err := m.Configuration.Validate(formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
 				return ve.ValidateName("configuration")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("configuration")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this bucket event request based on the context it is used
-func (m *BucketEventRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateConfiguration(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketEventRequest) contextValidateConfiguration(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Configuration != nil {
-		if err := m.Configuration.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("configuration")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("configuration")
 			}
 			return err
 		}

models/bucket_lifecycle_response.go

@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketLifecycleResponse bucket lifecycle response
-//
-// swagger:model bucketLifecycleResponse
-type BucketLifecycleResponse struct {
-
-	// lifecycle
-	Lifecycle []*ObjectBucketLifecycle `json:"lifecycle"`
-}
-
-// Validate validates this bucket lifecycle response
-func (m *BucketLifecycleResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateLifecycle(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketLifecycleResponse) validateLifecycle(formats strfmt.Registry) error {
-	if swag.IsZero(m.Lifecycle) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Lifecycle); i++ {
-		if swag.IsZero(m.Lifecycle[i]) { // not required
-			continue
-		}
-
-		if m.Lifecycle[i] != nil {
-			if err := m.Lifecycle[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("lifecycle" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("lifecycle" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this bucket lifecycle response based on the context it is used
-func (m *BucketLifecycleResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateLifecycle(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketLifecycleResponse) contextValidateLifecycle(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Lifecycle); i++ {
-
-		if m.Lifecycle[i] != nil {
-			if err := m.Lifecycle[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("lifecycle" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("lifecycle" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketLifecycleResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketLifecycleResponse) UnmarshalBinary(b []byte) error {
-	var res BucketLifecycleResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_ob_locking_response.go

@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketObLockingResponse bucket ob locking response
-//
-// swagger:model bucketObLockingResponse
-type BucketObLockingResponse struct {
-
-	// object locking enabled
-	ObjectLockingEnabled bool `json:"object_locking_enabled,omitempty"`
-}
-
-// Validate validates this bucket ob locking response
-func (m *BucketObLockingResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this bucket ob locking response based on context it is used
-func (m *BucketObLockingResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketObLockingResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketObLockingResponse) UnmarshalBinary(b []byte) error {
-	var res BucketObLockingResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_object.go

@@ -1,115 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketObject bucket object
-//
-// swagger:model bucketObject
-type BucketObject struct {
-
-	// content type
-	ContentType string `json:"content_type,omitempty"`
-
-	// etag
-	Etag string `json:"etag,omitempty"`
-
-	// expiration
-	Expiration string `json:"expiration,omitempty"`
-
-	// expiration rule id
-	ExpirationRuleID string `json:"expiration_rule_id,omitempty"`
-
-	// is delete marker
-	IsDeleteMarker bool `json:"is_delete_marker,omitempty"`
-
-	// is latest
-	IsLatest bool `json:"is_latest,omitempty"`
-
-	// last modified
-	LastModified string `json:"last_modified,omitempty"`
-
-	// legal hold status
-	LegalHoldStatus string `json:"legal_hold_status,omitempty"`
-
-	// metadata
-	Metadata map[string]string `json:"metadata,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// retention mode
-	RetentionMode string `json:"retention_mode,omitempty"`
-
-	// retention until date
-	RetentionUntilDate string `json:"retention_until_date,omitempty"`
-
-	// size
-	Size int64 `json:"size,omitempty"`
-
-	// tags
-	Tags map[string]string `json:"tags,omitempty"`
-
-	// user metadata
-	UserMetadata map[string]string `json:"user_metadata,omitempty"`
-
-	// user tags
-	UserTags map[string]string `json:"user_tags,omitempty"`
-
-	// version id
-	VersionID string `json:"version_id,omitempty"`
-}
-
-// Validate validates this bucket object
-func (m *BucketObject) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this bucket object based on context it is used
-func (m *BucketObject) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketObject) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketObject) UnmarshalBinary(b []byte) error {
-	var res BucketObject
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_quota.go

@@ -1,122 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-	"encoding/json"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// BucketQuota bucket quota
-//
-// swagger:model bucketQuota
-type BucketQuota struct {
-
-	// quota
-	Quota int64 `json:"quota,omitempty"`
-
-	// type
-	// Enum: [hard]
-	Type string `json:"type,omitempty"`
-}
-
-// Validate validates this bucket quota
-func (m *BucketQuota) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateType(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-var bucketQuotaTypeTypePropEnum []interface{}
-
-func init() {
-	var res []string
-	if err := json.Unmarshal([]byte(`["hard"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		bucketQuotaTypeTypePropEnum = append(bucketQuotaTypeTypePropEnum, v)
-	}
-}
-
-const (
-
-	// BucketQuotaTypeHard captures enum value "hard"
-	BucketQuotaTypeHard string = "hard"
-)
-
-// prop value enum
-func (m *BucketQuota) validateTypeEnum(path, location string, value string) error {
-	if err := validate.EnumCase(path, location, value, bucketQuotaTypeTypePropEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *BucketQuota) validateType(formats strfmt.Registry) error {
-	if swag.IsZero(m.Type) { // not required
-		return nil
-	}
-
-	// value enum
-	if err := m.validateTypeEnum("type", "body", m.Type); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this bucket quota based on context it is used
-func (m *BucketQuota) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketQuota) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketQuota) UnmarshalBinary(b []byte) error {
-	var res BucketQuota
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_replication_destination.go

@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketReplicationDestination bucket replication destination
-//
-// swagger:model bucketReplicationDestination
-type BucketReplicationDestination struct {
-
-	// bucket
-	Bucket string `json:"bucket,omitempty"`
-}
-
-// Validate validates this bucket replication destination
-func (m *BucketReplicationDestination) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this bucket replication destination based on context it is used
-func (m *BucketReplicationDestination) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketReplicationDestination) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketReplicationDestination) UnmarshalBinary(b []byte) error {
-	var res BucketReplicationDestination
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_replication_response.go

@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketReplicationResponse bucket replication response
-//
-// swagger:model bucketReplicationResponse
-type BucketReplicationResponse struct {
-
-	// rules
-	Rules []*BucketReplicationRule `json:"rules"`
-}
-
-// Validate validates this bucket replication response
-func (m *BucketReplicationResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateRules(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketReplicationResponse) validateRules(formats strfmt.Registry) error {
-	if swag.IsZero(m.Rules) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Rules); i++ {
-		if swag.IsZero(m.Rules[i]) { // not required
-			continue
-		}
-
-		if m.Rules[i] != nil {
-			if err := m.Rules[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("rules" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("rules" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this bucket replication response based on the context it is used
-func (m *BucketReplicationResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateRules(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketReplicationResponse) contextValidateRules(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Rules); i++ {
-
-		if m.Rules[i] != nil {
-			if err := m.Rules[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("rules" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("rules" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketReplicationResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketReplicationResponse) UnmarshalBinary(b []byte) error {
-	var res BucketReplicationResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_replication_rule.go

@@ -1,256 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-	"encoding/json"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// BucketReplicationRule bucket replication rule
-//
-// swagger:model bucketReplicationRule
-type BucketReplicationRule struct {
-
-	// bandwidth
-	Bandwidth string `json:"bandwidth,omitempty"`
-
-	// delete marker replication
-	DeleteMarkerReplication bool `json:"delete_marker_replication,omitempty"`
-
-	// deletes replication
-	DeletesReplication bool `json:"deletes_replication,omitempty"`
-
-	// destination
-	Destination *BucketReplicationDestination `json:"destination,omitempty"`
-
-	// existing objects
-	ExistingObjects bool `json:"existingObjects,omitempty"`
-
-	// health check period
-	HealthCheckPeriod int64 `json:"healthCheckPeriod,omitempty"`
-
-	// id
-	ID string `json:"id,omitempty"`
-
-	// metadata replication
-	MetadataReplication bool `json:"metadata_replication,omitempty"`
-
-	// prefix
-	Prefix string `json:"prefix,omitempty"`
-
-	// priority
-	Priority int32 `json:"priority,omitempty"`
-
-	// status
-	// Enum: [Enabled Disabled]
-	Status string `json:"status,omitempty"`
-
-	// storage class
-	StorageClass string `json:"storageClass,omitempty"`
-
-	// sync mode
-	// Enum: [async sync]
-	SyncMode *string `json:"syncMode,omitempty"`
-
-	// tags
-	Tags string `json:"tags,omitempty"`
-}
-
-// Validate validates this bucket replication rule
-func (m *BucketReplicationRule) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateDestination(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateStatus(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateSyncMode(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketReplicationRule) validateDestination(formats strfmt.Registry) error {
-	if swag.IsZero(m.Destination) { // not required
-		return nil
-	}
-
-	if m.Destination != nil {
-		if err := m.Destination.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("destination")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("destination")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-var bucketReplicationRuleTypeStatusPropEnum []interface{}
-
-func init() {
-	var res []string
-	if err := json.Unmarshal([]byte(`["Enabled","Disabled"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		bucketReplicationRuleTypeStatusPropEnum = append(bucketReplicationRuleTypeStatusPropEnum, v)
-	}
-}
-
-const (
-
-	// BucketReplicationRuleStatusEnabled captures enum value "Enabled"
-	BucketReplicationRuleStatusEnabled string = "Enabled"
-
-	// BucketReplicationRuleStatusDisabled captures enum value "Disabled"
-	BucketReplicationRuleStatusDisabled string = "Disabled"
-)
-
-// prop value enum
-func (m *BucketReplicationRule) validateStatusEnum(path, location string, value string) error {
-	if err := validate.EnumCase(path, location, value, bucketReplicationRuleTypeStatusPropEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *BucketReplicationRule) validateStatus(formats strfmt.Registry) error {
-	if swag.IsZero(m.Status) { // not required
-		return nil
-	}
-
-	// value enum
-	if err := m.validateStatusEnum("status", "body", m.Status); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-var bucketReplicationRuleTypeSyncModePropEnum []interface{}
-
-func init() {
-	var res []string
-	if err := json.Unmarshal([]byte(`["async","sync"]`), &res); err != nil {
-		panic(err)
-	}
-	for _, v := range res {
-		bucketReplicationRuleTypeSyncModePropEnum = append(bucketReplicationRuleTypeSyncModePropEnum, v)
-	}
-}
-
-const (
-
-	// BucketReplicationRuleSyncModeAsync captures enum value "async"
-	BucketReplicationRuleSyncModeAsync string = "async"
-
-	// BucketReplicationRuleSyncModeSync captures enum value "sync"
-	BucketReplicationRuleSyncModeSync string = "sync"
-)
-
-// prop value enum
-func (m *BucketReplicationRule) validateSyncModeEnum(path, location string, value string) error {
-	if err := validate.EnumCase(path, location, value, bucketReplicationRuleTypeSyncModePropEnum, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *BucketReplicationRule) validateSyncMode(formats strfmt.Registry) error {
-	if swag.IsZero(m.SyncMode) { // not required
-		return nil
-	}
-
-	// value enum
-	if err := m.validateSyncModeEnum("syncMode", "body", *m.SyncMode); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validate this bucket replication rule based on the context it is used
-func (m *BucketReplicationRule) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateDestination(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *BucketReplicationRule) contextValidateDestination(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Destination != nil {
-		if err := m.Destination.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("destination")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("destination")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketReplicationRule) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketReplicationRule) UnmarshalBinary(b []byte) error {
-	var res BucketReplicationRule
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bucket_versioning_response.go

@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-package 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"
-)
-
-// BucketVersioningResponse bucket versioning response
-//
-// swagger:model bucketVersioningResponse
-type BucketVersioningResponse struct {
-
-	// is versioned
-	IsVersioned bool `json:"is_versioned,omitempty"`
-}
-
-// Validate validates this bucket versioning response
-func (m *BucketVersioningResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this bucket versioning response based on context it is used
-func (m *BucketVersioningResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *BucketVersioningResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *BucketVersioningResponse) UnmarshalBinary(b []byte) error {
-	var res BucketVersioningResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}

models/bulk_user_groups.go

@@ -1,7 +1,7 @@
 // Code generated by go-swagger; DO NOT EDIT.
 
 // This file is part of MinIO Console Server
-// Copyright (c) 2021 MinIO, Inc.
+// Copyright (c) 2020 MinIO, Inc.
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,6 @@ package models
 // 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"
@@ -81,11 +79,6 @@ func (m *BulkUserGroups) validateUsers(formats strfmt.Registry) error {
 	return nil
 }
 
-// ContextValidate validates this bulk user groups based on context it is used
-func (m *BulkUserGroups) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *BulkUserGroups) MarshalBinary() ([]byte, error) {
 	if m == nil {