From b2b5541d88cca6e769ef201cefa539ccb7ece897 Mon Sep 17 00:00:00 2001 From: Nicolas Brichet Date: Tue, 20 May 2025 15:31:09 +0200 Subject: [PATCH 1/2] Do not throw if secrets manager is disabled --- src/manager.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/manager.ts b/src/manager.ts index 6bab69b..1e785d0 100644 --- a/src/manager.ts +++ b/src/manager.ts @@ -253,7 +253,9 @@ export namespace SecretsManager { throw new Error('Secrets manager is locked, check errors.'); } if (isDisabled('jupyter-secrets-manager:manager')) { - lock('Secret registry is disabled.'); + // If the secrets manager is disabled, we need to lock the manager, but not + // throw an error, to let the plugin get activated anyway. + lock('Secret registry is disabled.', false); } if (isDisabled(id)) { lock(`Sign error: plugin ${id} is disabled.`); @@ -293,9 +295,13 @@ namespace Private { * * @param message - the error message to throw. */ - export function lock(message: string) { + export function lock(message: string, throwError = true): void { locked = true; - throw new Error(message); + if (throwError) { + throw new Error(message); + } else { + console.warn(message); + } } /** From d56564dcc0be4a1f801be061574dc9cf82f3f7d7 Mon Sep 17 00:00:00 2001 From: Nicolas Brichet Date: Wed, 21 May 2025 14:05:02 +0200 Subject: [PATCH 2/2] Throw error only if the message is provided --- src/manager.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/manager.ts b/src/manager.ts index 1e785d0..74b0f65 100644 --- a/src/manager.ts +++ b/src/manager.ts @@ -255,7 +255,8 @@ export namespace SecretsManager { if (isDisabled('jupyter-secrets-manager:manager')) { // If the secrets manager is disabled, we need to lock the manager, but not // throw an error, to let the plugin get activated anyway. - lock('Secret registry is disabled.', false); + console.warn('Secrets manager is disabled.'); + lock(); } if (isDisabled(id)) { lock(`Sign error: plugin ${id} is disabled.`); @@ -295,12 +296,10 @@ namespace Private { * * @param message - the error message to throw. */ - export function lock(message: string, throwError = true): void { + export function lock(message?: string): void { locked = true; - if (throwError) { + if (message) { throw new Error(message); - } else { - console.warn(message); } }