From 84d7b55c6944002ada4043c83675cbe61322e2c8 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 16 Jul 2024 10:50:20 +0200 Subject: [PATCH 1/7] do not invoke callback two times when error retrieving token --- CHANGES_NEXT_RELEASE | 1 + lib/models/keystone.js | 3 ++- lib/models/updateAction.js | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index e69de29b..cad16a8d 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -0,0 +1 @@ +- Do not invoke calback twice when error retrieving token diff --git a/lib/models/keystone.js b/lib/models/keystone.js index 1fd2516b..10807557 100644 --- a/lib/models/keystone.js +++ b/lib/models/keystone.js @@ -59,7 +59,8 @@ function getToken(trust, callback) { // check trust was found or log it if (!trustConf) { - logger.error('Trust %s not found in configTrust file with content %s', trust, configTrust); + logger.error('Trust %s not found in configTrust file with content %j', trust, configTrust); + alarm.raise(alarm.AUTH); callback(new errors.TokenRetrievalError(trust, 'trust not found' + trust)); } var options = { diff --git a/lib/models/updateAction.js b/lib/models/updateAction.js index b9cbf3f4..ef387742 100644 --- a/lib/models/updateAction.js +++ b/lib/models/updateAction.js @@ -474,10 +474,10 @@ function doRequestV2(action, event, token, callback) { function makeTokenListenerFunc(action, event, version, callback) { return function tokenHandlerFunc(error, token) { logger.debug('tokenHandlerFunc error:%s token:%s', error, token); - if (error || !token) { - return callback(error); + if (error) { + throw error; } else { - logger.debug('tokenHandlerFunc retrying with', token); + logger.debug('tokenHandlerFunc retrying with %s', token); return doRequestV2(action, event, token, function cbDoReqUpdAxn(error, data) { callback(error, data); }); From a3c31348f7c827aa9ae6e5088fdf256e70f5ffd5 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 16 Jul 2024 13:09:53 +0200 Subject: [PATCH 2/7] thow error if not trust is found --- lib/models/keystone.js | 3 +-- lib/models/updateAction.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/models/keystone.js b/lib/models/keystone.js index 10807557..448d876d 100644 --- a/lib/models/keystone.js +++ b/lib/models/keystone.js @@ -60,8 +60,7 @@ function getToken(trust, callback) { // check trust was found or log it if (!trustConf) { logger.error('Trust %s not found in configTrust file with content %j', trust, configTrust); - alarm.raise(alarm.AUTH); - callback(new errors.TokenRetrievalError(trust, 'trust not found' + trust)); + throw errors.TokenRetrievalError(trust, 'trust not found' + trust); } var options = { url: 'http://' + trustConf.host + ':' + trustConf.port + '/v3/auth/tokens', diff --git a/lib/models/updateAction.js b/lib/models/updateAction.js index ef387742..a40e23d0 100644 --- a/lib/models/updateAction.js +++ b/lib/models/updateAction.js @@ -474,8 +474,8 @@ function doRequestV2(action, event, token, callback) { function makeTokenListenerFunc(action, event, version, callback) { return function tokenHandlerFunc(error, token) { logger.debug('tokenHandlerFunc error:%s token:%s', error, token); - if (error) { - throw error; + if (error || !token) { + return callback(error); } else { logger.debug('tokenHandlerFunc retrying with %s', token); return doRequestV2(action, event, token, function cbDoReqUpdAxn(error, data) { From 7123a252d8e84696b8da86ff531e8c2550911fa6 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Tue, 16 Jul 2024 13:49:43 +0200 Subject: [PATCH 3/7] update CNR --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index cad16a8d..146cded9 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1 +1 @@ -- Do not invoke calback twice when error retrieving token +- Do not invoke calback twice when error about trust not found in trustConf From 91ee4fff866eea11d4aef1efd84921d8aee2c88a Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 17 Jul 2024 07:57:26 +0200 Subject: [PATCH 4/7] do not print trustConf file in error log --- lib/models/keystone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/models/keystone.js b/lib/models/keystone.js index 448d876d..0d23eb85 100644 --- a/lib/models/keystone.js +++ b/lib/models/keystone.js @@ -59,7 +59,7 @@ function getToken(trust, callback) { // check trust was found or log it if (!trustConf) { - logger.error('Trust %s not found in configTrust file with content %j', trust, configTrust); + logger.error('Trust %s not found in configTrust file', trust); throw errors.TokenRetrievalError(trust, 'trust not found' + trust); } var options = { From f23178adb1db48cf43a7cbb0dd52b2efb7054a8f Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 17 Jul 2024 08:16:32 +0200 Subject: [PATCH 5/7] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 146cded9..7a4336c9 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1 +1 @@ -- Do not invoke calback twice when error about trust not found in trustConf +- Do not invoke calback twice when error about trust not found in trustConf (#750) From f1d9018adde92b7d5549645669fa5ade106ccb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Wed, 17 Jul 2024 09:10:27 +0200 Subject: [PATCH 6/7] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 7a4336c9..77c8426b 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1 +1 @@ -- Do not invoke calback twice when error about trust not found in trustConf (#750) +- Fix: do not invoke calback twice when error about trust not found in trustConf (#750) From efbc2d5a683a9128d330848d8092804a162756f8 Mon Sep 17 00:00:00 2001 From: Alvaro Vega Date: Wed, 17 Jul 2024 09:19:21 +0200 Subject: [PATCH 7/7] Update CHANGES_NEXT_RELEASE --- CHANGES_NEXT_RELEASE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 77c8426b..a1191de3 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1 +1 @@ -- Fix: do not invoke calback twice when error about trust not found in trustConf (#750) +- Fix: do not invoke calback twice when error about trust not found in trustConf (#790)