From 31743789dc055a207c6d8405fe5c46caadfc13b4 Mon Sep 17 00:00:00 2001
From: Frank Wessels <fwessels@xs4all.nl>
Date: Thu, 1 Feb 2024 19:42:56 -0800
Subject: [PATCH] Fix some leftover issues from PR 18936 (#18946)

---
 cmd/peer-rest-client.go | 70 +++++++++--------------------------------
 cmd/peer-rest-server.go |  4 +++
 2 files changed, 18 insertions(+), 56 deletions(-)

diff --git a/cmd/peer-rest-client.go b/cmd/peer-rest-client.go
index 31f1c1e4c..e538b2269 100644
--- a/cmd/peer-rest-client.go
+++ b/cmd/peer-rest-client.go
@@ -415,10 +415,7 @@ func (client *peerRESTClient) LoadBucketMetadata(bucket string) error {
 	_, err := loadBucketMetadataHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTBucket: bucket,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // DeleteBucketMetadata - Delete bucket metadata
@@ -430,10 +427,7 @@ func (client *peerRESTClient) DeleteBucketMetadata(bucket string) error {
 	_, err := deleteBucketMetadataHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTBucket: bucket,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // DeletePolicy - delete a specific canned policy.
@@ -446,10 +440,7 @@ func (client *peerRESTClient) DeletePolicy(policyName string) (err error) {
 	_, err = deletePolicyHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTPolicy: policyName,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // LoadPolicy - reload a specific canned policy.
@@ -462,10 +453,7 @@ func (client *peerRESTClient) LoadPolicy(policyName string) (err error) {
 	_, err = loadPolicyHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTPolicy: policyName,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // LoadPolicyMapping - reload a specific policy mapping
@@ -480,10 +468,7 @@ func (client *peerRESTClient) LoadPolicyMapping(userOrGroup string, userType IAM
 		peerRESTUserType:    strconv.Itoa(int(userType)),
 		peerRESTIsGroup:     strconv.FormatBool(isGroup),
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // DeleteUser - delete a specific user.
@@ -496,10 +481,7 @@ func (client *peerRESTClient) DeleteUser(accessKey string) (err error) {
 	_, err = deleteUserHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTUser: accessKey,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // DeleteServiceAccount - delete a specific service account.
@@ -512,10 +494,7 @@ func (client *peerRESTClient) DeleteServiceAccount(accessKey string) (err error)
 	_, err = deleteSvcActHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTUser: accessKey,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // LoadUser - reload a specific user.
@@ -529,10 +508,7 @@ func (client *peerRESTClient) LoadUser(accessKey string, temp bool) (err error)
 		peerRESTUser:     accessKey,
 		peerRESTUserTemp: strconv.FormatBool(temp),
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // LoadServiceAccount - reload a specific service account.
@@ -545,10 +521,7 @@ func (client *peerRESTClient) LoadServiceAccount(accessKey string) (err error) {
 	_, err = loadSvcActHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTUser: accessKey,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // LoadGroup - send load group command to peers.
@@ -561,10 +534,7 @@ func (client *peerRESTClient) LoadGroup(group string) error {
 	_, err := loadGroupHandler.Call(context.Background(), conn, grid.NewMSSWith(map[string]string{
 		peerRESTGroup: group,
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // VerifyBinary - sends verify binary message to remote peers.
@@ -678,10 +648,7 @@ func (client *peerRESTClient) ReloadPoolMeta(ctx context.Context) error {
 		return nil
 	}
 	_, err := reloadPoolMetaHandler.Call(ctx, conn, grid.NewMSSWith(map[string]string{}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (client *peerRESTClient) StopRebalance(ctx context.Context) error {
@@ -690,10 +657,7 @@ func (client *peerRESTClient) StopRebalance(ctx context.Context) error {
 		return nil
 	}
 	_, err := stopRebalanceHandler.Call(ctx, conn, grid.NewMSSWith(map[string]string{}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (client *peerRESTClient) LoadRebalanceMeta(ctx context.Context, startRebalance bool) error {
@@ -704,10 +668,7 @@ func (client *peerRESTClient) LoadRebalanceMeta(ctx context.Context, startRebala
 	_, err := loadRebalanceMetaHandler.Call(ctx, conn, grid.NewMSSWith(map[string]string{
 		peerRESTStartRebalance: strconv.FormatBool(startRebalance),
 	}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (client *peerRESTClient) LoadTransitionTierConfig(ctx context.Context) error {
@@ -716,10 +677,7 @@ func (client *peerRESTClient) LoadTransitionTierConfig(ctx context.Context) erro
 		return nil
 	}
 	_, err := loadTransitionTierConfigHandler.Call(ctx, conn, grid.NewMSSWith(map[string]string{}))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func (client *peerRESTClient) doTrace(ctx context.Context, traceCh chan<- []byte, traceOpts madmin.ServiceTraceOpts) {
diff --git a/cmd/peer-rest-server.go b/cmd/peer-rest-server.go
index 8f30da887..86f2e2e3c 100644
--- a/cmd/peer-rest-server.go
+++ b/cmd/peer-rest-server.go
@@ -228,6 +228,10 @@ func (s *peerRESTServer) LoadGroupHandler(mss *grid.MSS) (np grid.NoPayload, ner
 	}
 
 	group := mss.Get(peerRESTGroup)
+	if group == "" {
+		return np, grid.NewRemoteErr(errors.New("group is missing"))
+	}
+
 	err := globalIAMSys.LoadGroup(context.Background(), objAPI, group)
 	if err != nil {
 		return np, grid.NewRemoteErr(err)