mix of makefile and action

Author: ndyakov

.github/actions/run-tests/action.yml

@@ -47,6 +47,5 @@ runs:
         RCE_DOCKER: "true"
         RE_CLUSTER: "false"
       run: |
-        go test ./... -short -race && \
-        go test -coverprofile=coverage.txt -covermode=atomic ./... && \
+        make test.ci
       shell: bash

Makefile

@@ -1,14 +1,18 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
-export REDIS_VERSION := "7.2"
+export REDIS_VERSION := "7.4"
 
-redisstackdocker.start:
-	docker start go-redis-redis-stack || docker run -d --name go-redis-redis-stack  -p 6379:6379 -e REDIS_ARGS="--enable-debug-command yes --enable-module-command yes" redis/redis-stack-server:latest
+docker.start:
+	docker compose --profile all up -d
 
-redisstackdocker.stop:
-	docker stop go-redis-redis-stack
+docker.stop:
+	docker compose --profile all down
 
-test: testdeps
-	$(MAKE) redisstackdocker.start
+test:
+	$(MAKE) docker.start
+	$(MAKE) test.ci
+	$(MAKE) docker.stop
+
+test.ci:
 	$(eval GO_VERSION := $(shell go version | cut -d " " -f 3 | cut -d. -f2))
 	set -e; for dir in $(GO_MOD_DIRS); do \
 	  if echo "$${dir}" | grep -q "./example" && [ "$(GO_VERSION)" = "19" ]; then \
@@ -18,17 +22,12 @@ test: testdeps
 	  echo "go test in $${dir}"; \
 	  (cd "$${dir}" && \
 	    go mod tidy -compat=1.18 && \
-	    go test && \
-	    go test ./... -short -race && \
-	    env GOOS=linux GOARCH=386 go test && \
-	    go test -coverprofile=coverage.txt -covermode=atomic ./... && \
+	    go test ./... -short -race -v && \
+	    go test -v -coverprofile=coverage.txt -covermode=atomic ./... && \
 	    go vet); \
 	done
 	cd internal/customvet && go build .
 	go vet -vettool ./internal/customvet/customvet
-	$(MAKE) redisstackdocker.stop
-
-testdeps: testdata/redis/src/redis-server
 
 bench:
 	go test ./... -test.run=NONE -test.bench=. -test.benchmem
@@ -38,13 +37,6 @@ bench:
 build:
 	go build .
 
-testdata/redis:
-	mkdir -p $@
-	wget -qO- https://download.redis.io/releases/redis-7.4.2.tar.gz  | tar xvz --strip-components=1 -C $@
-
-testdata/redis/src/redis-server: testdata/redis
-	cd $< && make all
-
 fmt:
 	gofumpt -w ./
 	goimports -w  -local github.com/redis/go-redis ./

cluster_commands.go

