Merge pull request #1144 from mstgnz/main

fix Minio concurrency issues for content type

.github/dependabot.yml

@@ -32,6 +32,12 @@ updates:
             - "🤖 Dependencies"
         schedule:
             interval: "daily"
+    -   package-ecosystem: "gomod"
+        directory: "/coherence/" # Location of package manifests
+        labels:
+            - "🤖 Dependencies"
+        schedule:
+            interval: "daily"
     -   package-ecosystem: "gomod"
         directory: "/etcd/" # Location of package manifests
         labels:
@@ -62,6 +68,12 @@ updates:
             - "🤖 Dependencies"
         schedule:
             interval: "daily"
+    - package-ecosystem: "gomod"
+      directory: "/minio/" # Location of package manifests
+      labels:
+          - "🤖 Dependencies"
+      schedule:
+          interval: "daily"
     -   package-ecosystem: "gomod"
         directory: "/mongodb/" # Location of package manifests
         labels:
@@ -116,8 +128,21 @@ updates:
             - "🤖 Dependencies"
         schedule:
             interval: "daily"
+    -   package-ecosystem: "gomod"
         directory: "/mssql/" # Location of package manifests
         labels:
             - "🤖 Dependencies"
         schedule:
             interval: "daily"
+    -   package-ecosystem: "gomod"
+        directory: "/rueidis/" # Location of package manifests
+        labels:
+            - "🤖 Dependencies"
+        schedule:
+            interval: "daily"
+    - package-ecosystem: "gomod"
+      directory: "/scylladb/" # Location of package manifests
+      labels:
+          - "🤖 Dependencies"
+      schedule:
+          interval: "daily"

.github/release-drafter-coherence.yml

@@ -0,0 +1,50 @@
+name-template: 'Coherence - v$RESOLVED_VERSION'
+tag-template: 'coherence/v$RESOLVED_VERSION'
+tag-prefix: coherence/v
+include-paths:
+  - coherence
+categories:
+    - title: '❗ Breaking Changes'
+      labels:
+          - '❗ BreakingChange'
+    - title: '🚀 New'
+      labels:
+          - '✏️ Feature'
+    - title: '🧹 Updates'
+      labels:
+          - '🧹 Updates'
+          - '🤖 Dependencies'
+    - title: '🐛 Fixes'
+      labels:
+          - '☢️ Bug'
+    - title: '📚 Documentation'
+      labels:
+          - '📒 Documentation'
+change-template: '- $TITLE (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+exclude-contributors:
+    - dependabot
+    - dependabot[bot]
+version-resolver:
+    major:
+        labels:
+            - 'major'
+            - '❗ BreakingChange'
+    minor:
+        labels:
+            - 'minor'
+            - '✏️ Feature'
+    patch:
+        labels:
+            - 'patch'
+            - '📒 Documentation'
+            - '☢️ Bug'
+            - '🤖 Dependencies'
+            - '🧹 Updates'
+    default: patch
+template: |
+    $CHANGES
+
+    **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...coherence/v$RESOLVED_VERSION
+
+    Thank you $CONTRIBUTORS for making this update possible.

.github/release-drafter-minio.yml

@@ -0,0 +1,50 @@
+name-template: 'Minio - v$RESOLVED_VERSION'
+tag-template: 'minio/v$RESOLVED_VERSION'
+tag-prefix: minio/v
+include-paths:
+  - minio
+categories:
+    - title: '❗ Breaking Changes'
+      labels:
+          - '❗ BreakingChange'
+    - title: '🚀 New'
+      labels:
+          - '✏️ Feature'
+    - title: '🧹 Updates'
+      labels:
+          - '🧹 Updates'
+          - '🤖 Dependencies'
+    - title: '🐛 Fixes'
+      labels:
+          - '☢️ Bug'
+    - title: '📚 Documentation'
+      labels:
+          - '📒 Documentation'
+change-template: '- $TITLE (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+exclude-contributors:
+    - dependabot
+    - dependabot[bot]
+version-resolver:
+    major:
+        labels:
+            - 'major'
+            - '❗ BreakingChange'
+    minor:
+        labels:
+            - 'minor'
+            - '✏️ Feature'
+    patch:
+        labels:
+            - 'patch'
+            - '📒 Documentation'
+            - '☢️ Bug'
+            - '🤖 Dependencies'
+            - '🧹 Updates'
+    default: patch
+template: |
+    $CHANGES
+
+    **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...minio/v$RESOLVED_VERSION
+
+    Thank you $CONTRIBUTORS for making this update possible.

.github/release-drafter-rueidis.yml

@@ -0,0 +1,50 @@
+name-template: 'Rueidis - v$RESOLVED_VERSION'
+tag-template: 'rueidis/v$RESOLVED_VERSION'
+tag-prefix: rueidis/v
+include-paths:
+  - rueidis
+categories:
+    - title: '❗ Breaking Changes'
+      labels:
+          - '❗ BreakingChange'
+    - title: '🚀 New'
+      labels:
+          - '✏️ Feature'
+    - title: '🧹 Updates'
+      labels:
+          - '🧹 Updates'
+          - '🤖 Dependencies'
+    - title: '🐛 Fixes'
+      labels:
+          - '☢️ Bug'
+    - title: '📚 Documentation'
+      labels:
+          - '📒 Documentation'
+change-template: '- $TITLE (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+exclude-contributors:
+    - dependabot
+    - dependabot[bot]
+version-resolver:
+    major:
+        labels:
+            - 'major'
+            - '❗ BreakingChange'
+    minor:
+        labels:
+            - 'minor'
+            - '✏️ Feature'
+    patch:
+        labels:
+            - 'patch'
+            - '📒 Documentation'
+            - '☢️ Bug'
+            - '🤖 Dependencies'
+            - '🧹 Updates'
+    default: patch
+template: |
+    $CHANGES
+
+    **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...rueidis/v$RESOLVED_VERSION
+
+    Thank you $CONTRIBUTORS for making this update possible.

.github/release-drafter-scylladb.yml

@@ -0,0 +1,43 @@
+name-template: 'ScyllaDb - v$RESOLVED_VERSION'
+tag-template: 'scylladb/v$RESOLVED_VERSION'
+tag-prefix: scylladb/v
+include-paths:
+  - scylladb
+categories:
+  - title: '🚀 New'
+    labels:
+      - '✏️ Feature'
+  - title: '🧹 Updates'
+    labels:
+      - '🧹 Updates'
+      - '🤖 Dependencies'
+  - title: '🐛 Fixes'
+    labels:
+      - '☢️ Bug'
+  - title: '📚 Documentation'
+    labels:
+      - '📒 Documentation'
+change-template: '- $TITLE (#$NUMBER)'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+      - '✏️ Feature'
+  patch:
+    labels:
+      - 'patch'
+      - '📒 Documentation'
+      - '☢️ Bug'
+      - '🤖 Dependencies'
+      - '🧹 Updates'
+  default: patch
+template: |
+  $CHANGES
+  
+  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...scylladb/v$RESOLVED_VERSION
+  
+  Thank you $CONTRIBUTORS for making this update possible.

.github/scripts/gen-test-certs.sh

@@ -6,7 +6,8 @@
 #   ./tls/redis.{crt,key}       A certificate with no key usage/policy restrictions.
 #   ./tls/client.{crt,key}      A certificate restricted for SSL client usage.
 #   ./tls/server.{crt,key}      A certificate restricted for SSL server usage.
-#   ./tls/redis.dh              DH Params file.
+
+set -e
 
 generate_cert() {
     local name=$1
@@ -45,6 +46,8 @@ cat > ./tls/openssl.cnf <<_END_
 [ server_cert ]
 keyUsage = digitalSignature, keyEncipherment
 nsCertType = server
+subjectAltName = DNS:localhost"
+
 [ client_cert ]
 keyUsage = digitalSignature, keyEncipherment
 nsCertType = client
@@ -52,6 +55,8 @@ _END_
 
 generate_cert server "Server-only" "-extfile ./tls/openssl.cnf -extensions server_cert"
 generate_cert client "Client-only" "-extfile ./tls/openssl.cnf -extensions client_cert"
-generate_cert redis "Generic-cert"
+generate_cert redis "localhost" "-extfile ./tls/openssl.cnf -extensions server_cert"
 
-[ -f ./tls/redis.dh ] || openssl dhparam -out ./tls/redis.dh 2048
+# List generated certs
+ls -la ./tls
+echo "$PWD"

.github/scripts/sync_docs.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 # Some env variables
 BRANCH="main"

.github/workflows/benchmark.yml

@@ -0,0 +1,175 @@
+on:
+  push:
+    branches:
+      - master
+      - main
+    paths:
+      - "**"
+      - "!**.md"
+  pull_request:
+    paths:
+      - "**"
+      - "!**.md"
+
+permissions:
+  deployments: write
+  contents: write
+
+name: Benchmark
+jobs:
+  Compare:
+    runs-on: ubuntu-latest
+    services:
+      arangodb:
+        image: 'arangodb:latest'
+        env:
+          ARANGO_NO_AUTH: 1
+        ports:
+          - '8529:8529'
+      dynamodb:
+        image: 'amazon/dynamodb-local:latest'
+        ports:
+          - '8000:8000'
+      memcached:
+        image: 'memcached:latest'
+        ports:
+          - '11211:11211'
+      mongo:
+        image: 'mongo:latest'
+        ports:
+          - '27017:27017'
+      mssql:
+        image: 'mcmoe/mssqldocker:latest'
+        ports:
+          - '1433:1433'
+        env:
+          ACCEPT_EULA: Y
+          SA_PASSWORD: MsSql!1234
+          MSSQL_DB: master
+          MSSQL_USER: sa
+          MSSQL_PASSWORD: MsSql!1234
+        options: >-
+          --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
+          --health-interval 1s
+          --health-timeout 30s
+          --health-start-period 10s
+          --health-retries 20
+      mysql:
+        image: 'mysql:latest'
+        env:
+          MYSQL_DATABASE: fiber
+          MYSQL_USER: username
+          MYSQL_PASSWORD: password
+          MYSQL_ROOT_PASSWORD: password
+        ports:
+          - '3306:3306'
+        options: >-
+          --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout
+          5s --health-retries 5
+      postgres:
+        image: 'postgres:latest'
+        ports:
+          - '5432:5432'
+        env:
+          POSTGRES_DB: fiber
+          POSTGRES_USER: username
+          POSTGRES_PASSWORD: "pass#w%rd"
+        options: >-
+          --health-cmd pg_isready --health-interval 10s --health-timeout 5s
+          --health-retries 5
+    steps:
+      - name: Fetch Repository
+        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          # NOTE: Keep this in sync with the version from go.mod
+          go-version: "1.20.x"
+
+      - name: Install Azurite
+        run: |
+          docker run -d -p 10000:10000 mcr.microsoft.com/azure-storage/azurite azurite-blob --blobHost 0.0.0.0 --blobPort 10000
+
+      - name: Install Coherence
+        run: |
+          docker run -d -p 1408:1408 -p 30000:30000 ghcr.io/oracle/coherence-ce:22.06.5
+          sleep 30
+
+      - name: Install couchbase
+        run: |
+          docker run --name couchbase -d -p 8091-8097:8091-8097 -p 9123:9123 -p 11207:11207 -p 11210:11210 -p 11280:11280 -p 18091-18097:18091-18097 couchbase:enterprise-7.1.1
+          sleep 10
+          docker exec --tty couchbase couchbase-cli cluster-init -c localhost:8091 --cluster-username admin --cluster-password 123456 --cluster-ramsize 256 --services data
+          sleep 10
+          docker exec --tty couchbase couchbase-cli bucket-create -c localhost:8091 --username admin --password 123456 --bucket fiber_storage --bucket-type couchbase --bucket-ramsize 100 --enable-flush 1
+
+      - name: Install etcd
+        run: |
+          docker run -d --name Etcd-server \
+            --publish 2379:2379 \
+            --publish 2380:2380 \
+            --env ALLOW_NONE_AUTHENTICATION=yes \
+            --env ETCD_ADVERTISE_CLIENT_URLS=http://etcd-server:2379 \
+            bitnami/etcd:latest
+
+      - name: Install MinIO
+        run: |
+          docker run -d --restart always -p 9000:9000 --name storage-minio -e MINIO_ROOT_USER='minio-user' -e MINIO_ROOT_PASSWORD='minio-password' minio/minio server /data
+
+      - name: Install ScyllaDb
+        run: |
+          docker run --name scylladb -p 9042:9042 -p 19042:19042 -p 9160:9160 -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9180:9180 -d scylladb/scylla:latest --broadcast-address 127.0.0.1 --listen-address 0.0.0.0 --broadcast-rpc-address 127.0.0.1
+          sleep 15 # Wait for ScyllaDb to initialize
+
+      - name: Setup Redis
+        uses: shogo82148/actions-setup-redis@v1
+        with:
+          redis-version: '7.x'
+          auto-start: 'false'
+
+      - name: Run Redis
+        run: |
+          redis-server --port 6379 &
+
+      - name: Run Benchmarks
+        run: |
+          set -o pipefail
+          for d in */ ; do
+            [[ $d == "tls/" ]] && continue
+
+            cd "$d"
+            go test ./... -benchmem -run=^$ -bench . | tee -a ../output.txt
+            cd ..
+          done
+        shell: bash
+        env:
+          MSSQL_DATABASE: master
+          MSSQL_USERNAME: sa
+          MSSQL_PASSWORD: MsSql!1234
+          MYSQL_USERNAME: username
+          MYSQL_PASSWORD: password
+          MYSQL_DATABASE: fiber
+          POSTGRES_DATABASE: fiber
+          POSTGRES_USERNAME: username
+          POSTGRES_PASSWORD: "pass#w%rd"
+
+      - name: Get Previous Benchmark Results
+        uses: actions/cache@v3
+        with:
+          path: ./cache
+          key: ${{ runner.os }}-benchmark
+
+      - name: Save Benchmark Results
+        uses: benchmark-action/github-action-benchmark@v1.18.0
+        with:
+          tool: "go"
+          output-file-path: output.txt
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          benchmark-data-dir-path: "benchmarks"
+          alert-threshold: "300%"
+          fail-on-alert: true
+          comment-on-alert: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+          #summary-always: ${{ github.event_name != 'push' && github.event_name != 'workflow_dispatch' }}
+          auto-push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+          save-data-file: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}

.github/workflows/codeql-analysis.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/golangci-lint.yml

@@ -1,4 +1,4 @@
-name: Golangci Lint Check
+name: Golangci-Lint Check
 
 on:
   push:
@@ -20,12 +20,49 @@ on:
       - ".github/dependabot.yml"
 
 jobs:
-  golangci-lint:
+  generate-matrix:
     runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Fetch Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - id: set-matrix
+        run: |
+          # Determine the base and head commits for diff based on the event type
+          BASE_SHA="${{ github.event.pull_request.base.sha || github.event.before }}"
+          HEAD_SHA="${{ github.event.pull_request.head.sha || github.event.after }}"
+
+          # Extract directories from changed files, only include those with go.mod files
+          GO_MOD_DIRECTORIES=()
+          FILES=$(git diff --name-only $BASE_SHA $HEAD_SHA | grep -vE '/\.')
+          DIRECTORIES=$(echo "$FILES" | xargs -L1 dirname | sort -u)
+
+          for dir in $DIRECTORIES; do
+            if [[ -f "$dir/go.mod" ]]; then
+              GO_MOD_DIRECTORIES+=("$dir")
+            fi
+          done
+
+          # Export the JSON array
+          JSON_ARRAY=$(printf '%s\n' "${GO_MOD_DIRECTORIES[@]}" | jq -R -s -c 'split("\n")[:-1]')
+          echo "matrix=${JSON_ARRAY}" >> $GITHUB_OUTPUT
+
+  lint:
+    needs: generate-matrix
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        modules: ${{fromJson(needs.generate-matrix.outputs.matrix)}}
+    steps:
+      - name: Fetch Repository
+        uses: actions/checkout@v4
       - name: Run golangci-lint
         uses: reviewdog/action-golangci-lint@v2
         with:
