From b5bb7c3b04ce52e96fe16dd71b20c4e6194ec142 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 12 Jul 2021 17:47:16 +0100 Subject: [PATCH] [misc] switch from settings-sharelatex to @overleaf/settings --- services/track-changes/app.js | 2 +- .../app/js/DocumentUpdaterManager.js | 2 +- .../track-changes/app/js/HealthChecker.js | 2 +- services/track-changes/app/js/LockManager.js | 2 +- services/track-changes/app/js/MongoAWS.js | 2 +- services/track-changes/app/js/PackManager.js | 2 +- services/track-changes/app/js/PackWorker.js | 2 +- services/track-changes/app/js/RedisManager.js | 2 +- .../track-changes/app/js/UpdatesManager.js | 2 +- .../track-changes/app/js/WebApiManager.js | 2 +- services/track-changes/app/js/mongodb.js | 2 +- services/track-changes/package-lock.json | 20 +++++-------------- services/track-changes/package.json | 2 +- .../acceptance/js/AppendingUpdatesTests.js | 2 +- .../acceptance/js/ArchivingUpdatesTests.js | 2 +- .../acceptance/js/FlushingUpdatesTests.js | 2 +- .../test/acceptance/js/GettingADiffTests.js | 2 +- .../test/acceptance/js/GettingUpdatesTests.js | 2 +- .../test/acceptance/js/LockManagerTests.js | 2 +- .../test/acceptance/js/RestoringVersions.js | 2 +- .../acceptance/js/helpers/TrackChangesApp.js | 2 +- .../js/helpers/TrackChangesClient.js | 2 +- .../test/unit/js/DocArchive/MongoAWS.js | 2 +- .../DocumentUpdaterManagerTests.js | 2 +- .../unit/js/LockManager/LockManagerTests.js | 2 +- .../unit/js/PackManager/PackManagerTests.js | 2 +- .../unit/js/RedisManager/RedisManagerTests.js | 2 +- .../js/UpdatesManager/UpdatesManagerTests.js | 2 +- .../js/WebApiManager/WebApiManagerTests.js | 2 +- 29 files changed, 33 insertions(+), 43 deletions(-) diff --git a/services/track-changes/app.js b/services/track-changes/app.js index 9dd8f9440b..4245231b8d 100644 --- a/services/track-changes/app.js +++ b/services/track-changes/app.js @@ -7,7 +7,7 @@ */ const Metrics = require('@overleaf/metrics') Metrics.initialize('track-changes') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const logger = require('logger-sharelatex') const TrackChangesLogger = logger.initialize('track-changes').logger diff --git a/services/track-changes/app/js/DocumentUpdaterManager.js b/services/track-changes/app/js/DocumentUpdaterManager.js index 29247b1664..e3a7c2ce10 100644 --- a/services/track-changes/app/js/DocumentUpdaterManager.js +++ b/services/track-changes/app/js/DocumentUpdaterManager.js @@ -14,7 +14,7 @@ let DocumentUpdaterManager const request = require('request') const logger = require('logger-sharelatex') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') module.exports = DocumentUpdaterManager = { getDocument(project_id, doc_id, callback) { diff --git a/services/track-changes/app/js/HealthChecker.js b/services/track-changes/app/js/HealthChecker.js index afc7ff7fc8..7a645b254d 100644 --- a/services/track-changes/app/js/HealthChecker.js +++ b/services/track-changes/app/js/HealthChecker.js @@ -13,7 +13,7 @@ const { ObjectId } = require('./mongodb') const request = require('request') const async = require('async') -const settings = require('settings-sharelatex') +const settings = require('@overleaf/settings') const { port } = settings.internal.trackchanges const logger = require('logger-sharelatex') const LockManager = require('./LockManager') diff --git a/services/track-changes/app/js/LockManager.js b/services/track-changes/app/js/LockManager.js index 6b94a89233..6cdb03219a 100644 --- a/services/track-changes/app/js/LockManager.js +++ b/services/track-changes/app/js/LockManager.js @@ -10,7 +10,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let LockManager -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const redis = require('@overleaf/redis-wrapper') const rclient = redis.createClient(Settings.redis.lock) const os = require('os') diff --git a/services/track-changes/app/js/MongoAWS.js b/services/track-changes/app/js/MongoAWS.js index c0f88e98e3..cc4001e9ed 100644 --- a/services/track-changes/app/js/MongoAWS.js +++ b/services/track-changes/app/js/MongoAWS.js @@ -14,7 +14,7 @@ * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md */ let MongoAWS -const settings = require('settings-sharelatex') +const settings = require('@overleaf/settings') const logger = require('logger-sharelatex') const AWS = require('aws-sdk') const S3S = require('s3-streams') diff --git a/services/track-changes/app/js/PackManager.js b/services/track-changes/app/js/PackManager.js index 10938fede6..509ba3e1c7 100644 --- a/services/track-changes/app/js/PackManager.js +++ b/services/track-changes/app/js/PackManager.js @@ -24,7 +24,7 @@ const LockManager = require('./LockManager') const MongoAWS = require('./MongoAWS') const Metrics = require('@overleaf/metrics') const ProjectIterator = require('./ProjectIterator') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const keys = Settings.redis.lock.key_schema // Sharejs operations are stored in a 'pack' object diff --git a/services/track-changes/app/js/PackWorker.js b/services/track-changes/app/js/PackWorker.js index dc15ee8f21..fe507fe815 100644 --- a/services/track-changes/app/js/PackWorker.js +++ b/services/track-changes/app/js/PackWorker.js @@ -16,7 +16,7 @@ let LIMIT, pending let project_id, doc_id const { callbackify } = require('util') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const async = require('async') const _ = require('underscore') const { db, ObjectId, waitForDb, closeDb } = require('./mongodb') diff --git a/services/track-changes/app/js/RedisManager.js b/services/track-changes/app/js/RedisManager.js index b995a60128..6a88c31303 100644 --- a/services/track-changes/app/js/RedisManager.js +++ b/services/track-changes/app/js/RedisManager.js @@ -13,7 +13,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 redis = require('@overleaf/redis-wrapper') const rclient = redis.createClient(Settings.redis.history) const Keys = Settings.redis.history.key_schema diff --git a/services/track-changes/app/js/UpdatesManager.js b/services/track-changes/app/js/UpdatesManager.js index 7890208788..2acdf8039d 100644 --- a/services/track-changes/app/js/UpdatesManager.js +++ b/services/track-changes/app/js/UpdatesManager.js @@ -25,7 +25,7 @@ const UpdateTrimmer = require('./UpdateTrimmer') const logger = require('logger-sharelatex') const async = require('async') const _ = require('underscore') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const keys = Settings.redis.lock.key_schema module.exports = UpdatesManager = { diff --git a/services/track-changes/app/js/WebApiManager.js b/services/track-changes/app/js/WebApiManager.js index 2ab3bdfda1..b1bd6de063 100644 --- a/services/track-changes/app/js/WebApiManager.js +++ b/services/track-changes/app/js/WebApiManager.js @@ -13,7 +13,7 @@ let WebApiManager const request = require('requestretry') // allow retry on error https://github.com/FGRibreau/node-request-retry const logger = require('logger-sharelatex') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') // Don't let HTTP calls hang for a long time const MAX_HTTP_REQUEST_LENGTH = 15000 // 15 seconds diff --git a/services/track-changes/app/js/mongodb.js b/services/track-changes/app/js/mongodb.js index e0d50a165b..5b4f56dce8 100644 --- a/services/track-changes/app/js/mongodb.js +++ b/services/track-changes/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/track-changes/package-lock.json b/services/track-changes/package-lock.json index 9574423f5d..0a671ec1a6 100644 --- a/services/track-changes/package-lock.json +++ b/services/track-changes/package-lock.json @@ -980,6 +980,11 @@ "ioredis": "~4.17.3" } }, + "@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", @@ -6431,21 +6436,6 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, - "settings-sharelatex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/settings-sharelatex/-/settings-sharelatex-1.1.0.tgz", - "integrity": "sha512-f7D+0lnlohoteSn6IKTH72NE+JnAdMWTKwQglAuimZWTID2FRRItZSGeYMTRpvEnaQApkoVwRp//WRMsiddnqw==", - "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": "sha512-Tx8itEfCsQp8RbLDFt7qwjqXycAx2g6SI7//4PPUR2j6meLmNifYm6zKrNDcU1+Q/GWRhjhEZk7DaLG1TfIzGA==" - } - } - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", diff --git a/services/track-changes/package.json b/services/track-changes/package.json index 3ddb284bb0..c458f35ab7 100644 --- a/services/track-changes/package.json +++ b/services/track-changes/package.json @@ -21,6 +21,7 @@ "@overleaf/metrics": "^3.5.1", "@overleaf/o-error": "^3.1.0", "@overleaf/redis-wrapper": "^2.0.0", + "@overleaf/settings": "^2.1.1", "JSONStream": "^1.3.5", "async": "^2.6.3", "aws-sdk": "^2.643.0", @@ -38,7 +39,6 @@ "request": "~2.88.2", "requestretry": "^4.1.0", "s3-streams": "^0.4.0", - "settings-sharelatex": "^1.1.0", "underscore": "~1.13.1" }, "devDependencies": { diff --git a/services/track-changes/test/acceptance/js/AppendingUpdatesTests.js b/services/track-changes/test/acceptance/js/AppendingUpdatesTests.js index def0bdfa1d..c0bb0b07ae 100644 --- a/services/track-changes/test/acceptance/js/AppendingUpdatesTests.js +++ b/services/track-changes/test/acceptance/js/AppendingUpdatesTests.js @@ -13,7 +13,7 @@ const sinon = require('sinon') const { expect } = require('chai') const { ObjectId } = require('../../../app/js/mongodb') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const request = require('request') const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now diff --git a/services/track-changes/test/acceptance/js/ArchivingUpdatesTests.js b/services/track-changes/test/acceptance/js/ArchivingUpdatesTests.js index a17ad6f1de..4f693e70a1 100644 --- a/services/track-changes/test/acceptance/js/ArchivingUpdatesTests.js +++ b/services/track-changes/test/acceptance/js/ArchivingUpdatesTests.js @@ -17,7 +17,7 @@ const sinon = require('sinon') const { expect } = require('chai') const { db, ObjectId } = require('../../../app/js/mongodb') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const request = require('request') const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now diff --git a/services/track-changes/test/acceptance/js/FlushingUpdatesTests.js b/services/track-changes/test/acceptance/js/FlushingUpdatesTests.js index c9adeb5fd8..99851d9515 100644 --- a/services/track-changes/test/acceptance/js/FlushingUpdatesTests.js +++ b/services/track-changes/test/acceptance/js/FlushingUpdatesTests.js @@ -13,7 +13,7 @@ const sinon = require('sinon') const { expect } = require('chai') const { ObjectId } = require('../../../app/js/mongodb') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const request = require('request') const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now diff --git a/services/track-changes/test/acceptance/js/GettingADiffTests.js b/services/track-changes/test/acceptance/js/GettingADiffTests.js index 9ccc2cca36..b0390db9e4 100644 --- a/services/track-changes/test/acceptance/js/GettingADiffTests.js +++ b/services/track-changes/test/acceptance/js/GettingADiffTests.js @@ -12,7 +12,7 @@ const sinon = require('sinon') const { expect } = require('chai') const { ObjectId } = require('../../../app/js/mongodb') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const TrackChangesApp = require('./helpers/TrackChangesApp') const TrackChangesClient = require('./helpers/TrackChangesClient') diff --git a/services/track-changes/test/acceptance/js/GettingUpdatesTests.js b/services/track-changes/test/acceptance/js/GettingUpdatesTests.js index f216d987a4..f58c9b729f 100644 --- a/services/track-changes/test/acceptance/js/GettingUpdatesTests.js +++ b/services/track-changes/test/acceptance/js/GettingUpdatesTests.js @@ -13,7 +13,7 @@ const sinon = require('sinon') const { expect } = require('chai') const { ObjectId } = require('../../../app/js/mongodb') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const TrackChangesApp = require('./helpers/TrackChangesApp') const TrackChangesClient = require('./helpers/TrackChangesClient') diff --git a/services/track-changes/test/acceptance/js/LockManagerTests.js b/services/track-changes/test/acceptance/js/LockManagerTests.js index 7062a83237..47341f7891 100644 --- a/services/track-changes/test/acceptance/js/LockManagerTests.js +++ b/services/track-changes/test/acceptance/js/LockManagerTests.js @@ -11,7 +11,7 @@ */ const sinon = require('sinon') const { expect } = require('chai') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const LockManager = require('../../../app/js/LockManager') const rclient = require('redis').createClient(Settings.redis.history) // Only works locally for now const TrackChangesApp = require('./helpers/TrackChangesApp') diff --git a/services/track-changes/test/acceptance/js/RestoringVersions.js b/services/track-changes/test/acceptance/js/RestoringVersions.js index a947dc09df..1e9f0d43a5 100644 --- a/services/track-changes/test/acceptance/js/RestoringVersions.js +++ b/services/track-changes/test/acceptance/js/RestoringVersions.js @@ -12,7 +12,7 @@ const sinon = require('sinon') const { expect } = require('chai') const { ObjectId } = require('../../../app/js/mongodb') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const TrackChangesApp = require('./helpers/TrackChangesApp') const TrackChangesClient = require('./helpers/TrackChangesClient') diff --git a/services/track-changes/test/acceptance/js/helpers/TrackChangesApp.js b/services/track-changes/test/acceptance/js/helpers/TrackChangesApp.js index 861dcdde88..7840b1f569 100644 --- a/services/track-changes/test/acceptance/js/helpers/TrackChangesApp.js +++ b/services/track-changes/test/acceptance/js/helpers/TrackChangesApp.js @@ -15,7 +15,7 @@ const app = require('../../../../app') const { waitForDb } = require('../../../../app/js/mongodb') const logger = require('logger-sharelatex') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') module.exports = { running: false, diff --git a/services/track-changes/test/acceptance/js/helpers/TrackChangesClient.js b/services/track-changes/test/acceptance/js/helpers/TrackChangesClient.js index f20884448d..a48ccc7a78 100644 --- a/services/track-changes/test/acceptance/js/helpers/TrackChangesClient.js +++ b/services/track-changes/test/acceptance/js/helpers/TrackChangesClient.js @@ -16,7 +16,7 @@ let TrackChangesClient const async = require('async') const zlib = require('zlib') const request = require('request') -const Settings = require('settings-sharelatex') +const Settings = require('@overleaf/settings') const rclient = require('@overleaf/redis-wrapper').createClient( Settings.redis.history ) // Only works locally for now diff --git a/services/track-changes/test/unit/js/DocArchive/MongoAWS.js b/services/track-changes/test/unit/js/DocArchive/MongoAWS.js index dd4374e965..cc539c8393 100644 --- a/services/track-changes/test/unit/js/DocArchive/MongoAWS.js +++ b/services/track-changes/test/unit/js/DocArchive/MongoAWS.js @@ -21,7 +21,7 @@ describe('MongoAWS', function () { this.MongoAWS = SandboxedModule.require(modulePath, { singleOnly: true, requires: { - 'settings-sharelatex': (this.settings = { + '@overleaf/settings': (this.settings = { trackchanges: { s3: { secret: 's3-secret', diff --git a/services/track-changes/test/unit/js/DocumentUpdaterManager/DocumentUpdaterManagerTests.js b/services/track-changes/test/unit/js/DocumentUpdaterManager/DocumentUpdaterManagerTests.js index 2825a10fb5..c8a218d2a3 100644 --- a/services/track-changes/test/unit/js/DocumentUpdaterManager/DocumentUpdaterManagerTests.js +++ b/services/track-changes/test/unit/js/DocumentUpdaterManager/DocumentUpdaterManagerTests.js @@ -19,7 +19,7 @@ describe('DocumentUpdaterManager', function () { this.DocumentUpdaterManager = SandboxedModule.require(modulePath, { requires: { request: (this.request = {}), - 'settings-sharelatex': (this.settings = { + '@overleaf/settings': (this.settings = { apis: { documentupdater: { url: 'http://example.com' } } }) } diff --git a/services/track-changes/test/unit/js/LockManager/LockManagerTests.js b/services/track-changes/test/unit/js/LockManager/LockManagerTests.js index fc26997574..1c933c3eea 100644 --- a/services/track-changes/test/unit/js/LockManager/LockManagerTests.js +++ b/services/track-changes/test/unit/js/LockManager/LockManagerTests.js @@ -34,7 +34,7 @@ describe('LockManager', function () { return (this.rclient = { auth: sinon.stub() }) } }, - 'settings-sharelatex': this.Settings + '@overleaf/settings': this.Settings } }) diff --git a/services/track-changes/test/unit/js/PackManager/PackManagerTests.js b/services/track-changes/test/unit/js/PackManager/PackManagerTests.js index 957c22aac8..1f85dcf38c 100644 --- a/services/track-changes/test/unit/js/PackManager/PackManagerTests.js +++ b/services/track-changes/test/unit/js/PackManager/PackManagerTests.js @@ -30,7 +30,7 @@ describe('PackManager', function () { './MongoAWS': {}, '@overleaf/metrics': { inc() {} }, './ProjectIterator': require('../../../../app/js/ProjectIterator.js'), // Cache for speed - 'settings-sharelatex': { + '@overleaf/settings': { redis: { lock: { key_schema: {} } } } } diff --git a/services/track-changes/test/unit/js/RedisManager/RedisManagerTests.js b/services/track-changes/test/unit/js/RedisManager/RedisManagerTests.js index 13fa467570..0196bc0ae2 100644 --- a/services/track-changes/test/unit/js/RedisManager/RedisManagerTests.js +++ b/services/track-changes/test/unit/js/RedisManager/RedisManagerTests.js @@ -28,7 +28,7 @@ describe('RedisManager', function () { }) } }, - 'settings-sharelatex': { + '@overleaf/settings': { redis: { history: { key_schema: { diff --git a/services/track-changes/test/unit/js/UpdatesManager/UpdatesManagerTests.js b/services/track-changes/test/unit/js/UpdatesManager/UpdatesManagerTests.js index b90d1567c8..68904e9471 100644 --- a/services/track-changes/test/unit/js/UpdatesManager/UpdatesManagerTests.js +++ b/services/track-changes/test/unit/js/UpdatesManager/UpdatesManagerTests.js @@ -32,7 +32,7 @@ describe('UpdatesManager', function () { './WebApiManager': (this.WebApiManager = {}), './UpdateTrimmer': (this.UpdateTrimmer = {}), './DocArchiveManager': (this.DocArchiveManager = {}), - 'settings-sharelatex': { + '@overleaf/settings': { redis: { lock: { key_schema: { diff --git a/services/track-changes/test/unit/js/WebApiManager/WebApiManagerTests.js b/services/track-changes/test/unit/js/WebApiManager/WebApiManagerTests.js index 7e23e72b0a..ce2f6f6890 100644 --- a/services/track-changes/test/unit/js/WebApiManager/WebApiManagerTests.js +++ b/services/track-changes/test/unit/js/WebApiManager/WebApiManagerTests.js @@ -19,7 +19,7 @@ describe('WebApiManager', function () { this.WebApiManager = SandboxedModule.require(modulePath, { requires: { requestretry: (this.request = {}), - 'settings-sharelatex': (this.settings = { + '@overleaf/settings': (this.settings = { apis: { web: { url: 'http://example.com',