valkey-io
diff --git a/‎.github/json_matrices/build-matrix.json‎
Lines changed: 4 additions & 4 deletions b/‎.github/json_matrices/build-matrix.json‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎.github/workflows/go-cd.yml‎
Lines changed: 9 additions & 3 deletions b/‎.github/workflows/go-cd.yml‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎.github/workflows/go.yml‎
Lines changed: 24 additions & 4 deletions b/‎.github/workflows/go.yml‎
Lines changed: 24 additions & 4 deletions
diff --git a/‎.github/workflows/install-zig/action.yml‎
Lines changed: 5 additions & 1 deletion b/‎.github/workflows/install-zig/action.yml‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎.github/workflows/java-cd.yml‎
Lines changed: 49 additions & 6 deletions b/‎.github/workflows/java-cd.yml‎
Lines changed: 49 additions & 6 deletions
diff --git a/‎.github/workflows/java.yml‎
Lines changed: 5 additions & 0 deletions b/‎.github/workflows/java.yml‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/workflows/npm-cd.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/npm-cd.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎CONTRIBUTING.md‎
Lines changed: 1 addition & 0 deletions b/‎CONTRIBUTING.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎go/DEVELOPER.md‎
Lines changed: 1 addition & 9 deletions b/‎go/DEVELOPER.md‎
Lines changed: 1 addition & 9 deletions
diff --git a/‎go/Makefile‎
Lines changed: 37 additions & 5 deletions b/‎go/Makefile‎
Lines changed: 37 additions & 5 deletions
@@ -53,11 +53,11 @@
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-musl",
         "CD_TARGET": "aarch64-unknown-linux-gnu",
-        "RUNNER": "ubuntu-latest-arm",
+        "RUNNER": "ubuntu-24.04-arm",
         "CD_RUNNER": "ubuntu-24.04-arm",
         "IMAGE": "node:lts-alpine",
         "CONTAINER_OPTIONS": "--user root --privileged --rm",
