diff --git a/src/helpers.ts b/src/helpers.ts index c65f297..b304db6 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -171,11 +171,8 @@ export function validateAccountId(expectedAccountIds: string[] | undefined, acco return; } if (!account || !allowedAccountIds.includes(account)) { - throw new Error( - `The account ID of the provided credentials (${ - account ?? 'unknown' - }) does not match any of the expected account IDs: ${allowedAccountIds.join(', ')}`, - ); + // Account IDs are deliberately omitted: this error reaches the job log before any mask exists. + throw new Error('The account ID of the provided credentials does not match any of the allowed account IDs'); } } diff --git a/test/index.test.ts b/test/index.test.ts index 7b9aafd..18665ca 100644 --- a/test/index.test.ts +++ b/test/index.test.ts @@ -841,7 +841,7 @@ describe('Configure AWS Credentials', {}, () => { await run(); expect(core.setFailed).toHaveBeenCalledWith( - 'The account ID of the provided credentials (111111111111) does not match any of the expected account IDs: 999999999999', + 'The account ID of the provided credentials does not match any of the allowed account IDs', ); }); @@ -861,7 +861,7 @@ describe('Configure AWS Credentials', {}, () => { await run(); expect(core.setFailed).toHaveBeenCalledWith( - 'The account ID of the provided credentials (111111111111) does not match any of the expected account IDs: 999999999999, 888888888888', + 'The account ID of the provided credentials does not match any of the allowed account IDs', ); }); @@ -917,7 +917,7 @@ describe('Configure AWS Credentials', {}, () => { await run(); expect(core.setFailed).toHaveBeenCalledWith( - 'The account ID of the provided credentials (111111111111) does not match any of the expected account IDs: 999999999999', + 'The account ID of the provided credentials does not match any of the allowed account IDs', ); }); @@ -936,7 +936,7 @@ describe('Configure AWS Credentials', {}, () => { await run(); expect(core.setFailed).toHaveBeenCalledWith( - 'The account ID of the provided credentials (111111111111) does not match any of the expected account IDs: 999999999999', + 'The account ID of the provided credentials does not match any of the allowed account IDs', ); }); @@ -956,7 +956,7 @@ describe('Configure AWS Credentials', {}, () => { await run(); expect(core.setFailed).toHaveBeenCalledWith( - 'The account ID of the provided credentials (111111111111) does not match any of the expected account IDs: 999999999999', + 'The account ID of the provided credentials does not match any of the allowed account IDs', ); });