Skip to content

Commit

Permalink
v5.3 (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
@carmocca
carmocca authored Dec 16, 2022
1 parent b71e37c commit 0220b50
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 20 deletions.
28 changes: 20 additions & 8 deletions dist/check-group/core/config_getter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,28 +80,27 @@ var core = __importStar(require("@actions/core"));
* @returns The configuration or default configuration if non exists.
*/
var fetchConfig = function (context) { return __awaiter(void 0, void 0, void 0, function () {
var configData, filename, payload, repoFullName, githubRepository, prBranch, params, config;
var configData, payload, repoFullName, githubRepository, prBranch, baseBranch;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
configData = undefined;
filename = "checkgroup.yml";
payload = context.payload;
repoFullName = payload.pull_request.head.repo.full_name;
githubRepository = payload.pull_request.base.repo.full_name;
core.debug("fetchConfig ".concat(repoFullName, " ").concat(githubRepository));
if (!(repoFullName == githubRepository)) return [3 /*break*/, 2];
prBranch = payload.pull_request.head.ref;
core.info("The PR is from a branch in the repository. Reading the config in ".concat(prBranch));
params = context.repo({ path: ".github/".concat(filename) });
return [4 /*yield*/, context.octokit.config.get(__assign(__assign({}, params), { branch: prBranch }))];
return [4 /*yield*/, readConfig(context, prBranch)];
case 1:
config = (_a.sent()).config;
configData = config;
configData = _a.sent();
return [3 /*break*/, 4];
case 2: return [4 /*yield*/, context.config(filename)];
case 2:
baseBranch = payload.pull_request.base.ref;
core.info("The PR is from a fork (".concat(repoFullName, "). For security, reading the config in ").concat(baseBranch));
return [4 /*yield*/, readConfig(context, baseBranch)];
case 3:
// this will pull the config from master
configData = _a.sent();
_a.label = 4;
case 4:
Expand All @@ -111,3 +110,16 @@ var fetchConfig = function (context) { return __awaiter(void 0, void 0, void 0,
});
}); };
exports.fetchConfig = fetchConfig;
var readConfig = function (context, branch) { return __awaiter(void 0, void 0, void 0, function () {
var params, config;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
params = context.repo({ path: '.github/checkgroup.yml' });
return [4 /*yield*/, context.octokit.config.get(__assign(__assign({}, params), { branch: branch }))];
case 1:
config = (_a.sent()).config;
return [2 /*return*/, config];
}
});
}); };
11 changes: 9 additions & 2 deletions dist/check-group/core/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ var CheckGroup = /** @class */ (function () {
this.intervalTimer = setTimeout(function () { return ''; }, 0);
this.timeoutTimer = setTimeout(function () { return ''; }, 0);
this.inputs = {};
this.canComment = true;
this.pullRequestNumber = pullRequestNumber;
this.config = config;
this.context = context;
Expand Down Expand Up @@ -180,7 +181,11 @@ var CheckGroup = /** @class */ (function () {
e_1 = _a.sent();
if (e_1 instanceof request_error_1.RequestError && e_1.status === 403) {
// Forbidden: Resource not accessible by integration
core.info("Failed to comment on the PR: ".concat(JSON.stringify(e_1)));
if (this.canComment) {
core.info("Failed to comment on the PR: ".concat(JSON.stringify(e_1)));
}
// Use this boolean to only print the info message once
this.canComment = false;
}
else {
throw e_1;
Expand Down Expand Up @@ -223,7 +228,9 @@ var getPostedChecks = function (context, sha) { return __awaiter(void 0, void 0,
var checkRuns, checkNames;
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4 /*yield*/, context.octokit.paginate(context.octokit.checks.listForRef, context.repo({ ref: sha }), function (response) { return response.data; })];
case 0: return [4 /*yield*/, context.octokit.paginate(context.octokit.checks.listForRef,
// only the latest runs, in case it was run multiple times
context.repo({ ref: sha, filter: "latest" }), function (response) { return response.data; })];
case 1:
checkRuns = _a.sent();
core.debug("checkRuns: ".concat(JSON.stringify(checkRuns)));
Expand Down
20 changes: 12 additions & 8 deletions src/check-group/core/config_getter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,26 @@ import * as core from '@actions/core'
*/
export const fetchConfig = async (context: Context): Promise<CheckGroupConfig> => {
let configData: Record<string, unknown> = undefined
const filename = "checkgroup.yml"
const payload = context.payload as PullRequestEvent;
const repoFullName = payload.pull_request.head.repo.full_name
const githubRepository = payload.pull_request.base.repo.full_name
core.debug(`fetchConfig ${repoFullName} ${githubRepository}`)
if (repoFullName == githubRepository) {
const prBranch = payload.pull_request.head.ref;
core.info(`The PR is from a branch in the repository. Reading the config in ${prBranch}`)
const params = context.repo({path: `.github/${filename}`})
// https://github.com/probot/octokit-plugin-config
const { config } = await context.octokit.config.get({...params, branch: prBranch})
configData = config
core.info(`The PR is from a branch in the repository. Reading the config in '${prBranch}'`)
configData = await readConfig(context, prBranch)
} else {
// this will pull the config from master
configData = await context.config(filename);
const baseBranch = payload.pull_request.base.ref;
core.info(`The PR is from a fork: '${repoFullName}'. For security, reading the config in '${baseBranch}'`)
configData = await readConfig(context, baseBranch)
}
core.debug(`configData: ${JSON.stringify(configData)}`)
return parseUserConfig(configData);
};

const readConfig = async (context: Context, branch: string): Promise<Record<string, unknown>> => {
const params = context.repo({path: '.github/checkgroup.yml'})
// https://github.com/probot/octokit-plugin-config
const { config } = await context.octokit.config.get({...params, branch: branch})
return config
}
11 changes: 9 additions & 2 deletions src/check-group/core/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export class CheckGroup {
timeoutTimer: ReturnType<typeof setTimeout> = setTimeout(() => '', 0);
inputs: Record<string, any> = {};

canComment: boolean = true;

constructor(
pullRequestNumber: number,
config: CheckGroupConfig,
Expand Down Expand Up @@ -119,7 +121,11 @@ export class CheckGroup {
} catch (e) {
if (e instanceof RequestError && e.status === 403) {
// Forbidden: Resource not accessible by integration
core.info(`Failed to comment on the PR: ${JSON.stringify(e)}`)
if (this.canComment) {
core.info(`Failed to comment on the PR: ${JSON.stringify(e)}`)
}
// Use this boolean to only print the info message once
this.canComment = false
} else {
throw e
}
Expand Down Expand Up @@ -154,7 +160,8 @@ export {fetchConfig};
const getPostedChecks = async (context: Context, sha: string): Promise<Record<string, CheckRunData>> => {
const checkRuns = await context.octokit.paginate(
context.octokit.checks.listForRef,
context.repo({ref: sha}),
// only the latest runs, in case it was run multiple times
context.repo({ref: sha, filter: "latest"}),
(response) => response.data,
);
core.debug(`checkRuns: ${JSON.stringify(checkRuns)}`)
Expand Down

0 comments on commit 0220b50

Please sign in to comment.