-        "PACKAGE_MANAGERS": ["npm", "maven"],
+        "PACKAGE_MANAGERS": ["npm", "maven", "pkg_go_dev"],
         "languages": []
     },
     {
@@ -69,8 +69,8 @@
         "RUNNER": "ubuntu-latest",
         "IMAGE": "node:lts-alpine",
         "CONTAINER_OPTIONS": "--user root --privileged",
-        "PACKAGE_MANAGERS": ["npm", "maven"],
-        "languages": ["node", "java"]
+        "PACKAGE_MANAGERS": ["npm", "maven", "pkg_go_dev"],
+        "languages": ["node", "java", "go"]
     },
     {
         "OS": "amazon-linux",
 
@@ -116,17 +116,17 @@ jobs:
               uses: ./.github/workflows/install-shared-dependencies
               with:
                   os: ${{ matrix.host.OS }}
-                  target: ${{ matrix.host.TARGET }}
+                  target: ${{ matrix.host.CD_TARGET || matrix.host.TARGET }}
                   github-token: ${{ secrets.GITHUB_TOKEN }}
             - name: Build Go client
               working-directory: go
               env:
                   RELEASE_VERSION: ${{ needs.validate-release-version.outputs.RELEASE_VERSION }}
               run: |
                   make install-build-tools
-                  make build GLIDE_VERSION="${RELEASE_VERSION}"
+                  make build GLIDE_VERSION="${RELEASE_VERSION}" TARGET_TRIPLET="${{ matrix.host.TARGET }}"
             - name: Move FFI artifacts on linux
-              if: ${{ contains(matrix.host.TARGET, 'linux-gnu') }}
+              if: ${{ contains(matrix.host.TARGET, 'linux') }}
               run: |
                   mkdir -p $GITHUB_WORKSPACE/ffi/target/release
                   cp ffi/target/*/release/libglide_ffi.a $GITHUB_WORKSPACE/ffi/target/release/
@@ -187,6 +187,12 @@ jobs:
             fail-fast: false
             matrix:
                 host: ${{ fromJson(needs.load-platform-matrix.outputs.PLATFORM_MATRIX) }}
+                # Excluding musl targets for testing for now as there are issues with the runners
+                exclude:
+                    - host:
+                          TARGET: aarch64-unknown-linux-musl
+                    - host:
+                          TARGET: x86_64-unknown-linux-musl
         runs-on: ${{ matrix.host.RUNNER }}
         steps:
             - name: Setup self-hosted runner access
 
@@ -259,10 +259,17 @@ jobs:
         steps:
             - name: Install git
               run: |
-                  yum update
-                  yum install -y git tar
-                  git config --global --add safe.directory "$GITHUB_WORKSPACE"
-                  echo IMAGE=amazonlinux:latest | sed -r 's/:/-/g' >> $GITHUB_ENV
+                  if [[ "${{ matrix.host.OS }}" == "amazon-linux" ]]; then
+                    yum update
+                    yum install -y git tar
+                    git config --global --add safe.directory "$GITHUB_WORKSPACE"
+                    echo IMAGE=amazonlinux:latest | sed -r 's/:/-/g' >> $GITHUB_ENV
+                  elif [[ "${{ matrix.host.TARGET }}" == *"musl"* ]]; then
+                    apk update
+                    apk add git bash tar
+                    git config --global --add safe.directory "$GITHUB_WORKSPACE"
+                  fi
+
             # Replace `:` in the variable otherwise it can't be used in `upload-artifact`
             - uses: actions/checkout@v4
               with:
@@ -282,6 +289,19 @@ jobs:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   engine-version: ${{ matrix.engine.version }}
 
+            - name: Install Musl Dependencies
+              if: ${{ contains(matrix.host.TARGET, 'musl') }}
+              run: |
+                  apk add clang lld compiler-rt
+                  # Ensure Rust is in PATH for container environments
+                  echo "$HOME/.cargo/bin:$PATH" >> $GITHUB_PATH
+
+            - name: Install zig
+              if: ${{ contains(matrix.host.TARGET, 'musl') }}
+              uses: ./.github/workflows/install-zig
+              with:
+                  target: ${{ matrix.host.TARGET }}
+
             - uses: actions/cache@v4
               with:
                   path: |
 
@@ -17,10 +17,14 @@ runs:
           run: |
               if [[ `cat /etc/os-release | grep "Amazon Linux"` ]]; then
                   yum install -y python3-pip
+                  pip3 install ziglang
+              elif [[ `cat /etc/os-release | grep "Alpine"` ]]; then
+                  apk add py3-pip
+                  pip3 install ziglang --break-system-packages
               else
                   sudo apt install -y python3-pip
+                  pip3 install ziglang
               fi
-              pip3 install ziglang
               cargo install --locked cargo-zigbuild
 
               # Set environment variable to prevent cargo-zigbuild from auto-detecting malformed targets
 
@@ -39,9 +39,9 @@ jobs:
                   export PLATFORM_MATRIX=$(jq 'map(
                       select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["maven"])))
                       | .RUNNER = (
-                          if (.RUNNER | type == "array") 
-                          then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end)) 
-                          else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end) 
+                          if (.RUNNER | type == "array")
+                          then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end))
+                          else (if .RUNNER == "ephemeral" then "persistent" else .RUNNER end)
                           end
                       )
                   )' < .github/json_matrices/build-matrix.json | jq -c .)
@@ -129,45 +129,77 @@ jobs:
                       ${{ runner.os }}-gradle-cd-
                       ${{ runner.os }}-gradle-
 
-            - name: Create secret key ring file
+            - name: Create secret key ring file for all Java submodules
               working-directory: java/client
               run: |
+                  # Decode the provided base64 GPG key into the client module
                   echo "$SECRING_GPG" | base64 --decode > ./secring.gpg
-                  ls -ltr
+
+                  # Copy the key ring file into the jedis-compatibility module which also performs signing
+                  if [ -d ../jedis-compatibility ]; then
+                    cp ./secring.gpg ../jedis-compatibility/secring.gpg
+                  else
+                    echo "jedis-compatibility module directory not found" >&2
+                    exit 1
+                  fi
+
+                  echo "Listing key ring files to verify presence:"
+                  ls -l ./secring.gpg ../jedis-compatibility/secring.gpg
               env:
                   SECRING_GPG: ${{ secrets.SECRING_GPG }}
 
             - name: Build java client
               working-directory: java
               run: |
                   if [[ "${{ matrix.host.TARGET }}" == *"musl"* ]]; then
+                    # Build and publish client first
                     ./gradlew --build-cache :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
                     -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} \
                     -Ptarget=${{ matrix.host.TARGET }}
+                    
+                    # Then build jedis-compatibility
+                    ./gradlew --build-cache :jedis-compatibility:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
+                    -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} \
+                    -Ptarget=${{ matrix.host.TARGET }}
                   else
+                    # Build and publish client first
                     ./gradlew --build-cache :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
                     -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }}
+                    
+                    # Then build jedis-compatibility
+                    ./gradlew --build-cache :jedis-compatibility:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
+                    -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }}
                   fi
               env:
                   GLIDE_RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
 
             - name: Bundle JAR
               working-directory: java
               run: |
+                  # Bundle client JAR
                   src_folder=~/.m2/repository/io/valkey/valkey-glide/${{ env.RELEASE_VERSION }}
                   cd $src_folder
                   jar -cvf bundle.jar *
                   ls -ltr
                   cd -
                   cp $src_folder/bundle.jar bundle-${{ matrix.host.TARGET }}.jar
 
+                  # Bundle jedis-compatibility JAR
+                  jedis_src_folder=~/.m2/repository/io/valkey/valkey-glide-jedis-compatibility/${{ env.RELEASE_VERSION }}
+                  cd $jedis_src_folder
+                  jar -cvf jedis-bundle.jar *
+                  ls -ltr
+                  cd -
+                  cp $jedis_src_folder/jedis-bundle.jar jedis-bundle-${{ matrix.host.TARGET }}.jar
+
             - name: Upload artifacts to publish
               continue-on-error: true
               uses: actions/upload-artifact@v4
               with:
                   name: java-${{ matrix.host.TARGET }}
                   path: |
                       java/bundle*.jar
+                      java/jedis-bundle*.jar
 
     publish-to-maven-central-deployment:
         if: ${{ inputs.maven_publish == true || github.event_name == 'push' }}
@@ -196,8 +228,16 @@ jobs:
             - name: Move files to the correct directory tree
               run: |
                   mkdir -p build/io/valkey/valkey-glide/${{ env.RELEASE_VERSION }}
-                  cp -a maven-files/* build/io/valkey/valkey-glide/${{ env.RELEASE_VERSION }}
+                  mkdir -p build/io/valkey/valkey-glide-jedis-compatibility/${{ env.RELEASE_VERSION }}
+
+                  # Move jedis-compatibility files first
+                  cp -a maven-files/valkey-glide-jedis-compatibility* build/io/valkey/valkey-glide-jedis-compatibility/${{ env.RELEASE_VERSION }}
+
+                  # Move client files (exclude jedis-compatibility files)
+                  find maven-files -name "valkey-glide-*" ! -name "*jedis-compatibility*" -exec cp {} build/io/valkey/valkey-glide/${{ env.RELEASE_VERSION }}/ \;
+
                   rm -rf build/io/valkey/valkey-glide/${{ env.RELEASE_VERSION }}/META-INF
+                  rm -rf build/io/valkey/valkey-glide-jedis-compatibility/${{ env.RELEASE_VERSION }}/META-INF
                   cd build
                   zip -r ../build io
 
@@ -253,6 +293,9 @@ jobs:
             fail-fast: false
             matrix:
                 host: ${{ fromJson(needs.load-platform-matrix.outputs.PLATFORM_MATRIX) }}
+                exclude:
+                    - host:
+                          TARGET: aarch64-unknown-linux-musl
         runs-on: ${{ matrix.host.test-runner || matrix.host.runner }}
         container:
             image: ${{ matrix.host.IMAGE || ''}}
 
@@ -331,8 +331,13 @@ jobs:
             - name: Setup Rust Build
               if: ${{ contains(matrix.host.TARGET, 'musl') }}
               run: |
+                  export PATH="$HOME/.cargo/bin:$PATH"
                   echo "PATH=$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV
 
+                  # Install ziglang and zigbuild
+                  pip3 install ziglang --break-system-packages
+                  cargo install --locked cargo-zigbuild
+
             - uses: actions/cache@v4
               with:
                   path: |
 
@@ -447,9 +447,9 @@ jobs:
               uses: geekyeggo/delete-artifact@v2
               with:
                   name: |
-                      npm-packages-${{ github.run_id }}
                       artifacts-*
                       js-files-${{ github.run_id }}
+                  failOnError: false
 
     test-published-release:
         needs: [get-build-parameters, prepare-and-publish]
@@ -550,9 +550,9 @@ jobs:
               uses: geekyeggo/delete-artifact@v2
               with:
                   name: |
-                      npm-packages-${{ github.run_id }}
                       bindings-*
                       js-files-${{ github.run_id }}
+                  failOnError: false
 
     deprecate-on-failure:
         needs: [test-published-release, get-build-parameters]
 
@@ -41,6 +41,7 @@ Looking at the existing issues is a great way to find something to contribute on
 -   [Java](./java/DEVELOPER.md)
 -   [Node](./node/DEVELOPER.md)
 -   [Python](./python/DEVELOPER.md)
+-   [Go](./go/DEVELOPER.md)
 
 ## Code of Conduct
 This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
 
@@ -141,15 +141,7 @@ Before starting this step, make sure you've installed all software requirements.
     make build
     ```
 
-4. Run tests:
-    1. Ensure that you have installed valkey-server and valkey-cli on your host. You can find the Valkey installation guide at the following link: [Valkey Installation Guide](https://valkey.io/topics/installation/).
-    2. Execute the following command from the go folder:
-
-        ```bash
-        go test -race ./...
-        ```
-
-5. Install Go development tools with:
+4. Install Go development tools with:
 
     ```bash
     make install-dev-tools
 
@@ -10,27 +10,39 @@ TARGET_DIR := $(GLIDE_FFI_PATH)/target
 # Determine the target folder based on OS and architecture
 UNAME := $(shell uname)
 ARCH := $(shell uname -m)
+IS_ALPINE := $(shell test -f /etc/alpine-release && echo true || echo false)
 
 # Set default values for GLIDE_NAME and GLIDE_VERSION
 # GLIDE_VERSION is automatically set during the deployment workflow based on the value defined in go-cd.yml.
 # For local builds, you can manually specify the version using `GLIDE_VERSION=<version> make build`
 GLIDE_NAME = GlideGo
 GLIDE_VERSION ?= unknown
 
+ifndef TARGET_TRIPLET
 ifeq ($(UNAME), Darwin)
     TARGET_TRIPLET := $(if $(filter arm64,$(ARCH)),aarch64-apple-darwin,x86_64-apple-darwin)
+else ifeq ($(UNAME), Linux)
+    ifeq ($(IS_ALPINE), true)
+        TARGET_TRIPLET := $(if $(filter arm64 aarch64,$(ARCH)),aarch64-unknown-linux-musl,x86_64-unknown-linux-musl)
+    else
+        TARGET_TRIPLET := $(if $(filter arm64 aarch64,$(ARCH)),aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu)
+    endif
+else
+    $(error Unsupported platform: $(UNAME) $(ARCH))
+endif
+endif
+
+ifeq ($(UNAME), Darwin)
 	# https://github.com/rust-lang/rust/issues/51009#issuecomment-2274649980
 	BUILD_CMD := rustc --crate-type staticlib
 	CARGO_FIX_CMD := : # no-op
 	CARGO_POSTFIX_CMD := : # no-op
     STRIP_CMD := strip -x
 else ifeq ($(UNAME), Linux)
-    # TODO: musl
-    TARGET_TRIPLET := $(if $(filter arm64 aarch64,$(ARCH)),aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu)
 	# zigbuild https://github.com/rust-cross/cargo-zigbuild
-	BUILD_CMD := zigbuild --target $(TARGET_TRIPLET).2.17
+	BUILD_CMD := zigbuild --target $(TARGET_TRIPLET)
 	# workaround for https://github.com/rust-cross/cargo-zigbuild/issues/337
-	CARGO_FIX_CMD := sed -i 's/crate-type.*/crate-type = ["staticlib"]/g' Cargo.toml
+	CARGO_FIX_CMD := sed -i 's/crate-type.*/crate-type = ["staticlib"]/g' Cargo.toml && rustup target add $(TARGET_TRIPLET)
 	CARGO_POSTFIX_CMD := git restore Cargo.toml
     STRIP_CMD := strip --strip-unneeded
 	TARGET_DIR := $(TARGET_DIR)/$(TARGET_TRIPLET)
@@ -41,6 +53,15 @@ endif
 # Path where compiled binary is copied to and therefore used by go
 DEST_PATH := rustbin/$(TARGET_TRIPLET)
 
+# Determine if we're using musl
+IS_MUSL := $(if $(filter true,$(IS_ALPINE)),true,$(if $(findstring musl,$(TARGET_TRIPLET)),true,false))
+
+# Set GOFLAGS for musl to use musl tag
+ifeq ($(IS_MUSL), true)
+    export GOFLAGS := -tags=musl
+endif
+
+
 install-build-tools:
 	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.33.0
 	cargo install cbindgen
@@ -171,10 +192,21 @@ long-timeout-test: __it
 opentelemetry-test: export TEST_FILTER = -skip "TestGlideTestSuite/TestModule" -otel-test $(if $(test-filter), -testify.m $(test-filter), -testify.m TestOpenTelemetry)
 opentelemetry-test: __it
 
+# Test command for integration tests
+ifeq ($(IS_MUSL), true)
+# musl gcc does not support -fsanitize=address, so we use clang instead
+# TODO - Investigate musl + address sanitizer issue - https://github.com/valkey-io/valkey-glide/issues/4671
+# Disabled for now
+# MUSL_TEST_CMD := CC=clang go test -asan -v ./integTest/...
+    TEST_CMD := CC="gcc" go test -v ./integTest/...
+else
+    TEST_CMD := CC="gcc -fsanitize=address" go test -v ./integTest/...
+endif
+
 __it:
 	mkdir -p reports
 	set -o pipefail; \
-	CC="gcc -fsanitize=address" go test -v ./integTest/... \
+	$(TEST_CMD) \
 	$(TEST_FILTER) \
 	$(if $(filter true, $(tls)), --tls,) \
 	$(if $(standalone-endpoints), --standalone-endpoints=$(standalone-endpoints)) \