From 072c0e3b0296f6aa082398cdcb58fe256605e01e Mon Sep 17 00:00:00 2001 From: Coleman Kane Date: Sat, 6 Apr 2024 13:47:18 -0400 Subject: [PATCH] [graphql] Replace redlock@5.0.0-beta.2 w/ @sesamecare-oss/redlock@1.2.1 --- opencti-platform/opencti-graphql/package.json | 2 +- .../opencti-graphql/src/database/redis.ts | 2 +- opencti-platform/opencti-graphql/yarn.lock | 20 +++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/opencti-platform/opencti-graphql/package.json b/opencti-platform/opencti-graphql/package.json index a4c8d3a7f58a2..e9d9ba8258fbb 100644 --- a/opencti-platform/opencti-graphql/package.json +++ b/opencti-platform/opencti-graphql/package.json @@ -63,6 +63,7 @@ "@opentelemetry/sdk-trace-base": "1.23.0", "@opentelemetry/sdk-trace-node": "1.23.0", "@opentelemetry/semantic-conventions": "1.23.0", + "@sesamecare-oss/redlock": "1.2.1", "ajv": "8.12.0", "amqplib": "0.10.3", "antlr4": "4.13.1", @@ -136,7 +137,6 @@ "prom-client": "15.1.0", "python-shell": "5.0.0", "ramda": "0.29.1", - "redlock": "5.0.0-beta.2", "sanitize-filename": "1.6.3", "semver": "7.6.0", "set-interval-async": "3.0.3", diff --git a/opencti-platform/opencti-graphql/src/database/redis.ts b/opencti-platform/opencti-graphql/src/database/redis.ts index 748dce76a06dc..82ed743e85386 100644 --- a/opencti-platform/opencti-graphql/src/database/redis.ts +++ b/opencti-platform/opencti-graphql/src/database/redis.ts @@ -1,6 +1,6 @@ import { SEMATTRS_DB_NAME } from '@opentelemetry/semantic-conventions'; import Redis, { Cluster, type RedisOptions } from 'ioredis'; -import Redlock from 'redlock'; +import { Redlock } from '@sesamecare-oss/redlock'; import * as jsonpatch from 'fast-json-patch'; import { RedisPubSub } from 'graphql-redis-subscriptions'; import * as R from 'ramda'; diff --git a/opencti-platform/opencti-graphql/yarn.lock b/opencti-platform/opencti-graphql/yarn.lock index 1c74053c0f5f8..797b94042d7a0 100644 --- a/opencti-platform/opencti-graphql/yarn.lock +++ b/opencti-platform/opencti-graphql/yarn.lock @@ -3760,6 +3760,15 @@ __metadata: languageName: node linkType: hard +"@sesamecare-oss/redlock@npm:1.2.1": + version: 1.2.1 + resolution: "@sesamecare-oss/redlock@npm:1.2.1" + peerDependencies: + ioredis: ">=5" + checksum: 10/b4dc20c4ac1ade779e84fdd429617986fea84199be98948f27b2b2cecdc3033e7397e077b59ee78958f0dc16340e51af913a25e41d0bfcb89be6911d721ee365 + languageName: node + linkType: hard + "@sinclair/typebox@npm:^0.27.8": version: 0.27.8 resolution: "@sinclair/typebox@npm:0.27.8" @@ -11064,6 +11073,7 @@ __metadata: "@opentelemetry/sdk-trace-node": "npm:1.23.0" "@opentelemetry/semantic-conventions": "npm:1.23.0" "@rollup/plugin-graphql": "npm:2.0.4" + "@sesamecare-oss/redlock": "npm:1.2.1" "@types/bcryptjs": "npm:2.4.6" "@types/bluebird": "npm:3.5.42" "@types/dot-object": "npm:2.1.6" @@ -11167,7 +11177,6 @@ __metadata: prom-client: "npm:15.1.0" python-shell: "npm:5.0.0" ramda: "npm:0.29.1" - redlock: "npm:5.0.0-beta.2" sanitize-filename: "npm:1.6.3" semver: "npm:7.6.0" set-interval-async: "npm:3.0.3" @@ -12017,15 +12026,6 @@ __metadata: languageName: node linkType: hard -"redlock@npm:5.0.0-beta.2": - version: 5.0.0-beta.2 - resolution: "redlock@npm:5.0.0-beta.2" - dependencies: - node-abort-controller: "npm:^3.0.1" - checksum: 10/c1df94fb229182ccf59b744f600b45f2cda1d9c7e5b87b9bbf5c3ef92eb47339af7b33b80dc71e97c08c1f476443be68987dad6c49cfc1a89e9a647127884963 - languageName: node - linkType: hard - "reflect.getprototypeof@npm:^1.0.4": version: 1.0.6 resolution: "reflect.getprototypeof@npm:1.0.6"