Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Website: disable Mergefreeze related code in GH webhook (#20292)

Browse Source 
Changes:
- Commented out code related to Mergefreeze in the receive-from-github
webhook.
This commit is contained in:
Eric
2024-07-09 17:57:15 -05:00
committed by GitHub
parent 670a8ef2a0
commit e5188eaac6
1 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/api/controllers/webhooks/receive-from-github.js
Vendored
+69 -65
View File
@@ -36,7 +36,7 @@ module.exports = {
throw new Error(`Consistency violation: when the GitHub webhook received an event, more than one platform record was found.`);
}
let pocketOfPrNumbersUnfrozen = platformRecord.currentUnfrozenGitHubPrNumbers;
// let pocketOfPrNumbersUnfrozen = platformRecord.currentUnfrozenGitHubPrNumbers;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -446,84 +446,88 @@ module.exports = {
githubUserToCheck: sender.login,
isGithubUserMaintainerOrDoesntMatter: GITHUB_USERNAMES_OF_BOTS_AND_MAINTAINERS.includes(sender.login.toLowerCase())
});
// (2024-07-09): The Mergefreeze requests and related code in this webhook are disabled/commented out because we are no longer freezing the main branch.
// FUTURE: Remove mergefreeze related code and leave a comment with a link to an older version of this file
// -----------------------------------------------------
// Check whether the "main" branch is currently frozen (i.e. a feature freeze)
// [?] https://docs.mergefreeze.com/web-api#get-freeze-status
let mergeFreezeMainBranchStatusReport = await sails.helpers.http.get('https://www.mergefreeze.com/api/branches/fleetdm/fleet/main', { access_token: sails.config.custom.mergeFreezeAccessToken }) //eslint-disable-line camelcase
.tolerate(['non200Response', 'requestFailed', {name: 'TimeoutError'}], (err)=>{
// If the MergeFreeze API returns a non 200 response, log a warning and continue under the assumption that the main branch is not frozen.
sails.log.warn('When sending a request to the MergeFreeze API to get the status of the main branch, MergeFreeze did not respond with a 2xx status code. (Error details forthcoming in just a sec.) First, how to remediate: If the main branch is frozen, it will need to be manually unfrozen before PR #'+prNumber+' can be merged. Raw underlying error from MergeFreeze: '+err.stack);
return { frozen: false };
});
sails.log.verbose('#'+prNumber+' is under consideration... The MergeFreeze API claims that it current main branch "frozen" status is:',mergeFreezeMainBranchStatusReport.frozen);
let isMainBranchFrozen = mergeFreezeMainBranchStatusReport.frozen;
// If the "main" branch is not currently frozen and we still have PR numbers in our pocketOfPrNumbersUnfrozen array. Clear out the values in the platform record.
if(!isMainBranchFrozen && pocketOfPrNumbersUnfrozen.length > 0) {
await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: []});
}
// let mergeFreezeMainBranchStatusReport = await sails.helpers.http.get('https://www.mergefreeze.com/api/branches/fleetdm/fleet/main', { access_token: sails.config.custom.mergeFreezeAccessToken }) //eslint-disable-line camelcase
// .tolerate(['non200Response', 'requestFailed', {name: 'TimeoutError'}], (err)=>{
// // If the MergeFreeze API returns a non 200 response, log a warning and continue under the assumption that the main branch is not frozen.
// sails.log.warn('When sending a request to the MergeFreeze API to get the status of the main branch, MergeFreeze did not respond with a 2xx status code. (Error details forthcoming in just a sec.) First, how to remediate: If the main branch is frozen, it will need to be manually unfrozen before PR #'+prNumber+' can be merged. Raw underlying error from MergeFreeze: '+err.stack);
// return { frozen: false };
// });
// sails.log.verbose('#'+prNumber+' is under consideration... The MergeFreeze API claims that it current main branch "frozen" status is:',mergeFreezeMainBranchStatusReport.frozen);
// let isMainBranchFrozen = mergeFreezeMainBranchStatusReport.frozen;
// let isMainBranchFrozen = false;
// // If the "main" branch is not currently frozen and we still have PR numbers in our pocketOfPrNumbersUnfrozen array. Clear out the values in the platform record.
// if(!isMainBranchFrozen && pocketOfPrNumbersUnfrozen.length > 0) {
// await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: []});
// }
if (isAutoApprovalExpected) {
// [?] https://docs.github.com/en/rest/reference/pulls#create-a-review-for-a-pull-request
await sails.helpers.http.post(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}/reviews`, {
event: 'APPROVE'
}, baseHeaders);
}//fi
// // If "main" is explicitly frozen, then unfreeze this PR because it no longer contains
// // (or maybe never did contain) changes to freezeworthy files.
// // Note: We'll only do this if the PR is from the fleetdm/fleet repo.
// if (isMainBranchFrozen && repo === 'fleet') {
// If "main" is explicitly frozen, then unfreeze this PR because it no longer contains
// (or maybe never did contain) changes to freezeworthy files.
// Note: We'll only do this if the PR is from the fleetdm/fleet repo.
if (isMainBranchFrozen && repo === 'fleet') {
// pocketOfPrNumbersUnfrozen = _.union(pocketOfPrNumbersUnfrozen, [ prNumber ]);
// sails.log.verbose('#'+prNumber+' autoapproved, main branch is frozen... prNumbers unfrozen:',pocketOfPrNumbersUnfrozen);
pocketOfPrNumbersUnfrozen = _.union(pocketOfPrNumbersUnfrozen, [ prNumber ]);
sails.log.verbose('#'+prNumber+' autoapproved, main branch is frozen... prNumbers unfrozen:',pocketOfPrNumbersUnfrozen);
// // [?] See May 6th, 2022 changelog, which includes this code sample:
// // (https://www.mergefreeze.com/news)
// // (but as of July 26, 2022, I didn't see it documented here: https://docs.mergefreeze.com/web-api#post-freeze-status)
// // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// // > You may now freeze or unfreeze a single PR (while maintaining the overall freeze) via the Web API.
// // ```
// // curl -d "frozen=true&user_name=Scooby Doo&unblocked_prs=[3]" -X POST https://www.mergefreeze.com/api/branches/mergefreeze/core/master/?access_token=[Your access token]
// // ```
// // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// [?] See May 6th, 2022 changelog, which includes this code sample:
// (https://www.mergefreeze.com/news)
// (but as of July 26, 2022, I didn't see it documented here: https://docs.mergefreeze.com/web-api#post-freeze-status)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// > You may now freeze or unfreeze a single PR (while maintaining the overall freeze) via the Web API.
// ```
// curl -d "frozen=true&user_name=Scooby Doo&unblocked_prs=[3]" -X POST https://www.mergefreeze.com/api/branches/mergefreeze/core/master/?access_token=[Your access token]
// ```
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, {
// user_name: 'fleet-release',//eslint-disable-line camelcase
// unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase
// });
// // Update the Platform record to have the current unfrozen PR numbers
// await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen});
// }//fi
await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, {
user_name: 'fleet-release',//eslint-disable-line camelcase
unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase
});
// Update the Platform record to have the current unfrozen PR numbers
await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen});
}//fi
// } else {
// // If "main" is explicitly frozen, then freeze this PR because it now contains
// // (or maybe always did contain) changes to freezeworthy files.
// // Note: We'll only do this if the PR is from the fleetdm/fleet repo.
// if (isMainBranchFrozen && repo === 'fleet') {
} else {
// If "main" is explicitly frozen, then freeze this PR because it now contains
// (or maybe always did contain) changes to freezeworthy files.
// Note: We'll only do this if the PR is from the fleetdm/fleet repo.
if (isMainBranchFrozen && repo === 'fleet') {
// pocketOfPrNumbersUnfrozen = _.difference(pocketOfPrNumbersUnfrozen, [ prNumber ]);
// sails.log.verbose('#'+prNumber+' not autoapproved, main branch is frozen... prNumbers unfrozen:',pocketOfPrNumbersUnfrozen);
pocketOfPrNumbersUnfrozen = _.difference(pocketOfPrNumbersUnfrozen, [ prNumber ]);
sails.log.verbose('#'+prNumber+' not autoapproved, main branch is frozen... prNumbers unfrozen:',pocketOfPrNumbersUnfrozen);
// // [?] See explanation above.
// await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, {
// user_name: 'fleet-release',//eslint-disable-line camelcase
// unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase
// });
// // Update the Platform record to have the current unfrozen PR numbers
// await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen});
// }//fi
// [?] See explanation above.
await sails.helpers.http.post(`https://www.mergefreeze.com/api/branches/fleetdm/fleet/main?access_token=${encodeURIComponent(sails.config.custom.mergeFreezeAccessToken)}`, {
user_name: 'fleet-release',//eslint-disable-line camelcase
unblocked_prs: pocketOfPrNumbersUnfrozen,//eslint-disable-line camelcase
});
// Update the Platform record to have the current unfrozen PR numbers
await Platform.updateOne({id: platformRecord.id}).set({currentUnfrozenGitHubPrNumbers: pocketOfPrNumbersUnfrozen});
}//fi
// Is this in use?
// > For context on the history of this bit of code, which has gone been
// > implemented a couple of different ways, and gone back and forth, check out:
// > https://github.com/fleetdm/fleet/pull/5628#issuecomment-1196175485
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// if (IS_FROZEN) {
// // [?] https://docs.github.com/en/rest/reference/pulls#create-a-review-for-a-pull-request
// await sails.helpers.http.post(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}/reviews`, {
// event: 'REQUEST_CHANGES',
// body: 'The repository is currently frozen for an upcoming release. \n> After the freeze has ended, please dismiss this review. \n\nIn case of emergency, you can dismiss this review and merge now.'
// }, baseHeaders);
// }//fi
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
}
// // Is this in use?
// // > For context on the history of this bit of code, which has gone been
// // > implemented a couple of different ways, and gone back and forth, check out:
// // > https://github.com/fleetdm/fleet/pull/5628#issuecomment-1196175485
// // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// // if (IS_FROZEN) {
// // // [?] https://docs.github.com/en/rest/reference/pulls#create-a-review-for-a-pull-request
// // await sails.helpers.http.post(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}/reviews`, {
// // event: 'REQUEST_CHANGES',
// // body: 'The repository is currently frozen for an upcoming release. \n> After the freeze has ended, please dismiss this review. \n\nIn case of emergency, you can dismiss this review and merge now.'
// // }, baseHeaders);
// // }//fi
// // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// }
}
} else if (ghNoun === 'issue_comment' && ['created'].includes(action) && (issueOrPr&&issueOrPr.state === 'open')) {