From 9532aa9500189cf3bfcb89610544f4203a7e9338 Mon Sep 17 00:00:00 2001
From: jinapurapu <65002498+jinapurapu@users.noreply.github.com>
Date: Thu, 13 Oct 2022 20:05:59 -0700
Subject: [PATCH]  Fixed handling of nil usage in getUsageWidgetsForDeployment
 (#2378)

---
 restapi/admin_info.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/restapi/admin_info.go b/restapi/admin_info.go
index 732c53632..d93d8850c 100644
--- a/restapi/admin_info.go
+++ b/restapi/admin_info.go
@@ -893,7 +893,6 @@ func getUsageWidgetsForDeployment(ctx context.Context, prometheusURL string, mAd
 	if prometheusURL != "" && !testPrometheusURL(ctx, prometheusURL) {
 		prometheusStatus = models.AdminInfoResponseAdvancedMetricsStatusUnavailable
 	}
-
 	sessionResp := &models.AdminInfoResponse{
 		AdvancedMetricsStatus: prometheusStatus,
 	}
@@ -903,15 +902,18 @@ func getUsageWidgetsForDeployment(ctx context.Context, prometheusURL string, mAd
 		// create a minioClient interface implementation
 		// defining the client to be used
 		adminClient := AdminClient{Client: mAdmin}
+
 		// serialize output
 		usage, err := GetAdminInfo(ctx, adminClient)
 		if err != nil {
 			doneCh <- err
 		}
-		sessionResp.Buckets = usage.Buckets
-		sessionResp.Objects = usage.Objects
-		sessionResp.Usage = usage.Usage
-		sessionResp.Servers = usage.Servers
+		if usage != nil {
+			sessionResp.Buckets = usage.Buckets
+			sessionResp.Objects = usage.Objects
+			sessionResp.Usage = usage.Usage
+			sessionResp.Servers = usage.Servers
+		}
 	}()
 
 	var wdgts []*models.Widget