mirror of
https://github.com/codecov/codecov-action.git
synced 2026-02-08 03:57:26 +00:00
refactor: change getToken to return nullable output
This commit is contained in:
parent
c56aae1c00
commit
30c7aa0088
3 changed files with 15 additions and 15 deletions
14
dist/index.js
vendored
14
dist/index.js
vendored
|
|
@ -32351,12 +32351,11 @@ const isPullRequestFromFork = () => {
|
|||
return (baseLabel.split(':')[0] !== headLabel.split(':')[0]);
|
||||
};
|
||||
const getToken = () => buildExec_awaiter(void 0, void 0, void 0, function* () {
|
||||
var _a;
|
||||
let token = core.getInput('token');
|
||||
if (!token && isPullRequestFromFork()) {
|
||||
core.info('==> Fork detected, tokenless uploading used');
|
||||
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');
|
||||
const useOIDC = isTrue(core.getInput('use_oidc'));
|
||||
|
|
@ -32366,24 +32365,25 @@ const getToken = () => buildExec_awaiter(void 0, void 0, void 0, function* () {
|
|||
}
|
||||
try {
|
||||
token = yield core.getIDToken(url);
|
||||
return [true, token];
|
||||
return token;
|
||||
}
|
||||
catch (err) {
|
||||
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* () {
|
||||
var _a;
|
||||
const commitParent = core.getInput('commit_parent');
|
||||
const gitService = getGitService();
|
||||
let overrideBranch = core.getInput('override_branch');
|
||||
const overrideCommit = core.getInput('override_commit');
|
||||
const overridePr = core.getInput('override_pr');
|
||||
const slug = core.getInput('slug');
|
||||
const [tokenAvailable, token] = yield getToken();
|
||||
if (!tokenAvailable) {
|
||||
overrideBranch = token;
|
||||
const token = yield getToken();
|
||||
if (token == null) {
|
||||
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 workingDir = core.getInput('working-directory');
|
||||
|
|
|
|||
2
dist/index.js.map
vendored
2
dist/index.js.map
vendored
File diff suppressed because one or more lines are too long
|
|
@ -45,12 +45,12 @@ const isPullRequestFromFork = (): boolean => {
|
|||
return (baseLabel.split(':')[0] !== headLabel.split(':')[0]);
|
||||
};
|
||||
|
||||
const getToken = async (): Promise<[boolean, string]> => {
|
||||
const getToken = async (): Promise<string | null> => {
|
||||
let token = core.getInput('token');
|
||||
if (!token && isPullRequestFromFork()) {
|
||||
core.info('==> Fork detected, tokenless uploading used');
|
||||
process.env['TOKENLESS'] = context.payload.pull_request.head.label;
|
||||
return [false, context.payload.pull_request?.head.label];
|
||||
return null;
|
||||
}
|
||||
let url = core.getInput('url');
|
||||
const useOIDC = isTrue(core.getInput('use_oidc'));
|
||||
|
|
@ -60,7 +60,7 @@ const getToken = async (): Promise<[boolean, string]> => {
|
|||
}
|
||||
try {
|
||||
token = await core.getIDToken(url);
|
||||
return [true, token];
|
||||
return token;
|
||||
} catch (err) {
|
||||
setFailure(
|
||||
`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<{
|
||||
|
|
@ -82,9 +82,9 @@ const buildCommitExec = async (): Promise<{
|
|||
const overrideCommit = core.getInput('override_commit');
|
||||
const overridePr = core.getInput('override_pr');
|
||||
const slug = core.getInput('slug');
|
||||
const [tokenAvailable, token] = await getToken();
|
||||
if (!tokenAvailable) {
|
||||
overrideBranch = token;
|
||||
const token = await getToken();
|
||||
if (token == null) {
|
||||
overrideBranch = context.payload.pull_request?.head.label;
|
||||
}
|
||||
const failCi = isTrue(core.getInput('fail_ci_if_error'));
|
||||
const workingDir = core.getInput('working-directory');
|
||||
|
|
|
|||
Loading…
Reference in a new issue