Merge branch 'main' into repo-owner

Signed-off-by: Shoham Elias <shohame@amazon.com>

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -73,10 +73,10 @@ body:
       required: true
 
   - type: input
-    id: redis-version
+    id: engine-version
     attributes:
-      label: Redis Version
-      description: E.g. 6.2, 7.0
+      label: Engine type and version
+      description: E.g. Valkey 7.0
     validations:
       required: true
 
@@ -111,7 +111,7 @@ body:
     attributes:
       label: Cluster information
       description: |
-        Redis cluster information, cluster topology, number of shards, number of replicas, used data types.
+       Cluster information, cluster topology, number of shards, number of replicas, used data types.
     validations:
       required: false
 
@@ -120,7 +120,7 @@ body:
     attributes:
       label: Logs
       description: |
-        Client and/or Redis logs.
+        Client and/or server logs.
     validations:
       required: false
 

.github/workflows/build-node-wrapper/action.yml

@@ -42,7 +42,7 @@ inputs:
         description: "The NPM scope"
         required: false
         type: string
-        default: "@aws"
+        default: "@valkey"
     github-token:
         description: "GITHUB_TOKEN, GitHub App installation access token"
         required: true

.github/workflows/node-create-package-file/action.yml

@@ -33,7 +33,7 @@ inputs:
         description: "The NPM scope"
         required: false
         type: string
-        default: "@aws"
+        default: "@valkey"
     target:
         description: "Specified target for rust toolchain, ex. x86_64-apple-darwin"
         type: string
@@ -56,7 +56,7 @@ runs:
               # echo -musl if inputs.target is musl
               export MUSL_FLAG=`if [[ "${{ inputs.target }}" =~ .*"musl".*  ]]; then echo "-musl"; fi`
               # set the package name
-              name="glide-for-redis"
+              name="valkey-glide"
               # derive the OS and architecture from the inputs
               export node_os="${{ inputs.named_os }}"
               export node_arch="${{ inputs.arch }}"

.github/workflows/npm-cd.yml

@@ -33,11 +33,13 @@ jobs:
         if: github.repository_owner == 'valkey-io'
         runs-on: ubuntu-latest
         steps:
+
           - run: |
                 echo "Current repository: ${{ github.repository }}"
                 echo "Repository owner: ${{ github.repository_owner }}"
                 echo "Pull request head repo: ${{ github.event.pull_request.head.repo.full_name }}"
                 echo "Pull request base repo: ${{ github.event.pull_request.base.repo.full_name }}"
+                echo "Pull request base repo: ${{ github.event.pull_request.base.repo.owner }}"
             env:
                 OWNER: ${{ github.repository_owner }}
 
@@ -239,7 +241,7 @@ jobs:
               shell: bash
               working-directory: ./node/npm/glide
               run: |
-                  export pkg_name=glide-for-redis
+                  export pkg_name=valkey-glide
                   echo "${GITHUB_REF:11}"
                   export package_version=${GITHUB_REF:11}
                   export scope=`if [ "$NPM_SCOPE" != ''  ]; then echo "$NPM_SCOPE/"; fi`
@@ -372,7 +374,7 @@ jobs:
               working-directory: ./utils/release-candidate-testing/node
               run: |
                   npm install
-                  npm install --no-save @aws/glide-for-redis@${{ env.NPM_TAG }}
+                  npm install --no-save @valkey/valkey-glide@${{ env.NPM_TAG }}
                   npm run test
 
             # Reset the repository to make sure we get the clean checkout of the action later in other actions.

.github/workflows/ort.yml

@@ -122,7 +122,7 @@ jobs:
               run: |
                 # Remove the glide-rs dependency to avoid duplication 
                 sed -i '/ "glide-rs":/d' ../../package.json
