New Login Design (#1675)

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>

cluster/config.go

@@ -17,20 +17,15 @@
 package cluster
 
 import (
-	"errors"
-	"fmt"
 	"io/ioutil"
 	"net"
 	"net/http"
-	"regexp"
 	"strings"
 	"time"
 
-	"github.com/minio/pkg/env"
-)
+	"github.com/minio/console/pkg/utils"
 
-var (
-	errCantDetermineMinIOImage = errors.New("can't determine MinIO Image")
+	"github.com/minio/pkg/env"
 )
 
 func GetK8sAPIServer() string {
@@ -66,31 +61,8 @@ func GetNsFromFile() string {
 // Namespace will run only once at console startup
 var Namespace = GetNsFromFile()
 
-// getLatestMinIOImage returns the latest docker image for MinIO if found on the internet
-func getLatestMinIOImage(client HTTPClientI) (*string, error) {
-	resp, err := client.Get("https://dl.min.io/server/minio/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)\.\/minio\.(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/minio:%s", release)
-		return &dockerImage, nil
-	}
-	return nil, errCantDetermineMinIOImage
-}
-
-var latestMinIOImage, errLatestMinIOImage = getLatestMinIOImage(
-	&HTTPClient{
+var latestMinIOImage, errLatestMinIOImage = utils.GetLatestMinIOImage(
+	&utils.HTTPClient{
 		Client: &http.Client{
 			Timeout: 15 * time.Second,
 		},
@@ -112,8 +84,8 @@ func GetMinioImage() (*string, error) {
 }
 
 // GetLatestMinioImage returns the latest image URL on minio repository
-func GetLatestMinioImage(client HTTPClientI) (*string, error) {
-	latestMinIOImage, err := getLatestMinIOImage(client)
+func GetLatestMinioImage(client utils.HTTPClientI) (*string, error) {
+	latestMinIOImage, err := utils.GetLatestMinIOImage(client)
 	if err != nil {
 		return nil, err
 	}

cluster/http_client.go

@@ -1,53 +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 cluster
-
-import (
-	"io"
-	"net/http"
-)
-
-// HTTPClientI interface with all functions to be implemented
-// by mock when testing, it should include all HttpClient respective api calls
-// 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
-//
-// Define the structure of a http client and define the functions that are actually used
-type HTTPClient struct {
-	Client *http.Client
-}
-
-// Get implements http.Client.Get()
-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)
-}