Merge pull request #203 from codecrafters-io/eddie/redis-cli-patch

Patch: redis-cli logging

Author: UdeshyaDhungana

internal/instrumented_resp_connection/instrumented_resp_connection.go

@@ -26,11 +26,8 @@ func defaultCallbacks(logger *logger.Logger) resp_connection.RespConnectionCallb
 				commandPrefix = "$ redis-cli"
 			}
 
-			if len(args) > 0 {
-				logger.Infof("%s %s %s", commandPrefix, command, strings.Join(args, " "))
-			} else {
-				logger.Infof("%s %s", commandPrefix, command)
-			}
+			commandWithArgs := append([]string{command}, args...)
+			logger.Infof("%s %s", commandPrefix, quoteCLICommand(commandWithArgs))
 		},
 		BeforeSendValue: func(value resp_value.Value) {
 			logger.Infof("Sent %s", value.FormattedString())

internal/instrumented_resp_connection/utils.go

@@ -0,0 +1,28 @@
+package instrumented_resp_connection
+
+import (
+	"fmt"
+	"strings"
+)
+
+// quoteIfHasSpaceOrEscapeSequence quotes a string if it contains escapable characters or spaces
+func quoteIfHasSpaceOrEscapeSequence(s string) string {
+	quoted := fmt.Sprintf("%q", s)
+
+	// if the string does not change on trimming double quotes, no escapable chracter was present
+	if (s == strings.Trim(quoted, "\"")) && (!strings.Contains(s, " ")) {
+		return s
+	}
+
+	return quoted
+}
+
+// quoteCLICommand applies quoteIfHasSpaceOrEscapeSequence to each argument in commandWithArgs,
+// then joins them into a single space-separated string.
+func quoteCLICommand(commandWithArgs []string) string {
+	result := make([]string, len(commandWithArgs))
+	for i, a := range commandWithArgs {
+		result[i] = quoteIfHasSpaceOrEscapeSequence(a)
+	}
+	return strings.Join(result, " ")
+}

internal/test_cases/subscriber_group_test_case.go

@@ -84,7 +84,7 @@ func (t *SubscriberGroupTestCase) RunSubscribe(logger *logger.Logger) error {
 func (t *SubscriberGroupTestCase) RunAssertionForPublishedMessage(channel string, message string, logger *logger.Logger) error {
 	for _, subscriber := range t.subscribers {
 		if slices.Contains(subscriber.Channels, channel) {
-			subscriber.Client.GetLogger().Infof("Expecting published message: (%s)", message)
+			subscriber.Client.GetLogger().Infof("Expecting published message: %q", message)
 			receiveTestCase := ReceiveValueTestCase{
 				Assertion: resp_assertions.NewPublishedMessageAssertion(channel, message),
 			}