Skip to content

Commit 0e5bd42

Browse files
committed
fixup
1 parent b30ee67 commit 0e5bd42

File tree

6 files changed

+30
-28
lines changed

6 files changed

+30
-28
lines changed

libV2/server/API/metrics/listMetrics.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function positiveOrZero(value) {
2323
async function listMetric(ctx, params) {
2424
const labelName = serviceToWarp10Label[params.level];
2525
const resources = params.body[params.level];
26-
let [start, end] = params.body.timeRange;
26+
let [start, end] = params.body.timeRange; // eslint-disable-line prefer-const
2727
if (end === undefined) {
2828
end = Date.now();
2929
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "utapi",
33
"engines": {
4-
"node": ">=22"
4+
"node": ">=20"
55
},
66
"version": "8.1.16",
77
"description": "API for tracking resource utilization and reporting metrics",
@@ -18,14 +18,14 @@
1818
"homepage": "https://github.com/scality/utapi#readme",
1919
"dependencies": {
2020
"@hapi/joi": "^17.1.1",
21-
"@senx/warp10": "^1.0.14",
22-
"arsenal": "git+https://github.com/scality/Arsenal#7e142a1bfca7f516c107d2072baeae54cbbe379c",
21+
"@senx/warp10": "^2.0.3",
22+
"arsenal": "git+https://github.com/scality/Arsenal#e293f894917cd375f8e1ab6d03f4fb6869df136a",
2323
"async": "^3.2.0",
2424
"aws-sdk": "^2.1005.0",
2525
"aws4": "^1.8.0",
2626
"backo": "^1.1.0",
2727
"body-parser": "^1.19.0",
28-
"bucketclient": "scality/bucketclient#735550971f36842eac2285b448d781cdd4f60238",
28+
"bucketclient": "scality/bucketclient#0fe349950922700af82b57b157f6ef5fe29c6f12",
2929
"byte-size": "^7.0.0",
3030
"commander": "^5.1.0",
3131
"cron-parser": "^2.15.0",

tests/functional/client/testClientConnections.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ describe('Client connections', async function test() {
7373
Object.entries(expected).forEach(([k, v]) => {
7474
assert.strictEqual(data[0][k], v);
7575
});
76+
return done();
7677
});
7778
};
7879

@@ -108,19 +109,23 @@ describe('Client connections', async function test() {
108109
it('should not add connections after failover under load', done => {
109110
sentinel.sentinel('failover', 'scality-s3', (err, res) => {
110111
if (err) {
111-
return done(err);
112+
done(err);
113+
return;
112114
}
113115
assert.strictEqual(res, 'OK');
114116

115117
// Requests made with async.times will stay open when they occur
116118
// during the failover window so and async.race is used to resolve
117119
async.race([
118120
() => setTimeout(() => this.loadgen.emit('finished'), 3000),
119-
() => async.times(
120-
100,
121-
() => makeRequest(this, done),
122-
() => this.loadgen.emit('finished'),
123-
),
121+
() => {
122+
async.times(
123+
100,
124+
() => makeRequest(this, done),
125+
() => this.loadgen.emit('finished'),
126+
);
127+
return null;
128+
},
124129
]);
125130
});
126131

tests/functional/v2/task/testReindex.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,10 @@ describe('Test ReindexTask', function () {
188188
// Once the timeout promise resolves, bucketd is able to be called.
189189
// If we make a call after 10 seconds, this shows that retries
190190
// have been occuring during bucketd downtime.
191-
() => {
192-
return {
193-
key: 'foo',
194-
value: 'bar',
195-
};
196-
},
191+
() => ({
192+
key: 'foo',
193+
value: 'bar',
194+
}),
197195
);
198196

199197
const reindexPromise = new Promise((resolve, reject) => {

tests/utils/vaultclient.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class VaultClient {
133133
if (err) {
134134
return reject(err);
135135
}
136-
resolve(res.account);
136+
return resolve(res.account);
137137
},
138138
));
139139
}

yarn.lock

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,10 @@
408408
resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
409409
integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
410410

411-
"@senx/warp10@^1.0.14":
412-
version "1.1.4"
413-
resolved "https://registry.yarnpkg.com/@senx/warp10/-/warp10-1.1.4.tgz#2674e62e05bbfea5e7811a6f171115025161024d"
414-
integrity sha512-2UmvM6HP4sxNgPimjYwIzVqhOFPGli7JeeFsdiwrF39RAEZxxSBpj9OCiZf5rLml/XeNnumVObajAopuuc+wuw==
411+
"@senx/warp10@^2.0.3":
412+
version "2.0.3"
413+
resolved "https://registry.yarnpkg.com/@senx/warp10/-/warp10-2.0.3.tgz#dcce3890d491c6380f2967abcf126909ed208969"
414+
integrity sha512-FB3acF3vEGyyfwV17oBsJcbzagcOAQIZv3dZGuyBjiuSqf3KrOqn8hGGLyPXrZ6a6igD5v4M1ROHvqJklAffgA==
415415
dependencies:
416416
dayjs "^1.11.10"
417417

@@ -955,9 +955,9 @@ arraybuffer.prototype.slice@^1.0.3:
955955
is-array-buffer "^3.0.4"
956956
is-shared-array-buffer "^1.0.2"
957957

958-
"arsenal@git+https://github.com/scality/Arsenal#7e142a1bfca7f516c107d2072baeae54cbbe379c":
958+
"arsenal@git+https://github.com/scality/Arsenal#e293f894917cd375f8e1ab6d03f4fb6869df136a":
959959
version "8.2.0"
960-
resolved "git+https://github.com/scality/Arsenal#7e142a1bfca7f516c107d2072baeae54cbbe379c"
960+
resolved "git+https://github.com/scality/Arsenal#e293f894917cd375f8e1ab6d03f4fb6869df136a"
961961
dependencies:
962962
"@azure/identity" "^4.5.0"
963963
"@azure/storage-blob" "^12.25.0"
@@ -1172,11 +1172,11 @@ bson@^6.10.0, bson@^6.8.0:
11721172
resolved "https://registry.yarnpkg.com/bson/-/bson-6.10.0.tgz#559c767cc8b605c3ab14e5896214c8f2abdd6a12"
11731173
integrity sha512-ROchNosXMJD2cbQGm84KoP7vOGPO6/bOAW0veMMbzhXLqoZptcaYRVLitwvuhwhjjpU1qP4YZRWLhgETdgqUQw==
11741174

1175-
bucketclient@scality/bucketclient#735550971f36842eac2285b448d781cdd4f60238:
1175+
bucketclient@scality/bucketclient#0fe349950922700af82b57b157f6ef5fe29c6f12:
11761176
version "8.1.11"
1177-
resolved "https://codeload.github.com/scality/bucketclient/tar.gz/735550971f36842eac2285b448d781cdd4f60238"
1177+
resolved "https://codeload.github.com/scality/bucketclient/tar.gz/0fe349950922700af82b57b157f6ef5fe29c6f12"
11781178
dependencies:
1179-
arsenal "git+https://github.com/scality/Arsenal#7e142a1bfca7f516c107d2072baeae54cbbe379c"
1179+
arsenal "git+https://github.com/scality/Arsenal#e293f894917cd375f8e1ab6d03f4fb6869df136a"
11801180
httpagent "git+https://github.com/scality/httpagent#1.0.6"
11811181
werelogs scality/werelogs#8.1.5
11821182

@@ -2584,7 +2584,6 @@ http-signature@~1.2.0:
25842584

25852585
"httpagent@git+https://github.com/scality/httpagent#1.1.0":
25862586
version "1.1.0"
2587-
uid "8f9958eb9cde086db7819a86582fba640a5f8876"
25882587
resolved "git+https://github.com/scality/httpagent#8f9958eb9cde086db7819a86582fba640a5f8876"
25892588
dependencies:
25902589
agentkeepalive "^4.5.0"

0 commit comments

Comments
 (0)