Merge branch 'main' into go/tjz-credentials

Author: tjzhang-BQ

.github/workflows/go-cd.yml

@@ -1,6 +1,9 @@
 name: Go - Continuous Deployment
 
 on:
+    push:
+        tags:
+            - "v*.*"
     workflow_dispatch:
         inputs:
             version:
@@ -21,6 +24,7 @@ permissions:
 
 jobs:
     load-platform-matrix:
+        if: github.repository_owner == 'valkey-io'
         runs-on: ubuntu-latest
         environment: AWS_ACTIONS
         outputs:
@@ -46,39 +50,45 @@ jobs:
                   echo "PLATFORM_MATRIX=${PLATFORM_MATRIX}" >> $GITHUB_OUTPUT
 
     validate-release-version:
-        if: ${{ github.event.inputs.pkg_go_dev_publish }}
+        if: ${{ github.event_name == 'push' || inputs.pkg_go_dev_publish }}
         runs-on: ubuntu-latest
         outputs:
             RELEASE_VERSION: ${{ steps.release-tag.outputs.RELEASE_VERSION }}
         env:
             INPUT_VERSION: ${{ github.event.inputs.version }}
+            TAG_VERSION: ${{ github.ref_name }}
         steps:
-            - name: Validate Version Against RegEx
-              run: |
-                  echo "input version is: ${{ env.INPUT_VERSION }}"
-                  if ! echo "${{ env.INPUT_VERSION }}" | grep -Pq '^v\d+\.\d+\.\d+(-rc\d+)?$'; then
-                      echo "Version is not valid, must be v*.*.* or v*.*.*-rc*"
-                      exit 1
-                  fi
-
             - name: Checkout for tag check
+              if: ${{ github.event_name == 'workflow_dispatch' }}
               uses: actions/checkout@v4
 
             - name: Validate version agaisnt tags
+              if: ${{ github.event_name == 'workflow_dispatch' }}
               run: |
                   git fetch --tags
                   if git tag | grep -q "^go/${{ env.INPUT_VERSION }}$"; then
                       echo "Version ${{ env.INPUT_VERSION }} already exists."
                       exit 1
                   fi
-            - name: Output release tag
+
+            - name: Validate Version Against RegEx and output
               id: release-tag
               run: |
-                  echo "RELEASE_VERSION=${{ env.INPUT_VERSION }}" >> $GITHUB_OUTPUT
+                  if ${{ github.event_name == 'workflow_dispatch' }}; then
+                    R_VERSION="${{ env.INPUT_VERSION }}"
+                  else
+                    R_VERSION="${{ env.TAG_VERSION }}"
+                  fi
+                  echo "Releassing version is: ${R_VERSION}"
+                  if ! echo "${R_VERSION}" | grep -Pq '^v\d+\.\d+\.\d+(-rc\d+)?$'; then
+                      echo "Version is not valid, must be v*.*.* or v*.*.*-rc*"
+                      exit 1
+                  fi
+                  echo "RELEASE_VERSION=${R_VERSION}" >> $GITHUB_OUTPUT
 
     create-binaries:
         needs: [load-platform-matrix]
-        if: success() && github.repository_owner == 'valkey-io'
+        if: success()
         strategy:
             fail-fast: false
             matrix:
@@ -123,7 +133,7 @@ jobs:
                       go/protobuf/
 
     commit-auto-gen-files-with-tag:
-        if: ${{ github.event.inputs.pkg_go_dev_publish }}
+        if: ${{ github.event_name == 'push' || inputs.pkg_go_dev_publish }}
         needs: [validate-release-version, create-binaries]
         runs-on: ubuntu-latest
         permissions:

.gitignore

@@ -52,3 +52,6 @@ utils/TestUtils.js
 
 # java compiled files.
 *.class
+
+# generaged files (e.g. protobuf)
+generated/

glide-core/Cargo.toml

@@ -44,11 +44,12 @@ serde = { version = "1", features = ["derive"] }
 versions = "6.3"
 
 [features]
