From 519dd274bf91851269c8f55c6678b9e0d2d1734f Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 12 Jul 2021 17:47:15 +0100 Subject: [PATCH] [misc] switch from settings-sharelatex to @overleaf/settings --- services/document-updater/app.js | 2 +- .../app/js/DeleteQueueManager.js | 2 +- .../app/js/DispatchManager.js | 2 +- .../document-updater/app/js/HistoryManager.js | 2 +- .../app/js/HistoryRedisManager.js | 2 +- .../document-updater/app/js/HttpController.js | 2 +- .../document-updater/app/js/LockManager.js | 2 +- .../app/js/PersistenceManager.js | 2 +- services/document-updater/app/js/Profiler.js | 2 +- .../document-updater/app/js/ProjectFlusher.js | 2 +- .../app/js/ProjectHistoryRedisManager.js | 2 +- .../app/js/RateLimitManager.js | 2 +- .../app/js/RealTimeRedisManager.js | 2 +- .../document-updater/app/js/RedisManager.js | 2 +- .../app/js/ShareJsUpdateManager.js | 2 +- .../document-updater/app/js/UpdateManager.js | 2 +- services/document-updater/app/js/mongodb.js | 2 +- services/document-updater/expire_docops.js | 2 +- services/document-updater/package-lock.json | 20 +++++-------------- services/document-updater/package.json | 4 ++-- .../js/ApplyingUpdatesToADocTests.js | 2 +- .../ApplyingUpdatesToProjectStructureTests.js | 2 +- .../acceptance/js/SettingADocumentTests.js | 2 +- .../test/acceptance/js/SizeCheckTests.js | 2 +- .../acceptance/js/helpers/DocUpdaterClient.js | 2 +- .../DispatchManager/DispatchManagerTests.js | 2 +- .../js/HistoryManager/HistoryManagerTests.js | 2 +- .../HistoryRedisManagerTests.js | 2 +- .../unit/js/LockManager/ReleasingTheLock.js | 2 +- .../test/unit/js/LockManager/tryLockTests.js | 2 +- .../PersistenceManagerTests.js | 2 +- .../ProjectHistoryRedisManagerTests.js | 2 +- .../js/RateLimitManager/RateLimitManager.js | 2 +- .../RealTimeRedisManagerTests.js | 2 +- .../unit/js/RedisManager/RedisManagerTests.js | 2 +- .../js/UpdateManager/UpdateManagerTests.js | 2 +- 36 files changed, 41 insertions(+), 51 deletions(-) diff --git a/services/document-updater/app.js b/services/document-updater/app.js index d8b67dd31e..553ab9403b 100644 --- a/services/document-updater/app.js +++ b/services/document-updater/app.js @@ -2,7 +2,7 @@ const Metrics = require('@overleaf/metrics') Metrics.initialize('doc-updater') const express = require('express') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const logger = require('logger-sharelatex') logger.initialize('document-updater') diff --git a/services/document-updater/app/js/DeleteQueueManager.js b/services/document-updater/app/js/DeleteQueueManager.js index fc5bb904e3..36466f8b10 100644 --- a/services/document-updater/app/js/DeleteQueueManager.js +++ b/services/document-updater/app/js/DeleteQueueManager.js @@ -13,7 +13,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let DeleteQueueManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const RedisManager = require('./RedisManager') const ProjectManager = require('./ProjectManager') const logger = require('logger-sharelatex') diff --git a/services/document-updater/app/js/DispatchManager.js b/services/document-updater/app/js/DispatchManager.js index c600adec7b..e94e6cde0e 100644 --- a/services/document-updater/app/js/DispatchManager.js +++ b/services/document-updater/app/js/DispatchManager.js @@ -15,7 +15,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let DispatchManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const logger = require('logger-sharelatex') const Keys = require('./UpdateKeys') const redis = require('@overleaf/redis-wrapper') diff --git a/services/document-updater/app/js/HistoryManager.js b/services/document-updater/app/js/HistoryManager.js index 18c5b7f6d2..4b7de3f5af 100644 --- a/services/document-updater/app/js/HistoryManager.js +++ b/services/document-updater/app/js/HistoryManager.js @@ -15,7 +15,7 @@ let HistoryManager const async = require('async') const logger = require('logger-sharelatex') const request = require('request') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const HistoryRedisManager = require('./HistoryRedisManager') const ProjectHistoryRedisManager = require('./ProjectHistoryRedisManager') const RedisManager = require('./RedisManager') diff --git a/services/document-updater/app/js/HistoryRedisManager.js b/services/document-updater/app/js/HistoryRedisManager.js index 20ce0651dd..bd7b3672f4 100644 --- a/services/document-updater/app/js/HistoryRedisManager.js +++ b/services/document-updater/app/js/HistoryRedisManager.js @@ -12,7 +12,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let HistoryRedisManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const rclient = require('@overleaf/redis-wrapper').createClient( Settings.redis.history ) diff --git a/services/document-updater/app/js/HttpController.js b/services/document-updater/app/js/HttpController.js index 5e47cf5bf1..9959a84b07 100644 --- a/services/document-updater/app/js/HttpController.js +++ b/services/document-updater/app/js/HttpController.js @@ -3,7 +3,7 @@ const HistoryManager = require('./HistoryManager') const ProjectManager = require('./ProjectManager') const Errors = require('./Errors') const logger = require('logger-sharelatex') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const Metrics = require('./Metrics') const ProjectFlusher = require('./ProjectFlusher') const DeleteQueueManager = require('./DeleteQueueManager') diff --git a/services/document-updater/app/js/LockManager.js b/services/document-updater/app/js/LockManager.js index 1c4427ed44..c23379d811 100644 --- a/services/document-updater/app/js/LockManager.js +++ b/services/document-updater/app/js/LockManager.js @@ -13,7 +13,7 @@ */ let LockManager const metrics = require('./Metrics') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const redis = require('@overleaf/redis-wrapper') const rclient = redis.createClient(Settings.redis.lock) const keys = Settings.redis.lock.key_schema diff --git a/services/document-updater/app/js/PersistenceManager.js b/services/document-updater/app/js/PersistenceManager.js index fca23a7c47..664d36a3c7 100644 --- a/services/document-updater/app/js/PersistenceManager.js +++ b/services/document-updater/app/js/PersistenceManager.js @@ -15,7 +15,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let PersistenceManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const Errors = require('./Errors') const Metrics = require('./Metrics') const logger = require('logger-sharelatex') diff --git a/services/document-updater/app/js/Profiler.js b/services/document-updater/app/js/Profiler.js index 60431e64cb..6f7a66a7aa 100644 --- a/services/document-updater/app/js/Profiler.js +++ b/services/document-updater/app/js/Profiler.js @@ -9,7 +9,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let Profiler -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const logger = require('logger-sharelatex') const deltaMs = function (ta, tb) { diff --git a/services/document-updater/app/js/ProjectFlusher.js b/services/document-updater/app/js/ProjectFlusher.js index 7f9783ac0d..704600fbc3 100644 --- a/services/document-updater/app/js/ProjectFlusher.js +++ b/services/document-updater/app/js/ProjectFlusher.js @@ -13,7 +13,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ const request = require('request') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const RedisManager = require('./RedisManager') const { rclient } = RedisManager const docUpdaterKeys = Settings.redis.documentupdater.key_schema diff --git a/services/document-updater/app/js/ProjectHistoryRedisManager.js b/services/document-updater/app/js/ProjectHistoryRedisManager.js index ab7a9d0faa..3d8b0cd95a 100644 --- a/services/document-updater/app/js/ProjectHistoryRedisManager.js +++ b/services/document-updater/app/js/ProjectHistoryRedisManager.js @@ -14,7 +14,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let ProjectHistoryRedisManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const projectHistoryKeys = __guard__( Settings.redis != null ? Settings.redis.project_history : undefined, (x) => x.key_schema diff --git a/services/document-updater/app/js/RateLimitManager.js b/services/document-updater/app/js/RateLimitManager.js index 831b34eae1..9b699235b7 100644 --- a/services/document-updater/app/js/RateLimitManager.js +++ b/services/document-updater/app/js/RateLimitManager.js @@ -10,7 +10,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let RateLimiter -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const logger = require('logger-sharelatex') const Metrics = require('./Metrics') diff --git a/services/document-updater/app/js/RealTimeRedisManager.js b/services/document-updater/app/js/RealTimeRedisManager.js index 1059dc6079..298fb26940 100644 --- a/services/document-updater/app/js/RealTimeRedisManager.js +++ b/services/document-updater/app/js/RealTimeRedisManager.js @@ -12,7 +12,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let RealTimeRedisManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const rclient = require('@overleaf/redis-wrapper').createClient( Settings.redis.documentupdater ) diff --git a/services/document-updater/app/js/RedisManager.js b/services/document-updater/app/js/RedisManager.js index 418e3ec6d4..59eb10e332 100644 --- a/services/document-updater/app/js/RedisManager.js +++ b/services/document-updater/app/js/RedisManager.js @@ -14,7 +14,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let RedisManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const rclient = require('@overleaf/redis-wrapper').createClient( Settings.redis.documentupdater ) diff --git a/services/document-updater/app/js/ShareJsUpdateManager.js b/services/document-updater/app/js/ShareJsUpdateManager.js index 8ae91df32c..19bfee9ea4 100644 --- a/services/document-updater/app/js/ShareJsUpdateManager.js +++ b/services/document-updater/app/js/ShareJsUpdateManager.js @@ -16,7 +16,7 @@ let ShareJsUpdateManager const ShareJsModel = require('./sharejs/server/model') const ShareJsDB = require('./ShareJsDB') const logger = require('logger-sharelatex') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const Keys = require('./UpdateKeys') const { EventEmitter } = require('events') const util = require('util') diff --git a/services/document-updater/app/js/UpdateManager.js b/services/document-updater/app/js/UpdateManager.js index e92e40f44c..999994d556 100644 --- a/services/document-updater/app/js/UpdateManager.js +++ b/services/document-updater/app/js/UpdateManager.js @@ -20,7 +20,7 @@ const RedisManager = require('./RedisManager') const RealTimeRedisManager = require('./RealTimeRedisManager') const ShareJsUpdateManager = require('./ShareJsUpdateManager') const HistoryManager = require('./HistoryManager') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const _ = require('lodash') const async = require('async') const logger = require('logger-sharelatex') diff --git a/services/document-updater/app/js/mongodb.js b/services/document-updater/app/js/mongodb.js index 86b015a308..115d0adcb7 100644 --- a/services/document-updater/app/js/mongodb.js +++ b/services/document-updater/app/js/mongodb.js @@ -1,4 +1,4 @@ -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const { MongoClient, ObjectId } = require('mongodb') const clientPromise = MongoClient.connect( diff --git a/services/document-updater/expire_docops.js b/services/document-updater/expire_docops.js index 398bf5229a..b9fafb072d 100644 --- a/services/document-updater/expire_docops.js +++ b/services/document-updater/expire_docops.js @@ -1,4 +1,4 @@ -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const rclient = require('@overleaf/redis-wrapper').createClient( Settings.redis.documentupdater ) diff --git a/services/document-updater/package-lock.json b/services/document-updater/package-lock.json index bda3f21608..ff38a00247 100644 --- a/services/document-updater/package-lock.json +++ b/services/document-updater/package-lock.json @@ -926,6 +926,11 @@ "ioredis": "~4.27.1" } }, + "@overleaf/settings": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@overleaf/settings/-/settings-2.1.1.tgz", + "integrity": "sha512-vcJwqCGFKmQxTP/syUqCeMaSRjHmBcQgKOACR9He2uJcErg2GZPa1go+nGvszMbkElM4HfRKm/MfxvqHhoN4TQ==" + }, "@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -6239,21 +6244,6 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, - "settings-sharelatex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/settings-sharelatex/-/settings-sharelatex-1.3.0.tgz", - "integrity": "sha512-AWSeCiY1eHi+z6DF4bmTyC3tusOc6EF5zDkC28aAOhEAbgVEIuY034kx1X7a4j9HE0iVs0sVOlZrQMWJBVk3oQ==", - "requires": { - "coffee-script": "1.6.0" - }, - "dependencies": { - "coffee-script": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", - "integrity": "sha1-gIs5bhEPU9AhoZpO8fZb4OjjX6M=" - } - } - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", diff --git a/services/document-updater/package.json b/services/document-updater/package.json index 230fd6f7cb..44c57d0e05 100644 --- a/services/document-updater/package.json +++ b/services/document-updater/package.json @@ -21,6 +21,7 @@ "@overleaf/metrics": "^3.5.1", "@overleaf/o-error": "^3.3.1", "@overleaf/redis-wrapper": "^2.0.1", + "@overleaf/settings": "^2.1.1", "async": "^2.5.0", "body-parser": "^1.19.0", "bunyan": "^1.8.15", @@ -30,8 +31,7 @@ "logger-sharelatex": "^2.2.0", "mongodb": "^3.6.6", "request": "^2.88.2", - "requestretry": "^4.1.2", - "settings-sharelatex": "^1.3.0" + "requestretry": "^4.1.2" }, "devDependencies": { "babel-eslint": "^10.1.0", diff --git a/services/document-updater/test/acceptance/js/ApplyingUpdatesToADocTests.js b/services/document-updater/test/acceptance/js/ApplyingUpdatesToADocTests.js index adf045645e..4c069008bc 100644 --- a/services/document-updater/test/acceptance/js/ApplyingUpdatesToADocTests.js +++ b/services/document-updater/test/acceptance/js/ApplyingUpdatesToADocTests.js @@ -14,7 +14,7 @@ const sinon = require('sinon') const { expect } = require('chai') const async = require('async') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const rclient_history = require('@overleaf/redis-wrapper').createClient( Settings.redis.history ) // note: this is track changes, not project-history diff --git a/services/document-updater/test/acceptance/js/ApplyingUpdatesToProjectStructureTests.js b/services/document-updater/test/acceptance/js/ApplyingUpdatesToProjectStructureTests.js index 3bc2c793e1..ea4cc7b0ee 100644 --- a/services/document-updater/test/acceptance/js/ApplyingUpdatesToProjectStructureTests.js +++ b/services/document-updater/test/acceptance/js/ApplyingUpdatesToProjectStructureTests.js @@ -1,5 +1,5 @@ const sinon = require('sinon') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const rclientProjectHistory = require('@overleaf/redis-wrapper').createClient( Settings.redis.project_history ) diff --git a/services/document-updater/test/acceptance/js/SettingADocumentTests.js b/services/document-updater/test/acceptance/js/SettingADocumentTests.js index 7d2307c526..60d46dcdec 100644 --- a/services/document-updater/test/acceptance/js/SettingADocumentTests.js +++ b/services/document-updater/test/acceptance/js/SettingADocumentTests.js @@ -1,6 +1,6 @@ const sinon = require('sinon') const { expect } = require('chai') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const docUpdaterRedis = require('@overleaf/redis-wrapper').createClient( Settings.redis.documentupdater ) diff --git a/services/document-updater/test/acceptance/js/SizeCheckTests.js b/services/document-updater/test/acceptance/js/SizeCheckTests.js index 288cc485e1..ed893884be 100644 --- a/services/document-updater/test/acceptance/js/SizeCheckTests.js +++ b/services/document-updater/test/acceptance/js/SizeCheckTests.js @@ -1,5 +1,5 @@ const { expect } = require('chai') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const MockWebApi = require('./helpers/MockWebApi') const DocUpdaterClient = require('./helpers/DocUpdaterClient') diff --git a/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js b/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js index 719df741c3..ee356d3bf7 100644 --- a/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js +++ b/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js @@ -1,5 +1,5 @@ let DocUpdaterClient -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const _ = require('lodash') const rclient = require('@overleaf/redis-wrapper').createClient( Settings.redis.documentupdater diff --git a/services/document-updater/test/unit/js/DispatchManager/DispatchManagerTests.js b/services/document-updater/test/unit/js/DispatchManager/DispatchManagerTests.js index 81ef37f4be..d4cb72b89d 100644 --- a/services/document-updater/test/unit/js/DispatchManager/DispatchManagerTests.js +++ b/services/document-updater/test/unit/js/DispatchManager/DispatchManagerTests.js @@ -23,7 +23,7 @@ describe('DispatchManager', function () { this.DispatchManager = SandboxedModule.require(modulePath, { requires: { './UpdateManager': (this.UpdateManager = {}), - 'settings-sharelatex': (this.settings = { + '@overleaf/settings': (this.settings = { redis: { documentupdater: {} } diff --git a/services/document-updater/test/unit/js/HistoryManager/HistoryManagerTests.js b/services/document-updater/test/unit/js/HistoryManager/HistoryManagerTests.js index df3261b0f4..5f1529ab0b 100644 --- a/services/document-updater/test/unit/js/HistoryManager/HistoryManagerTests.js +++ b/services/document-updater/test/unit/js/HistoryManager/HistoryManagerTests.js @@ -21,7 +21,7 @@ describe('HistoryManager', function () { this.HistoryManager = SandboxedModule.require(modulePath, { requires: { request: (this.request = {}), - 'settings-sharelatex': (this.Settings = { + '@overleaf/settings': (this.Settings = { apis: { project_history: { enabled: true, diff --git a/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js b/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js index f9b719991a..626398fc6b 100644 --- a/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js +++ b/services/document-updater/test/unit/js/HistoryRedisManager/HistoryRedisManagerTests.js @@ -26,7 +26,7 @@ describe('HistoryRedisManager', function () { this.HistoryRedisManager = SandboxedModule.require(modulePath, { requires: { '@overleaf/redis-wrapper': { createClient: () => this.rclient }, - 'settings-sharelatex': { + '@overleaf/settings': { redis: { history: (this.settings = { key_schema: { diff --git a/services/document-updater/test/unit/js/LockManager/ReleasingTheLock.js b/services/document-updater/test/unit/js/LockManager/ReleasingTheLock.js index 3d6cf7a5ba..177869d0db 100644 --- a/services/document-updater/test/unit/js/LockManager/ReleasingTheLock.js +++ b/services/document-updater/test/unit/js/LockManager/ReleasingTheLock.js @@ -30,7 +30,7 @@ describe('LockManager - releasing the lock', function () { '@overleaf/redis-wrapper': { createClient: () => this.client }, - 'settings-sharelatex': { + '@overleaf/settings': { redis: { lock: { key_schema: { diff --git a/services/document-updater/test/unit/js/LockManager/tryLockTests.js b/services/document-updater/test/unit/js/LockManager/tryLockTests.js index fb49e94aa1..ef92b50214 100644 --- a/services/document-updater/test/unit/js/LockManager/tryLockTests.js +++ b/services/document-updater/test/unit/js/LockManager/tryLockTests.js @@ -29,7 +29,7 @@ describe('LockManager - trying the lock', function () { } }, './Metrics': { inc() {} }, - 'settings-sharelatex': { + '@overleaf/settings': { redis: { lock: { key_schema: { diff --git a/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js b/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js index 4015ef2662..a9137175b6 100644 --- a/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js +++ b/services/document-updater/test/unit/js/PersistenceManager/PersistenceManagerTests.js @@ -23,7 +23,7 @@ describe('PersistenceManager', function () { this.PersistenceManager = SandboxedModule.require(modulePath, { requires: { requestretry: this.request, - 'settings-sharelatex': (this.Settings = {}), + '@overleaf/settings': (this.Settings = {}), './Metrics': (this.Metrics = { Timer: (Timer = (function () { Timer = class Timer { diff --git a/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js b/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js index 1ff3d53ded..8e20214e88 100644 --- a/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js +++ b/services/document-updater/test/unit/js/ProjectHistoryRedisManager/ProjectHistoryRedisManagerTests.js @@ -28,7 +28,7 @@ describe('ProjectHistoryRedisManager', function () { modulePath, { requires: { - 'settings-sharelatex': (this.settings = { + '@overleaf/settings': (this.settings = { redis: { project_history: { key_schema: { diff --git a/services/document-updater/test/unit/js/RateLimitManager/RateLimitManager.js b/services/document-updater/test/unit/js/RateLimitManager/RateLimitManager.js index 8fef08051f..6c488c4c29 100644 --- a/services/document-updater/test/unit/js/RateLimitManager/RateLimitManager.js +++ b/services/document-updater/test/unit/js/RateLimitManager/RateLimitManager.js @@ -20,7 +20,7 @@ describe('RateLimitManager', function () { let Timer this.RateLimitManager = SandboxedModule.require(modulePath, { requires: { - 'settings-sharelatex': (this.settings = {}), + '@overleaf/settings': (this.settings = {}), './Metrics': (this.Metrics = { Timer: (Timer = (function () { Timer = class Timer { diff --git a/services/document-updater/test/unit/js/RealTimeRedisManager/RealTimeRedisManagerTests.js b/services/document-updater/test/unit/js/RealTimeRedisManager/RealTimeRedisManagerTests.js index 83cd5f99ce..c05ede76df 100644 --- a/services/document-updater/test/unit/js/RealTimeRedisManager/RealTimeRedisManagerTests.js +++ b/services/document-updater/test/unit/js/RealTimeRedisManager/RealTimeRedisManagerTests.js @@ -29,7 +29,7 @@ describe('RealTimeRedisManager', function () { createClient: (config) => config.name === 'pubsub' ? this.pubsubClient : this.rclient }, - 'settings-sharelatex': { + '@overleaf/settings': { redis: { documentupdater: (this.settings = { key_schema: { diff --git a/services/document-updater/test/unit/js/RedisManager/RedisManagerTests.js b/services/document-updater/test/unit/js/RedisManager/RedisManagerTests.js index 29329e8411..7679d217a3 100644 --- a/services/document-updater/test/unit/js/RedisManager/RedisManagerTests.js +++ b/services/document-updater/test/unit/js/RedisManager/RedisManagerTests.js @@ -27,7 +27,7 @@ describe('RedisManager', function () { this.RedisManager = SandboxedModule.require(modulePath, { requires: { './ProjectHistoryRedisManager': (this.ProjectHistoryRedisManager = {}), - 'settings-sharelatex': (this.settings = { + '@overleaf/settings': (this.settings = { documentupdater: { logHashErrors: { write: true, read: true } }, apis: { project_history: { enabled: true } diff --git a/services/document-updater/test/unit/js/UpdateManager/UpdateManagerTests.js b/services/document-updater/test/unit/js/UpdateManager/UpdateManagerTests.js index cac51b9f5f..907fac3d12 100644 --- a/services/document-updater/test/unit/js/UpdateManager/UpdateManagerTests.js +++ b/services/document-updater/test/unit/js/UpdateManager/UpdateManagerTests.js @@ -40,7 +40,7 @@ describe('UpdateManager', function () { return Timer })()) }), - 'settings-sharelatex': (this.Settings = {}), + '@overleaf/settings': (this.Settings = {}), './DocumentManager': (this.DocumentManager = {}), './RangesManager': (this.RangesManager = {}), './SnapshotManager': (this.SnapshotManager = {}),