Skip to content
Snippets Groups Projects
Unverified Commit 1fe1eef9 authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

fix(config): better decrypt errors (#11777)

parent 23b1c18e
No related branches found
No related tags found
No related merge requests found
...@@ -101,27 +101,37 @@ export async function tryDecrypt( ...@@ -101,27 +101,37 @@ export async function tryDecrypt(
if (scopedRepository === repository) { if (scopedRepository === repository) {
decryptedStr = value; decryptedStr = value;
} else { } else {
logger.warn( logger.debug(
{ scopedRepository }, { scopedRepository },
'Secret is scoped to a different repository' 'Secret is scoped to a different repository'
); );
const error = new Error('config-validation');
error.validationError = `Encrypted secret is scoped to a different repository: ${scopedRepository}.`;
throw error;
} }
} else { } else {
const scopedOrg = `${orgName}/`; const scopedOrg = `${orgName}/`;
if (repository.startsWith(scopedOrg)) { if (repository.startsWith(scopedOrg)) {
decryptedStr = value; decryptedStr = value;
} else { } else {
logger.warn( logger.debug(
{ scopedOrg }, { scopedOrg },
'Secret is scoped to a different org' 'Secret is scoped to a different org'
); );
const error = new Error('config-validation');
error.validationError = `Encrypted secret is scoped to a different org" ${scopedOrg}.`;
throw error;
} }
} }
} else { } else {
logger.warn('Missing scope from decrypted object'); const error = new Error('config-validation');
error.validationError = `Encrypted value in config is missing a scope.`;
throw error;
} }
} else { } else {
logger.warn('Decrypted object is missing a value'); const error = new Error('config-validation');
error.validationError = `Encrypted value in config is missing a value.`;
throw error;
} }
} catch (err) { } catch (err) {
logger.warn({ err }, 'Could not parse decrypted string'); logger.warn({ err }, 'Could not parse decrypted string');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment