refactor: change getToken to return nullable output

This commit is contained in:
joseph-sentry 2024-07-23 16:07:22 -04:00
parent c56aae1c00
commit 30c7aa0088
No known key found for this signature in database
3 changed files with 15 additions and 15 deletions

14
dist/index.js vendored
View file

@ -32351,12 +32351,11 @@ const isPullRequestFromFork = () => {
return (baseLabel.split(':')[0] !== headLabel.split(':')[0]); return (baseLabel.split(':')[0] !== headLabel.split(':')[0]);
}; };
const getToken = () => buildExec_awaiter(void 0, void 0, void 0, function* () { const getToken = () => buildExec_awaiter(void 0, void 0, void 0, function* () {
var _a;
let token = core.getInput('token'); let token = core.getInput('token');
if (!token && isPullRequestFromFork()) { if (!token && isPullRequestFromFork()) {
core.info('==> Fork detected, tokenless uploading used'); core.info('==> Fork detected, tokenless uploading used');
process.env['TOKENLESS'] = context.payload.pull_request.head.label; process.env['TOKENLESS'] = context.payload.pull_request.head.label;
return [false, (_a = context.payload.pull_request) === null || _a === void 0 ? void 0 : _a.head.label]; return null;
} }
let url = core.getInput('url'); let url = core.getInput('url');
const useOIDC = isTrue(core.getInput('use_oidc')); const useOIDC = isTrue(core.getInput('use_oidc'));
@ -32366,24 +32365,25 @@ const getToken = () => buildExec_awaiter(void 0, void 0, void 0, function* () {
} }
try { try {
token = yield core.getIDToken(url); token = yield core.getIDToken(url);
return [true, token]; return token;
} }
catch (err) { catch (err) {
setFailure(`Codecov: Failed to get OIDC token with url: ${url}. ${err.message}`, true); setFailure(`Codecov: Failed to get OIDC token with url: ${url}. ${err.message}`, true);
} }
} }
return [true, token]; return token;
}); });
const buildCommitExec = () => buildExec_awaiter(void 0, void 0, void 0, function* () { const buildCommitExec = () => buildExec_awaiter(void 0, void 0, void 0, function* () {
var _a;
const commitParent = core.getInput('commit_parent'); const commitParent = core.getInput('commit_parent');
const gitService = getGitService(); const gitService = getGitService();
let overrideBranch = core.getInput('override_branch'); let overrideBranch = core.getInput('override_branch');
const overrideCommit = core.getInput('override_commit'); const overrideCommit = core.getInput('override_commit');
const overridePr = core.getInput('override_pr'); const overridePr = core.getInput('override_pr');
const slug = core.getInput('slug'); const slug = core.getInput('slug');
const [tokenAvailable, token] = yield getToken(); const token = yield getToken();
if (!tokenAvailable) { if (token == null) {
overrideBranch = token; overrideBranch = (_a = context.payload.pull_request) === null || _a === void 0 ? void 0 : _a.head.label;
} }
const failCi = isTrue(core.getInput('fail_ci_if_error')); const failCi = isTrue(core.getInput('fail_ci_if_error'));
const workingDir = core.getInput('working-directory'); const workingDir = core.getInput('working-directory');

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View file

@ -45,12 +45,12 @@ const isPullRequestFromFork = (): boolean => {
return (baseLabel.split(':')[0] !== headLabel.split(':')[0]); return (baseLabel.split(':')[0] !== headLabel.split(':')[0]);
}; };
const getToken = async (): Promise<[boolean, string]> => { const getToken = async (): Promise<string | null> => {
let token = core.getInput('token'); let token = core.getInput('token');
if (!token && isPullRequestFromFork()) { if (!token && isPullRequestFromFork()) {
core.info('==> Fork detected, tokenless uploading used'); core.info('==> Fork detected, tokenless uploading used');
process.env['TOKENLESS'] = context.payload.pull_request.head.label; process.env['TOKENLESS'] = context.payload.pull_request.head.label;
return [false, context.payload.pull_request?.head.label]; return null;
} }
let url = core.getInput('url'); let url = core.getInput('url');
const useOIDC = isTrue(core.getInput('use_oidc')); const useOIDC = isTrue(core.getInput('use_oidc'));
@ -60,7 +60,7 @@ const getToken = async (): Promise<[boolean, string]> => {
} }
try { try {
token = await core.getIDToken(url); token = await core.getIDToken(url);
return [true, token]; return token;
} catch (err) { } catch (err) {
setFailure( setFailure(
`Codecov: Failed to get OIDC token with url: ${url}. ${err.message}`, `Codecov: Failed to get OIDC token with url: ${url}. ${err.message}`,
@ -68,7 +68,7 @@ const getToken = async (): Promise<[boolean, string]> => {
); );
} }
} }
return [true, token]; return token;
}; };
const buildCommitExec = async (): Promise<{ const buildCommitExec = async (): Promise<{
@ -82,9 +82,9 @@ const buildCommitExec = async (): Promise<{
const overrideCommit = core.getInput('override_commit'); const overrideCommit = core.getInput('override_commit');
const overridePr = core.getInput('override_pr'); const overridePr = core.getInput('override_pr');
const slug = core.getInput('slug'); const slug = core.getInput('slug');
const [tokenAvailable, token] = await getToken(); const token = await getToken();
if (!tokenAvailable) { if (token == null) {
overrideBranch = token; overrideBranch = context.payload.pull_request?.head.label;
} }
const failCi = isTrue(core.getInput('fail_ci_if_error')); const failCi = isTrue(core.getInput('fail_ci_if_error'));
const workingDir = core.getInput('working-directory'); const workingDir = core.getInput('working-directory');