Merge pull request #179 from codecrafters-io/deps-upgrade

Update dependencies + Go version

Author: ryan-gang

.github/workflows/test.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
 
       # Required for tests
       - name: Install Redis
@@ -35,14 +35,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
 
-      - uses: dominikh/[email protected].0
+      - uses: dominikh/[email protected].1
         with:
-          version: "2023.1"
+          version: "2025.1.1"
           install-go: false

go.mod

@@ -1,25 +1,27 @@
 module github.com/codecrafters-io/redis-tester
 
-go 1.21
+go 1.24
+
+toolchain go1.24.2
 
 require (
-	github.com/codecrafters-io/tester-utils v0.2.38
+	github.com/codecrafters-io/tester-utils v0.4.2
 	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/hdt3213/rdb v1.0.18
-	github.com/stretchr/testify v1.9.0
+	github.com/hdt3213/rdb v1.1.0
+	github.com/stretchr/testify v1.10.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.17.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/onsi/ginkgo v1.11.0 // indirect
 	github.com/onsi/gomega v1.8.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 

go.sum

@@ -6,27 +6,26 @@ github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/codecrafters-io/tester-utils v0.2.38 h1:rKxm02A4Ll6gGrwcsGKDHxZExjH4hMbtu2ra7r/E7Lk=
-github.com/codecrafters-io/tester-utils v0.2.38/go.mod h1:VgP0WmmRsA8L1urWGMXPW4Zv5jcwHwR0LdKZ8ZAEFT4=
+github.com/codecrafters-io/tester-utils v0.4.2 h1:WwSq/2uEQDPRQuTZtjeswwbzqNoI9cNYPTAY6qYRA4Q=
+github.com/codecrafters-io/tester-utils v0.4.2/go.mod h1:Fyrv4IebzjWtvKfpYf8ooYDoOtjYe2qx8bV7KAJpX+w=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
-github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
 github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/hdt3213/rdb v1.0.18 h1:mfYKZBkowTWR8uNWUnvL48GsE7RdDH1i7mnDa/eFwzc=
-github.com/hdt3213/rdb v1.0.18/go.mod h1:p2O7ep2/CDdaZt4gywZevL6Vdjash4+imZ0wpinogm8=
+github.com/hdt3213/rdb v1.1.0 h1:PntkgzBCK5Ss4lncvKAQnWHqb7bCR50/d7LZmNHHk3k=
+github.com/hdt3213/rdb v1.1.0/go.mod h1:p2O7ep2/CDdaZt4gywZevL6Vdjash4+imZ0wpinogm8=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
@@ -45,21 +44,20 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.9.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=

internal/rdb_file_creator.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 
 	"github.com/codecrafters-io/tester-utils/logger"
-	testerutils_random "github.com/codecrafters-io/tester-utils/random"
+	"github.com/codecrafters-io/tester-utils/random"
 	"github.com/codecrafters-io/tester-utils/test_case_harness"
 
 	"github.com/hdt3213/rdb/encoder"
@@ -39,7 +39,7 @@ func NewRDBFileCreator() (*RDBFileCreator, error) {
 
 	return &RDBFileCreator{
 		Dir:      realDir,
-		Filename: fmt.Sprintf("%s.rdb", testerutils_random.RandomWord()),
+		Filename: fmt.Sprintf("%s.rdb", random.RandomWord()),
 	}, nil
 }
 

internal/rdb_file_creator_test.go

@@ -6,17 +6,19 @@ import (
 	"path/filepath"
 	"testing"
 
-	testerutils_random "github.com/codecrafters-io/tester-utils/random"
+	"github.com/codecrafters-io/tester-utils/random"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRDBFileCreator(t *testing.T) {
+	random.Init()
+
 	RDBFileCreator, err := NewRDBFileCreator()
 	if err != nil {
 		t.Fatalf("CodeCrafters Tester Error: %s", err)
 	}
 
-	randomKeyAndValue := testerutils_random.RandomWords(2)
+	randomKeyAndValue := random.RandomWords(2)
 	randomKey, randomValue := randomKeyAndValue[0], randomKeyAndValue[1]
 
 	if err := RDBFileCreator.Write([]KeyValuePair{{key: randomKey, value: randomValue}}); err != nil {

internal/redis_executable/redis_executable.go

@@ -29,7 +29,7 @@ func NewRedisExecutable(stageHarness *test_case_harness.TestCaseHarness) *RedisE
 
 func (b *RedisExecutable) Run(args ...string) error {
 	b.args = args
-	if b.args == nil || len(b.args) == 0 {
+	if len(b.args) == 0 {
 		b.logger.Infof("$ ./%s", path.Base(b.executable.Path))
 	} else {
 		var log string
@@ -41,7 +41,7 @@ func (b *RedisExecutable) Run(args ...string) error {
 				log += " " + arg
 			}
 		}
-		b.logger.Infof(log)
+		b.logger.Infof("%s", log)
 	}
 
 	if err := b.executable.Start(b.args...); err != nil {

internal/stages_test.go

@@ -114,7 +114,7 @@ func normalizeTesterOutput(testerOutput []byte) []byte {
 		"xadd_id":                 {regexp.MustCompile(`\d{13}-\d+`)},
 		"rdb_bytes":               {regexp.MustCompile(`"\$[0-9]+\\r\\nREDIS.*"`)},
 		"info_replication_bytes":  {regexp.MustCompile(`"\$[0-9]+\\r\\n# Replication\\r\\n[^"]+"`)},
-		"rdb_keys":                {regexp.MustCompile(`\[stage-11\] .*Received .*`)},
+		"rdb_keys":                {regexp.MustCompile(`\[tester::#JW4\] .*Received .*`)},
 		"hexdump":                 {regexp.MustCompile(`[0-9a-fA-F]{4} \| [0-9a-fA-F ]{47} \| .{0,16}`)},
 	}
 

internal/test_helpers/fixtures/bind/failure

@@ -1,6 +1,6 @@
-[stage-1] Running tests for Stage #1: jm1
-[stage-1] $ ./spawn_redis_server.sh
-[stage-1] Connecting to port 6379...
+[tester::#JM1] Running tests for Stage #JM1 (jm1)
+[tester::#JM1] $ ./spawn_redis_server.sh
+[tester::#JM1] Connecting to port 6379...
 [your_program] hey, not going to bind!
-[stage-1] Failed to connect to port 6379.
-[stage-1] Test failed (try setting 'debug: true' in your codecrafters.yml to see more details)
+[tester::#JM1] Failed to connect to port 6379.
+[tester::#JM1] Test failed (try setting 'debug: true' in your codecrafters.yml to see more details)

internal/test_helpers/fixtures/bind/success

@@ -1,10 +1,10 @@
 Debug = true
 
-[stage-1] Running tests for Stage #1: jm1
-[stage-1] $ ./spawn_redis_server.sh
-[stage-1] Connecting to port 6379...
+[tester::#JM1] Running tests for Stage #JM1 (jm1)
+[tester::#JM1] $ ./spawn_redis_server.sh
+[tester::#JM1] Connecting to port 6379...
 [your_program] hey, binding to 6379
-[stage-1] Connection successful
-[stage-1] Test passed.
-[stage-1] Terminating program
-[stage-1] Program terminated successfully
+[tester::#JM1] Connection successful
+[tester::#JM1] Test passed.
+[tester::#JM1] Terminating program
+[tester::#JM1] Program terminated successfully

internal/test_helpers/fixtures/bind/timeout

@@ -1,18 +1,18 @@
-[stage-1] Running tests for Stage #1: jm1
-[stage-1] $ ./spawn_redis_server.sh
-[stage-1] Connecting to port 6379...
+[tester::#JM1] Running tests for Stage #JM1 (jm1)
+[tester::#JM1] $ ./spawn_redis_server.sh
+[tester::#JM1] Connecting to port 6379...
 [your_program] hey, not going to bind!
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] Failed to connect to port 6379, retrying in 1s
-[stage-1] timed out, test exceeded 15 seconds
-[stage-1] Test failed (try setting 'debug: true' in your codecrafters.yml to see more details)
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] Failed to connect to port 6379, retrying in 1s
+[tester::#JM1] timed out, test exceeded 15 seconds
+[tester::#JM1] Test failed (try setting 'debug: true' in your codecrafters.yml to see more details)