From 38d89d66375e5f6074ca8e881de5f20c9b942bca Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 17 Mar 2026 16:19:27 -0500 Subject: [PATCH] Website: Remove release section in GitHub webhook (#41898) Changes: - Commented out the section of the GitHub webhook that handles "release" webhook events. The Zapier automation triggered by the webhook has been turned off. --- .../webhooks/receive-from-github.js | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/website/api/controllers/webhooks/receive-from-github.js b/website/api/controllers/webhooks/receive-from-github.js index 15f72d2ffa..b302284df3 100644 --- a/website/api/controllers/webhooks/receive-from-github.js +++ b/website/api/controllers/webhooks/receive-from-github.js @@ -31,7 +31,7 @@ module.exports = { }, - fn: async function ({botSignature, action, sender, repository, changes, issue, comment, pull_request: pr, label, release, projects_v2_item: projectsV2Item}) { + fn: async function ({botSignature, action, sender, repository, changes, issue, comment, pull_request: pr, label, projects_v2_item: projectsV2Item}) { // Grab the set of GitHub pull request numbers the bot considers "unfrozen" from the platform record. // If there is more than one platform record, or it is missing, we'll throw an error. @@ -707,7 +707,8 @@ module.exports = { ) .timeout(5000) .retry([{name: 'TimeoutError'}, 'non200Response', 'requestFailed']); - } else if(ghNoun === 'release' && ['published'].includes(action) ) { + // 2026-03-17: @eashaw: this section is commented out because the zapier automation used by this webhook has been turned off. + // } else if(ghNoun === 'release' && ['published'].includes(action) ) { // ██████╗ ███████╗██╗ ███████╗ █████╗ ███████╗███████╗███████╗ // ██╔══██╗██╔════╝██║ ██╔════╝██╔══██╗██╔════╝██╔════╝██╔════╝ // ██████╔╝█████╗ ██║ █████╗ ███████║███████╗█████╗ ███████╗ @@ -717,31 +718,30 @@ module.exports = { // // Handle new Fleet releases by sending a POST request to Zapier to // trigger an automation that updates Slack channel topics with the latest version of Fleet. - let owner = repository.owner.login; - let repo = repository.name; - - // Only continue if this release came from the fleetdm/fleet repo, - if(owner === 'fleetdm' && repo === 'fleet') { - if(release - && _.startsWith(release.tag_name, 'fleet-v')// Only send requests for releases with tag names that start with 'fleet' - && _.endsWith(release.tag_name, '.0')// Only send requests if the release is a major or minor version. This works because all Fleet semvers have 2 periods. - ) { - // Send a POST request to Zapier with the release object. - await sails.helpers.http.post.with({ - url: 'https://hooks.zapier.com/hooks/catch/3627242/3ozw6bk/', - data: { - 'release': release, - 'webhookSecret': sails.config.custom.zapierSandboxWebhookSecret, - } - }) - .timeout(5000) - .tolerate(['non200Response', 'requestFailed', {name: 'TimeoutError'}], (err)=>{ - // Note that Zapier responds with a 2xx status code even if something goes wrong, so just because this message is not logged doesn't mean everything is hunky dory. More info: https://github.com/fleetdm/fleet/pull/6380#issuecomment-1204395762 - sails.log.warn(`When trying to send information about a new Fleet release to Zapier, an error occured. Raw error: ${require('util').inspect(err)}`); - return; - }); - } - }//fi + // let owner = repository.owner.login; + // let repo = repository.name; + // // Only continue if this release came from the fleetdm/fleet repo, + // if(owner === 'fleetdm' && repo === 'fleet') { + // if(release + // && _.startsWith(release.tag_name, 'fleet-v')// Only send requests for releases with tag names that start with 'fleet' + // && _.endsWith(release.tag_name, '.0')// Only send requests if the release is a major or minor version. This works because all Fleet semvers have 2 periods. + // ) { + // // Send a POST request to Zapier with the release object. + // await sails.helpers.http.post.with({ + // url: 'https://hooks.zapier.com/hooks/catch/3627242/3ozw6bk/', + // data: { + // 'release': release, + // 'webhookSecret': sails.config.custom.zapierSandboxWebhookSecret, + // } + // }) + // .timeout(5000) + // .tolerate(['non200Response', 'requestFailed', {name: 'TimeoutError'}], (err)=>{ + // // Note that Zapier responds with a 2xx status code even if something goes wrong, so just because this message is not logged doesn't mean everything is hunky dory. More info: https://github.com/fleetdm/fleet/pull/6380#issuecomment-1204395762 + // sails.log.warn(`When trying to send information about a new Fleet release to Zapier, an error occured. Raw error: ${require('util').inspect(err)}`); + // return; + // }); + // } + // }//fi } else if(ghNoun === 'projects_v2_item') { // // ██████╗ ██████╗ ██████╗ ██╗███████╗ ██████╗████████╗███████╗ ██╗ ██╗██████╗