@@ -7,6 +7,7 @@ const http = require('http');
7
7
const https = require ( 'https' ) ;
8
8
const parseString = require ( 'xml2js' ) . parseString ;
9
9
const queryString = require ( 'querystring' ) ;
10
+ const Logger = require ( 'werelogs' ) . Logger ;
10
11
11
12
class IAMClient {
12
13
/**
@@ -52,6 +53,7 @@ class IAMClient {
52
53
}
53
54
this . accessKey = accessKey ;
54
55
this . secretKeyValue = secretKeyValue ;
56
+ this . logger = new Logger ( 'vaultclient' ) ;
55
57
}
56
58
57
59
getServerHost ( ) {
@@ -361,6 +363,7 @@ class IAMClient {
361
363
* @returns {undefined }
362
364
*/
363
365
request ( method , path , callback , data , reqUid , logger ) {
366
+ const log = logger || this . logger ;
364
367
const options = {
365
368
method,
366
369
path,
@@ -417,15 +420,12 @@ class IAMClient {
417
420
} ) ;
418
421
} ) ;
419
422
req . on ( 'error' , err => {
420
- if ( logger ) {
421
- logger . debug ( 'error during request' , {
422
- component : 'vaultclient' ,
423
- method : 'IAMClient:request()' ,
424
- error : err . stack || err ,
425
- } ) ;
426
- return callback ( errors . InternalError ) ;
427
- }
428
- return callback ( err ) ;
423
+ log . error ( 'error during request' , {
424
+ component : 'vaultclient' ,
425
+ method : 'IAMClient:request()' ,
426
+ error : err . stack || err ,
427
+ } ) ;
428
+ return callback ( errors . InternalError ) ;
429
429
} ) ;
430
430
req . end ( ) ;
431
431
}
@@ -481,10 +481,11 @@ class IAMClient {
481
481
* @returns {undefined }
482
482
*/
483
483
handleResponse ( res , ret , log , callback ) {
484
+ const logger = log || this . logger ;
484
485
this . getObj ( ret , ( err , obj ) => {
485
486
if ( err ) {
486
- if ( log ) {
487
- log . error ( 'error from vault' ,
487
+ if ( logger ) {
488
+ logger . error ( 'error from vault' ,
488
489
{ error : err , method : 'IAMClient.handleResponse' } ) ;
489
490
}
490
491
return callback ( err , null , res . statusCode ) ;
@@ -496,15 +497,15 @@ class IAMClient {
496
497
497
498
// Load the error from errors(arsenal)
498
499
if ( obj && obj . ErrorResponse && obj . ErrorResponse . Error ) {
499
- if ( log ) {
500
- log . debug ( 'error from vault' ,
500
+ if ( logger ) {
501
+ logger . debug ( 'error from vault' ,
501
502
{ error : obj , method : 'IAMClient.handleResponse' } ) ;
502
503
}
503
504
return callback (
504
505
errors [ obj . ErrorResponse . Error . Code ] , null , res . statusCode ) ;
505
506
}
506
- if ( log ) {
507
- log . error ( 'unable to translate error from vault' , {
507
+ if ( logger ) {
508
+ logger . error ( 'unable to translate error from vault' , {
508
509
error : obj ,
509
510
method : 'IAMClient.handleResponse' ,
510
511
} ) ;
0 commit comments