Skip to content

Commit 9532aa9

Browse files
authored
Fixed handling of nil usage in getUsageWidgetsForDeployment (#2378)
1 parent ec3deed commit 9532aa9

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

restapi/admin_info.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,6 @@ func getUsageWidgetsForDeployment(ctx context.Context, prometheusURL string, mAd
893893
if prometheusURL != "" && !testPrometheusURL(ctx, prometheusURL) {
894894
prometheusStatus = models.AdminInfoResponseAdvancedMetricsStatusUnavailable
895895
}
896-
897896
sessionResp := &models.AdminInfoResponse{
898897
AdvancedMetricsStatus: prometheusStatus,
899898
}
@@ -903,15 +902,18 @@ func getUsageWidgetsForDeployment(ctx context.Context, prometheusURL string, mAd
903902
// create a minioClient interface implementation
904903
// defining the client to be used
905904
adminClient := AdminClient{Client: mAdmin}
905+
906906
// serialize output
907907
usage, err := GetAdminInfo(ctx, adminClient)
908908
if err != nil {
909909
doneCh <- err
910910
}
911-
sessionResp.Buckets = usage.Buckets
912-
sessionResp.Objects = usage.Objects
913-
sessionResp.Usage = usage.Usage
914-
sessionResp.Servers = usage.Servers
911+
if usage != nil {
912+
sessionResp.Buckets = usage.Buckets
913+
sessionResp.Objects = usage.Objects
914+
sessionResp.Usage = usage.Usage
915+
sessionResp.Servers = usage.Servers
916+
}
915917
}()
916918

917919
var wdgts []*models.Widget

0 commit comments

Comments
 (0)