From 47f635ee1639ed30f3b5cba9b746ac45c7d84ecf Mon Sep 17 00:00:00 2001
From: Malavan Sotheeswaran <msotheeswaran@snapchat.com>
Date: Mon, 23 Oct 2023 14:34:23 -0400
Subject: [PATCH] Fix tls auditlog tests and enable tls for CI (#234)

* fix auditlog test titles, and enable tls tests for CI

* fix tls auditlog key string
---
 build.yaml                  | 4 ++--
 src/server.cpp              | 4 ++--
 tests/unit/tls-auditlog.tcl | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.yaml b/build.yaml
index 63667f283..8b63cc7ff 100644
--- a/build.yaml
+++ b/build.yaml
@@ -21,13 +21,13 @@ machamp:
         parent: make-build
         # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
         builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest --clients 4 --verbose 
+        command: ./runtest --clients 4 --verbose --tls
       cluster-test:
         type: cmd
         parent: make-build
         # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
         builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest-cluster 
+        command: ./runtest-cluster --tls
       sentinel-test:
         type: cmd
         parent: make-build
diff --git a/src/server.cpp b/src/server.cpp
index 27af97b3a..48c78a838 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -5102,8 +5102,8 @@ int processCommand(client *c, int callFlags) {
 
             sds str = sdsempty();
             for (int j = 0; j < numkeys; j++) {
-                sdscatsds(str, (sds)ptrFromObj(c->argv[keyindex[j]]));
-                sdscat(str, " ");
+                str = sdscatsds(str, (sds)ptrFromObj(c->argv[keyindex[j]]));
+                str = sdscat(str, " ");
             }
         
             if (numkeys > 0)
diff --git a/tests/unit/tls-auditlog.tcl b/tests/unit/tls-auditlog.tcl
index 4761ada56..655e624e3 100644
--- a/tests/unit/tls-auditlog.tcl
+++ b/tests/unit/tls-auditlog.tcl
@@ -51,7 +51,7 @@ if {$::tls} {
         }
     }
 
-    test {TLS: Able to connect while with SAN having a comprehensive list} {
+    test {TLS Audit Log: Able to connect while with SAN having a comprehensive list} {
         start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.keydb.dev san2.keydb.dev other.keydb.dev}}} {
             catch {r PING} e
             assert_match {PONG} $e
@@ -65,7 +65,7 @@ if {$::tls} {
         }
     }
 
-    test {TLS Audit LogTLS: Able to connect while with SAN having a comprehensive list with wildcards} {
+    test {TLS Audit Log: Able to connect while with SAN having a comprehensive list with wildcards} {
         start_server {tags {"tls"} overrides {tls-auditlog-blocklist {dummy.* san*.dev other.*}}} {
             catch {r PING} e
             assert_match {PONG} $e