-                export pkg_name=glide-for-redis-base
+                export pkg_name=valkey-glide-base
                 export package_version="${{ env.RELEASE_VERSION }}"
                 export scope=`if [ "$NPM_SCOPE" != ''  ]; then echo "$NPM_SCOPE/"; fi`
                 mv package.json package.json.tmpl
@@ -203,11 +203,11 @@ jobs:
               run: |
                 export BRANCH_NAME=`if [ "$EVENT_NAME" == 'schedule' ] || [ "$EVENT_NAME" == 'pull_request' ]; then echo 'scheduled-ort'; else echo "ort-v$INPUT_VERSION"; fi`
                 echo "Creating pull request from branch ${BRANCH_NAME} to branch ${{ env.BASE_BRANCH }}"
-                git config --global user.email "glide-for-redis@amazon.com"
+                git config --global user.email "valkey-glide@lists.valkey.io"
                 git config --global user.name "ort-bot"
                 git checkout -b ${BRANCH_NAME}
                 git add $PYTHON_ATTRIBUTIONS $NODE_ATTRIBUTIONS $RUST_ATTRIBUTIONS $JAVA_ATTRIBUTIONS
-                git commit -m "Updated attribution files"
+                git commit -m "Updated attribution files" -s
                 git push --set-upstream origin ${BRANCH_NAME} -f
                 title="Updated attribution files for ${BRANCH_NAME}"
                 gh pr create -B ${{ env.BASE_BRANCH }} -H ${BRANCH_NAME} --title "${title}" --body 'Created by Github action.\n${{ env.LICENSES_LIST }}'

CODEOWNERS

@@ -1 +1 @@
-* @aws/glide
+* @valkey-io/glide-maintainers

CONTRIBUTING.md