-          golangci_lint_flags: "--tests=false"
+          golangci_lint_flags: "--tests=false --timeout=5m"
+          workdir: ${{ matrix.modules }}
+          fail_on_error: true
+          filter_mode: nofilter

.github/workflows/gosec.yml

@@ -20,95 +20,45 @@ on:
       - ".github/dependabot.yml"
 
 jobs:
+  detect-changes:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.changed-files.outputs.all_changed_files }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Changed Files
+        uses: tj-actions/changed-files@v40
+        id: changed-files
+        with:
+          files_ignore: |
+            .github/**
+            **.md
+          json: true
+          escape_json: false
+          dir_names: true
+          dir_names_exclude_current_dir: true
+
   gosec-scan:
     runs-on: ubuntu-latest
+    needs: detect-changes
     env:
       GO111MODULE: on
+    strategy:
+      matrix:
+        modules: ${{ fromJSON(needs.detect-changes.outputs.matrix) }}
     steps:
       - name: Fetch Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '^1.18.x'
+          go-version: '^1.19.x'
           check-latest: true
           cache: false
-      - name: Install Gosec
+      - name: Install gosec
         run: go install github.com/securego/gosec/v2/cmd/gosec@latest
-      - name: Run Gosec (root)
-        working-directory: .
-        run: |
-          gosec -exclude-dir=arangodb -exclude-dir=badger -exclude-dir=couchbase -exclude-dir=dynamodb -exclude-dir=etcd -exclude-dir=memcache -exclude-dir=memory -exclude-dir=mongodb -exclude-dir=mysql -exclude-dir=postgres -exclude-dir=redis -exclude-dir=ristretto -exclude-dir=sqlite3 -exclude-dir=s3 -exclude-dir=bbolt -exclude-dir=azureblob -exclude-dir=mssql -exclude-dir=pebble ./....
-        # -----
-      - name: Run Gosec (arangodb)
-        working-directory: ./arangodb
+      - name: Run gosec
+        working-directory: ${{ matrix.modules }}
         run: gosec ./...
-        # -----
-      - name: Run Gosec (badger)
-        working-directory: ./badger
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (couchbase)
-        working-directory: ./couchbase
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (dynamodb)
-        working-directory: ./dynamodb
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (etcd)
-        working-directory: ./etcd
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (memcache)
-        working-directory: ./memcache
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (memory)
-        working-directory: ./memory
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (mongodb)
-        working-directory: ./mongodb
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (mysql)
-        working-directory: ./mysql
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (postgres)
-        working-directory: ./postgres
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (redis)
-        working-directory: ./redis
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (sqlite3)
-        working-directory: ./sqlite3
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (s3)
-        working-directory: ./s3
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (ristretto)
-        working-directory: ./ristretto
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (bbolt)
-        working-directory: ./bbolt
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (azureblob)
-        working-directory: ./azureblob
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (mssql)
-        working-directory: ./mssql
-        run: gosec ./...
-        # -----
-      - name: Run Gosec (pebble)
-        working-directory: ./pebble
-        run: gosec ./...
-        # -----

.github/workflows/govulncheck.yml

@@ -26,9 +26,9 @@ jobs:
       GO111MODULE: on
     steps:
     - name: Fetch Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: 'stable'
         check-latest: true

.github/workflows/release-drafter-coherence.yml

@@ -0,0 +1,19 @@
+name: Release Drafter Coherence
+on:
+    push:
+        # branches to consider in the event; optional, defaults to all
+        branches:
+            - master
+            - main
+        paths:
+            - 'coherence/**'
+jobs:
+    draft_release_coherence:
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            -   uses: release-drafter/release-drafter@v5
+                with:
+                    config-name: release-drafter-coherence.yml
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-drafter-memory.yml

@@ -0,0 +1,19 @@
+name: Release Drafter Memory
+on:
+    push:
+        # branches to consider in the event; optional, defaults to all
+        branches:
+            - master
+            - main
+        paths:
+            - 'memory/**'
+jobs:
+    draft_release_memcache:
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            -   uses: release-drafter/release-drafter@v5
+                with:
+                    config-name: release-drafter-memory.yml
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-drafter-minio.yml

@@ -0,0 +1,19 @@
+name: Release Drafter Minio
+on:
+    push:
+        # branches to consider in the event; optional, defaults to all
+        branches:
+            - master
+            - main
+        paths:
+            - 'minio/**'
+jobs:
+    draft_release_minio:
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            -   uses: release-drafter/release-drafter@v5
+                with:
+                    config-name: release-drafter-minio.yml
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-drafter-rueidis.yml

@@ -0,0 +1,19 @@
+name: Release Drafter Rueidis
+on:
+    push:
+        # branches to consider in the event; optional, defaults to all
+        branches:
+            - master
+            - main
+        paths:
+            - 'rueidis/**'
+jobs:
+    draft_release_rueidis:
+        runs-on: ubuntu-latest
+        timeout-minutes: 30
+        steps:
+            -   uses: release-drafter/release-drafter@v5
+                with:
+                    config-name: release-drafter-rueidis.yml
+                env:
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-drafter-scylladb.yml

@@ -0,0 +1,19 @@
+name: Release Drafter ScyllaDb
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+      - main
+    paths:
+      - 'scylladb/**'
+jobs:
+  draft_release_scylladb:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      -   uses: release-drafter/release-drafter@v5
+          with:
+            config-name: release-drafter-scylladb.yml
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync-docs.yml

@@ -17,13 +17,13 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.event.pull_request.head.sha }}
                   fetch-depth: 2
 
             - name: Setup Node.js environment
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: '18'
 

.github/workflows/test-arangodb.yml

@@ -22,15 +22,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-azureblob.yml

@@ -15,17 +15,17 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
         -   name: Install Azurite
             run: |
                 docker run -d -p 10000:10000 mcr.microsoft.com/azure-storage/azurite azurite-blob --blobHost 0.0.0.0 --blobPort 10000
         -   name: Fetch Repository
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
         -   name: Install Go
-            uses: actions/setup-go@v4
+            uses: actions/setup-go@v5
             with:
                 go-version: '${{ matrix.go-version }}'
         -   name: Run Test

.github/workflows/test-badger.yml

@@ -14,15 +14,15 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         runs-on: ubuntu-latest
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Test Badger

.github/workflows/test-bbolt.yml

@@ -15,14 +15,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-coherence.yml

@@ -0,0 +1,33 @@
+on:
+  push:
+    branches:
+      - master
+      - main
+    paths:
+      - 'coherence/**'
+  pull_request:
+    paths:
+      - 'coherence/**'
+name: "Tests Coherence"
+jobs:
+  Tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version:
+          - 1.19.x
+          - 1.20.x
+          - 1.21.x
+    steps:
+      - name: Fetch Repository
+        uses: actions/checkout@v4
+      - name: Startup Coherence
+        run: |
+          docker run -d -p 1408:1408 -p 30000:30000 ghcr.io/oracle/coherence-ce:22.06.5
+          sleep 30
+      -   name: Install Go
+          uses: actions/setup-go@v5
+          with:
+            go-version: '${{ matrix.go-version }}'
+      -   name: Run Test
+          run: cd ./coherence && go clean -testcache && go test ./... -v

.github/workflows/test-couchbase.yml

@@ -17,9 +17,10 @@ jobs:
         go-version:
           - 1.19.x
           - 1.20.x
+          - 1.21.x
     steps:
       - name: Fetch Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install couchbase
         run: |
           docker run --name couchbase -d -p 8091-8097:8091-8097 -p 9123:9123 -p 11207:11207 -p 11210:11210 -p 11280:11280 -p 18091-18097:18091-18097 couchbase:enterprise-7.1.1
@@ -28,7 +29,7 @@ jobs:
           sleep 10
           docker exec --tty couchbase couchbase-cli bucket-create -c localhost:8091 --username admin --password 123456 --bucket fiber_storage --bucket-type couchbase --bucket-ramsize 100 --enable-flush 1
       -   name: Install Go
-          uses: actions/setup-go@v4
+          uses: actions/setup-go@v5
           with:
             go-version: '${{ matrix.go-version }}'
       -   name: Run Test

.github/workflows/test-dynamodb.yml

@@ -20,15 +20,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-etcd.yml

@@ -17,9 +17,10 @@ jobs:
                 go-version:
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install etcd
                 run: |
                     docker run -d --name Etcd-server \
@@ -30,7 +31,7 @@ jobs:
                       bitnami/etcd:latest
 
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-memcache.yml

@@ -20,15 +20,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-memory.yml

@@ -14,16 +14,15 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         runs-on: ubuntu-latest
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Test Memory

.github/workflows/test-minio.yml

@@ -0,0 +1,33 @@
+on:
+    push:
+        branches:
+            - master
+            - main
+        paths:
+            - 'minio/**'
+    pull_request:
+        paths:
+            - 'minio/**'
+name: "Tests Minio"
+jobs:
+    Tests:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                go-version:
+                    - 1.19.x
+                    - 1.20.x
+                    - 1.21.x
+        steps:
+            -   name: Install MinIO
+                run: |
+                    docker run -d --restart always -p 9000:9000 --name storage-minio -e MINIO_ROOT_USER='minio-user' -e MINIO_ROOT_PASSWORD='minio-password' minio/minio server /data
+
+            -   name: Fetch Repository
+                uses: actions/checkout@v4
+            -   name: Install Go
+                uses: actions/setup-go@v5
+                with:
+                    go-version: '${{ matrix.go-version }}'
+            -   name: Run Test
+                run: cd ./minio && go test ./... -v -race

.github/workflows/test-mongodb.yml

@@ -20,15 +20,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-mssql.yml

@@ -32,14 +32,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-mysql.yml

@@ -28,15 +28,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-pebble.yml

@@ -16,12 +16,13 @@ jobs:
         go-version:
           - 1.19.x
           - 1.20.x
+          - 1.21.x
     runs-on: ubuntu-latest
     steps:
     -   name: Fetch Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
     -   name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
             go-version: '${{ matrix.go-version }}'
     -   name: Test Pebble

.github/workflows/test-postgres.yml

@@ -29,11 +29,12 @@ jobs:
                 go-version:
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-redis.yml

@@ -15,33 +15,48 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
                 redis:
                     - '6.x'
                     - '7.x'
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
+
+            -   name: Generate TLS certs
+                run: ./.github/scripts/gen-test-certs.sh
+
+            -   name: Add Custom CA cert
+                run: sudo cp /home/runner/work/storage/storage/tls/ca.crt /usr/local/share/ca-certificates/custom.crt
+
+            -   name: Trust Custom CA Cert
+                run: sudo update-ca-certificates
 
             -   name: Setup Redis
                 uses: shogo82148/actions-setup-redis@v1
                 with:
                     redis-version: ${{ matrix.redis }}
                     auto-start: 'false'
-                    redis-port: '6379'
-                    redis-tls-port: '6380'
 
             -   name: Run Redis
                 run: |
                     redis-server --tls-port 6380 --port 6379 \
-                    --tls-cert-file ./redis/tests/tls/redis.crt \
-                    --tls-key-file ./redis/tests/tls/redis.key \
-                    --tls-ca-cert-file ./redis/tests/tls/ca.crt&
+                    --tls-cert-file /home/runner/work/storage/storage/tls/redis.crt \
+                    --tls-key-file /home/runner/work/storage/storage/tls/redis.key \
+                    --tls-ca-cert-file /home/runner/work/storage/storage/tls/ca.crt &
+
+            -   name: Run Redis instance with MTLS disabled
+                run: |
+                    redis-server --tls-port 16380 --port 16379 \
+                    --tls-cert-file /home/runner/work/storage/storage/tls/redis.crt \
+                    --tls-key-file /home/runner/work/storage/storage/tls/redis.key \
+                    --tls-ca-cert-file /home/runner/work/storage/storage/tls/ca.crt \
+                    --tls-auth-clients no &
 
             -   name: Setup Redis Cluster
-                uses: vishnudxb/redis-cluster@1.0.5
+                uses: vishnudxb/redis-cluster@1.0.9
                 with:
                     master1-port: 7000
                     master2-port: 7001
@@ -49,9 +64,13 @@ jobs:
                     slave1-port: 7003
                     slave2-port: 7004
                     slave3-port: 7005
+                    sleep-duration: 10
+
+            -   name: Wait for Redis to Start
+                run: sleep 15
 
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
 

.github/workflows/test-ristretto.yml

@@ -15,14 +15,14 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Run Test

.github/workflows/test-rueidis.yml

@@ -0,0 +1,62 @@
+on:
+    push:
+        branches:
+            - master
+            - main
+        paths:
+            - 'rueidis/**'
+    pull_request:
+        paths:
+            - 'rueidis/**'
+name: "Tests Rueidis"
+jobs:
+    Tests:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                go-version:
+                    - 1.20.x
+                    - 1.21.x
+                redis:
+                    - '6.x'
+                    - '7.x'
+        steps:
+            -   name: Fetch Repository
+                uses: actions/checkout@v4
+
+            -   name: Generate TLS certs
+                run: ./.github/scripts/gen-test-certs.sh
+
+            -   name: Setup Redis
+                uses: shogo82148/actions-setup-redis@v1
+                with:
+                    redis-version: ${{ matrix.redis }}
+                    auto-start: 'false'
+                    redis-port: '6379'
+                    redis-tls-port: '6380'
+
+            -   name: Run Redis
+                run: |
+                    redis-server --tls-port 6380 --port 6379 \
+                    --tls-cert-file /home/runner/work/storage/storage/tls/redis.crt \
+                    --tls-key-file /home/runner/work/storage/storage/tls/redis.key \
+                    --tls-ca-cert-file /home/runner/work/storage/storage/tls/ca.crt &
+
+            -   name: Setup Redis Cluster
+                uses: vishnudxb/redis-cluster@1.0.9
+                with:
+                    master1-port: 7000
+                    master2-port: 7001
+                    master3-port: 7002
+                    slave1-port: 7003
+                    slave2-port: 7004
+                    slave3-port: 7005
+                    sleep-duration: 10
+
+            -   name: Install Go
+                uses: actions/setup-go@v5
+                with:
+                    go-version: '${{ matrix.go-version }}'
+
+            -   name: Run Test
+                run: cd ./rueidis && go test ./... -v -race

.github/workflows/test-s3.yml

@@ -15,23 +15,16 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         steps:
         -   name: Install MinIO
-            run: |
-                docker run -d -p 9000:9000 --name minio minio/minio server /data
-
-                export AWS_ACCESS_KEY_ID=minioadmin
-                export AWS_SECRET_ACCESS_KEY=minioadmin
-                export AWS_EC2_METADATA_DISABLED=true
-
-                aws --endpoint-url http://127.0.0.1:9000/ s3 mb s3://testbucket
+            run:  docker run -d --restart always -p 9000:9000 --name storage-minio -e MINIO_ROOT_USER='minio-user' -e MINIO_ROOT_PASSWORD='minio-password' minio/minio server /data
         -   name: Fetch Repository
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
         -   name: Install Go
-            uses: actions/setup-go@v4
+            uses: actions/setup-go@v5
             with:
                 go-version: '${{ matrix.go-version }}'
         -   name: Run Test

.github/workflows/test-scylladb.yml

@@ -0,0 +1,39 @@
+on:
+  push:
+    branches:
+      - master
+      - main
+    paths:
+      - 'scylladb/**'
+  pull_request:
+    paths:
+      - 'scylladb/**'
+
+name: "Tests ScyllaDb"
+
+jobs:
+  Tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        go-version:
+          - 1.20.x
+          - 1.21.x
+
+    steps:
+      - name: Fetch Repository
+        uses: actions/checkout@v4
+
+      - name: Run ScyllaDb
+        run: |
+          docker run --name scylladb -p 9042:9042 -p 19042:19042 -p 9160:9160 -p 10000:10000 -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9180:9180 -d scylladb/scylla:latest --broadcast-address 127.0.0.1 --listen-address 0.0.0.0 --broadcast-rpc-address 127.0.0.1
+          sleep 30 # Wait for ScyllaDb to initialize
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '${{ matrix.go-version }}'
+
+      - name: Run Test
+        run: cd ./scylladb && go test ./... -v -race

.github/workflows/test-sqlite3.yml

@@ -14,16 +14,15 @@ jobs:
         strategy:
             matrix:
                 go-version:
-                    - 1.17.x
-                    - 1.18.x
                     - 1.19.x
                     - 1.20.x
+                    - 1.21.x
         runs-on: ubuntu-latest
         steps:
             -   name: Fetch Repository
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
             -   name: Install Go
-                uses: actions/setup-go@v4
+                uses: actions/setup-go@v5
                 with:
                     go-version: '${{ matrix.go-version }}'
             -   name: Test SQLite3 - with -race check

README.md

@@ -54,17 +54,21 @@ type Storage interface {
 - [AzureBlob](./azureblob/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Azure+Blob%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-azureblob.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Badger](./badger/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Badger%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-badger.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Bbolt](./bbolt) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Bbolt%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-bbolt.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
+- [Coherence](./coherence/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Coherence%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-coherence.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Couchbase](./couchbase/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Couchbase%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-couchbase.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [DynamoDB](./dynamodb/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+DynamoDB%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-dynamodb.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Etcd](./etcd/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Etcd%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-etcd.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Memcache](./memcache/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Memcache%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-memcache.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Memory](./memory/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Local+Storage%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-memory.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
+- [Minio](./minio/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Minio%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-minio.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [MongoDB](./mongodb/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Mongodb%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-mongodb.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [MSSQL](./mssql/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+MSSQL%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-mssql.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [MySQL](./mysql/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+MySQL%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-mysql.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Pebble](./pebble/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Pebble%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-pebble.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Postgres](./postgres/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Postgres%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-postgres.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [Redis](./redis/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Redis%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-redis.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
+- [Rueidis](./rueidis/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+rueidis%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-rueidis.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [S3](./s3/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+S3%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-s3.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
+- [ScyllaDB](./scylladb/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+scylladb%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-scylladb.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 - [SQLite3](./sqlite3/README.md) <a href="https://github.com/gofiber/storage/actions?query=workflow%3A%22Tests+Sqlite3%22"> <img src="https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-sqlite3.yml?branch=main&label=%F0%9F%A7%AA%20&style=flat&color=75C46B" /> </a>
 

arangodb/README.md

@@ -11,6 +11,8 @@ title: ArangoDB
 
 A ArangoDB storage driver using `arangodb/go-driver` and [arangodb/go-driver](https://github.com/arangodb/go-driver).
 
+**Note: Requires Go 1.19 and above**
+
 ### Table of Contents
 - [Signatures](#signatures)
 - [Installation](#installation)
@@ -35,13 +37,13 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the mysql implementation:
 ```bash
-go get github.com/gofiber/storage/arangodb
+go get github.com/gofiber/storage/arangodb/v2
 ```
 
 ### Examples
 Import the storage package.
 ```go
-import "github.com/gofiber/storage/arangodb"
+import "github.com/gofiber/storage/arangodb/v2"
 ```
 
 You can use the following possibilities to create a storage:

arangodb/arangodb.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/arangodb/go-driver"
 	"github.com/arangodb/go-driver/http"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Storage interface that is implemented by storage providers

arangodb/arangodb_test.go

@@ -4,51 +4,51 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
 var testStore = New(Config{
 	Reset: true,
 })
 
-func Test_ARANGODB_Set(t *testing.T) {
+func Test_ArangoDB_Set(t *testing.T) {
 	var (
 		key = "john"
 		val = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
-func Test_ARANGODB_Upsert(t *testing.T) {
+func Test_ArangoDB_Upsert(t *testing.T) {
 	var (
 		key = "john"
 		val = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
-func Test_ARANGODB_Get(t *testing.T) {
+func Test_ArangoDB_Get(t *testing.T) {
 	var (
 		key = "john"
 		val = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
-func Test_ARANGODB_Set_Expiration(t *testing.T) {
+func Test_ArangoDB_Set_Expiration(t *testing.T) {
 	var (
 		key = "john"
 		val = []byte("doe")
@@ -56,83 +56,117 @@ func Test_ARANGODB_Set_Expiration(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, exp)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	time.Sleep(1100 * time.Millisecond)
 }
 
-func Test_ARANGODB_Get_Expired(t *testing.T) {
-	var (
-		key = "john"
-	)
+func Test_ArangoDB_Get_Expired(t *testing.T) {
+	key := "john"
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
-func Test_ARANGODB_Get_NotExist(t *testing.T) {
-
+func Test_ArangoDB_Get_NotExist(t *testing.T) {
 	result, err := testStore.Get("notexist")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
-func Test_ARANGODB_Delete(t *testing.T) {
+func Test_ArangoDB_Delete(t *testing.T) {
 	var (
 		key = "john"
 		val = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
-func Test_ARANGODB_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
+func Test_ArangoDB_Reset(t *testing.T) {
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
-func Test_ARANGODB_Non_UTF8(t *testing.T) {
+func Test_ArangoDB_Non_UTF8(t *testing.T) {
 	val := []byte("0xF5")
 
 	err := testStore.Set("0xF6", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("0xF6")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
-func Test_ARANGODB_Close(t *testing.T) {
-	utils.AssertEqual(t, nil, testStore.Close())
+func Test_ArangoDB_Close(t *testing.T) {
+	require.Nil(t, testStore.Close())
 }
 
-func Test_ARANGODB_Conn(t *testing.T) {
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
+func Test_ArangoDB_Conn(t *testing.T) {
+	require.True(t, testStore.Conn() != nil)
+}
+
+func Benchmark_ArangoDB_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_ArangoDB_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_ArangoDB_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

arangodb/go.mod

@@ -1,13 +1,18 @@
-module github.com/gofiber/storage/arangodb
+module github.com/gofiber/storage/arangodb/v2
 
-go 1.17
+go 1.19
 
 require (
-	github.com/arangodb/go-driver v1.6.0
-	github.com/gofiber/utils v1.1.0
+	github.com/arangodb/go-driver v1.6.1
+	github.com/gofiber/utils/v2 v2.0.0-beta.3
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
 	github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

arangodb/go.sum

@@ -1,54 +1,24 @@
-github.com/arangodb/go-driver v1.6.0 h1:NFWj/idqXZxhFVueihMSI2R9NotNIsgvNfM/xmpekb4=
-github.com/arangodb/go-driver v1.6.0/go.mod h1:HQmdGkvNMVBTE3SIPSQ8T/ZddC6iwNsfMR+dDJQxIsI=
+github.com/arangodb/go-driver v1.6.1 h1:bnhrpbA4U1NU13JOWs5sWWYMtQwdjKT0+jkl8dSndyY=
+github.com/arangodb/go-driver v1.6.1/go.mod h1:ywucwwi34GBxxXFWw/ym+7/66//L4K9abxk/sFJro2k=
 github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e h1:Xg+hGrY2LcQBbxd0ZFdbGSyRKTYMZCfBbw/pMJFOk1g=
 github.com/arangodb/go-velocypack v0.0.0-20200318135517-5af53c29c67e/go.mod h1:mq7Shfa/CaixoDxiyAAc5jZ6CVBAyPaNQCGS7mkj4Ho=
-github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4=
-github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
-github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gofiber/utils/v2 v2.0.0-beta.3 h1:pfOhUDDVjBJpkWv6C5jaDyYLvpui7zQ97zpyFFsUOKw=
+github.com/gofiber/utils/v2 v2.0.0-beta.3/go.mod h1:jsl17+MsKfwJjM3ONCE9Rzji/j8XNbwjhUVTjzgfDCo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

azureblob/README.md

@@ -11,7 +11,7 @@ title: Azure Blob
 
 [Azure Blob storage](https://azure.microsoft.com/en-us/products/storage/blobs/#overview) is Microsoft's object storage solution for the cloud.
 
-> NOTE: Go **1.18** or later is required. Source: [link](https://github.com/Azure/azure-sdk-for-go/blob/main/README.md)
+**Note: Requires Go 1.19 and above**
 
 ### Table of Contents
 
@@ -44,7 +44,7 @@ go mod init github.com/<user>/<repo>
 And then install the azure blob implementation:
 
 ```bash
-go get github.com/gofiber/storage/azureblob
+go get github.com/gofiber/storage/azureblob/v2
 ```
 
 ### Examples
@@ -52,7 +52,7 @@ go get github.com/gofiber/storage/azureblob
 Import the storage package.
 
 ```go
-import "github.com/gofiber/storage/azureblob"
+import "github.com/gofiber/storage/azureblob/v2"
 ```
 
 You can use the following possibilities to create a storage:

azureblob/azureblob.go

@@ -2,12 +2,12 @@ package azureblob
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror"
 	"io"
 	"time"
+
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror"
 )
 
 // Storage interface that is implemented by storage providers
@@ -107,7 +107,7 @@ func (s *Storage) Reset() error {
 		}
 	}
 	if errCounter > 0 {
-		return errors.New(fmt.Sprintf("%d errors occured while resetting", errCounter))
+		return fmt.Errorf("%d errors occured while resetting", errCounter)
 	}
 	return nil
 }

azureblob/azureblob_test.go

@@ -1,13 +1,17 @@
 package azureblob
 
 import (
-	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror"
-	"github.com/gofiber/fiber/v2/utils"
+	"os"
 	"testing"
+
+	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror"
+	"github.com/stretchr/testify/require"
 )
 
-func newStore() *Storage {
-	return New(Config{
+var testStore *Storage
+
+func TestMain(m *testing.M) {
+	testStore = New(Config{
 		Account:   "devstoreaccount1",
 		Container: "test",
 		Endpoint:  "http://127.0.0.1:10000/devstoreaccount1",
@@ -15,21 +19,27 @@ func newStore() *Storage {
 			Account: "devstoreaccount1",
 			Key:     "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==",
 		},
+		Reset: true,
 	})
+
+	code := m.Run()
+
+	_ = testStore.Close()
+	os.Exit(code)
 }
+
 func Test_AzureBlob_Get(t *testing.T) {
 	var (
 		key = "john"
 		val = []byte("doe")
 	)
-	testStore := newStore()
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
 func Test_AzureBlob_Set(t *testing.T) {
@@ -38,9 +48,8 @@ func Test_AzureBlob_Set(t *testing.T) {
 		val = []byte("doe")
 	)
 
-	testStore := newStore()
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_AzureBlob_Delete(t *testing.T) {
@@ -48,13 +57,12 @@ func Test_AzureBlob_Delete(t *testing.T) {
 		key = "john"
 		val = []byte("doe")
 	)
-	testStore := newStore()
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
 	if err != nil {
@@ -62,8 +70,8 @@ func Test_AzureBlob_Delete(t *testing.T) {
 			err = nil
 		}
 	}
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_AzureBlob_Override(t *testing.T) {
@@ -71,41 +79,36 @@ func Test_AzureBlob_Override(t *testing.T) {
 		key = "john"
 		val = []byte("doe")
 	)
-	testStore := newStore()
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_AzureBlob_Get_NotExist(t *testing.T) {
-	testStore := newStore()
 	result, err := testStore.Get("notexist")
 	if err != nil {
 		if bloberror.HasCode(err, bloberror.BlobNotFound) {
 			err = nil
 		}
 	}
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_AzureBlob_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
-	testStore := newStore()
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
 	if err != nil {
@@ -113,8 +116,8 @@ func Test_AzureBlob_Reset(t *testing.T) {
 			err = nil
 		}
 	}
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
 	if err != nil {
@@ -122,16 +125,53 @@ func Test_AzureBlob_Reset(t *testing.T) {
 			err = nil
 		}
 	}
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_S3_Conn(t *testing.T) {
-	testStore := newStore()
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
+	require.True(t, testStore.Conn() != nil)
 }
 
 func Test_AzureBlob_Close(t *testing.T) {
-	testStore := newStore()
-	utils.AssertEqual(t, nil, testStore.Close())
+	require.Nil(t, testStore.Close())
+}
+
+func Benchmark_AzureBlob_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_AzureBlob_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_AzureBlob_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

azureblob/go.mod

@@ -1,17 +1,18 @@
-module github.com/gofiber/storage/azureblob
+module github.com/gofiber/storage/azureblob/v2
 
-go 1.18
+go 1.19
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1
-	github.com/gofiber/fiber/v2 v2.43.0
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

azureblob/go.sum

@@ -1,28 +1,31 @@
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0 h1:sVW/AFBTGyJxDaMYlq0ct3jUXTtj12tQ6zE2GZUgVQw=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.2.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 h1:QkAcEIAKbNL4KoFr4SathZPhDhF4mVwpBMFlYjyAqy8=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 h1:+5VZ72z0Qan5Bog5C+ZkgSqUbeVUd9wgtHOrIKuc5b8=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 h1:YvQv9Mz6T8oR5ypQOL6erY0Z5t71ak1uHV4QFokCOZk=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1/go.mod h1:c6WvOhtmjNUWbLfOG1qxM/q0SPvQNSVJvolm+C52dIU=
-github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 h1:BWe8a+f/t+7KY7zH2mqygeUD0t8hNFXe08p1Pb3/jKE=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 h1:lGlwhPtrX6EVml1hO0ivjkUxsSyl4dsiw9qcA1k/3IQ=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 h1:6oNBlSdi1QqM1PNW7FPA6xOGA5UNsXnkaYZz9vdPGhA=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 h1:AMf7YbZOZIW5b66cXNHMWWT/zkjhz5+a+k/3x40EO7E=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1/go.mod h1:uwfk06ZBcvL/g4VHNjurPfVln9NMbsk2XIZxJ+hu81k=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
-github.com/gofiber/fiber/v2 v2.43.0 h1:yit3E4kHf178B60p5CQBa/3v+WVuziWMa/G2ZNyLJB0=
-github.com/gofiber/fiber/v2 v2.43.0/go.mod h1:mpS1ZNE5jU+u+BA4FbM+KKnUzJ4wzTK+FT2tG3tU+6I=
-github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
+github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

badger/README.md

@@ -11,6 +11,8 @@ title: Badger
 
 A fast key-value DB using [dgraph-io/badger](https://github.com/dgraph-io/badger)
 
+**Note: Requires Go 1.19 and above**
+
 ### Table of Contents
 
 - [Signatures](#signatures)
@@ -42,7 +44,7 @@ go mod init github.com/<user>/<repo>
 And then install the badger implementation:
 
 ```bash
-go get github.com/gofiber/storage/badger
+go get github.com/gofiber/storage/badger/v2
 ```
 
 ### Examples
@@ -50,7 +52,7 @@ go get github.com/gofiber/storage/badger
 Import the storage package.
 
 ```go
-import "github.com/gofiber/storage/badger"
+import "github.com/gofiber/storage/badger/v2"
 ```
 
 You can use the following possibilities to create a storage:

badger/badger.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/dgraph-io/badger/v3"
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 )
 
 // Storage interface that is implemented by storage providers

badger/badger_test.go

@@ -4,10 +4,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
-var testStore = New()
+var testStore = New(Config{
+	Reset: true,
+})
 
 func Test_Badger_Set(t *testing.T) {
 	var (
@@ -16,7 +18,7 @@ func Test_Badger_Set(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_Badger_Set_Override(t *testing.T) {
@@ -26,10 +28,10 @@ func Test_Badger_Set_Override(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_Badger_Get(t *testing.T) {
@@ -39,11 +41,11 @@ func Test_Badger_Get(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
 func Test_Badger_Set_Expiration(t *testing.T) {
@@ -54,26 +56,23 @@ func Test_Badger_Set_Expiration(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, exp)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	time.Sleep(1100 * time.Millisecond)
 }
 
 func Test_Badger_Get_Expired(t *testing.T) {
-	var (
-		key = "john"
-	)
+	key := "john"
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Badger_Get_NotExist(t *testing.T) {
-
 	result, err := testStore.Get("notexist")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Badger_Delete(t *testing.T) {
@@ -83,43 +82,80 @@ func Test_Badger_Delete(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Badger_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Badger_Close(t *testing.T) {
-	utils.AssertEqual(t, nil, testStore.Close())
+	require.Nil(t, testStore.Close())
 }
 
 func Test_Badger_Conn(t *testing.T) {
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
-}
+	require.True(t, testStore.Conn() != nil)
+}
+
+func Benchmark_Badger_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Badger_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Badger_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
+}

badger/config.go

@@ -1,8 +1,9 @@
 package badger
 
 import (
-	"github.com/dgraph-io/badger/v3"
 	"time"
+
+	"github.com/dgraph-io/badger/v3"
 )
 
 // Config defines the config for storage.

badger/config_test.go

@@ -1,14 +1,15 @@
 package badger
 
 import (
-	"github.com/dgraph-io/badger/v3"
-	"github.com/gofiber/utils"
 	"testing"
+
+	"github.com/dgraph-io/badger/v3"
+	"github.com/stretchr/testify/require"
 )
 
 func assertRecoveryPanic(t *testing.T) {
 	err := recover()
-	utils.AssertEqual(t, nil, err)
+	require.Nil(t, nil, err)
 }
 
 func Test_Badger_Only_Name(t *testing.T) {
@@ -17,7 +18,7 @@ func Test_Badger_Only_Name(t *testing.T) {
 		Database:  "fiber.config.badger",
 		UseLogger: false,
 	})
-	utils.AssertEqual(t, nil, testDB.Close())
+	require.Nil(t, testDB.Close())
 }
 
 func Test_Badger_Options(t *testing.T) {
@@ -26,11 +27,11 @@ func Test_Badger_Options(t *testing.T) {
 		BadgerOptions: badger.DefaultOptions("fiber.with_options.badger"),
 		UseLogger:     false,
 	})
-	utils.AssertEqual(t, nil, testDB.Close())
+	require.Nil(t, testDB.Close())
 }
 
 func Test_Empty_Config(t *testing.T) {
 	defer assertRecoveryPanic(t)
 	testDB := New(Config{})
-	utils.AssertEqual(t, nil, testDB.Close())
+	require.Nil(t, testDB.Close())
 }

badger/go.mod

@@ -1,27 +1,32 @@
-module github.com/gofiber/storage/badger
+module github.com/gofiber/storage/badger/v2
 
-go 1.18
+go 1.19
 
 require (
 	github.com/dgraph-io/badger/v3 v3.2103.5
-	github.com/gofiber/utils v1.1.0
+	github.com/gofiber/utils/v2 v2.0.0-beta.3
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
 	github.com/cespare/xxhash v1.1.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.0.0 // indirect
+	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/flatbuffers v22.10.26+incompatible // indirect
-	github.com/klauspost/compress v1.15.12 // indirect
+	github.com/google/flatbuffers v23.5.26+incompatible // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

badger/go.sum

@@ -7,8 +7,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -24,20 +24,21 @@ github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWa
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
-github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
+github.com/gofiber/utils/v2 v2.0.0-beta.3 h1:pfOhUDDVjBJpkWv6C5jaDyYLvpui7zQ97zpyFFsUOKw=
+github.com/gofiber/utils/v2 v2.0.0-beta.3/go.mod h1:jsl17+MsKfwJjM3ONCE9Rzji/j8XNbwjhUVTjzgfDCo=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
-github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
+github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
+github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -54,14 +55,14 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/flatbuffers v22.10.26+incompatible h1:z1QiaMyPu1x3Z6xf2u1dsLj1ZxicdGSeaLpCuIsQNZM=
-github.com/google/flatbuffers v22.10.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
+github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -72,15 +73,19 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
-github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
+github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -108,8 +113,9 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -136,8 +142,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -152,8 +158,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -192,9 +198,10 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

bbolt/README.md

@@ -11,6 +11,7 @@ title: Bbolt
 
 A Bbolt storage driver using [etcd-io/bbolt](https://github.com/etcd-io/bbolt). Bolt is a pure Go key/value store inspired by [Howard Chu's](https://twitter.com/hyc_symas) [LMDB project](https://www.symas.com/symas-embedded-database-lmdb). The goal of the project is to provide a simple, fast, and reliable database for projects that don't require a full database server such as Postgres or MySQL.
 
+**Note: Requires Go 1.19 and above**
 
 ### Table of Contents
 - [Signatures](#signatures)
@@ -36,13 +37,13 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the s3 implementation:
 ```bash
-go get github.com/gofiber/storage/bbolt
+go get github.com/gofiber/storage/bbolt/v2
 ```
 
 ### Examples
 Import the storage package.
 ```go
-import "github.com/gofiber/storage/bbolt"
+import "github.com/gofiber/storage/bbolt/v2"
 ```
 
 You can use the following possibilities to create a storage:

bbolt/bbolt.go

@@ -3,7 +3,7 @@ package bbolt
 import (
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/gofiber/utils/v2"
 	"go.etcd.io/bbolt"
 )
 
@@ -18,7 +18,7 @@ func New(config ...Config) *Storage {
 	// Set default config
 	cfg := configDefault(config...)
 
-	conn, err := bbolt.Open(cfg.Database, 0666, &bbolt.Options{
+	conn, err := bbolt.Open(cfg.Database, 0o666, &bbolt.Options{
 		Timeout:  cfg.Timeout,
 		ReadOnly: cfg.ReadOnly,
 	})
@@ -42,7 +42,6 @@ func New(config ...Config) *Storage {
 		conn:   conn,
 		bucket: cfg.Bucket,
 	}
-
 }
 
 // Get value by key

bbolt/bbolt_test.go

@@ -1,12 +1,25 @@
 package bbolt
 
 import (
+	"os"
 	"testing"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
-var testStore = New()
+var testStore *Storage
+
+func TestMain(m *testing.M) {
+	testStore = New(Config{
+		Bucket: "fiber-bucket",
+		Reset:  true,
+	})
+
+	code := m.Run()
+
+	_ = testStore.Close()
+	os.Exit(code)
+}
 
 func Test_Bbolt_Set(t *testing.T) {
 	var (
@@ -15,7 +28,7 @@ func Test_Bbolt_Set(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_Bbolt_Set_Override(t *testing.T) {
@@ -25,10 +38,10 @@ func Test_Bbolt_Set_Override(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_Bbolt_Get(t *testing.T) {
@@ -38,18 +51,17 @@ func Test_Bbolt_Get(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
 func Test_Bbolt_Get_NotExist(t *testing.T) {
-
 	result, err := testStore.Get("notexist")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Bbolt_Delete(t *testing.T) {
@@ -59,43 +71,80 @@ func Test_Bbolt_Delete(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Bbolt_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Bbolt_Close(t *testing.T) {
-	utils.AssertEqual(t, nil, testStore.Close())
+	require.Nil(t, testStore.Close())
 }
 
 func Test_Bbolt_Conn(t *testing.T) {
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
+	require.True(t, testStore.Conn() != nil)
+}
+
+func Benchmark_Bbolt_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Bbolt_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Bbolt_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

bbolt/go.mod

@@ -1,10 +1,17 @@
-module github.com/gofiber/storage/bbolt
+module github.com/gofiber/storage/bbolt/v2
 
-go 1.18
+go 1.19
 
 require (
-	github.com/gofiber/utils v1.0.1
-	go.etcd.io/bbolt v1.3.7
+	github.com/gofiber/utils/v2 v2.0.0-beta.3
+	github.com/stretchr/testify v1.8.4
+	go.etcd.io/bbolt v1.3.8
 )
 
-require golang.org/x/sys v0.4.0 // indirect
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

bbolt/go.sum

@@ -1,10 +1,18 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/gofiber/utils v1.0.1 h1:knct4cXwBipWQqFrOy1Pv6UcgPM+EXo9jDgc66V1Qio=
-github.com/gofiber/utils v1.0.1/go.mod h1:pacRFtghAE3UoknMOUiXh2Io/nLWSUHtQCi/3QASsOc=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gofiber/utils/v2 v2.0.0-beta.3 h1:pfOhUDDVjBJpkWv6C5jaDyYLvpui7zQ97zpyFFsUOKw=
+github.com/gofiber/utils/v2 v2.0.0-beta.3/go.mod h1:jsl17+MsKfwJjM3ONCE9Rzji/j8XNbwjhUVTjzgfDCo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
+go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

bbolt/utils.go

@@ -1,7 +1,8 @@
 package bbolt
 
 import (
-	"github.com/gofiber/utils"
+	"errors"
+	"github.com/gofiber/utils/v2"
 	"go.etcd.io/bbolt"
 )
 
@@ -15,6 +16,11 @@ func createBucket(cfg Config, conn *bbolt.DB) error {
 
 func removeBucket(cfg Config, conn *bbolt.DB) error {
 	return conn.Update(func(tx *bbolt.Tx) error {
-		return tx.DeleteBucket(utils.UnsafeBytes(cfg.Bucket))
+		err := tx.DeleteBucket(utils.UnsafeBytes(cfg.Bucket))
+		if errors.Is(err, bbolt.ErrBucketNotFound) {
+			return nil
+		}
+
+		return err
 	})
 }

coherence/README.md

@@ -0,0 +1,106 @@
+# Coherence
+<!-- Copyright © 2023, Oracle and/or its affiliates. -->
+A Coherence storage driver using [https://github.com/oracle/coherence-go-client](https://github.com/oracle/coherence-go-client).
+
+### Table of Contents
+- [Signatures](#signatures)
+- [Installation](#installation)
+- [Examples](#examples)
+- [Config](#config)
+- [Default Config](#default-config)
+
+### Signatures
+```go
+func New(config ...Config) (*Storage, error)
+func (s *Storage) Get(key string) ([]byte, error)
+func (s *Storage) Set(key string, val []byte, exp time.Duration) error
+func (s *Storage) Delete(key string) error
+func (s *Storage) Reset() error
+func (s *Storage) Close() error
+func (s *Storage) Conn() *Session
+```
+
+### Installation
+Coherence is supported on Go versions 1.19 and above:
+
+Install the coherence implementation:
+```bash
+go get github.com/gofiber/storage/coherence
+```
+
+Before running or testing this implementation, you must ensure a Coherence cluster is available.
+For local development, we recommend using the Coherence CE Docker image; it contains everything
+necessary for the client to operate correctly.
+
+To start a Coherence cluster using Docker, issue the following:
+
+```bash
+docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:22.06.5
+```
+
+See the documentation [here](https://pkg.go.dev/github.com/oracle/coherence-go-client/coherence#hdr-Obtaining_a_Session) on connection options
+when creating a Coherence session.
+
+### Examples
+Import the storage package.
+```go
+import "github.com/gofiber/storage/coherence"
+```
+
+You can use the following possibilities to create a storage:
+```go
+// Initialize default config, to connect to localhost:1408 using plain text
+store, err := coherence.New()
+
+// Initialize custom config to connect to a different host/port and use plaint ext.
+store, err := coherence.New(coherence.Config{
+    Address: "my-host:myport",
+})
+
+// Initialize to connect with TLS enabled with your own tls.Config
+tlsConfig := config := &tls.Config{...}
+
+store, err := coherence.New(coherence.Config{
+    Address: "my-host:myport",
+    TLSConfig: tlsConfig,
+})
+```
+
+> Note: If you create two stores using `coherence.New()` they will effectivity be idential.
+> If you wish to have two separate stores, then you can use:
+> ```go
+> store1, err := coherence.New(Config{ScopeName: "scope1"})
+> store2, err := coherence.New(Config{ScopeName: "scope2"})
+> ```
+
+### Config
+
+```go
+// Config defines configuration options for Coherence connection.
+type Config struct {
+    // Address to connect to, defaults to "localhost:1408"
+    Address string
+
+    // Timeout is the default session timeout to connect to Coherence, defaults to 30s
+    Timeout time.Duration
+	
+    // ScopeName defines a scope allowing for multiple storage sessions
+    ScopeName string
+
+    // Reset indicates if the store should be reset after being created
+    Reset bool
+
+    // TLSConfig specifies tls.Config to use when connecting, if nil then plain text is used 
+    TLSConfig *tls.Config
+}
+```
+
+### Default Config
+```go
+var DefaultConfig = Config{
+    Address:   "localhost:1408",
+    Timeout:   time.Duration(30) * time.Millisecond,
+    ScopeName: defaultScopeName,
+    Reset:     false,
+}
+```

coherence/coherence.go

@@ -0,0 +1,156 @@
+package coherence
+
+/*
+ * Copyright © 2023, Oracle and/or its affiliates.
+ */
+import (
+	"context"
+	"crypto/tls"
+	coh "github.com/oracle/coherence-go-client/coherence"
+	"time"
+)
+
+const (
+	defaultScopeName = "default-store"
+	defaultTimeout   = time.Duration(30) * time.Second
+	defaultAddress   = "localhost:1408"
+)
+
+// Storage represents an implementation of Coherence storage provider.
+type Storage struct {
+	session    *coh.Session
+	namedCache coh.NamedCache[string, []byte]
+	ctx        context.Context
+}
+
+// Config defines configuration options for Coherence connection.
+type Config struct {
+	// Address to connect to, defaults to "localhost:1408"
+	Address string
+
+	// Timeout is the default session timeout to connect to Coherence, defaults to 30s
+	Timeout time.Duration
+
+	// ScopeName defines a scope allowing for multiple storage sessions
+	ScopeName string
+
+	// Reset indicates if the store should be reset after being created
+	Reset bool
+
+	// TLSConfig specifies tls.Config to use when connecting, if nil then plain text is used
+	TLSConfig *tls.Config
+}
+
+// DefaultConfig defines default options.
+var DefaultConfig = Config{
+	Address:   defaultAddress,
+	Timeout:   defaultTimeout,
+	ScopeName: defaultScopeName,
+	Reset:     false,
+}
+
+// New returns a new [Storage] given a [Config].
+func New(config ...Config) (*Storage, error) {
+	cfg := setupConfig(config...)
+
+	options := make([]func(session *coh.SessionOptions), 0)
+
+	// apply any config values as Coherence options
+	options = append(options, coh.WithAddress(cfg.Address))
+
+	if cfg.TLSConfig != nil {
+		options = append(options, coh.WithTLSConfig(cfg.TLSConfig))
+	} else {
+		options = append(options, coh.WithPlainText())
+	}
+
+	options = append(options, coh.WithRequestTimeout(cfg.Timeout))
+
+	// create the Coherence session
+	session, err := coh.NewSession(context.Background(), options...)
+	if err != nil {
+		return nil, err
+	}
+
+	store, err := newCoherenceStorage(session, cfg.ScopeName)
+	if err != nil {
+		return nil, err
+	}
+
+	// if Reset is true then reset the store
+	if cfg.Reset {
+		return store, store.Reset()
+	}
+
+	return store, nil
+}
+
+// setupConfig sets the default config.
+func setupConfig(config ...Config) Config {
+	// if nothing provided then use the default config values
+	if len(config) == 0 {
+		return DefaultConfig
+	}
+
+	cfg := config[0]
+
+	// Check for any invalid default values and overwrite them
+	if cfg.Address == "" {
+		cfg.Address = DefaultConfig.Address
+	}
+	if cfg.ScopeName == "" {
+		cfg.ScopeName = DefaultConfig.ScopeName
+	}
+	if cfg.Timeout == 0 {
+		cfg.Timeout = DefaultConfig.Timeout
+	}
+
+	return cfg
+}
+
+// newCoherenceStorage returns a new Coherence [Storage].
+func newCoherenceStorage(session *coh.Session, cacheName string) (*Storage, error) {
+	nc, err := coh.GetNamedCache[string, []byte](session, "fiber$"+cacheName)
+	if err != nil {
+		return nil, err
+	}
+	return &Storage{
+		session:    session,
+		namedCache: nc,
+		ctx:        context.Background(),
+	}, nil
+}
+
+func (s *Storage) Get(key string) ([]byte, error) {
+	v, err := s.namedCache.Get(s.ctx, key)
+	if err != nil {
+		return nil, err
+	}
+	if v == nil {
+		return nil, nil
+	}
+	return *v, nil
+}
+
+func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
+	_, err := s.namedCache.PutWithExpiry(s.ctx, key, val, exp)
+	return err
+}
+
+func (s *Storage) Delete(key string) error {
+	_, err := s.namedCache.Remove(s.ctx, key)
+	return err
+}
+
+func (s *Storage) Reset() error {
+	return s.namedCache.Clear(s.ctx)
+}
+
+func (s *Storage) Close() error {
+	s.session.Close()
+	return nil
+}
+
+func (s *Storage) Conn() *coh.Session {
+	return s.namedCache.GetSession()
+}

