Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert(prlint): fail prlinter on codecov failures, with exemption label #32867

Merged
merged 1 commit into from
Jan 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 5 additions & 46 deletions tools/@aws-cdk/prlint/lint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,7 @@ export type GitHubPr =
Endpoints['GET /repos/{owner}/{repo}/pulls/{pull_number}']['response']['data'];

export const CODE_BUILD_CONTEXT = 'AWS CodeBuild us-east-1 (AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv)';
export const CODECOV_PREFIX = 'codecov/';

export const CODECOV_CHECKS = [
'patch',
'patch/packages/aws-cdk',
'patch/packages/aws-cdk-lib/core',
'project',
'project/packages/aws-cdk',
'project/packages/aws-cdk-lib/core'
];

const PR_FROM_MAIN_ERROR = 'Pull requests from `main` branch of a fork cannot be accepted. Please reopen this contribution from another branch on your fork. For more information, see https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md#step-4-pull-request.';

/**
Expand All @@ -33,7 +24,6 @@ enum Exemption {
CLI_INTEG_TESTED = 'pr-linter/cli-integ-tested',
REQUEST_CLARIFICATION = 'pr/reviewer-clarification-requested',
REQUEST_EXEMPTION = 'pr-linter/exemption-requested',
CODECOV = "pr-linter/exempt-codecov",
}

export interface GithubStatusEvent {
Expand Down Expand Up @@ -346,23 +336,14 @@ export class PullRequestLinter {
* @param sha the commit sha to evaluate
*/
private async codeBuildJobSucceeded(sha: string): Promise<boolean> {
return this.checkStatusSucceeded(sha, CODE_BUILD_CONTEXT);
}

/**
* Check a specific status check to see if it is successful for the given commit
*
* @param sha the commit sha to evaluate
*/
private async checkStatusSucceeded(sha: string, context: string): Promise<boolean> {
const statuses = await this.client.paginate(this.client.repos.listCommitStatusesForRef, {
const statuses = await this.client.repos.listCommitStatusesForRef({
owner: this.prParams.owner,
repo: this.prParams.repo,
ref: sha,
});
let status = statuses.filter(status => status.context === context).map(status => status.state);
console.log(`${context} statuses: ${status}`);
return statuses.some(status => status.context === context && status.state === 'success');
let status = statuses.data.filter(status => status.context === CODE_BUILD_CONTEXT).map(status => status.state);
console.log("CodeBuild Commit Statuses: ", status);
return statuses.data.some(status => status.context === CODE_BUILD_CONTEXT && status.state === 'success');
}

public async validateStatusEvent(pr: GitHubPr, status: StatusEvent): Promise<void> {
Expand Down Expand Up @@ -594,24 +575,6 @@ export class PullRequestLinter {
],
});

const codecovTests: Test[] = [];
for (const c of CODECOV_CHECKS) {
const checkName = `${CODECOV_PREFIX}${c}`;
const succeeded = await this.checkStatusSucceeded(sha, checkName);
codecovTests.push({
test: () => {
const result = new TestResult();
result.assessFailure(!succeeded, `${checkName} job is not succeeding`);
return result;
}
})
}

validationCollector.validateRuleSet({
exemption: shouldExemptCodecov,
testRuleSet: codecovTests,
});

console.log("Deleting PR Linter Comment now");
await this.deletePRLinterComment();
try {
Expand Down Expand Up @@ -693,10 +656,6 @@ function fixContainsIntegTest(pr: GitHubPr, files: GitHubFile[]): TestResult {
return result;
}

function shouldExemptCodecov(pr: GitHubPr): boolean {
return hasLabel(pr, Exemption.CODECOV);
}

function shouldExemptReadme(pr: GitHubPr): boolean {
return hasLabel(pr, Exemption.README);
}
Expand Down
11 changes: 4 additions & 7 deletions tools/@aws-cdk/prlint/test/lint.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1182,13 +1182,10 @@ function configureMock(pr: Subset<linter.GitHubPr>, prFiles?: linter.GitHubFile[
const reposClient = {
listCommitStatusesForRef() {
return {
data: [
{
context: linter.CODE_BUILD_CONTEXT,
state: 'success',
},
...(linter.CODECOV_CHECKS.map(c => ({ context: `${linter.CODECOV_PREFIX}${c}`, state: 'success'})))
],
data: [{
context: linter.CODE_BUILD_CONTEXT,
state: 'success',
}],
};
},
};
Expand Down
Loading