@@ -38,6 +38,7 @@ GitHub provides additional document on [forking a repository](https://help.githu
 Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
 
 ## Developer Guides
+-   [Java](./java/DEVELOPER.md)
 -   [Node](./node/DEVELOPER.md)
 -   [Python](./python/DEVELOPER.md)
 
@@ -48,7 +49,7 @@ opensource-codeofconduct@amazon.com with any additional questions or comments.
 
 
 ## Security issue notifications
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
+See [SECURITY.md](./SECURITY.md)
 
 
 ## Licensing

SECURITY.md

@@ -1,11 +1,6 @@
-## Reporting Security Issues
+# Reporting a Vulnerability
 
-We take all security reports seriously.
-When we receive such reports,
-we will investigate and subsequently address
-any potential vulnerabilities as quickly as possible.
-If you discover a potential security issue in this project,
-please notify AWS/Amazon Security via our
-[vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/)
-or directly via email to [AWS Security](mailto:aws-security@amazon.com).
-Please do *not* create a public GitHub issue in this project.
+If you believe you've discovered a security vulnerability, please contact the Valkey team at security@lists.valkey.io.
+Please *DO NOT* create an issue.
+We follow a responsible disclosure procedure, so depending on the severity of the issue we may notify Valkey vendors about the issue before releasing it publicly.
+If you would like to be added to our list of vendors, please reach out to the Valkey team at valkey-glide@lists.valkey.io.

benchmarks/node/node_benchmark.ts

@@ -3,12 +3,12 @@
  */
 
 import { writeFileSync } from "fs";
-import { GlideClient, GlideClusterClient, Logger } from "glide-for-redis";
 import { Cluster, Redis } from "ioredis";
 import { parse } from "path";
 import percentile from "percentile";
 import { RedisClientType, createClient, createCluster } from "redis";
 import { stdev } from "stats-lite";
+import { GlideClient, GlideClusterClient, Logger } from "valkey-glide";
 import {
     generateKeyGet,
     generateKeySet,

benchmarks/node/package.json

@@ -14,7 +14,7 @@
         "@types/command-line-args": "^5.2.0",
         "@types/stats-lite": "^2.2.0",
         "command-line-args": "^5.2.1",
-        "glide-for-redis": "file:../../node",
+        "valkey-glide": "file:../../node",
         "ioredis": "5.3.2",
         "percentile": "^1.6.0",
         "redis": "4.6.13",

csharp/DEVELOPER.md

@@ -84,7 +84,7 @@ Before starting this step, make sure you've installed all software requirments.
 ```bash
 VERSION=0.1.0 # You can modify this to other released version or set it to "main" to get the unstable branch
 git clone --branch ${VERSION} https://github.com/valkey-io/valkey-glide.git
-cd glide-for-redis
+cd valkey-glide
 ```
 
 2. Initialize git submodule

examples/node/README.MD

@@ -21,19 +21,19 @@ npm i -g npm@8
 ## Build
 To build GLIDE's Node client, run (on unix based systems):
 ```
-cd glide-for-redis/node
+cd valkey-glide/node
 git submodule update --init --recursive
 npm install
 rm -rf build-ts
 npm run build:release
-cd glide-for-redis/examples/node
+cd valkey-glide/examples/node
 npm install
 npx tsc
 ```
 
 ## Run
 To run the example:
 ```
-cd glide-for-redis/examples/node
+cd valkey-glide/examples/node
 node index.js
 ```

examples/node/index.ts

@@ -2,7 +2,7 @@
  * Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
  */
 
-import { GlideClient, GlideClusterClient, Logger } from "@aws/glide-for-redis";
+import { GlideClient, GlideClusterClient, Logger } from "@valkey/valkey-glide";
 
 async function sendPingToNode() {
     // When in Redis is in standalone mode, add address of the primary node, and any replicas you'd like to be able to read from.

examples/node/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "dependencies": {
-        "@aws/glide-for-redis": "^0.1.0",
+        "@valkey/valkey-glide": "^1.0.0",
         "@types/node": "^20.4.8"
     },
     "devDependencies": {

examples/python/requirements.txt

@@ -1 +1 @@
-glide-for-redis>=0.1
+valkey-glide

glide-core/THIRD_PARTY_LICENSES_RUST

@@ -22969,7 +22969,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----
 
-Package: syn:2.0.69
+Package: syn:2.0.70
 
 The following copyrights and licenses were found in the source code of this package:
 
@@ -24572,7 +24572,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----
 
-Package: tinyvec:1.7.0
+Package: tinyvec:1.8.0
 
 The following copyrights and licenses were found in the source code of this package:
 

go/Makefile

@@ -33,9 +33,9 @@ build-glide-client:
 generate-protobuf:
 	mkdir -p protobuf
 	protoc --proto_path=../glide-core/src/protobuf \
-		--go_opt=Mconnection_request.proto=github.com/aws/glide-for-redis/go/protobuf \
-		--go_opt=Mcommand_request.proto=github.com/aws/glide-for-redis/go/protobuf \
-		--go_opt=Mresponse.proto=github.com/aws/glide-for-redis/go/protobuf \
+		--go_opt=Mconnection_request.proto=github.com/valkey-io/valkey-glide/go/protobuf \
+		--go_opt=Mcommand_request.proto=github.com/valkey-io/valkey-glide/go/protobuf \
+		--go_opt=Mresponse.proto=github.com/valkey-io/valkey-glide/go/protobuf \
 		--go_out=./protobuf \
 		--go_opt=paths=source_relative \
 		../glide-core/src/protobuf/*.proto

go/api/config.go

@@ -2,7 +2,7 @@
 
 package api
 
-import "github.com/aws/glide-for-redis/go/glide/protobuf"
+import "github.com/valkey-io/valkey-glide/go/glide/protobuf"
 
 const (
 	defaultHost = "localhost"

go/api/config_test.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/aws/glide-for-redis/go/glide/protobuf"
 	"github.com/stretchr/testify/assert"
+	"github.com/valkey-io/valkey-glide/go/glide/protobuf"
 )
 
 func TestDefaultStandaloneConfig(t *testing.T) {

go/go.mod

@@ -1,4 +1,4 @@
-module github.com/aws/glide-for-redis/go/glide
+module github.com/valkey-io/valkey-glide/go/glide
 
 go 1.18
 

java/THIRD_PARTY_LICENSES_JAVA

@@ -23864,7 +23864,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----
 
-Package: syn:2.0.69
+Package: syn:2.0.70
 
 The following copyrights and licenses were found in the source code of this package:
 
@@ -25467,7 +25467,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----
 
-Package: tinyvec:1.7.0
+Package: tinyvec:1.8.0
 
 The following copyrights and licenses were found in the source code of this package:
 

node/THIRD_PARTY_LICENSES_NODE

@@ -24594,7 +24594,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----
 
-Package: syn:2.0.69
+Package: syn:2.0.70
 
 The following copyrights and licenses were found in the source code of this package:
 
@@ -26655,7 +26655,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----
 
-Package: tinyvec:1.7.0
+Package: tinyvec:1.8.0
 
 The following copyrights and licenses were found in the source code of this package:
 

node/hybrid-node-tests/commonjs-test/package.json

@@ -16,7 +16,7 @@
     "dependencies": {
         "child_process": "^1.0.2",
         "find-free-port": "^2.0.0",
-        "glide-for-redis": "file:../../../node/build-ts/cjs"
+        "valkey-glide": "file:../../../node/build-ts/cjs"
     },
     "devDependencies": {
         "@types/node": "^18.7.9",

node/hybrid-node-tests/ecmascript-test/package.json

@@ -16,7 +16,7 @@
     "dependencies": {
         "child_process": "^1.0.2",
         "find-free-ports": "^3.1.1",
-        "glide-for-redis": "file:../../../node/build-ts/mjs"
+        "valkey-glide": "file:../../../node/build-ts/mjs"
     },
     "devDependencies": {
         "@types/node": "^18.7.9",

node/npm/glide/index.ts

@@ -17,26 +17,26 @@ function loadNativeBinding() {
                 case "x64":
                     switch (familySync()) {
                         case GLIBC:
-                            nativeBinding = require("@scope/glide-for-redis-linux-x64");
+                            nativeBinding = require("@scope/valkey-glide-linux-x64");
                             break;
                         case MUSL:
-                            nativeBinding = require("@scope/glide-for-redis-linux-musl-x64");
+                            nativeBinding = require("@scope/valkey-glide-linux-musl-x64");
                             break;
                         default:
-                            nativeBinding = require("@scope/glide-for-redis-linux-x64");
+                            nativeBinding = require("@scope/valkey-glide-linux-x64");
                             break;
                     }
                     break;
                 case "arm64":
                     switch (familySync()) {
                         case GLIBC:
-                            nativeBinding = require("@scope/glide-for-redis-linux-arm64");
+                            nativeBinding = require("@scope/valkey-glide-linux-arm64");
                             break;
                         case MUSL:
-                            nativeBinding = require("@scope/glide-for-redis-linux-musl-arm64");
+                            nativeBinding = require("@scope/valkey-glide-linux-musl-arm64");
                             break;
                         default:
-                            nativeBinding = require("@scope/glide-for-redis-linux-arm64");
+                            nativeBinding = require("@scope/valkey-glide-linux-arm64");
                             break;
                     }
                     break;
@@ -49,10 +49,10 @@ function loadNativeBinding() {
         case "darwin":
             switch (arch) {
                 case "x64":
-                    nativeBinding = require("@scope/glide-for-redis-darwin-x64");
+                    nativeBinding = require("@scope/valkey-glide-darwin-x64");
                     break;
                 case "arm64":
-                    nativeBinding = require("@scope/glide-for-redis-darwin-arm64");
+                    nativeBinding = require("@scope/valkey-glide-darwin-arm64");
                     break;
                 default:
                     throw new Error(