Merge branch 'master' into inspect-v2-format

Author: bexsoft

models/tier.go

@@ -471,7 +471,7 @@ export const erasureCodeCalc = (
 
   const fourVar = parityValidValues.find((element) => element === "EC:4");
 
-  if (totalDisks >= 8 && totalNodes > 16 && fourVar) {
+  if (fourVar) {
     defaultEC = "EC:4";
   }
 

portal-ui/src/common/utils.ts

@@ -106,7 +106,6 @@ const ListTiersConfiguration = ({ classes }: IListTiersConfig) => {
   const [records, setRecords] = useState<ITierElement[]>([]);
   const [filter, setFilter] = useState<string>("");
   const [isLoading, setIsLoading] = useState<boolean>(true);
-  const [checkTierStatus, setcheckTierStatus] = useState<boolean>(false);
   const [updateCredentialsOpen, setUpdateCredentialsOpen] =
     useState<boolean>(false);
   const [selectedTier, setSelectedTier] = useState<ITierElement>({
@@ -117,46 +116,6 @@ const ListTiersConfiguration = ({ classes }: IListTiersConfig) => {
     IAM_SCOPES.ADMIN_SET_TIER,
   ]);
 
-  useEffect(() => {
-    if (checkTierStatus) {
-      records.forEach((tier: ITierElement) => {
-        var endpoint: string;
-        switch (tier.type) {
-          case "minio":
-            endpoint = tier.minio?.endpoint + "/" + tier.minio?.bucket || "";
-            break;
-          case "s3":
-            endpoint = tier.s3?.endpoint + "/" + tier.s3?.bucket || "";
-            break;
-          case "gcs":
-            endpoint = tier.gcs?.endpoint + "/" + tier.gcs?.bucket || "";
-            break;
-          case "azure":
-            endpoint = tier.azure?.endpoint + "/" + tier.azure?.bucket || "";
-            break;
-          default:
-            endpoint = "";
-        }
-        const xhr = new XMLHttpRequest();
-        xhr.open("HEAD", endpoint);
-        xhr.send();
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState === 4 || xhr.readyState === 2) {
-            tier.status = true;
-          } else {
-            tier.status = false;
-          }
-        };
-        xhr.onerror = () => {
-          tier.status = false;
-        };
-      });
-      setRecords(records);
-      setcheckTierStatus(false);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [checkTierStatus]);
-
   useEffect(() => {
     if (isLoading) {
       if (distributedSetup) {
@@ -166,7 +125,6 @@ const ListTiersConfiguration = ({ classes }: IListTiersConfig) => {
             .then((res: ITierResponse) => {
               setRecords(res.items || []);
               setIsLoading(false);
-              setcheckTierStatus(true);
             })
             .catch((err: ErrorResponseHandler) => {
               dispatch(setErrorSnackMessage(err));

portal-ui/src/screens/Console/Configurations/TiersConfiguration/ListTiersConfiguration.tsx

@@ -19,14 +19,20 @@ package restapi
 import (
 	"context"
 	"encoding/base64"
+	"log"
+	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/dustin/go-humanize"
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations"
 	tieringApi "github.com/minio/console/restapi/operations/tiering"
 	"github.com/minio/madmin-go"
+
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
 )
 
 func registerAdminTiersHandlers(api *operations.ConsoleAPI) {
@@ -109,6 +115,7 @@ func getTiers(ctx context.Context, client MinioAdmin) (*models.TierListResponse,
 					Objects:      strconv.Itoa(stats.NumObjects),
 					Versions:     strconv.Itoa(stats.NumVersions),
 				},
+				Status: false,
 			})
 		case madmin.MinIO:
 			tiersList = append(tiersList, &models.Tier{
@@ -125,6 +132,7 @@ func getTiers(ctx context.Context, client MinioAdmin) (*models.TierListResponse,
 					Objects:   strconv.Itoa(stats.NumObjects),
 					Versions:  strconv.Itoa(stats.NumVersions),
 				},
+				Status: checkTierStatus(tierData.MinIO.Endpoint, tierData.MinIO.AccessKey, tierData.MinIO.SecretKey, tierData.MinIO.Bucket),
 			})
 		case madmin.GCS:
 			tiersList = append(tiersList, &models.Tier{
@@ -140,6 +148,7 @@ func getTiers(ctx context.Context, client MinioAdmin) (*models.TierListResponse,
 					Objects:  strconv.Itoa(stats.NumObjects),
 					Versions: strconv.Itoa(stats.NumVersions),
 				},
+				Status: false,
 			})
 		case madmin.Azure:
 			tiersList = append(tiersList, &models.Tier{
@@ -156,15 +165,16 @@ func getTiers(ctx context.Context, client MinioAdmin) (*models.TierListResponse,
 					Objects:     strconv.Itoa(stats.NumObjects),
 					Versions:    strconv.Itoa(stats.NumVersions),
 				},
+				Status: false,
 			})
 		case madmin.Unsupported:
 			tiersList = append(tiersList, &models.Tier{
-				Type: models.TierTypeUnsupported,
+				Type:   models.TierTypeUnsupported,
+				Status: false,
 			})
 
 		}
 	}
-
 	// build response
 	return &models.TierListResponse{
 		Items: tiersList,
@@ -407,3 +417,23 @@ func getEditTierCredentialsResponse(session *models.Principal, params tieringApi
 	}
 	return nil
 }
+
+func checkTierStatus(endpoint string, accessKey string, secretKey string, bucketName string) bool {
+	// Initialize minio client object.
+	re := regexp.MustCompile(`(^\w+:|^)\/\/`)
+	s := re.ReplaceAllString(endpoint, "")
+	minioClient, err := minio.New(s, &minio.Options{
+		Creds:  credentials.NewStaticV4(accessKey, secretKey, ""),
+		Secure: false,
+	})
+	if err != nil {
+		log.Println(err)
+		return false
+	}
+	bucketTest, err := minioClient.BucketExists(context.Background(), bucketName)
+	if err != nil {
+		log.Println(err)
+		return strings.Contains(err.Error(), "The request signature we calculated does not match the signature you provided. Check your key and signing method.")
+	}
+	return bucketTest
+}

restapi/admin_tiers.go

@@ -5119,6 +5119,8 @@ definitions:
   tier:
     type: object
     properties:
+      status:
+        type: boolean
       type:
         type: string
         enum: