Merge branch 'master' into sentinal-read-from-any

Author: ndyakov

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

@@ -25,9 +25,9 @@ runs:
         
         # Mapping of redis version to redis testing containers
         declare -A redis_version_mapping=(
-          ["8.0-M03"]="8.0-M04-pre"
-          ["7.4.2"]="rs-7.4.0-v2"
-          ["7.2.7"]="rs-7.2.0-v14"
+          ["8.0.x"]="8.0.2"
+          ["7.4.x"]="rs-7.4.0-v5"
+          ["7.2.x"]="rs-7.2.0-v17"
         )
         
         if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then

.github/wordlist.txt

@@ -29,6 +29,7 @@ Lua
 MSSQL
 namespace
 NoSQL
+OpenTelemetry
 ORM
 Packagist
 PhpRedis
@@ -64,4 +65,12 @@ RedisGears
 RedisTimeseries
 RediSearch
 RawResult
-RawVal
+RawVal
+entra
+EntraID
+Entra
+OAuth
+Azure
+StreamingCredentialsProvider
+oauth
+entraid

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: Go
 
 on:
   push:
-    branches: [master, v9, v9.7]
+    branches: [master, v9, v9.7, v9.8]
   pull_request:
-    branches: [master, v9, v9.7]
+    branches: [master, v9, v9.7, v9.8]
 
 permissions:
   contents: read
@@ -18,8 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         redis-version:
-          - "8.0-M03" # 8.0 milestone 4
-          - "7.4.2" # should use redis stack 7.4
+          - "8.0.x" # Redis CE 8.0
+          - "7.4.x" # Redis stack 7.4
         go-version:
           - "1.23.x"
           - "1.24.x"
@@ -43,8 +43,8 @@ jobs:
           
           # Mapping of redis version to redis testing containers
           declare -A redis_version_mapping=(
-            ["8.0-M03"]="8.0-M04-pre"
-            ["7.4.2"]="rs-7.4.0-v2"
+            ["8.0.x"]="8.0.2"
+            ["7.4.x"]="rs-7.4.0-v5"
           )
           if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
             echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
@@ -72,9 +72,9 @@ jobs:
         fail-fast: false
         matrix:
           redis-version:
-            - "8.0-M03" # 8.0 milestone 4
-            - "7.4.2" # should use redis stack 7.4
-            - "7.2.7" # should redis stack 7.2
+            - "8.0.x" # Redis CE 8.0
+            - "7.4.x" # Redis stack 7.4
+            - "7.2.x" # Redis stack 7.2
           go-version:
             - "1.23.x"
             - "1.24.x"

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [master, v9, v9.7, v9.8]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [master, v9, v9.7, v9.8]
 
 jobs:
   analyze:

.github/workflows/doctests.yaml

@@ -16,9 +16,11 @@ jobs:
 
     services:
       redis-stack:
-        image: redis/redis-stack-server:latest
-        options: >-
-          --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+        image: redislabs/client-libs-test:8.0.2
+        env:
+          TLS_ENABLED: no
+          REDIS_CLUSTER: no
+          PORT: 6379
         ports:
           - 6379:6379
 
@@ -38,4 +40,4 @@ jobs:
 
       - name: Test doc examples
         working-directory: ./doctests
-        run: go test -v
+        run: make test

.github/workflows/golangci-lint.yml

@@ -8,6 +8,7 @@ on:
       - master
       - main
       - v9
+      - v9.8
   pull_request:
 
 permissions:
@@ -21,4 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/[email protected]
+        uses: golangci/[email protected]
+        with:
+          verify: true 
+

.github/workflows/spellcheck.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.47.0
+        uses: rojopolis/spellcheck-github-actions@0.49.0
         with:
           config_path: .github/spellcheck-settings.yml
           task_name: Markdown

.github/workflows/test-redis-enterprise.yml

@@ -2,7 +2,7 @@ name: RE Tests
 
 on:
   push:
-    branches: [master]
+    branches: [master, v9, v9.7, v9.8]
   pull_request:
 
 permissions:
@@ -54,5 +54,4 @@ jobs:
           --ginkgo.skip-file="sentinel_test.go" \
           --ginkgo.skip-file="osscluster_test.go" \
           --ginkgo.skip-file="pubsub_test.go" \
-          --ginkgo.skip-file="gears_commands_test.go" \
           --ginkgo.label-filter='!NonRedisEnterprise'

.gitignore

@@ -7,4 +7,5 @@ testdata/*
 redis8tests.sh
 coverage.txt
 **/coverage.txt
-.vscode
+.vscode
+tmp/*

.golangci.yml

@@ -1,3 +1,34 @@
+version: "2"
 run:
   timeout: 5m
   tests: false
+linters:
+  settings:
+    staticcheck:
+      checks:
+        - all
+        # Incorrect or missing package comment.
+        # https://staticcheck.dev/docs/checks/#ST1000
+        - -ST1000
+        # Omit embedded fields from selector expression.
+        # https://staticcheck.dev/docs/checks/#QF1008
+        - -QF1008
+        - -ST1003
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

CONTRIBUTING.md

@@ -112,3 +112,7 @@ The core team regularly looks at pull requests. We will provide
 feedback as soon as possible. After receiving our feedback, please respond
 within two weeks. After that time, we may close your PR if it isn't
 showing any activity.
+
+## Support
+
+Maintainers can provide limited support to contributors on discord: https://discord.gg/W4txy5AeKM

Makefile

@@ -8,7 +8,19 @@ docker.stop:
 
 test:
 	$(MAKE) docker.start
-	$(MAKE) test.ci
+	@if [ -z "$(REDIS_VERSION)" ]; then \
+		echo "REDIS_VERSION not set, running all tests"; \
+		$(MAKE) test.ci; \
+	else \
+		MAJOR_VERSION=$$(echo "$(REDIS_VERSION)" | cut -d. -f1); \
+		if [ "$$MAJOR_VERSION" -ge 8 ]; then \
+			echo "REDIS_VERSION $(REDIS_VERSION) >= 8, running all tests"; \
+			$(MAKE) test.ci; \
+		else \
+			echo "REDIS_VERSION $(REDIS_VERSION) < 8, skipping vector_sets tests"; \
+			$(MAKE) test.ci.skip-vectorsets; \
+		fi; \
+	fi
 	$(MAKE) docker.stop
 
 test.ci:
@@ -17,15 +29,27 @@ test.ci:
 	  (cd "$${dir}" && \
 	    go mod tidy -compat=1.18 && \
 	    go vet && \
-	    go test -coverprofile=coverage.txt -covermode=atomic ./... -race); \
+	    go test -v -coverprofile=coverage.txt -covermode=atomic ./... -race -skip Example); \
+	done
+	cd internal/customvet && go build .
+	go vet -vettool ./internal/customvet/customvet
+
+test.ci.skip-vectorsets:
+	set -e; for dir in $(GO_MOD_DIRS); do \
+	  echo "go test in $${dir} (skipping vector sets)"; \
+	  (cd "$${dir}" && \
+	    go mod tidy -compat=1.18 && \
+	    go vet && \
+	    go test -v -coverprofile=coverage.txt -covermode=atomic ./... -race \
+	      -run '^(?!.*(?:VectorSet|vectorset|ExampleClient_vectorset)).*$$' -skip Example); \
 	done
 	cd internal/customvet && go build .
 	go vet -vettool ./internal/customvet/customvet
 
 bench:
-	go test ./... -test.run=NONE -test.bench=. -test.benchmem
+	go test ./... -test.run=NONE -test.bench=. -test.benchmem -skip Example
 
-.PHONY: all test bench fmt
+.PHONY: all test test.ci test.ci.skip-vectorsets bench fmt
 
 build:
 	go build .