@@ -4,6 +4,7 @@ import "context"
 
 type ClusterCmdable interface {
 	ClusterMyShardID(ctx context.Context) *StringCmd
+	ClusterMyID(ctx context.Context) *StringCmd
 	ClusterSlots(ctx context.Context) *ClusterSlotsCmd
 	ClusterShards(ctx context.Context) *ClusterShardsCmd
 	ClusterLinks(ctx context.Context) *ClusterLinksCmd
@@ -35,6 +36,12 @@ func (c cmdable) ClusterMyShardID(ctx context.Context) *StringCmd {
 	return cmd
 }
 
+func (c cmdable) ClusterMyID(ctx context.Context) *StringCmd {
+	cmd := NewStringCmd(ctx, "cluster", "myid")
+	_ = c(ctx, cmd)
+	return cmd
+}
+
 func (c cmdable) ClusterSlots(ctx context.Context) *ClusterSlotsCmd {
 	cmd := NewClusterSlotsCmd(ctx, "cluster", "slots")
 	_ = c(ctx, cmd)

commands_test.go

@@ -703,7 +703,7 @@ var _ = Describe("Commands", func() {
 	})
 
 	Describe("debugging", func() {
-		PIt("should DebugObject", func() {
+		It("should DebugObject", func() {
 			err := client.DebugObject(ctx, "foo").Err()
 			Expect(err).To(MatchError("ERR no such key"))
 
@@ -6628,14 +6628,12 @@ var _ = Describe("Commands", func() {
 
 			res, err := client.ZRangeWithScores(ctx, "result", 0, -1).Result()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(res).To(ContainElement(redis.Z{
-				Score:  190.44242984775784,
-				Member: "Palermo",
-			}))
-			Expect(res).To(ContainElement(redis.Z{
-				Score:  56.4412578701582,
-				Member: "Catania",
-			}))
+			Expect(len(res)).To(Equal(2))
+			var palermo, catania redis.Z
+			Expect(res).To(ContainElement(HaveField("Member", "Palermo"), &palermo))
+			Expect(res).To(ContainElement(HaveField("Member", "Catania"), &catania))
+			Expect(palermo.Score).To(BeNumerically("~", 190, 1))
+			Expect(catania.Score).To(BeNumerically("~", 56, 1))
 		})
 
 		It("should search geo radius with options", func() {
@@ -6947,16 +6945,13 @@ var _ = Describe("Commands", func() {
 
 			v, err := client.ZRangeWithScores(ctx, "key2", 0, -1).Result()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(v).To(Equal([]redis.Z{
-				{
-					Score:  56.441257870158204,
-					Member: "Catania",
-				},
-				{
-					Score:  190.44242984775784,
-					Member: "Palermo",
-				},
-			}))
+
+			Expect(len(v)).To(Equal(2))
+			var palermo, catania redis.Z
+			Expect(v).To(ContainElement(HaveField("Member", "Palermo"), &palermo))
+			Expect(v).To(ContainElement(HaveField("Member", "Catania"), &catania))
+			Expect(palermo.Score).To(BeNumerically("~", 190, 1))
+			Expect(catania.Score).To(BeNumerically("~", 56, 1))
 		})
 	})
 

docker-compose.yml

@@ -2,7 +2,7 @@
 
 services:
   redis:
-    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2}
     container_name: redis-standalone
     environment:
       - TLS_ENABLED=yes
@@ -21,32 +21,32 @@ services:
       - all-stack
       - all
 
-  cluster:
-    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
-    container_name: redis-cluster
+  osscluster:
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2}
+    container_name: redis-osscluster
     environment:
       - NODES=6
       - PORT=16600
     command: "--cluster-enabled yes"
     ports:
       - "16600-16605:16600-16605"
     volumes:
-      - "./dockers/cluster:/redis/work"
+      - "./dockers/osscluster:/redis/work"
     profiles:
       - cluster
       - all-stack
       - all
 
-  sentinel:
+  sentinel1:
     image: ${REDIS_IMAGE:-redis:7.4.1}
-    container_name: redis-sentinel
+    container_name: redis-sentinel1
     depends_on:
       - redis
-    entrypoint: "redis-sentinel /redis.conf --port 26379"
+    entrypoint: "redis-sentinel /etc/redis-conf/sentinels/sentinel1.conf --port 26379"
     ports:
       - 26379:26379
     volumes:
-      - "./dockers/sentinel.conf:/redis.conf"
+      - "./dockers:/etc/redis-conf"
     profiles:
       - sentinel
       - all-stack
@@ -57,11 +57,11 @@ services:
     container_name: redis-sentinel2
     depends_on:
       - redis
-    entrypoint: "redis-sentinel /redis.conf --port 26380"
+    entrypoint: "redis-sentinel /etc/redis-conf/sentinels/sentinel2.conf --port 26380"
     ports:
       - 26380:26380
     volumes:
-      - "./dockers/sentinel.conf:/redis.conf"
+      - "./dockers:/etc/redis-conf"
     profiles:
       - sentinel
       - all-stack
@@ -72,18 +72,36 @@ services:
     container_name: redis-sentinel3
     depends_on:
       - redis
-    entrypoint: "redis-sentinel /redis.conf --port 26381"
+    entrypoint: "redis-sentinel /etc/redis-conf/sentinels/sentinel3.conf --port 26381"
     ports:
       - 26381:26381
     volumes:
-      - "./dockers/sentinel.conf:/redis.conf"
+      - "./dockers:/etc/redis-conf"
+    profiles:
+      - sentinel
+      - all-stack
+      - all
+
+  sentinel-cluster:
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2}
+    container_name: redis-sentinel-cluster
+    environment:
+      - NODES=3
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - PORT=9121
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - "9121-9123:9121-9123"
+    volumes:
+      - "./dockers/sentinel-cluster:/redis/work"
     profiles:
       - sentinel
       - all-stack
       - all
 
   redisRing1:
-    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2}
     container_name: redis-ring-1
     environment:
       - TLS_ENABLED=yes
@@ -102,7 +120,7 @@ services:
       - all
 
   redisRing2:
-    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2}
     container_name: redis-ring-2
     environment:
       - TLS_ENABLED=yes
@@ -121,7 +139,7 @@ services:
       - all
 
   redisRing3:
-    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:7.4.1}
+    image: ${CLIENT_LIBS_TEST_IMAGE:-redislabs/client-libs-test:rs-7.4.0-v2}
     container_name: redis-ring-3
     environment:
       - TLS_ENABLED=yes
@@ -137,4 +155,4 @@ services:
       - cluster
       - sentinel
       - all-stack
-      - all
+      - all

dockers/sentinel.conf

@@ -292,8 +292,8 @@ var _ = Describe("race", func() {
 	BeforeEach(func() {
 		C, N = 10, 1000
 		if testing.Short() {
-			C = 4
-			N = 100
+			C = 2
+			N = 50
 		}
 	})