Add valkey8-bundle to search index tests

Author: nantiferov

Makefile

@@ -37,6 +37,7 @@ test:
 	TEST_REDIS_URI="redis://localhost:6379" \
 	TEST_VALKEY7_URI="valkey://localhost:16384" \
 	TEST_VALKEY8_URI="valkey://localhost:16382" \
+	TEST_VALKEY8_BUNDLE_URI="valkey://localhost:16389" \
 	TEST_VALKEY8_TLS_URI="valkeys://localhost:16386" \
 	TEST_REDIS7_TLS_URI="rediss://localhost:16387" \
 	TEST_REDIS8_URI="redis://localhost:16388" \

docker-compose.yml

@@ -20,6 +20,12 @@ services:
     ports:
       - "16386:6379"
 
+  valkey8-bundle:
+    image: valkey/valkey-bundle:8
+    command: "valkey-server --enable-debug-command yes --protected-mode no"
+    ports:
+      - "16389:6379"
+
   valkey7:
     image: valkey/valkey:7
     command: "valkey-server --enable-debug-command yes --protected-mode no"

exporter/modules_test.go

@@ -74,8 +74,8 @@ func TestModulesv74(t *testing.T) {
 }
 
 func TestModulesv80(t *testing.T) {
-	if os.Getenv("TEST_REDIS8_URI") == "" {
-		t.Skipf("TEST_REDIS8_URI not set - skipping")
+	if os.Getenv("TEST_REDIS8_URI") == "" || os.Getenv("TEST_REDIS_URI") == "" {
+		t.Skipf("TEST_REDIS8_URI / TEST_REDIS_URI aren't set - skipping")
 	}
 
 	tsts := []struct {

exporter/search_indexes_test.go

@@ -18,29 +18,36 @@ func setupSearchIndex(t *testing.T, addr string) error {
 	}
 	defer c.Close()
 
-	// create search index, based on https://redis.io/docs/latest/develop/get-started/document-database/
-	if _, err := doRedisCmd(c, "FT.CREATE", "idx:bicycle", "ON", "JSON", "PREFIX", "1", "bicycle:", "SCORE", "1.0", "SCHEMA", "$.brand", "AS", "brand", "TEXT", "WEIGHT", "1.0", "$.model", "AS", "model", "TEXT", "WEIGHT", "1.0", "$.description", "AS", "description", "TEXT", "WEIGHT", "1.0", "$.price", "AS", "price", "NUMERIC", "$.condition", "AS", "condition", "TAG", "SEPARATOR", ","); err != nil {
+	// create search index, based on https://redis.io/docs/latest/commands/ft.create and https://valkey.io/commands/ft.create
+	if _, err := doRedisCmd(c, "FT.CREATE", "test_index", "SCHEMA", "my_hash_field_key", "VECTOR", "HNSW", "10", "TYPE", "FLOAT32", "DIM", "20", "DISTANCE_METRIC", "COSINE", "M", "4", "EF_CONSTRUCTION", "100"); err != nil {
 		log.Printf("setupSearchIndex() - couldn't create search index, err: %s ", err)
 		return err
 	}
 	return nil
 }
 
 func TestExtractSearchIndexesMetrics(t *testing.T) {
-	if os.Getenv("TEST_REDIS8_URI") == "" {
-		t.Skipf("TEST_REDIS8_URI not set - skipping")
+	test_redis8_uri := os.Getenv("TEST_REDIS8_URI")
+	test_valkey8_bundle_uri := os.Getenv("TEST_VALKEY8_BUNDLE_URI")
+	if test_redis8_uri == "" || test_valkey8_bundle_uri == "" {
+		t.Skipf("TEST_REDIS8_URI or TEST_VALKEY8_BUNDLE_URI aren't set - skipping")
 	}
-	if err := setupSearchIndex(t, os.Getenv("TEST_REDIS8_URI")); err != nil {
-		t.Fatalf("couldn't create search index, err: %s ", err)
+	if err := setupSearchIndex(t, test_redis8_uri); err != nil {
+		t.Fatalf("couldn't create search index in TEST_REDIS8_URI (%s), err: %s ", test_redis8_uri, err)
+	}
+	if err := setupSearchIndex(t, test_valkey8_bundle_uri); err != nil {
+		t.Fatalf("couldn't create search index in TEST_VALKEY8_BUNDLE_URI (%s), err: %s ", test_valkey8_bundle_uri, err)
 	}
 
 	tsts := []struct {
 		addr                     string
 		inclSearchIndexesMetrics bool
 		wantSearchIndexesMetrics bool
 	}{
-		{addr: os.Getenv("TEST_REDIS8_URI"), inclSearchIndexesMetrics: true, wantSearchIndexesMetrics: true},
-		{addr: os.Getenv("TEST_REDIS8_URI"), inclSearchIndexesMetrics: false, wantSearchIndexesMetrics: false},
+		{addr: test_redis8_uri, inclSearchIndexesMetrics: true, wantSearchIndexesMetrics: true},
+		{addr: test_redis8_uri, inclSearchIndexesMetrics: false, wantSearchIndexesMetrics: false},
+		{addr: test_valkey8_bundle_uri, inclSearchIndexesMetrics: true, wantSearchIndexesMetrics: true},
+		{addr: test_valkey8_bundle_uri, inclSearchIndexesMetrics: false, wantSearchIndexesMetrics: false},
 	}
 
 	for _, tst := range tsts {