+proto = ["protobuf"]
 socket-layer = [
+    "proto",
     "directories",
     "integer-encoding",
     "num_cpus",
-    "protobuf",
     "tokio-util",
 ]
 standalone_heartbeat = []

glide-core/build.rs

@@ -1,6 +1,6 @@
 // Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 fn build_protobuf() {
     let customization_options = protobuf_codegen::Customize::default()
         .lite_runtime(false)
@@ -13,10 +13,11 @@ fn build_protobuf() {
         .input("src/protobuf/response.proto")
         .input("src/protobuf/connection_request.proto")
         .customize(customization_options)
+        .out_dir("src/generated")
         .run_from_script();
 }
 
 fn main() {
-    #[cfg(feature = "socket-layer")]
+    #[cfg(feature = "proto")]
     build_protobuf();
 }

glide-core/src/client/types.rs

@@ -6,7 +6,7 @@ use logger_core::log_warn;
 use std::collections::HashSet;
 use std::time::Duration;
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 use crate::connection_request as protobuf;
 
 #[derive(Default)]
@@ -77,7 +77,7 @@ pub struct ConnectionRetryStrategy {
     pub number_of_retries: u32,
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 fn chars_to_string_option(chars: &::protobuf::Chars) -> Option<String> {
     if chars.is_empty() {
         None
@@ -86,7 +86,7 @@ fn chars_to_string_option(chars: &::protobuf::Chars) -> Option<String> {
     }
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 fn none_if_zero(value: u32) -> Option<u32> {
     if value == 0 {
         None
@@ -95,7 +95,7 @@ fn none_if_zero(value: u32) -> Option<u32> {
     }
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 impl From<protobuf::ConnectionRequest> for ConnectionRequest {
     fn from(value: protobuf::ConnectionRequest) -> Self {
         let read_from = value.read_from.enum_value().ok().map(|val| match val {

glide-core/src/lib.rs

@@ -1,7 +1,7 @@
 // Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
 
-#[cfg(feature = "socket-layer")]
-include!(concat!(env!("OUT_DIR"), "/protobuf/mod.rs"));
+#[cfg(feature = "proto")]
+include!("generated/mod.rs");
 pub mod client;
 mod retry_strategies;
 #[cfg(feature = "socket-layer")]

glide-core/src/request_type.rs

@@ -2,7 +2,7 @@
 
 use redis::{cmd, Cmd};
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 use crate::command_request::RequestType as ProtobufRequestType;
 
 #[repr(C)]
@@ -431,7 +431,7 @@ fn get_two_word_command(first: &str, second: &str) -> Cmd {
     cmd
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 impl From<::protobuf::EnumOrUnknown<ProtobufRequestType>> for RequestType {
     fn from(value: ::protobuf::EnumOrUnknown<ProtobufRequestType>) -> Self {
         match value.enum_value_or(ProtobufRequestType::InvalidRequest) {

glide-core/src/retry_strategies.rs

@@ -54,7 +54,7 @@ pub(crate) fn get_exponential_backoff(
     }
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 #[allow(dead_code)]
 pub(crate) fn get_fixed_interval_backoff(
     fixed_interval: u32,

go/Cargo.toml

@@ -10,7 +10,7 @@ crate-type = ["staticlib"]
 
 [dependencies]
 redis = { path = "../glide-core/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tokio-rustls-comp"] }
-glide-core = { path = "../glide-core", features = ["socket-layer"] }
+glide-core = { path = "../glide-core", features = ["proto"] }
 tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] }
 protobuf = { version = "3.3.0", features = [] }
 

go/src/lib.rs

@@ -40,7 +40,7 @@ use tokio::runtime::Runtime;
 #[derive(Debug)]
 pub struct CommandResponse {
     response_type: ResponseType,
-    int_value: c_long,
+    int_value: i64,
     float_value: c_double,
     bool_value: bool,
 

java/integTest/build.gradle

@@ -137,8 +137,10 @@ compileTestJava.dependsOn ':client:publishToMavenLocal'
 
 tasks.withType(Test) {
     useJUnitPlatform()
-    dependsOn 'beforeTests'
-    finalizedBy 'afterTests'
+    if (!project.gradle.startParameter.taskNames.contains(':integTest:modulesTest')) {
+        dependsOn 'beforeTests'
+        finalizedBy 'afterTests'
+    }
 
     doFirst {
         systemProperty 'test.server.standalone', standaloneHosts

java/integTest/src/test/java/glide/TestConfiguration.java

@@ -9,9 +9,9 @@
 import glide.api.GlideClient;
 import glide.api.GlideClusterClient;
 import glide.api.logging.Logger;
+import org.apache.commons.lang3.tuple.Pair;
 
 public final class TestConfiguration {
-    // All servers are hosted on localhost
     public static final String[] STANDALONE_HOSTS =
             System.getProperty("test.server.standalone", "").split(",");
     public static final String[] CLUSTER_HOSTS =
@@ -24,21 +24,64 @@ public final class TestConfiguration {
     static {
         Logger.init(Logger.Level.OFF);
         Logger.setLoggerConfig(Logger.Level.OFF);
+
+        System.out.printf("STANDALONE_HOSTS = %s\n", System.getProperty("test.server.standalone", ""));
+        System.out.printf("CLUSTER_HOSTS = %s\n", System.getProperty("test.server.cluster", ""));
+        System.out.printf("AZ_CLUSTER_HOSTS = %s\n", System.getProperty("test.server.azcluster", ""));
+
+        var result = getVersionFromStandalone();
+        if (result.getKey() != null) {
+            SERVER_VERSION = result.getKey();
+        } else {
+            var errorStandalone = result.getValue();
+            result = getVersionFromCluster();
+            if (result.getKey() != null) {
+                SERVER_VERSION = result.getKey();
+            } else {
+                var errorCluster = result.getValue();
+                errorStandalone.printStackTrace(System.err);
+                System.err.println();
+                errorCluster.printStackTrace(System.err);
+                throw new RuntimeException("Failed to get server version");
+            }
+        }
+        System.out.printf("SERVER_VERSION = %s\n", SERVER_VERSION);
+    }
+
+    private static Pair<Semver, Exception> getVersionFromStandalone() {
+        if (STANDALONE_HOSTS[0].isEmpty()) {
+            return Pair.of(null, new Exception("No standalone nodes given"));
+        }
         try {
-            BaseClient client =
-                    !STANDALONE_HOSTS[0].isEmpty()
-                            ? GlideClient.createClient(commonClientConfig().build()).get()
-                            : GlideClusterClient.createClient(commonClusterClientConfig().build()).get();
+            BaseClient client = GlideClient.createClient(commonClientConfig().build()).get();
 
             String serverVersion = TestUtilities.getServerVersion(client);
             if (serverVersion != null) {
-                SERVER_VERSION = new Semver(serverVersion);
+                return Pair.of(new Semver(serverVersion), null);
             } else {
-                throw new Exception("Failed to get server version");
+                return Pair.of(null, new Exception("Failed to parse version"));
             }
+        } catch (Exception e) {
+            return Pair.of(null, e);
+        }
+    }
+
+    private static Pair<Semver, Exception> getVersionFromCluster() {
+        if (CLUSTER_HOSTS[0].isEmpty()) {
+            return Pair.of(null, new Exception("No cluster nodes given"));
+        }
+        try {
+            BaseClient client =
+                    GlideClusterClient.createClient(commonClusterClientConfig().build()).get();
 
+            String serverVersion = TestUtilities.getServerVersion(client);
+            if (serverVersion != null) {
+                return Pair.of(new Semver(serverVersion), null);
+            } else {
+                return Pair.of(null, new Exception("Failed to parse version"));
+            }
         } catch (Exception e) {
-            throw new RuntimeException("Failed to get server version", e);
+            return Pair.of(null, e);
         }
     }
 }