Skip to content

Commit 9e8c505

Browse files
CLDSRV-625: No scality-kms warning if not conf
Avoid print the warning if scality-kms is not configured: ```json {"name":"S3","time":1742220545805,"error":{"code":"MODULE_NOT_FOUND","requireStack":["/home/mickael/scality/cloudserver/lib/kms/wrapper.js","/home/mickael/scality/cloudserver/lib/data/wrapper.js","/home/mickael/scality/cloudserver/lib/utilities/healthcheckHandler.js","/home/mickael/scality/cloudserver/lib/utilities/internalHandlers.js","/home/mickael/scality/cloudserver/lib/server.js","/home/mickael/scality/cloudserver/index.js"]},"level":"warn","message":"scality kms unavailable. Using file kms backend unless mem specified.","hostname":"mickael-xps","pid":139701} ```
1 parent d4933b9 commit 9e8c505

1 file changed

Lines changed: 19 additions & 15 deletions

File tree

lib/kms/wrapper.js

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,24 @@ const Common = require('./common');
1212
const vault = require('../auth/vault');
1313
const Cache = require('./Cache');
1414
const cache = new Cache();
15-
let scalityKMS;
16-
let scalityKMSImpl;
17-
try {
18-
// eslint-disable-next-line import/no-unresolved
19-
const ScalityKMS = require('scality-kms');
20-
scalityKMS = new ScalityKMS(config.kms);
21-
scalityKMSImpl = 'scalityKms';
22-
} catch (error) {
23-
logger.warn('scality kms unavailable. ' +
24-
'Using file kms backend unless mem specified.',
25-
{ error });
26-
scalityKMS = file;
27-
scalityKMSImpl = 'fileKms';
15+
16+
function getScalityKms() {
17+
let scalityKMS;
18+
let scalityKMSImpl;
19+
20+
try {
21+
// eslint-disable-next-line import/no-unresolved
22+
const ScalityKMS = require('scality-kms');
23+
scalityKMS = new ScalityKMS(config.kms);
24+
scalityKMSImpl = 'scalityKms';
25+
} catch (error) {
26+
logger.warn('scality kms unavailable. ' +
27+
'Using file kms backend unless mem specified.',
28+
{ error });
29+
scalityKMS = file;
30+
scalityKMSImpl = 'fileKms';
31+
}
32+
return { scalityKMS, scalityKMSImpl };
2833
}
2934

3035
let client;
@@ -37,8 +42,7 @@ if (config.backends.kms === 'mem') {
3742
client = file;
3843
implName = 'fileKms';
3944
} else if (config.backends.kms === 'scality') {
40-
client = scalityKMS;
41-
implName = scalityKMSImpl;
45+
({ scalityKMS: client, scalityKMSImpl: implName } = getScalityKms());
4246
} else if (config.backends.kms === 'kmip') {
4347
const kmipConfig = { kmip: config.kmip };
4448
if (!kmipConfig.kmip) {

0 commit comments

Comments
 (0)