add envs when running redis stack container from go

Author: ndyakov

.github/workflows/build.yml

@@ -16,7 +16,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.22.x, 1.23.x]
+        go-version: [1.21.x, 1.22.x, 1.23.x]
+
+    services:
+      redis:
+        image: redis/redis-stack-server:latest
+        options: >-
+          --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+        ports:
+          - 6379:6379
 
     steps:
       - name: Set up ${{ matrix.go-version }}

commands_test.go

@@ -441,7 +441,6 @@ var _ = Describe("Commands", func() {
 		It("should Command", Label("NonRedisEnterprise"), func() {
 			cmds, err := client.Command(ctx).Result()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(len(cmds)).To(BeNumerically("~", 240, 25))
 
 			cmd := cmds["mget"]
 			Expect(cmd.Name).To(Equal("mget"))

main_test.go

@@ -73,6 +73,9 @@ var RECluster = false
 // Redis Community Edition Docker
 var RCEDocker = false
 
+// Are tests running in CI (github actions)
+var CI = false
+
 func registerProcess(port string, p *redisProcess) {
 	if processes == nil {
 		processes = make(map[string]*redisProcess)
@@ -89,14 +92,13 @@ var _ = BeforeSuite(func() {
 	var err error
 	RECluster, _ = strconv.ParseBool(os.Getenv("RE_CLUSTER"))
 	RCEDocker, _ = strconv.ParseBool(os.Getenv("RCE_DOCKER"))
+	CI, _ = strconv.ParseBool(os.Getenv("CI"))
 	fmt.Printf("RECluster: %v\n", RECluster)
 	fmt.Printf("RCEDocker: %v\n", RCEDocker)
 	if !RECluster && !RCEDocker {
-
 		// redis stack container will be started for tests
 		// TODO: Rewrite this section to be aware that redis stack is running in docker
-		err = startRedisStack(redisPort)
-		Expect(err).NotTo(HaveOccurred())
+		startRedisStack(redisPort)
 
 		ringShard1, err = startRedis(ringShard1Port)
 		Expect(err).NotTo(HaveOccurred())
@@ -136,7 +138,6 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	Expect(stopRedisStack(redisPort)).NotTo(HaveOccurred())
 	// This should result in no errors when there were no processes started from the tests
 	Expect(cluster.Close()).NotTo(HaveOccurred())
 
@@ -352,26 +353,36 @@ func redisDir(port string) (string, error) {
 }
 
 func startRedisStack(port string, args ...string) error {
+	// don't start redis stack in CI, the github action should handle this
+	if CI {
+		return nil
+	}
+
 	ctx := context.Background()
 	dockerClient, err := client.NewClientWithOpts(client.FromEnv)
 	imageName := "redis/redis-stack-server:latest"
 
 	if err != nil {
-		return err
+		panic(err)
 	}
 	defer dockerClient.Close()
 
 	resp, err := dockerClient.ImagePull(ctx, imageName, image.PullOptions{})
 	if err != nil {
-		return err
+		panic(err)
 	}
 	defer resp.Close()
-	io.Copy(io.Discard, resp)
+
+	_, err = io.Copy(io.Discard, resp)
+	if err != nil {
+		panic(err)
+	}
 
 	rePort := nat.Port(port)
 	cont, err := dockerClient.ContainerCreate(ctx, &container.Config{
 		Image:        imageName,
 		ExposedPorts: nat.PortSet{rePort: struct{}{}},
+		Env:          []string{`REDIS_ARGS=--enable-debug-command yes --enable-module-command yes`},
 		Labels:       map[string]string{"go-redis-testing": "true"},
 	}, &container.HostConfig{
 		PortBindings: map[nat.Port][]nat.PortBinding{rePort: {
@@ -383,24 +394,32 @@ func startRedisStack(port string, args ...string) error {
 	}, nil, nil, fmt.Sprintf("go-redis-test-%d", time.Now().UnixNano()))
 
 	if err != nil {
-		return err
+		panic(err)
+	} else {
+		fmt.Println(cont.ID)
 	}
 
 	if err := dockerClient.ContainerStart(ctx, cont.ID, container.StartOptions{}); err != nil {
-		return err
+		panic(err)
 	}
+
 	return nil
 }
 
 func stopRedisStack(port string, args ...string) error {
+	// don't stop redis stack in CI, the github action will handle this
+	if os.Getenv("CI") == "true" {
+		return nil
+	}
+
 	ctx := context.Background()
 	dockerClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
 	if err != nil {
 		return err
 	}
 	defer dockerClient.Close()
 
-	f := filters.NewArgs(filters.KeyValuePair{Key: "go-redis-testing", Value: "true"})
+	f := filters.NewArgs(filters.KeyValuePair{Key: "label", Value: "go-redis-testing=true"})
 	containers, err := dockerClient.ContainerList(ctx, container.ListOptions{Filters: f})
 	if err != nil {
 		return err

search_commands.go

@@ -283,22 +283,23 @@ type FTSearchSortBy struct {
 }
 
 type FTSearchOptions struct {
-	NoContent       bool
-	Verbatim        bool
-	NoStopWords     bool
-	WithScores      bool
-	WithPayloads    bool
-	WithSortKeys    bool
-	Filters         []FTSearchFilter
-	GeoFilter       []FTSearchGeoFilter
-	InKeys          []interface{}
-	InFields        []interface{}
-	Return          []FTSearchReturn
-	Slop            int
-	Timeout         int
-	InOrder         bool
-	Language        string
-	Expander        string
+	NoContent    bool
+	Verbatim     bool
+	NoStopWords  bool
+	WithScores   bool
+	WithPayloads bool
+	WithSortKeys bool
+	Filters      []FTSearchFilter
+	GeoFilter    []FTSearchGeoFilter
+	InKeys       []interface{}
+	InFields     []interface{}
+	Return       []FTSearchReturn
+	Slop         int
+	Timeout      int
+	InOrder      bool
+	Language     string
+	Expander     string
+	// TODO: add document about scorers
 	Scorer          string
 	ExplainScore    bool
 	Payload         string