coherence/coherence_test.go

@@ -0,0 +1,230 @@
+package coherence
+
+/*
+ * Copyright © 2023, Oracle and/or its affiliates.
+ */
+import (
+	"github.com/stretchr/testify/require"
+	"os"
+	"testing"
+	"time"
+)
+
+var (
+	key1       = "key1"
+	key2       = "key2"
+	missingKey = "missing-key"
+	value1     = []byte("value1")
+	value2     = []byte("value2")
+)
+
+var testStore *Storage
+
+func TestMain(m *testing.M) {
+	testStore, _ = New(Config{
+		Reset: true,
+	})
+
+	code := m.Run()
+
+	_ = testStore.Close()
+	os.Exit(code)
+}
+
+// newTestStore returns a new Coherence Store and ensures it is reset.
+func newTestStore(t testing.TB, config ...Config) (*Storage, error) {
+	t.Helper()
+
+	testStore, err := New(config...)
+	require.NoError(t, err)
+
+	err = testStore.Reset()
+
+	return testStore, err
+}
+
+func Test_Coherence_Set_And_Get(t *testing.T) {
+	var val []byte
+
+	err := testStore.Set(key1, value1, 0)
+	require.NoError(t, err)
+
+	val, err = testStore.Get(key1)
+	require.NoError(t, err)
+	require.Equal(t, value1, val)
+
+	require.NotNil(t, testStore.Conn())
+}
+
+func Test_Coherence_Set_Override(t *testing.T) {
+	var val []byte
+
+	err := testStore.Set(key1, value1, 0)
+	require.NoError(t, err)
+
+	err = testStore.Set(key1, value2, 0)
+	require.NoError(t, err)
+
+	val, err = testStore.Get(key1)
+	require.NoError(t, err)
+	require.Equal(t, value2, val)
+}
+
+func Test_Coherence_Set_With_Reset(t *testing.T) {
+	var val []byte
+
+	err := testStore.Set(key1, value1, 0)
+	require.NoError(t, err)
+
+	val, err = testStore.Get(key1)
+	require.NoError(t, err)
+	require.Equal(t, value1, val)
+
+	// get a new store but reset it, so the subsequent Get will return nil
+	testStore2, err := newTestStore(t, Config{Reset: true})
+	require.NoError(t, err)
+
+	val, err = testStore2.Get(key1)
+	require.NoError(t, err)
+	require.True(t, len(val) == 0)
+
+	require.Equal(t, nil, testStore2.Close())
+}
+
+func Test_Coherence_Set_With_Expiry(t *testing.T) {
+	var val []byte
+
+	// set with an expiry of 5 seconds
+	err := testStore.Set(key1, value1, time.Duration(5)*time.Second)
+	require.NoError(t, err)
+	time.Sleep(time.Duration(6) * time.Second)
+
+	val, err = testStore.Get(key1)
+	require.NoError(t, err)
+	require.True(t, len(val) == 0)
+
+}
+
+func Test_Coherence_Get_Missing(t *testing.T) {
+	var val []byte
+
+	val, err := testStore.Get(missingKey)
+	require.NoError(t, err)
+	require.True(t, len(val) == 0)
+}
+
+func Test_Coherence_Reset(t *testing.T) {
+	var val []byte
+
+	err := testStore.Set(key1, value1, 0)
+	require.NoError(t, err)
+
+	err = testStore.Set(key2, value2, 0)
+	require.NoError(t, err)
+
+	// check the keys exist
+	val, err = testStore.Get(key1)
+	require.NoError(t, err)
+	require.Equal(t, value1, val)
+
+	val, err = testStore.Get(key2)
+	require.NoError(t, err)
+	require.Equal(t, value2, val)
+
+	// reset the store, this should remove both entries
+	err = testStore.Reset()
+
+	// check the keys have expired
+	val, err = testStore.Get(key1)
+	require.NoError(t, err)
+	require.True(t, len(val) == 0)
+
+	val, err = testStore.Get(key2)
+	require.NoError(t, err)
+	require.True(t, len(val) == 0)
+}
+
+func Test_Coherence_Set_And_Delete(t *testing.T) {
+	var val []byte
+
+	err := testStore.Set(key1, value1, 0)
+	require.NoError(t, err)
+
+	err = testStore.Delete(key1)
+	require.NoError(t, err)
+
+	// ensure the key has gone
+	val, err = testStore.Get(key1)
+	require.NoError(t, err)
+	require.True(t, len(val) == 0)
+}
+
+// TestCoherenceWithScope ensures we can create multiple session stores with multiple scopes.
+func Test_Coherence_With_Scope(t *testing.T) {
+	var val []byte
+
+	// create two session stores with different scopes
+	testStore1, err := newTestStore(t, Config{ScopeName: "scope1"})
+	require.NoError(t, err)
+
+	testStore2, err := newTestStore(t, Config{ScopeName: "scope2"})
+	require.NoError(t, err)
+
+	// ensure we can put the same key with different values in each scope
+	err = testStore1.Set(key1, value1, 0)
+	require.NoError(t, err)
+
+	err = testStore2.Set(key1, value2, 0)
+	require.NoError(t, err)
+
+	// ensure the value of "key1" is different for each store
+	val, err = testStore1.Get(key1)
+	require.NoError(t, err)
+	require.Equal(t, value1, val)
+
+	val, err = testStore2.Get(key1)
+	require.NoError(t, err)
+	require.Equal(t, value2, val)
+
+	require.NoError(t, testStore1.Close())
+	require.NoError(t, testStore2.Close())
+}
+
+func Benchmark_Coherence_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Coherence_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Coherence_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
+}

