add additional details

Author: cesnietor

models/tenant.go

@@ -42,9 +42,10 @@ func registerAdminInfoHandlers(api *operations.McsAPI) {
 }
 
 type usageInfo struct {
-	Buckets int64
-	Objects int64
-	Usage   int64
+	Buckets    int64
+	Objects    int64
+	Usage      int64
+	DisksUsage int64
 }
 
 // getAdminInfo invokes admin info and returns a parsed `usageInfo` structure
@@ -55,10 +56,19 @@ func getAdminInfo(ctx context.Context, client MinioAdmin) (*usageInfo, error) {
 	}
 	// we are trimming uint64 to int64 this will report an incorrect measurement for numbers greater than
 	// 9,223,372,036,854,775,807
+
+	var usedSpace int64
+	for _, serv := range serverInfo.Servers {
+		for _, disk := range serv.Disks {
+			usedSpace += int64(disk.UsedSpace)
+		}
+	}
+
 	return &usageInfo{
-		Buckets: int64(serverInfo.Buckets.Count),
-		Objects: int64(serverInfo.Objects.Count),
-		Usage:   int64(serverInfo.Usage.Size),
+		Buckets:    int64(serverInfo.Buckets.Count),
+		Objects:    int64(serverInfo.Objects.Count),
+		Usage:      int64(serverInfo.Usage.Size),
+		DisksUsage: usedSpace,
 	}, nil
 }
 

restapi/admin_info.go

@@ -129,13 +129,53 @@ func getDeleteTenantResponse(token string, params admin_api.DeleteTenantParams)
 }
 
 func getTenantInfoResponse(token string, params admin_api.TenantInfoParams) (*models.Tenant, error) {
+	ctx := context.Background()
 	opClient, err := cluster.OperatorClient(token)
 	if err != nil {
 		return nil, err
 	}
 
-	minInst, err := opClient.OperatorV1().MinIOInstances(params.Namespace).Get(context.Background(), params.Tenant, metav1.GetOptions{})
+	minInst, err := opClient.OperatorV1().MinIOInstances(params.Namespace).Get(ctx, params.Tenant, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	clientset, err := cluster.K8sClient(token)
+	if err != nil {
+		return nil, err
+	}
+
+	creds, err := clientset.CoreV1().Secrets(params.Namespace).Get(ctx, "minio-creds-secret", metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	accessKey, ok := creds.Data["accesskey"]
+	if !ok {
+		return nil, errorGeneric
+	}
+	secretkey, ok := creds.Data["secretkey"]
+	if !ok {
+		return nil, errorGeneric
+	}
+	endpoint, err := clientset.CoreV1().Services(params.Namespace).Get(ctx, fmt.Sprintf("%s-internal-service", params.Tenant), metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+	mAdmin, pErr := NewAdminClient(fmt.Sprintf("http://%s:9000", endpoint.Spec.ClusterIP), string(accessKey), string(secretkey))
+	if pErr != nil {
+		return nil, pErr.Cause
+	}
+	// create a minioClient interface implementation
+	// defining the client to be used
+	adminClient := adminClient{client: mAdmin}
+	// 20 seconds timeout
+	ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
+	// serialize output
+	usage, err := getAdminInfo(ctx, adminClient)
 	if err != nil {
+		log.Println("error getting information:", err)
 		return nil, err
 	}
 
@@ -162,10 +202,13 @@ func getTenantInfoResponse(token string, params admin_api.TenantInfoParams) (*mo
 		VolumesPerServer: int64(minInst.Spec.VolumesPerServer),
 		VolumeCount:      volumeCount,
 		VolumeSize:       minInst.Spec.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value(),
+		TotalSize:        int64(minInst.Spec.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value() * volumeCount),
 		ZoneCount:        int64(len(minInst.Spec.Zones)),
 		CurrentState:     minInst.Status.CurrentState,
 		Zones:            zones,
 		Namespace:        minInst.ObjectMeta.Namespace,
+		Image:            minInst.Spec.Image,
+		UsedSize:         usage.DisksUsage,
 	}, nil
 }
 

restapi/tenants.go renamed to restapi/admin_tenants.go

@@ -28,7 +28,6 @@ import (
 
 	"github.com/minio/mcs/models"
 	"github.com/minio/mcs/pkg"
-	"github.com/minio/mcs/pkg/auth"
 
 	assetFS "github.com/elazarl/go-bindata-assetfs"