fixups post reviews

benzekrimaha · benzekrimaha · commit d960b4caad28 · 2025-03-19T12:05:09.000+01:00
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -31,4 +31,4 @@ export default [...compat.extends("scality"), {
         "no-param-reassign": "off",
         "no-empty-pattern": "off",
     },
-}];
+}];
diff --git a/lib/ListMetrics.js b/lib/ListMetrics.js
@@ -170,7 +170,7 @@ class ListMetrics {
         let start = range[0];
         const end = range[1] || Date.now();
         const subRangesCount = Math.floor((end - start) / MAX_RANGE_MS) + 1;
-        const subRanges = [];         
+        const subRanges = [];
         for (let i = 0; i < subRangesCount; i++) {
             if (i + 1 === subRangesCount) {
                 subRanges.push([start, end]);
diff --git a/lib/Vault.js b/lib/Vault.js
@@ -51,7 +51,7 @@ class Vault {
         this._client.verifySignatureV4(
             stringToSign, signatureFromRequest,
             accessKey, region, scopeDate,
-            { reqUid: log.getSerializedUids(), requestContext: serializedRCs , get: true},
+            { reqUid: log.getSerializedUids(), requestContext: serializedRCs, get: true},
             (err, authInfo) => {
                 if (err) {
                     log.trace('error from vault', { error: err });
diff --git a/libV2/cache/backend/memory.js b/libV2/cache/backend/memory.js
@@ -19,11 +19,11 @@ class MemoryCache {
         this._prefix = 'utapi';
         this._expirations = {};
     }
-     
+
     async connect() {
         return true;
     }
-     
+
     async disconnect() {
         Object.values(this._expirations).forEach(clearTimeout);
         return true;
diff --git a/libV2/config/index.js b/libV2/config/index.js
@@ -136,7 +136,7 @@ class Config {
         return Array.from(
             new Set([
                 ...Object.keys(parent),
-                ...Object.keys(child)],             
+                ...Object.keys(child)],
             ))
             .reduce((ret, key) => {
                 ret[key] = this._recursiveUpdate(parent[key], child[key]);
diff --git a/libV2/metadata/index.js b/libV2/metadata/index.js
@@ -44,7 +44,6 @@ function _listObject(bucket, prefix, hydrateFunc) {
                 let res;
 
                 try {
-                     
                     res = await async.retryable(ebConfig, _listingWrapper)(bucket, { ...listingParams, gt });
                 } catch (error) {
                     moduleLogger.error('Error during listing', { error });
diff --git a/libV2/process.js b/libV2/process.js
@@ -37,7 +37,7 @@ class Process extends EventEmitter {
 
     async _start() {}
 
-    async _join() {}     
+    async _join() {}
 }
 
 module.exports = Process;
diff --git a/libV2/server/API/internal/prometheusMetrics.js b/libV2/server/API/internal/prometheusMetrics.js
@@ -5,7 +5,7 @@ collectDefaultMetrics({
     gcDurationBuckets: [0.001, 0.01, 0.1, 1, 2, 5],
 });
 
-async function prometheusMetrics(ctx) {     
+async function prometheusMetrics(ctx) {
     ctx.results.statusCode = 200;
     ctx.results.body = await register.metrics();
 }
diff --git a/libV2/server/API/metrics/ingestMetric.js b/libV2/server/API/metrics/ingestMetric.js
@@ -19,7 +19,7 @@ async function ingestMetric(ctx, params) {
         await Promise.all(metrics.map(m => cacheClient.pushMetric(m)));
     } catch {
         throw errors.ServiceUnavailable;
-    }     
+    }
     ctx.results.statusCode = 200;
 }
 
diff --git a/libV2/server/API/metrics/listMetrics.js b/libV2/server/API/metrics/listMetrics.js
@@ -23,7 +23,8 @@ function positiveOrZero(value) {
 async function listMetric(ctx, params) {
     const labelName = serviceToWarp10Label[params.level];
     const resources = params.body[params.level];
-    let [start, end] = params.body.timeRange; // eslint-disable-line prefer-const
+    const start = params.body.timeRange[0];
+    let end = params.body.timeRange[1];
     if (end === undefined) {
         end = Date.now();
     }
diff --git a/libV2/server/middleware.js b/libV2/server/middleware.js
@@ -82,11 +82,9 @@ function errorMiddleware(err, req, res, next) {
     // failed request validation by oas-tools
     if (err.failedValidation) {
         // You can't actually use destructing here
-         
         statusCode = errors.InvalidRequest.code;
         code = errors.InvalidRequest.message;
         message = errors.InvalidRequest.description;
-         
     }
 
     if (!err.utapiError && !config.development) {
@@ -102,7 +100,6 @@ function errorMiddleware(err, req, res, next) {
     responseLoggerMiddleware(req, res, () => httpMetricsMiddleware(req, res));
 }
 
- 
 async function authV4Middleware(request, response, params) {
     const authHeader = request.headers.authorization;
     if (!authHeader || !authHeader.startsWith('AWS4-')) {
diff --git a/libV2/server/spec.js b/libV2/server/spec.js
@@ -25,7 +25,7 @@ function _getApiOperationIds(routes) {
                     moduleLogger
                         .with({ method: '_getApiOperationIds' })
                         .trace('Registering handler', { tag, operationId: optId });
-                    if (optIds[tag] === undefined) {                         
+                    if (optIds[tag] === undefined) {
                         optIds[tag] = new Set([optId]);
                     } else {
                         optIds[tag].add(optId);
diff --git a/libV2/tasks/BaseTask.js b/libV2/tasks/BaseTask.js
@@ -91,7 +91,7 @@ class BaseTask extends Process {
             executionFailures,
         };
     }
-     
+
     _registerMetricHandlers() {
         return {};
     }
@@ -174,7 +174,6 @@ class BaseTask extends Process {
         }
     }
 
-     
     async _execute(timestamp) {
         logger.info(`Default Task ${timestamp}`);
     }
diff --git a/libV2/tasks/CreateCheckpoint.js b/libV2/tasks/CreateCheckpoint.js
@@ -20,7 +20,7 @@ class CreateCheckpoint extends BaseTask {
         this._defaultSchedule = config.checkpointSchedule;
         this._defaultLag = checkpointLagSecs;
     }
-     
+
     _registerMetricHandlers() {
         const created = new promClient.Counter({
             name: 's3_utapi_create_checkpoint_created_total',
diff --git a/libV2/tasks/CreateSnapshot.js b/libV2/tasks/CreateSnapshot.js
@@ -20,7 +20,7 @@ class CreateSnapshot extends BaseTask {
         this._defaultSchedule = config.snapshotSchedule;
         this._defaultLag = snapshotLagSecs;
     }
-     
+
     _registerMetricHandlers() {
         const created = new promClient.Counter({
             name: 's3_utapi_create_snapshot_created_total',
diff --git a/libV2/tasks/DiskUsage.js b/libV2/tasks/DiskUsage.js
@@ -48,7 +48,7 @@ class MonitorDiskUsage extends BaseTask {
                 'Manually trigger an unlock of the warp 10 database. This will cause all other options to be ignored.',
             );
     }
-     
+
     _registerMetricHandlers() {
         const isLocked = new promClient.Gauge({
             name: 's3_utapi_monitor_disk_usage_is_locked',
@@ -142,7 +142,6 @@ class MonitorDiskUsage extends BaseTask {
         return this._program.lock !== undefined;
     }
 
-     
     async _getUsage(path) {
         moduleLogger.debug(`calculating disk usage for ${path}`);
         if (!fs.existsSync(path)) {
diff --git a/libV2/tasks/IngestShard.js b/libV2/tasks/IngestShard.js
@@ -28,7 +28,7 @@ class IngestShardTask extends BaseTask {
         this._defaultLag = config.ingestionLagSeconds;
         this._stripEventUUID = options.stripEventUUID !== undefined ? options.stripEventUUID : true;
     }
-     
+
     _registerMetricHandlers() {
         const ingestedTotal = new promClient.Counter({
             name: 's3_utapi_ingest_shard_task_ingest_total',
@@ -150,7 +150,6 @@ class IngestShardTask extends BaseTask {
 
                         let ingestedIntoNodeId;
                         const status = await this.withWarp10(async warp10 => {
-                             
                             ingestedIntoNodeId = warp10.nodeId;
                             return warp10.ingest(
                                 {
diff --git a/libV2/tasks/Migrate.js b/libV2/tasks/Migrate.js
@@ -205,7 +205,6 @@ class MigrateTask extends BaseTask {
 
     async _findOldestSnapshot(level, resource, beginTimestamp) {
         let pos = beginTimestamp;
-         
         while (true) {
             const resp = await this.withWarp10(async warp10 => warp10.fetch({
                 className: 'utapi.snapshot',
@@ -248,7 +247,6 @@ class MigrateTask extends BaseTask {
         const incomingBytes = (a.incomingBytes || 0) + (b.incomingBytes || 0);
         const outgoingBytes = (a.outgoingBytes || 0) + (b.outgoingBytes || 0);
         const operationKeys = new Set(Object.keys(a.operations || {}).concat(Object.keys(b.operations || {})));
-         
         const operations = comprehend(Array.from(operationKeys), (_, key) => (
             {
                 key,
diff --git a/libV2/tasks/Reindex.js b/libV2/tasks/Reindex.js
@@ -59,13 +59,11 @@ class ReindexTask extends BaseTask {
 
         for await (const obj of metadata.listObjects(bucket)) {
             if (obj.value.isDeleteMarker || obj.value.isPHD) {
-                 
                 continue;
             }
 
             if (!Number.isInteger(obj.value['content-length'])) {
                 logger.debug('object missing content-length, not including in count');
-                 
                 continue;
             }
 
diff --git a/libV2/tasks/Repair.js b/libV2/tasks/Repair.js
@@ -20,7 +20,6 @@ class RepairTask extends BaseTask {
         this._defaultSchedule = config.repairSchedule;
         this._defaultLag = repairLagSecs;
     }
-     
     _registerMetricHandlers() {
         const created = new promClient.Counter({
             name: 's3_utapi_repair_task_created_total',
diff --git a/libV2/utils/func.js b/libV2/utils/func.js
@@ -42,9 +42,9 @@ function comprehend(data, func) {
  * @returns {*} -
  */
 async function iterIfError(items, func, onError) {
-    let error;     
+    let error;
     for (const item of items) {
-        try {             
+        try {
             const resp = await func(item);
             return resp;
         } catch (_error) {
diff --git a/libV2/vault/client.js b/libV2/vault/client.js
@@ -50,7 +50,7 @@ class VaultWrapper extends auth.Vault {
                     })));
                 }));
     }
-     
+
     authenticateRequest(request, action, level, resources) {
         const policyContext = new policies.RequestContext(
             request.headers,
diff --git a/tests/functional/v2/server/testGetStorage.js b/tests/functional/v2/server/testGetStorage.js
@@ -22,7 +22,6 @@ const getClient = () => new CacheClient({
 
 const warp10 = warp10Clients[0];
 
- 
 describe('Test getStorage handler', function () {
     this.timeout(120000);
     let client;
diff --git a/tests/functional/v2/task/testBaseTask.js b/tests/functional/v2/task/testBaseTask.js
@@ -11,7 +11,7 @@ const { getMetricValues } = require('../../../utils/prom');
 
 const METRICS_SERVER_PORT = 10999;
 
-class CustomTask extends BaseTask {     
+class CustomTask extends BaseTask {
     _registerMetricHandlers() {
         const foo = new promClient.Gauge({
             name: 's3_utapi_custom_task_foo_total',
diff --git a/tests/functional/v2/task/testCreateCheckpoint.js b/tests/functional/v2/task/testCreateCheckpoint.js
@@ -39,7 +39,6 @@ function assertResults(totals, series) {
     });
 }
 
- 
 describe('Test CreateCheckpoint', function () {
     this.timeout(10000);
 
diff --git a/tests/functional/v2/task/testCreateSnapshot.js b/tests/functional/v2/task/testCreateSnapshot.js
@@ -39,7 +39,6 @@ function assertResults(totals, series) {
     });
 }
 
- 
 describe('Test CreateSnapshot', function () {
     this.timeout(10000);
 
diff --git a/tests/functional/v2/task/testDiskUsage.js b/tests/functional/v2/task/testDiskUsage.js
@@ -25,7 +25,6 @@ const testCases = [
     { count: 100, size: 1024 * 1024, expected: 104857600 },
 ];
 
- 
 describe('Test MonitorDiskUsage', () => {
     let task;
     let path;
diff --git a/tests/functional/v2/task/testIngestShards.js b/tests/functional/v2/task/testIngestShards.js
@@ -45,7 +45,6 @@ function assertResults(events, series) {
     });
 }
 
- 
 describe('Test IngestShards', function () {
     this.timeout(10000);
 
diff --git a/tests/functional/v2/task/testReindex.js b/tests/functional/v2/task/testReindex.js
@@ -24,7 +24,6 @@ const accountRecord = {
     objD: 1,
 };
 
- 
 describe('Test ReindexTask', function () {
     this.timeout(120000);
 
diff --git a/tests/functional/v2/task/testRepair.js b/tests/functional/v2/task/testRepair.js
@@ -40,7 +40,6 @@ function assertResults(totals, series) {
     });
 }
 
- 
 describe('Test Repair', function () {
     this.timeout(10000);
 
diff --git a/tests/functional/v2/testClient.js b/tests/functional/v2/testClient.js
@@ -22,7 +22,6 @@ const getClient = () => new CacheClient({
     ),
 });
 
- 
 describe('Test UtapiClient', function () {
     this.timeout(10000);
 
diff --git a/tests/unit/testUtapiClient.js b/tests/unit/testUtapiClient.js
@@ -32,7 +32,7 @@ function isSortedSetKey(key) {
 function deserializeMemoryBackend(data) {
     Object.keys(data).forEach(key => {
         if (isSortedSetKey(key)) {
-            data[key][0][1] = member.deserialize(data[key][0][1]);  
+            data[key][0][1] = member.deserialize(data[key][0][1]);
         }
     });
 }
diff --git a/tests/unit/v2/cache/testCacheClient.js b/tests/unit/v2/cache/testCacheClient.js
@@ -36,7 +36,7 @@ describe('Test high level cache client', () => {
             const shard = shardFromTimestamp(event.timestamp);
             if (es[shard]) {
                 es[shard].push(event);
-            } else {                 
+            } else {
                 es[shard] = [event];
             }
             return es;
@@ -58,7 +58,6 @@ describe('Test high level cache client', () => {
             if (es[shard]) {
                 es[shard].push(event);
             } else {
-                 
                 es[shard] = [event];
             }
             return es;
diff --git a/tests/unit/v2/server/testMiddleware.js b/tests/unit/v2/server/testMiddleware.js
@@ -111,7 +111,6 @@ describe('Test middleware', () => {
                     },
                 },
             });
-        
             req.ctx = new RequestContext(req);
             middleware.httpMetricsMiddleware(req, resp);
             await assertMetricValue('s3_utapi_http_requests_total', 1);
diff --git a/tests/unit/v2/utils/testSliceTimeRange.js b/tests/unit/v2/utils/testSliceTimeRange.js
@@ -86,7 +86,7 @@ describe('Test sliceTimeRange', () => {
             start, end, step, expected,
         } = testCase;
         it(`should correctly slice range ${start}-${end} with step ${step}`, () => {
-            const results = [];            
+            const results = [];
             for (const item of sliceTimeRange(start, end, step)) {
                 results.push(item);
             }
diff --git a/tests/utils/mock/BucketD.js b/tests/utils/mock/BucketD.js
@@ -137,7 +137,7 @@ class BucketD {
     }
 
     _initiateRoutes() {
-        this._app.param('bucketName', (req, res, next, bucketName) => {             
+        this._app.param('bucketName', (req, res, next, bucketName) => {
             if (bucketName === constants.usersBucket) {
                 req.body = this._getUsersBucketResponse(req);
             } else if (req.query.listingType === 'MPU') {
@@ -157,7 +157,6 @@ class BucketD {
                     req.body = req.body.Contents;
                 }
             }
-             
             next();
         });
 
diff --git a/tests/utils/utils.js b/tests/utils/utils.js
@@ -38,7 +38,6 @@ function getAllResourceTypeKeys() {
         return counters.concat(keys);
     });
     // Concatenate each array of resourceType keys into one single array.
-     
     return [].concat.apply([], allResourceTypeKeys);
 }
 
diff --git a/tests/utils/vaultclient.js b/tests/utils/vaultclient.js
@@ -60,7 +60,6 @@ class VaultClient {
             const res = /^https?:\/\/([^:]*)(:[0-9]+)?\/?$/.exec(
                 process.env.VAULT_ENDPOINT,
             );
-             
             [host] = res[1];
             port = parseInt(res[2].substring(1), 10);
             const https = process.env.VAULT_ENDPOINT.startsWith('https://');

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ class MemoryCache {`
`19`	`19`	`this._prefix = 'utapi';`
`20`	`20`	`this._expirations = {};`
`21`	`21`	`}`
`22`		`-`
	`22`	`+`
`23`	`23`	`async connect() {`
`24`	`24`	`return true;`
`25`	`25`	`}`
`26`		`-`
	`26`	`+`
`27`	`27`	`async disconnect() {`
`28`	`28`	`Object.values(this._expirations).forEach(clearTimeout);`
`29`	`29`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class Process extends EventEmitter {`
`37`	`37`
`38`	`38`	`async _start() {}`
`39`	`39`
`40`		`- async _join() {}`
	`40`	`+ async _join() {}`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`module.exports = Process;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ collectDefaultMetrics({`
`5`	`5`	`gcDurationBuckets: [0.001, 0.01, 0.1, 1, 2, 5],`
`6`	`6`	`});`
`7`	`7`
`8`		`-async function prometheusMetrics(ctx) {`
	`8`	`+async function prometheusMetrics(ctx) {`
`9`	`9`	`ctx.results.statusCode = 200;`
`10`	`10`	`ctx.results.body = await register.metrics();`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ async function ingestMetric(ctx, params) {`
`19`	`19`	`await Promise.all(metrics.map(m => cacheClient.pushMetric(m)));`
`20`	`20`	`} catch {`
`21`	`21`	`throw errors.ServiceUnavailable;`
`22`		`- }`
	`22`	`+ }`
`23`	`23`	`ctx.results.statusCode = 200;`
`24`	`24`	`}`
`25`	`25`