coherence/go.mod

@@ -0,0 +1,26 @@
+module github.com/gofiber/storage/coherence
+
+go 1.19
+
+require (
+	github.com/oracle/coherence-go-client v1.0.3
+	github.com/stretchr/testify v1.8.4
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
+require (
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/grpc v1.58.3 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+)

coherence/go.sum

@@ -0,0 +1,40 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/oracle/coherence-go-client v1.0.3 h1:P8Rzgo21BAaJsKzemzMCFY9I27PdKBpr5ZqrHhZ7zPg=
+github.com/oracle/coherence-go-client v1.0.3/go.mod h1:IAk8etsxzhUK6YaGzbInR1LYlh+1fiG85bGpyvzY0QY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
+google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
+google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

couchbase/README.md

@@ -11,6 +11,8 @@ title: Couchbase
 
 A Couchbase storage driver using [couchbase/gocb](https://github.com/couchbase/gocb).
 
+**Note: Requires Go 1.19 and above**
+
 ### Table of Contents
 - [Signatures](#signatures)
 - [Installation](#installation)
@@ -35,13 +37,13 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the Couchbase implementation:
 ```bash
-go get github.com/gofiber/storage/couchbase
+go get github.com/gofiber/storage/couchbase/v2
 ```
 
 ### Examples
 Import the storage package.
 ```go
-import "github.com/gofiber/storage/couchbase"
+import "github.com/gofiber/storage/couchbase/v2"
 ```
 
 You can use the following possibilities to create a storage:

couchbase/couchbase.go

@@ -26,7 +26,6 @@ func New(config ...Config) *Storage {
 		},
 		Transcoder: gocb.NewLegacyTranscoder(),
 	})
-
 	if err != nil {
 		panic(err)
 	}

couchbase/couchbase_test.go

@@ -4,127 +4,142 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
-func TestSetCouchbase_ShouldReturnNoError(t *testing.T) {
-	testStorage := New(Config{
+func newTestStore(t testing.TB) *Storage {
+	t.Helper()
+	return New(Config{
 		Username: "admin",
 		Password: "123456",
 		Host:     "127.0.0.1:8091",
 		Bucket:   "fiber_storage",
 	})
+}
 
-	err := testStorage.Set("test", []byte("test"), 0)
+func TestSetCouchbase_ShouldReturnNoError(t *testing.T) {
+	testStore := newTestStore(t)
 
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Set("test", []byte("test"), 0)
+
+	require.NoError(t, err)
 }
 
 func TestGetCouchbase_ShouldReturnNil_WhenDocumentNotFound(t *testing.T) {
-	testStorage := New(Config{
-		Username: "admin",
-		Password: "123456",
-		Host:     "127.0.0.1:8091",
-		Bucket:   "fiber_storage",
-	})
+	testStore := newTestStore(t)
 
-	val, err := testStorage.Get("not_found_key")
+	val, err := testStore.Get("not_found_key")
 
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, 0, len(val))
+	require.NoError(t, err)
+	require.Zero(t, len(val))
 }
 
-func TestSetAndGet_GetShouldReturn_SettedValueWithoutError(t *testing.T) {
-	testStorage := New(Config{
-		Username: "admin",
-		Password: "123456",
-		Host:     "127.0.0.1:8091",
-		Bucket:   "fiber_storage",
-	})
+func TestSetAndGet_GetShouldReturn_SetValueWithoutError(t *testing.T) {
+	testStore := newTestStore(t)
 
-	err := testStorage.Set("test", []byte("fiber_test_value"), 0)
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Set("test", []byte("fiber_test_value"), 0)
+	require.NoError(t, err)
 
-	val, err := testStorage.Get("test")
+	val, err := testStore.Get("test")
 
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, []byte("fiber_test_value"))
+	require.NoError(t, err)
+	require.Equal(t, val, []byte("fiber_test_value"))
 }
 
 func TestSetAndGet_GetShouldReturnNil_WhenTTLExpired(t *testing.T) {
-	testStorage := New(Config{
-		Username: "admin",
-		Password: "123456",
-		Host:     "127.0.0.1:8091",
-		Bucket:   "fiber_storage",
-	})
+	testStore := newTestStore(t)
 
-	err := testStorage.Set("test", []byte("fiber_test_value"), 3*time.Second)
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Set("test", []byte("fiber_test_value"), 3*time.Second)
+	require.NoError(t, err)
 
 	time.Sleep(6 * time.Second)
 
-	val, err := testStorage.Get("test")
+	val, err := testStore.Get("test")
 
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, 0, len(val))
+	require.NoError(t, err)
+	require.Zero(t, len(val))
 }
 
 func TestSetAndDelete_DeleteShouldReturn_NoError(t *testing.T) {
-	testStorage := New(Config{
-		Username: "admin",
-		Password: "123456",
-		Host:     "127.0.0.1:8091",
-		Bucket:   "fiber_storage",
-	})
+	testStore := newTestStore(t)
 
-	err := testStorage.Set("test", []byte("fiber_test_value"), 0)
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Set("test", []byte("fiber_test_value"), 0)
+	require.NoError(t, err)
 
-	err = testStorage.Delete("test")
-	utils.AssertEqual(t, nil, err)
+	err = testStore.Delete("test")
+	require.NoError(t, err)
 
-	_, err = testStorage.Get("test")
-	utils.AssertEqual(t, nil, err)
+	_, err = testStore.Get("test")
+	require.NoError(t, err)
 }
 
 func TestSetAndReset_ResetShouldReturn_NoError(t *testing.T) {
-	testStorage := New(Config{
-		Username: "admin",
-		Password: "123456",
-		Host:     "127.0.0.1:8091",
-		Bucket:   "fiber_storage",
-	})
+	testStore := newTestStore(t)
 
-	err := testStorage.Set("test", []byte("fiber_test_value"), 0)
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Set("test", []byte("fiber_test_value"), 0)
+	require.NoError(t, err)
 
-	err = testStorage.Reset()
-	utils.AssertEqual(t, nil, err)
+	err = testStore.Reset()
+	require.NoError(t, err)
 
-	_, err = testStorage.Get("test")
-	utils.AssertEqual(t, nil, err)
+	_, err = testStore.Get("test")
+	require.NoError(t, err)
 }
 
 func TestClose_CloseShouldReturn_NoError(t *testing.T) {
-	testStorage := New(Config{
-		Username: "admin",
-		Password: "123456",
-		Host:     "127.0.0.1:8091",
-		Bucket:   "fiber_storage",
-	})
+	testStore := newTestStore(t)
 
-	err := testStorage.Close()
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Close()
+	require.NoError(t, err)
 }
 
-func TestGetConn_ReturnsNotNill(t *testing.T) {
-	testStorage := New(Config{
-		Username: "admin",
-		Password: "123456",
-		Host:     "127.0.0.1:8091",
-		Bucket:   "fiber_storage",
-	})
-	conn := testStorage.Conn()
-	utils.AssertEqual(t, true, conn != nil)
+func TestGetConn_ReturnsNotNil(t *testing.T) {
+	testStore := newTestStore(t)
+
+	require.True(t, testStore.Conn() != nil)
+}
+
+func Benchmark_Couchbase_Set(b *testing.B) {
+	testStore := newTestStore(b)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Couchbase_Get(b *testing.B) {
+	testStore := newTestStore(b)
+
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Couchbase_SetAndDelete(b *testing.B) {
+	testStore := newTestStore(b)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

couchbase/go.mod

@@ -1,14 +1,30 @@
-module github.com/gofiber/storage/couchbase
+module github.com/gofiber/storage/couchbase/v2
 
 go 1.19
 
 require (
-	github.com/couchbase/gocb/v2 v2.6.3
-	github.com/gofiber/utils v1.1.0
+	github.com/couchbase/gocb/v2 v2.7.0
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
-	github.com/couchbase/gocbcore/v10 v10.2.3 // indirect
+	github.com/couchbase/gocbcore/v10 v10.3.0 // indirect
+	github.com/couchbase/gocbcoreps v0.1.0 // indirect
+	github.com/couchbase/goprotostellar v1.0.0 // indirect
+	github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20230515165046-68b522a21131 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.26.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
+	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

couchbase/go.sum

@@ -1,30 +1,166 @@
-github.com/couchbase/gocb/v2 v2.6.3 h1:5RsMo+RRfK0mVxHLAfpBz3/tHlgXZb1WBNItLk9Ab+c=
-github.com/couchbase/gocb/v2 v2.6.3/go.mod h1:yF5F6BHTZ/ZowhEuZbySbXrlI4rHd1TIhm5azOaMbJU=
-github.com/couchbase/gocbcore/v10 v10.2.3 h1:PEkRSNSkKjUBXx82Ucr094+anoiCG5GleOOQZOHo6D4=
-github.com/couchbase/gocbcore/v10 v10.2.3/go.mod h1:lYQIIk+tzoMcwtwU5GzPbDdqEkwkH3isI2rkSpfL0oM=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/couchbase/gocb/v2 v2.7.0 h1:zU/Eh9+RIS1TvQFiEF4JBajMm9VTjkeQssE9ov7F87c=
+github.com/couchbase/gocb/v2 v2.7.0/go.mod h1:IHq/c3cnrqKq9scFQJ8OyD/xhqZ0b4mHYVH6VEMnsnw=
+github.com/couchbase/gocbcore/v10 v10.3.0 h1:cu5KWP5Yq9cANw0UitpKWmb8mv9NDhC0ApIf9rMrVq8=
+github.com/couchbase/gocbcore/v10 v10.3.0/go.mod h1:lYQIIk+tzoMcwtwU5GzPbDdqEkwkH3isI2rkSpfL0oM=
+github.com/couchbase/gocbcoreps v0.1.0 h1:9+Qq+H/YXYn+H6f5A5MndUv40qdCwPwoJjinHolxq2g=
+github.com/couchbase/gocbcoreps v0.1.0/go.mod h1:LjH33s/LNVBAwVU1Ka/YU3cLkuAyFC2dzGGiValJ5oY=
+github.com/couchbase/goprotostellar v1.0.0 h1:umfH4hOxrUS/0QY1AkdoVcpp9rg7Jl+UNWzNJ3KxIHc=
+github.com/couchbase/goprotostellar v1.0.0/go.mod h1:gs1eioLVOHETTFWxDY4v7Q/kRPMgqmX6t/TPcI429ls=
 github.com/couchbaselabs/gocaves/client v0.0.0-20230307083111-cc3960c624b1/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY=
 github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259 h1:2TXy68EGEzIMHOx9UvczR5ApVecwCfQZ0LjkmwMI6g4=
-github.com/couchbaselabs/gocaves/client v0.0.0-20230404095311-05e3ba4f0259/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY=
+github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20230515165046-68b522a21131 h1:2EAfFswAfgYn3a05DVcegiw6DgMgn1Mv5eGz6IHt1Cw=
+github.com/couchbaselabs/gocbconnstr/v2 v2.0.0-20230515165046-68b522a21131/go.mod h1:o7T431UOfFVHDNvMBUmUxpHnhivwv7BziUao/nMl81E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
-github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
+github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

dynamodb/README.md

@@ -13,7 +13,7 @@ A DynamoDB storage driver using [aws/aws-sdk-go-v2](https://github.com/aws/aws-s
 
 **Note:** If config fields of credentials not given, credentials are using from the environment variables, ~/.aws/credentials, or EC2 instance role. If config fields of credentials given, credentials are using from config. Look at: [specifying credentials](https://aws.github.io/aws-sdk-go-v2/docs/configuring-sdk/#specifying-credentials)
 
-....
+**Note: Requires Go 1.19 and above**
 
 ### Table of Contents
 - [Signatures](#signatures)
@@ -43,13 +43,13 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the dynamodb implementation:
 ```bash
-go get github.com/gofiber/storage/dynamodb
+go get github.com/gofiber/storage/dynamodb/v2
 ```
 
 ### Examples
 Import the storage package.
 ```go
-import "github.com/gofiber/storage/dynamodb"
+import "github.com/gofiber/storage/dynamodb/v2"
 ```
 
 You can use the following possibilities to create a storage:

dynamodb/dynamodb_test.go

@@ -1,13 +1,16 @@
 package dynamodb
 
 import (
+	"os"
 	"testing"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
-var testStore = New(
-	Config{
+var testStore *Storage
+
+func TestMain(m *testing.M) {
+	testStore = New(Config{
 		Table:    "fiber_storage",
 		Endpoint: "http://localhost:8000/",
 		Region:   "us-east-1",
@@ -15,8 +18,14 @@ var testStore = New(
 			AccessKey:       "dummy",
 			SecretAccessKey: "dummy",
 		},
-	},
-)
+		Reset: true,
+	})
+
+	code := m.Run()
+
+	_ = testStore.Close()
+	os.Exit(code)
+}
 
 func Test_DynamoDB_Set(t *testing.T) {
 	var (
@@ -25,7 +34,7 @@ func Test_DynamoDB_Set(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_DynamoDB_Set_Override(t *testing.T) {
@@ -35,10 +44,10 @@ func Test_DynamoDB_Set_Override(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_DynamoDB_Get(t *testing.T) {
@@ -48,18 +57,17 @@ func Test_DynamoDB_Get(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
 func Test_DynamoDB_Get_NotExist(t *testing.T) {
-
 	result, err := testStore.Get("notexist")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_DynamoDB_Delete(t *testing.T) {
@@ -69,43 +77,80 @@ func Test_DynamoDB_Delete(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_DynamoDB_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_DynamoDB_Close(t *testing.T) {
-	utils.AssertEqual(t, nil, testStore.Close())
+	require.Nil(t, testStore.Close())
 }
 
 func Test_DynamoDB_Conn(t *testing.T) {
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
+	require.True(t, testStore.Conn() != nil)
+}
+
+func Benchmark_DynamoDB_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_DynamoDB_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_DynamoDB_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

dynamodb/go.mod

@@ -1,28 +1,31 @@
-module github.com/gofiber/storage/dynamodb
+module github.com/gofiber/storage/dynamodb/v2
 
-go 1.17
+go 1.19
 
 require (
-	github.com/aws/aws-sdk-go-v2 v1.20.0
-	github.com/aws/aws-sdk-go-v2/config v1.18.32
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.31
-	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.35
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.1
-	github.com/gofiber/utils v1.1.0
+	github.com/aws/aws-sdk-go-v2 v1.24.0
+	github.com/aws/aws-sdk-go-v2/config v1.26.1
+	github.com/aws/aws-sdk-go-v2/credentials v1.16.12
+	github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.12.12
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.26.6
+	github.com/stretchr/testify v1.8.4
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38 // indirect
-	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.15.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.31 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.13.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.21.1 // indirect
-	github.com/aws/smithy-go v1.14.0 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.18.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.8.10 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 // indirect
+	github.com/aws/smithy-go v1.19.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

dynamodb/go.sum

@@ -1,43 +1,41 @@
-github.com/aws/aws-sdk-go-v2 v1.20.0 h1:INUDpYLt4oiPOJl0XwZDK2OVAVf0Rzo+MGVTv9f+gy8=
-github.com/aws/aws-sdk-go-v2 v1.20.0/go.mod h1:uWOr0m0jDsiWw8nnXiqZ+YG6LdvAlGYDLLf2NmHZoy4=
-github.com/aws/aws-sdk-go-v2/config v1.18.32 h1:tqEOvkbTxwEV7hToRcJ1xZRjcATqwDVsWbAscgRKyNI=
-github.com/aws/aws-sdk-go-v2/config v1.18.32/go.mod h1:U3ZF0fQRRA4gnbn9GGvOWLoT2EzzZfAWeKwnVrm1rDc=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.31 h1:vJyON3lG7R8VOErpJJBclBADiWTwzcwdkQpTKx8D2sk=
-github.com/aws/aws-sdk-go-v2/credentials v1.13.31/go.mod h1:T4sESjBtY2lNxLgkIASmeP57b5j7hTQqCbqG0tWnxC4=
-github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.35 h1:JUj9P4aJEfkd2G4Ia7HoLiXj0v/Ma2vpzzpG/pYt3rM=
-github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.10.35/go.mod h1:8wa/3VX1KSmMPKUrXRb5Vhq13rYShhevGBc28tjywow=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7 h1:X3H6+SU21x+76LRglk21dFRgMTJMa5QcpW+SqUf5BBg=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.7/go.mod h1:3we0V09SwcJBzNlnyovrR2wWJhWmVdqAsmVs4uronv8=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37 h1:zr/gxAZkMcvP71ZhQOcvdm8ReLjFgIXnIn0fw5AM7mo=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.37/go.mod h1:Pdn4j43v49Kk6+82spO3Tu5gSeQXRsxo56ePPQAvFiA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31 h1:0HCMIkAkVY9KMgueD8tf4bRTUanzEYvhw7KkPXIMpO0=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.31/go.mod h1:fTJDMe8LOFYtqiFFFeHA+SVMAwqLhoq0kcInYoLa9Js=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38 h1:+i1DOFrW3YZ3apE45tCal9+aDKK6kNEbW6Ib7e1nFxE=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.3.38/go.mod h1:1/jLp0OgOaWIetycOmycW+vYTYgTZFPttJQRgsI1PoU=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.1 h1:E9giR4LylJO/iu/75Sb8golqceDcM26k7RZ8ng5MQ2k=
-github.com/aws/aws-sdk-go-v2/service/dynamodb v1.21.1/go.mod h1:HVZN4RDNEO/u7XvWytqUBKm9BsBjt5OKVnRTW8NMMVc=
-github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.15.1 h1:W3+SLNmzfuquOygK5xinFnh3etTOX3Q/aFuXC0zeNDw=
-github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.15.1/go.mod h1:AddBz80OPyAl0VVaOzuOMA5wsUnoSXCuVj38mr4Qrd4=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12 h1:uAiiHnWihGP2rVp64fHwzLDrswGjEjsPszwRYMiYQPU=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.12/go.mod h1:fUTHpOXqRQpXvEpDPSa3zxCc2fnpW6YnBoba+eQr+Bg=
-github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.31 h1:L6ya7BMQ12LV6rsE1jiKm9ajsrnkRAYalatWRwFawHk=
-github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.31/go.mod h1:tp7VzPEi+bKtSCP5fSrsZrB271L6oC8CWP3g2cZLofU=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31 h1:auGDJ0aLZahF5SPvkJ6WcUuX7iQ7kyl2MamV7Tm8QBk=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.31/go.mod h1:3+lloe3sZuBQw1aBc5MyndvodzQlyqCZ7x1QPDHaWP4=
-github.com/aws/aws-sdk-go-v2/service/sso v1.13.1 h1:DSNpSbfEgFXRV+IfEcKE5kTbqxm+MeF5WgyeRlsLnHY=
-github.com/aws/aws-sdk-go-v2/service/sso v1.13.1/go.mod h1:TC9BubuFMVScIU+TLKamO6VZiYTkYoEHqlSQwAe2omw=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1 h1:hd0SKLMdOL/Sl6Z0np1PX9LeH2gqNtBe0MhTedA8MGI=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.1/go.mod h1:XO/VcyoQ8nKyKfFW/3DMsRQXsfh/052tHTWmg3xBXRg=
-github.com/aws/aws-sdk-go-v2/service/sts v1.21.1 h1:pAOJj+80tC8sPVgSDHzMYD6KLWsaLQ1kZw31PTeORbs=
-github.com/aws/aws-sdk-go-v2/service/sts v1.21.1/go.mod h1:G8SbvL0rFk4WOJroU8tKBczhsbhj2p/YY7qeJezJ3CI=
-github.com/aws/smithy-go v1.14.0 h1:+X90sB94fizKjDmwb4vyl2cTTPXTE5E2G/1mjByb0io=
-github.com/aws/smithy-go v1.14.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk=
+github.com/aws/aws-sdk-go-v2 v1.24.0/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4=
+github.com/aws/aws-sdk-go-v2/config v1.26.1 h1:z6DqMxclFGL3Zfo+4Q0rLnAZ6yVkzCRxhRMsiRQnD1o=
+github.com/aws/aws-sdk-go-v2/config v1.26.1/go.mod h1:ZB+CuKHRbb5v5F0oJtGdhFTelmrxd4iWO1lf0rQwSAg=
+github.com/aws/aws-sdk-go-v2/credentials v1.16.12 h1:v/WgB8NxprNvr5inKIiVVrXPuuTegM+K8nncFkr1usU=
+github.com/aws/aws-sdk-go-v2/credentials v1.16.12/go.mod h1:X21k0FjEJe+/pauud82HYiQbEr9jRKY3kXEIQ4hXeTQ=
+github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.12.12 h1:6p4l8wc8QMRSg8Yb6qfmiJpkfwyJtcljmGH6hcxz/ik=
+github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.12.12/go.mod h1:mzvoVQGD+ivawg984kcM2zd7oCFcknJ0uWTaR19lqEs=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6JkVzjowOKeOJRHERyy1vh58=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9 h1:v+HbZaCGmOwnTTVS86Fleq0vPzOd7tnJGbFhP0stNLs=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.9/go.mod h1:Xjqy+Nyj7VDLBtCMkQYOw1QYfAEZCVLrfI0ezve8wd4=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9 h1:N94sVhRACtXyVcjXxrwK1SKFIJrA9pOJ5yu2eSHnmls=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.9/go.mod h1:hqamLz7g1/4EJP+GH5NBhcUMLjW+gKLQabgyz6/7WAU=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.26.6 h1:kSdpnPOZL9NG5QHoKL5rTsdY+J+77hr+vqVMsPeyNe0=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.26.6/go.mod h1:o7TD9sjdgrl8l/g2a2IkYjuhxjPy9DMP2sWo7piaRBQ=
+github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.18.5 h1:ekyZDC/JMR4s/64oT9KsOnYWfGr03ebkwgHwe3iX9rA=
+github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.18.5/go.mod h1:T461RxBmf94zuOuIUifdy5Zim3DJTo0X4nXE3vodXQI=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.8.10 h1:h8uweImUHGgyNKrxIUwpPs6XiH0a6DJ17hSJvFLgPAo=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.8.10/go.mod h1:LZKVtMBiZfdvUWgwg61Qo6kyAmE5rn9Dw36AqnycvG8=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9 h1:Nf2sHxjMJR8CSImIVCONRi4g0Su3J+TSTbS7G0pUeMU=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.9/go.mod h1:idky4TER38YIjr2cADF1/ugFMKvZV7p//pVeV5LZbF0=
+github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 h1:ldSFWz9tEHAwHNmjx2Cvy1MjP5/L9kNoR0skc6wyOOM=
+github.com/aws/aws-sdk-go-v2/service/sso v1.18.5/go.mod h1:CaFfXLYL376jgbP7VKC96uFcU8Rlavak0UlAwk1Dlhc=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38=
+github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 h1:5UYvv8JUvllZsRnfrcMQ+hJ9jNICmcgKPAO1CER25Wg=
+github.com/aws/aws-sdk-go-v2/service/sts v1.26.5/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU=
+github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM=
+github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
-github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -45,6 +43,11 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfC
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

etcd/README.md

@@ -11,6 +11,8 @@ title: Etcd
 
 A Etcd storage driver using [`etcd-io/etcd`](https://github.com/etcd-io/etcd).
 
+**Note: Requires Go 1.19 and above**
+
 ### Table of Contents
 - [Signatures](#signatures)
 - [Installation](#installation)
@@ -36,13 +38,13 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the etcd implementation:
 ```bash
-go get github.com/gofiber/storage/etcd
+go get github.com/gofiber/storage/etcd/v2
 ```
 
 ### Examples
 Import the storage package.
 ```go
-import "github.com/gofiber/storage/etcd"
+import "github.com/gofiber/storage/etcd/v2"
 ```
 
 You can use the following possibilities to create a storage:

etcd/etcd.go

@@ -2,8 +2,9 @@ package etcd
 
 import (
 	"context"
-	"go.etcd.io/etcd/client/v3"
 	"time"
+
+	"go.etcd.io/etcd/client/v3"
 )
 
 type Storage struct {
@@ -36,7 +37,6 @@ func (s *Storage) Get(key string) ([]byte, error) {
 		return nil, nil
 	}
 	item, err := s.db.Get(context.Background(), key)
-
 	if err != nil {
 		return nil, err
 	}
@@ -55,7 +55,6 @@ func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
 	}
 
 	lease, err := s.db.Grant(context.Background(), int64(exp.Seconds()))
-
 	if err != nil {
 		return err
 	}
@@ -83,7 +82,6 @@ func (s *Storage) Delete(key string) error {
 
 func (s *Storage) Reset() error {
 	_, err := s.db.Delete(context.Background(), "", clientv3.WithPrefix())
-
 	if err != nil {
 		return err
 	}

etcd/etcd_test.go

@@ -1,110 +1,132 @@
 package etcd
 
 import (
-	"github.com/gofiber/utils"
+	"os"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
-func TestSetEtcd_ShouldReturnNoError(t *testing.T) {
-	testStorage := New(Config{
+var testStore *Storage
+
+func TestMain(m *testing.M) {
+	testStore = New(Config{
 		Endpoints: []string{"localhost:2379"},
 	})
 
+	code := m.Run()
+
+	_ = testStore.Reset()
+	_ = testStore.Close()
+	os.Exit(code)
+}
+
+func TestSetEtcd_ShouldReturnNoError(t *testing.T) {
 	var (
 		key = "john"
 		val = []byte("doe")
 	)
 
-	err := testStorage.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Set(key, val, 0)
+	require.NoError(t, err)
 }
 
 func TestGetEtcd_ShouldReturnNil_WhenDocumentNotFound(t *testing.T) {
-	testStorage := New(Config{
-		Endpoints: []string{"localhost:2379"},
-	})
+	val, err := testStore.Get("not_found_key")
 
-	val, err := testStorage.Get("not_found_key")
-
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, 0, len(val))
+	require.NoError(t, err)
+	require.Zero(t, len(val))
 }
 
 func TestSetAndGet_GetShouldReturn_SettedValueWithoutError(t *testing.T) {
-	testStorage := New(Config{
-		Endpoints: []string{"localhost:2379"},
-	})
+	err := testStore.Set("test", []byte("fiber_test_value"), 0)
+	require.NoError(t, err)
 
-	err := testStorage.Set("test", []byte("fiber_test_value"), 0)
-	utils.AssertEqual(t, nil, err)
+	val, err := testStore.Get("test")
 
-	val, err := testStorage.Get("test")
-
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, []byte("fiber_test_value"))
+	require.NoError(t, err)
+	require.Equal(t, val, []byte("fiber_test_value"))
 }
 
 func TestSetAndGet_GetShouldReturnNil_WhenTTLExpired(t *testing.T) {
-	testStorage := New(Config{
-		Endpoints: []string{"localhost:2379"},
-	})
-
-	err := testStorage.Set("test", []byte("fiber_test_value"), 3*time.Second)
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Set("test", []byte("fiber_test_value"), 3*time.Second)
+	require.NoError(t, err)
 
 	time.Sleep(6 * time.Second)
 
-	val, err := testStorage.Get("test")
+	val, err := testStore.Get("test")
 
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, 0, len(val))
+	require.NoError(t, err)
+	require.Zero(t, len(val))
 }
 
 func TestSetAndDelete_DeleteShouldReturn_NoError(t *testing.T) {
-	testStorage := New(Config{
-		Endpoints: []string{"localhost:2379"},
-	})
+	err := testStore.Set("test", []byte("fiber_test_value"), 0)
+	require.NoError(t, err)
 
-	err := testStorage.Set("test", []byte("fiber_test_value"), 0)
-	utils.AssertEqual(t, nil, err)
+	err = testStore.Delete("test")
+	require.NoError(t, err)
 
-	err = testStorage.Delete("test")
-	utils.AssertEqual(t, nil, err)
-
-	_, err = testStorage.Get("test")
-	utils.AssertEqual(t, nil, err)
+	_, err = testStore.Get("test")
+	require.NoError(t, err)
 }
 
 func TestSetAndReset_ResetShouldReturn_NoError(t *testing.T) {
-	testStorage := New(Config{
-		Endpoints: []string{"localhost:2379"},
-	})
+	err := testStore.Set("test", []byte("fiber_test_value"), 0)
+	require.NoError(t, err)
 
-	err := testStorage.Set("test", []byte("fiber_test_value"), 0)
-	utils.AssertEqual(t, nil, err)
+	err = testStore.Reset()
+	require.NoError(t, err)
 
-	err = testStorage.Reset()
-	utils.AssertEqual(t, nil, err)
-
-	_, err = testStorage.Get("test")
-	utils.AssertEqual(t, nil, err)
+	_, err = testStore.Get("test")
+	require.NoError(t, err)
 }
 
 func TestClose_CloseShouldReturn_NoError(t *testing.T) {
-	testStorage := New(Config{
-		Endpoints: []string{"localhost:2379"},
-	})
-
-	err := testStorage.Close()
-	utils.AssertEqual(t, nil, err)
+	err := testStore.Close()
+	require.NoError(t, err)
 }
 
 func TestGetConn_ReturnsNotNill(t *testing.T) {
-	testStorage := New(Config{
-		Endpoints: []string{"localhost:2379"},
-	})
-
-	conn := testStorage.Conn()
-	utils.AssertEqual(t, true, conn != nil)
+	require.True(t, testStore.Conn() != nil)
+}
+
+func Benchmark_Etcd_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Etcd_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Etcd_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

etcd/go.mod

@@ -1,26 +1,30 @@
-module github.com/gofiber/storage/etcd
+module github.com/gofiber/storage/etcd/v2
 
 go 1.19
 
 require (
-	github.com/gofiber/utils v1.1.0
-	go.etcd.io/etcd/client/v3 v3.5.9
+	github.com/stretchr/testify v1.8.4
+	go.etcd.io/etcd/client/v3 v3.5.11
 )
 
 require (
 	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
-	google.golang.org/grpc v1.55.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.11 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.25.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

etcd/go.sum

@@ -1,14 +1,11 @@
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
 github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
-github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
-github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -18,27 +15,23 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs=
-go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k=
-go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE=
-go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4=
-go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E=
-go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+go.etcd.io/etcd/api/v3 v3.5.11 h1:B54KwXbWDHyD3XYAwprxNzTe7vlhR69LuBgZnMVvS7E=
+go.etcd.io/etcd/api/v3 v3.5.11/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4=
+go.etcd.io/etcd/client/pkg/v3 v3.5.11 h1:bT2xVspdiCj2910T0V+/KHcVKjkUrCZVtk8J2JF2z1A=
+go.etcd.io/etcd/client/pkg/v3 v3.5.11/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4=
+go.etcd.io/etcd/client/v3 v3.5.11 h1:ajWtgoNSZJ1gmS8k+icvPtqsqEav+iUorF7b0qozgUU=
+go.etcd.io/etcd/client/v3 v3.5.11/go.mod h1:a6xQUEqFJ8vztO1agJh/KQKOMfFI8og52ZconzcDJwE=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
+go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -48,20 +41,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -70,14 +63,19 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
-google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY=
+google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
+google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
+google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

@@ -1,3 +1,3 @@
 module github.com/gofiber/storage
 
-go 1.18
+go 1.19

memcache/README.md

@@ -11,6 +11,8 @@ title: Memcache
 
 A Memcache storage driver using [`bradfitz/gomemcache`](https://github.com/bradfitz/gomemcache).
 
+**Note: Requires Go 1.19 and above**
+
 ### Table of Contents
 - [Signatures](#signatures)
 - [Installation](#installation)
@@ -36,7 +38,7 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the memory implementation:
 ```bash
-go get github.com/gofiber/storage/memory
+go get github.com/gofiber/storage/memory/v2
 ```
 
 ### Examples

memcache/go.mod

@@ -1,8 +1,14 @@
-module github.com/gofiber/storage/memcache
+module github.com/gofiber/storage/memcache/v2
 
-go 1.17
+go 1.19
 
 require (
-	github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822
-	github.com/gofiber/utils v1.1.0
+	github.com/bradfitz/gomemcache v0.0.0-20230611145640-acc696258285
+	github.com/stretchr/testify v1.8.4
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

memcache/go.sum

@@ -1,4 +1,12 @@
-github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 h1:hjXJeBcAMS1WGENGqDpzvmgS43oECTx8UXq31UBu0Jw=
-github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
-github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
+github.com/bradfitz/gomemcache v0.0.0-20230611145640-acc696258285 h1:Dr+ezPI5ivhMn/3WOoB86XzMhie146DNaBbhaQWZHMY=
+github.com/bradfitz/gomemcache v0.0.0-20230611145640-acc696258285/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

memcache/memcache.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	mc "github.com/bradfitz/gomemcache/memcache"
-	"github.com/gofiber/utils"
 )
 
 // Storage interface that is implemented by storage providers
@@ -21,7 +20,7 @@ func New(config ...Config) *Storage {
 	cfg := configDefault(config...)
 
 	// Split comma separated servers into slice
-	serverList := strings.Split(utils.Trim(cfg.Servers, ' '), ",")
+	serverList := strings.Split(strings.TrimSpace(cfg.Servers), ",")
 
 	// Create db
 	db := mc.New(serverList...)

memcache/memcache_test.go

@@ -1,13 +1,25 @@
 package memcache
 
 import (
+	"os"
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
-var testStore = New()
+var testStore *Storage
+
+func TestMain(m *testing.M) {
+	testStore = New(Config{
+		Reset: true,
+	})
+
+	code := m.Run()
+
+	_ = testStore.Close()
+	os.Exit(code)
+}
 
 func Test_Memcache_Set(t *testing.T) {
 	var (
@@ -16,7 +28,7 @@ func Test_Memcache_Set(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_Memcache_Set_Override(t *testing.T) {
@@ -26,10 +38,10 @@ func Test_Memcache_Set_Override(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 }
 
 func Test_Memcache_Get(t *testing.T) {
@@ -39,11 +51,11 @@ func Test_Memcache_Get(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
 }
 
 func Test_Memcache_Set_Expiration(t *testing.T) {
@@ -54,26 +66,23 @@ func Test_Memcache_Set_Expiration(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, exp)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	time.Sleep(1100 * time.Millisecond)
 }
 
 func Test_Memcache_Get_Expired(t *testing.T) {
-	var (
-		key = "john"
-	)
+	key := "john"
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Memcache_Get_NotExist(t *testing.T) {
-
 	result, err := testStore.Get("notexist")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Memcache_Delete(t *testing.T) {
@@ -83,43 +92,80 @@ func Test_Memcache_Delete(t *testing.T) {
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Memcache_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 }
 
 func Test_Memcache_Close(t *testing.T) {
-	utils.AssertEqual(t, nil, testStore.Close())
+	require.Nil(t, testStore.Close())
 }
 
 func Test_Memcache_Conn(t *testing.T) {
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
+	require.True(t, testStore.Conn() != nil)
+}
+
+func Benchmark_Memcache_Set(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Memcache_Get(b *testing.B) {
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Memcache_SetAndDelete(b *testing.B) {
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

memory/README.md

@@ -12,6 +12,8 @@ title: Memory
 
 An in-memory storage driver.
 
+**Note: Requires Go 1.19 and above**
+
 ### Table of Contents
 - [Signatures](#signatures)
 - [Installation](#installation)
@@ -29,6 +31,7 @@ func (s *Storage) Delete(key string) error
 func (s *Storage) Reset() error
 func (s *Storage) Close() error
 func (s *Storage) Conn() map[string]entry
+func (s *Storage) Keys() ([][]byte, error)
 ```
 
 ### Installation
@@ -38,13 +41,13 @@ go mod init github.com/<user>/<repo>
 ```
 And then install the memory implementation:
 ```bash
-go get github.com/gofiber/storage/memory
+go get github.com/gofiber/storage/memory/v2
 ```
 
 ### Examples
 Import the storage package.
 ```go
-import "github.com/gofiber/storage/memory"
+import "github.com/gofiber/storage/memory/v2"
 ```
 
 You can use the following possibilities to create a storage:

memory/go.mod

@@ -1,5 +1,11 @@
-module github.com/gofiber/storage/memory
+module github.com/gofiber/storage/memory/v2
 
-go 1.17
+go 1.19
 
-require github.com/gofiber/utils v1.1.0
+require github.com/stretchr/testify v1.8.4
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

memory/go.sum

@@ -1,2 +1,10 @@
-github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
-github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

memory/internal/time_test.go

@@ -5,12 +5,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
 func checkTimeStamp(t testing.TB, expectedCurrent, actualCurrent uint32) {
 	// test with some buffer in front and back of the expectedCurrent time -> because of the timing on the work machine
-	utils.AssertEqual(t, true, actualCurrent >= expectedCurrent-1 || actualCurrent <= expectedCurrent+1)
+	require.True(t, actualCurrent >= expectedCurrent-1 || actualCurrent <= expectedCurrent+1)
 }
 
 func Test_TimeStampUpdater(t *testing.T) {

memory/memory.go

@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/gofiber/storage/memory/internal"
+	"github.com/gofiber/storage/memory/v2/internal"
 )
 
 // Storage interface that is implemented by storage providers
@@ -141,3 +141,29 @@ func (s *Storage) Conn() map[string]entry {
 	defer s.mux.RUnlock()
 	return s.db
 }
+
+// Return all the keys
+func (s *Storage) Keys() ([][]byte, error) {
+	s.mux.RLock()
+	defer s.mux.RUnlock()
+
+	if len(s.db) == 0 {
+		return nil, nil
+	}
+
+	ts := atomic.LoadUint32(&internal.Timestamp)
+	keys := make([][]byte, 0, len(s.db))
+	for key, v := range s.db {
+		// Filter out the expired keys
+		if v.expiry == 0 || v.expiry > ts {
+			keys = append(keys, []byte(key))
+		}
+	}
+
+	// Double check if no valid keys were found
+	if len(keys) == 0 {
+		return nil, nil
+	}
+
+	return keys, nil
+}

memory/memory_test.go

@@ -4,151 +4,229 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofiber/utils"
+	"github.com/stretchr/testify/require"
 )
 
-var testStore = New()
-
 func Test_Storage_Memory_Set(t *testing.T) {
 	var (
-		key = "john"
-		val = []byte("doe")
+		testStore = New()
+		key       = "john"
+		val       = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Len(t, keys, 1)
 }
 
 func Test_Storage_Memory_Set_Override(t *testing.T) {
 	var (
-		key = "john"
-		val = []byte("doe")
+		testStore = New()
+		key       = "john"
+		val       = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Len(t, keys, 1)
 }
 
 func Test_Storage_Memory_Get(t *testing.T) {
 	var (
-		key = "john"
-		val = []byte("doe")
+		testStore = New()
+		key       = "john"
+		val       = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, val, result)
+	require.NoError(t, err)
+	require.Equal(t, val, result)
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Len(t, keys, 1)
 }
 
 func Test_Storage_Memory_Set_Expiration(t *testing.T) {
 	var (
-		key = "john"
-		val = []byte("doe")
-		exp = 1 * time.Second
+		testStore = New()
+		key       = "john"
+		val       = []byte("doe")
+		exp       = 1 * time.Second
 	)
 
 	err := testStore.Set(key, val, exp)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	time.Sleep(1100 * time.Millisecond)
-}
-
-func Test_Storage_Memory_Get_Expired(t *testing.T) {
-	var (
-		key = "john"
-	)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Nil(t, keys)
+}
+
+func Test_Storage_Memory_Set_Long_Expiration_with_Keys(t *testing.T) {
+	var (
+		testStore = New()
+		key       = "john"
+		val       = []byte("doe")
+		exp       = 5 * time.Second
+	)
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Nil(t, keys)
+
+	err = testStore.Set(key, val, exp)
+	require.NoError(t, err)
+
+	time.Sleep(1100 * time.Millisecond)
+
+	keys, err = testStore.Keys()
+	require.NoError(t, err)
+	require.Len(t, keys, 1)
+
+	time.Sleep(4000 * time.Millisecond)
+	result, err := testStore.Get(key)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
+
+	keys, err = testStore.Keys()
+	require.NoError(t, err)
+	require.Nil(t, keys)
 }
 
 func Test_Storage_Memory_Get_NotExist(t *testing.T) {
-
+	testStore := New()
 	result, err := testStore.Get("notexist")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Nil(t, keys)
 }
 
 func Test_Storage_Memory_Delete(t *testing.T) {
 	var (
-		key = "john"
-		val = []byte("doe")
+		testStore = New()
+		key       = "john"
+		val       = []byte("doe")
 	)
 
 	err := testStore.Set(key, val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Len(t, keys, 1)
 
 	err = testStore.Delete(key)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get(key)
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
+
+	keys, err = testStore.Keys()
+	require.NoError(t, err)
+	require.Nil(t, keys)
 }
 
 func Test_Storage_Memory_Reset(t *testing.T) {
-	var (
-		val = []byte("doe")
-	)
+	testStore := New()
+	val := []byte("doe")
 
 	err := testStore.Set("john1", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	err = testStore.Set("john2", val, 0)
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
+
+	keys, err := testStore.Keys()
+	require.NoError(t, err)
+	require.Len(t, keys, 2)
 
 	err = testStore.Reset()
-	utils.AssertEqual(t, nil, err)
+	require.NoError(t, err)
 
 	result, err := testStore.Get("john1")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
 
 	result, err = testStore.Get("john2")
-	utils.AssertEqual(t, nil, err)
-	utils.AssertEqual(t, true, len(result) == 0)
+	require.NoError(t, err)
+	require.Zero(t, len(result))
+
+	keys, err = testStore.Keys()
+	require.NoError(t, err)
+	require.Nil(t, keys)
 }
 
 func Test_Storage_Memory_Close(t *testing.T) {
-	utils.AssertEqual(t, nil, testStore.Close())
+	testStore := New()
+	require.Nil(t, testStore.Close())
 }
 
 func Test_Storage_Memory_Conn(t *testing.T) {
-	utils.AssertEqual(t, true, testStore.Conn() != nil)
+	testStore := New()
+	require.True(t, testStore.Conn() != nil)
 }
 
+func Benchmark_Memory_Set(b *testing.B) {
+	testStore := New()
+	b.ReportAllocs()
+	b.ResetTimer()
 
-// go test -v -run=^$ -bench=Benchmark_Storage_Memory -benchmem -count=4
-func Benchmark_Storage_Memory(b *testing.B) {
-	keyLength := 1000
-	keys := make([]string, keyLength)
-	for i := 0; i < keyLength; i++ {
-		keys[i] = utils.UUID()
+	var err error
+	for i := 0; i < b.N; i++ {
+		err = testStore.Set("john", []byte("doe"), 0)
 	}
-	value := []byte("joe")
 
-	ttl := 2 * time.Second
-	b.Run("fiber_memory", func(b *testing.B) {
-		d := New()
-		b.ReportAllocs()
-		b.ResetTimer()
-		for n := 0; n < b.N; n++ {
-			for _, key := range keys {
-				d.Set(key, value, ttl)
-			}
-			for _, key := range keys {
-				_, _ = d.Get(key)
-			}
-			for _, key := range keys {
-				d.Delete(key)
-			}
-		}
-	})
+	require.NoError(b, err)
+}
+
+func Benchmark_Memory_Get(b *testing.B) {
+	testStore := New()
+	err := testStore.Set("john", []byte("doe"), 0)
+	require.NoError(b, err)
+
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		_, err = testStore.Get("john")
+	}
+
+	require.NoError(b, err)
+}
+
+func Benchmark_Memory_SetAndDelete(b *testing.B) {
+	testStore := New()
+	b.ReportAllocs()
+	b.ResetTimer()
+
+	var err error
+	for i := 0; i < b.N; i++ {
+		_ = testStore.Set("john", []byte("doe"), 0)
+		err = testStore.Delete("john")
+	}
+
+	require.NoError(b, err)
 }

minio/README.md

@@ -0,0 +1,137 @@
+---
+id: minio
+title: Minio
+---
+
+![Release](https://img.shields.io/github/v/tag/gofiber/storage?filter=minio*)
+[![Discord](https://img.shields.io/discord/704680098577514527?style=flat&label=%F0%9F%92%AC%20discord&color=00ACD7)](https://gofiber.io/discord)
+![Test](https://img.shields.io/github/actions/workflow/status/gofiber/storage/test-minio.yml?label=Tests)
+![Security](https://img.shields.io/github/actions/workflow/status/gofiber/storage/gosec.yml?label=Security)
+![Linter](https://img.shields.io/github/actions/workflow/status/gofiber/storage/linter.yml?label=Linter)
+
+## Minio
+
+A Minio storage driver using [minio/minio-go](https://github.com/minio/minio-go).
+
+**Note: Requires Go 1.19 and above**
+
+### Table of Contents
+- [Signatures](#signatures)
+- [Installation](#installation)
+- [Examples](#examples)
+- [Config](#config)
+- [Default Config](#default-config)
+
+### Signatures
+```go
+func New(config ...Config) Storage
+func (s *Storage) Get(key string) ([]byte, error)
+func (s *Storage) Set(key string, val []byte, exp time.Duration) error
+func (s *Storage) Delete(key string) error
+func (s *Storage) Reset() error
+func (s *Storage) Close() error
+func (s *Storage) CheckBucket() error
+func (s *Storage) CreateBucket() error
+func (s *Storage) RemoveBucket() error
+func (s *Storage) Conn() *minio.Client
+```
+### Installation
+Install the Minio implementation:
+```bash
+go get github.com/gofiber/storage/minio
+```
+And then run minio on Docker
+```bash
+docker run -d --restart always -p 9000:9000 -p 9001:9001 --name storage-minio --volume=minio:/var/lib/minio -e MINIO_ROOT_USER='minio-user' -e MINIO_ROOT_PASSWORD='minio-password' minio/minio server --console-address ":9001" /var/lib/minio
+```
+
+### Examples
+Import the storage package.
+```go
+import "github.com/gofiber/storage/minio"
+```
+
+You can use the following possibilities to create a storage:
+```go
+// Initialize default config
+store := minio.New()
+
+// Initialize custom config
+store := minio.New(minio.Config{
+    Bucket:   "fiber-bucket",
+    Endpoint: "localhost:9000",
+    Credentials: Credentials{
+        AccessKeyID:     "minio-user",
+        SecretAccessKey: "minio-password",
+    },
+})
+```
+
+### Config
+```go
+// Config defines the config for storage.
+type Config struct {
+    // Bucket
+    // Default fiber-bucket
+    Bucket string
+    
+    // Endpoint is a host name or an IP address
+    Endpoint string
+    
+    // Region Set this value to override region cache
+    // Optional
+    Region string
+    
+    // Token Set this value to provide x-amz-security-token (AWS S3 specific)
+    // Optional, Default is false
+    Token string
+    
+    // Secure If set to true, https is used instead of http.
+    // Default is false
+    Secure bool
+    
+    // Reset clears any existing keys in existing Bucket
+    // Optional. Default is false
+    Reset bool
+    
+    // Credentials Minio access key and Minio secret key.
+    // Need to be defined
+    Credentials Credentials
+    
+    // GetObjectOptions Options for GET requests specifying additional options like encryption, If-Match
+    GetObjectOptions minio.GetObjectOptions
+    
+    // PutObjectOptions
+    // Allows user to set optional custom metadata, content headers, encryption keys and number of threads for multipart upload operation.
+    PutObjectOptions minio.PutObjectOptions
+    
+    // ListObjectsOptions Options per to list objects
+    ListObjectsOptions minio.ListObjectsOptions
+    
+    // RemoveObjectOptions Allows user to set options
+    RemoveObjectOptions minio.RemoveObjectOptions
+}
+```
+
+### Default Config
+The default configuration lacks Bucket, Region, and Endpoint which are all required and must be overwritten:
+```go
+// ConfigDefault is the default config
+var ConfigDefault = Config{
+    Bucket:              "fiber-bucket",
+    Endpoint:            "",
+    Region:              "",
+    Token:               "",
+    Secure:              false,
+    Reset:               false,
+    Credentials:         Credentials{},
+    GetObjectOptions:    minio.GetObjectOptions{},
+    PutObjectOptions:    minio.PutObjectOptions{},
+    ListObjectsOptions:  minio.ListObjectsOptions{},
+    RemoveObjectOptions: minio.RemoveObjectOptions{},
+}
+type Credentials struct {
+    AccessKeyID     string
+    SecretAccessKey string
+}
+```

minio/config.go

@@ -0,0 +1,88 @@
+package minio
+
+import (
+	"github.com/minio/minio-go/v7"
+)
+
+// Config defines the config for storage.
+type Config struct {
+	// Bucket
+	// Default fiber-bucket
+	Bucket string
+
+	// Endpoint is a host name or an IP address
+	Endpoint string
+
+	// Region Set this value to override region cache
+	// Optional
+	Region string
+
+	// Token Set this value to provide x-amz-security-token (AWS S3 specific)
+	// Optional, Default is false
+	Token string
+
+	// Secure If set to true, https is used instead of http.
+	// Default is false
+	Secure bool
+
+	// Reset clears any existing keys in existing Bucket
+	// Optional. Default is false
+	Reset bool
+
+	// Credentials Minio access key and Minio secret key.
+	// Need to be defined
+	Credentials Credentials
+
+	// GetObjectOptions Options for GET requests specifying additional options like encryption, If-Match
+	GetObjectOptions minio.GetObjectOptions
+
+	// PutObjectOptions
+	// Allows user to set optional custom metadata, content headers, encryption keys and number of threads for multipart upload operation.
+	PutObjectOptions minio.PutObjectOptions
+
+	// ListObjectsOptions Options per to list objects
+	ListObjectsOptions minio.ListObjectsOptions
+
+	// RemoveObjectOptions Allows user to set options
+	RemoveObjectOptions minio.RemoveObjectOptions
+}
+
+type Credentials struct {
+	// AccessKeyID is like user-id that uniquely identifies your account.
+	AccessKeyID string
+	// SecretAccessKey is the password to your account.
+	SecretAccessKey string
+}
+
+// ConfigDefault is the default config
+var ConfigDefault = Config{
+	Bucket:              "fiber-bucket",
+	Endpoint:            "",
+	Region:              "",
+	Token:               "",
+	Secure:              false,
+	Reset:               false,
+	Credentials:         Credentials{},
+	GetObjectOptions:    minio.GetObjectOptions{},
+	PutObjectOptions:    minio.PutObjectOptions{},
+	ListObjectsOptions:  minio.ListObjectsOptions{},
+	RemoveObjectOptions: minio.RemoveObjectOptions{},
+}
+
+// Helper function to set default values
+func configDefault(config ...Config) Config {
+	// Return default config if nothing provided
+	if len(config) < 1 {
+		return ConfigDefault
+	}
+
+	// Override default config
+	cfg := config[0]
+
+	// Set default values
+	if cfg.Bucket == "" {
+		cfg.Bucket = ConfigDefault.Bucket
+	}
+
+	return cfg
+}

minio/go.mod

@@ -0,0 +1,31 @@
+module github.com/gofiber/storage/minio
+
+go 1.19
+
+require (
+	github.com/minio/minio-go/v7 v7.0.66
+	github.com/stretchr/testify v1.8.4
+	github.com/valyala/bytebufferpool v1.0.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/google/uuid v1.5.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/sha256-simd v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rs/xid v1.5.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

minio/go.sum

@@ -0,0 +1,56 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
+github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
+github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
+github.com/minio/minio-go/v7 v7.0.66 h1:bnTOXOHjOqv/gcMuiVbN9o2ngRItvqE774dG9nq0Dzw=
+github.com/minio/minio-go/v7 v7.0.66/go.mod h1:DHAgmyQEGdW3Cif0UooKOyrT3Vxs82zNdV6tkKhRtbs=
+github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
+github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

minio/minio.go

@@ -0,0 +1,175 @@
+package minio
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"log"
+	"net/http"
+	"sync"
+	"time"
+
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	"github.com/valyala/bytebufferpool"
+)
+
+// Storage interface that is implemented by storage providers
+type Storage struct {
+	minio *minio.Client
+	cfg   Config
+	ctx   context.Context
+	mu    sync.Mutex
+}
+
+// New creates a new storage
+func New(config ...Config) *Storage {
+
+	// Set default config
+	cfg := configDefault(config...)
+
+	// Minio instance
+	minioClient, err := minio.New(cfg.Endpoint, &minio.Options{
+		Creds:  credentials.NewStaticV4(cfg.Credentials.AccessKeyID, cfg.Credentials.SecretAccessKey, cfg.Token),
+		Secure: cfg.Secure,
+		Region: cfg.Region,
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	storage := &Storage{minio: minioClient, cfg: cfg, ctx: context.Background()}
+
+	// Reset all entries if set to true
+	if cfg.Reset {
+		if err = storage.Reset(); err != nil {
+			panic(err)
+		}
+	}
+
+	// check bucket
+	err = storage.CheckBucket()
+	if err != nil {
+		// create bucket
+		err = storage.CreateBucket()
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	return storage
+}
+
+// Get value by key
+func (s *Storage) Get(key string) ([]byte, error) {
+
+	if len(key) <= 0 {
+		return nil, errors.New("the key value is required")
+	}
+
+	// get object
+	object, err := s.minio.GetObject(s.ctx, s.cfg.Bucket, key, s.cfg.GetObjectOptions)
+	if err != nil {
+		return nil, err
+	}
+
+	// convert to byte
+	bb := bytebufferpool.Get()
+	defer bytebufferpool.Put(bb)
+	_, err = bb.ReadFrom(object)
+	if err != nil {
+		return nil, err
+	}
+	return bb.Bytes(), nil
+}
+
+// Set key with value
+func (s *Storage) Set(key string, val []byte, exp time.Duration) error {
+
+	if len(key) <= 0 {
+		return errors.New("the key value is required")
+	}
+
+	// create Reader
+	file := bytes.NewReader(val)
+
+	// set content type
+	s.mu.Lock()
+	s.cfg.PutObjectOptions.ContentType = http.DetectContentType(val)
+
+	// put object
+	_, err := s.minio.PutObject(s.ctx, s.cfg.Bucket, key, file, file.Size(), s.cfg.PutObjectOptions)
+	s.mu.Unlock()
+
+	return err
+}
+
+// Delete entry by key
+func (s *Storage) Delete(key string) error {
+
+	if len(key) <= 0 {
+		return errors.New("the key value is required")
+	}
+
+	// remove
+	err := s.minio.RemoveObject(s.ctx, s.cfg.Bucket, key, s.cfg.RemoveObjectOptions)
+
+	return err
+}
+
+// Reset all entries, including unexpired
+func (s *Storage) Reset() error {
+
+	objectsCh := make(chan minio.ObjectInfo)
+
+	// Send object names that are needed to be removed to objectsCh
+	go func() {
+		defer close(objectsCh)
+		// List all objects from a bucket-name with a matching prefix.
+		for object := range s.minio.ListObjects(s.ctx, s.cfg.Bucket, s.cfg.ListObjectsOptions) {
+			if object.Err != nil {
+				log.Println(object.Err)
+			}
+			objectsCh <- object
+		}
+	}()
+
+	opts := minio.RemoveObjectsOptions{
+		GovernanceBypass: true,
+	}
+
+	for err := range s.minio.RemoveObjects(s.ctx, s.cfg.Bucket, objectsCh, opts) {
+		log.Println("Error detected during deletion: ", err)
+	}
+
+	return nil
+}
+
+// Close the storage
+func (s *Storage) Close() error {
+	return nil
+}
+
+// CheckBucket Check to see if bucket already exists
+func (s *Storage) CheckBucket() error {
+	exists, err := s.minio.BucketExists(s.ctx, s.cfg.Bucket)
+	if !exists || err != nil {
+		return errors.New("the specified bucket does not exist")
+	}
+	return nil
+}
+
+// CreateBucket Bucket not found so Make a new bucket
+func (s *Storage) CreateBucket() error {
+	return s.minio.MakeBucket(s.ctx, s.cfg.Bucket, minio.MakeBucketOptions{Region: s.cfg.Region})
+}
+
+// RemoveBucket Bucket remove if bucket is empty
+func (s *Storage) RemoveBucket() error {
+	return s.minio.RemoveBucket(s.ctx, s.cfg.Bucket)
+}
+
+// Conn Return minio client
+func (s *Storage) Conn() *minio.Client {
+	return s.minio
+}