mongo: pr review

Author: jgao54

flow/shared/mongo/commands.go

@@ -12,7 +12,7 @@ type BuildInfo struct {
 	Version string `bson:"version"`
 }
 
-func GetBuildInfo(ctx context.Context, client *mongo.Client) (*BuildInfo, error) {
+func GetBuildInfo(ctx context.Context, client *mongo.Client) (BuildInfo, error) {
 	return runCommand[BuildInfo](ctx, client, "buildInfo")
 }
 
@@ -21,7 +21,7 @@ type ReplSetGetStatus struct {
 	MyState int    `bson:"myState"`
 }
 
-func GetReplSetGetStatus(ctx context.Context, client *mongo.Client) (*ReplSetGetStatus, error) {
+func GetReplSetGetStatus(ctx context.Context, client *mongo.Client) (ReplSetGetStatus, error) {
 	return runCommand[ReplSetGetStatus](ctx, client, "replSetGetStatus")
 }
 
@@ -38,7 +38,7 @@ type ServerStatus struct {
 	OplogTruncation OplogTruncation `bson:"oplogTruncation"`
 }
 
-func GetServerStatus(ctx context.Context, client *mongo.Client) (*ServerStatus, error) {
+func GetServerStatus(ctx context.Context, client *mongo.Client) (ServerStatus, error) {
 	return runCommand[ServerStatus](ctx, client, "serverStatus")
 }
 
@@ -55,7 +55,7 @@ type Role struct {
 	DB   string `bson:"db"`
 }
 
-func GetConnectionStatus(ctx context.Context, client *mongo.Client) (*ConnectionStatus, error) {
+func GetConnectionStatus(ctx context.Context, client *mongo.Client) (ConnectionStatus, error) {
 	return runCommand[ConnectionStatus](ctx, client, "connectionStatus")
 }
 
@@ -64,21 +64,21 @@ type HelloResponse struct {
 	Hosts []string `bson:"hosts,omitempty"`
 }
 
-func GetHelloResponse(ctx context.Context, client *mongo.Client) (*HelloResponse, error) {
+func GetHelloResponse(ctx context.Context, client *mongo.Client) (HelloResponse, error) {
 	return runCommand[HelloResponse](ctx, client, "hello")
 }
 
-func runCommand[T any](ctx context.Context, client *mongo.Client, command string) (*T, error) {
+func runCommand[T any](ctx context.Context, client *mongo.Client, command string) (T, error) {
+	var result T
 	singleResult := client.Database("admin").RunCommand(ctx, bson.D{
 		bson.E{Key: command, Value: 1},
 	})
 	if singleResult.Err() != nil {
-		return nil, fmt.Errorf("'%s' failed: %v", command, singleResult.Err())
+		return result, fmt.Errorf("'%s' failed: %v", command, singleResult.Err())
 	}
 
-	var result T
 	if err := singleResult.Decode(&result); err != nil {
-		return nil, fmt.Errorf("'%s' failed: %v", command, err)
+		return result, fmt.Errorf("'%s' failed: %v", command, err)
 	}
-	return &result, nil
+	return result, nil
 }

flow/shared/mongo/validation.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 
 	"go.mongodb.org/mongo-driver/v2/mongo"
 )
@@ -16,6 +17,8 @@ const (
 	ShardedCluster = "ShardedCluster"
 )
 
+var RequiredRoles = [...]string{"readAnyDatabase", "clusterMonitor"}
+
 func ValidateServerCompatibility(ctx context.Context, client *mongo.Client) error {
 	buildInfo, err := GetBuildInfo(ctx, client)
 	if err != nil {
@@ -54,24 +57,15 @@ func ValidateServerCompatibility(ctx context.Context, client *mongo.Client) erro
 }
 
 func ValidateUserRoles(ctx context.Context, client *mongo.Client) error {
-	RequiredRoles := []string{"readAnyDatabase", "clusterMonitor"}
-
 	connectionStatus, err := GetConnectionStatus(ctx, client)
 	if err != nil {
 		return err
 	}
 
-	hasRole := func(roles []Role, targetRole string) bool {
-		for _, role := range roles {
-			if role.Role == targetRole {
-				return true
-			}
-		}
-		return false
-	}
-
 	for _, requiredRole := range RequiredRoles {
-		if !hasRole(connectionStatus.AuthInfo.AuthenticatedUserRoles, requiredRole) {
+		if !slices.ContainsFunc(connectionStatus.AuthInfo.AuthenticatedUserRoles, func(r Role) bool {
+			return r.Role == requiredRole
+		}) {
 			return fmt.Errorf("missing required role: %s", requiredRole)
 		}
 	}