Refactor functions into their own modules

This makes it much easier to mock things in the future, and also
structures the code better.

This commit is best viewed with `--color-moved`.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

GitGitGadget/index.js

@@ -8,73 +8,9 @@
  * via the "webHookType", starting with v2, we have to do the payload
  * validation "by hand".
  */
-const crypto = require('crypto');
-const https = require('https');
+const { validateGitHubWebHook } = require('./validate-github-webhook');
 
-const validateGitHubWebHook = (context) => {
-    const secret = process.env['GITHUB_WEBHOOK_SECRET'];
-    if (!secret) {
-        throw new Error('Webhook secret not configured');
-    }
-    if (context.req.headers['content-type'] !== 'application/json') {
-        throw new Error('Unexpected content type: ' + context.req.headers['content-type']);
-    }
-    const signature = context.req.headers['x-hub-signature-256'];
-    if (!signature) {
-        throw new Error('Missing X-Hub-Signature');
-    }
-    const sha256 = signature.match(/^sha256=(.*)/);
-    if (!sha256) {
-        throw new Error('Unexpected X-Hub-Signature format: ' + signature);
-    }
-    const computed = crypto.createHmac('sha256', secret).update(context.req.rawBody).digest('hex');
-    if (sha256[1] !== computed) {
-        throw new Error('Incorrect X-Hub-Signature');
-    }
-}
-
-const triggerAzurePipeline = async (token, organization, project, buildDefinitionId, sourceBranch, parameters) => {
-    const auth = Buffer.from('PAT:' + token).toString('base64');
-    const headers = {
-        'Accept': 'application/json; api-version=5.0-preview.5; excludeUrls=true',
-        'Authorization': 'Basic ' + auth,
-    };
-    const json = JSON.stringify({
-        'definition': { 'id': buildDefinitionId },
-        'sourceBranch': sourceBranch,
-        'parameters': JSON.stringify(parameters),
-    });
-    headers['Content-Type'] = 'application/json';
-    headers['Content-Length'] = Buffer.byteLength(json);
-
-    const requestOptions = {
-        host: 'dev.azure.com',
-        port: '443',
-        path: `/${organization}/${project}/_apis/build/builds?ignoreWarnings=false&api-version=5.0-preview.5`,
-        method: 'POST',
-        headers: headers
-    };
-
-    return new Promise((resolve, reject) => {
-        const handleResponse = (res) => {
-            res.setEncoding('utf8');
-            var response = '';
-            res.on('data', (chunk) => {
-                response += chunk;
-            });
-            res.on('end', () => {
-                resolve(JSON.parse(response));
-            });
-            res.on('error', (err) => {
-                reject(err);
-            })
-        };
-
-        const request = https.request(requestOptions, handleResponse);
-        request.write(json);
-        request.end();
-    });
-}
+const { triggerAzurePipeline } = require('./trigger-azure-pipeline');
 
 module.exports = async (context, req) => {
     try {

GitGitGadget/trigger-azure-pipeline.js

@@ -0,0 +1,48 @@
+const https = require('https');
+
+const triggerAzurePipeline = async (token, organization, project, buildDefinitionId, sourceBranch, parameters) => {
+    const auth = Buffer.from('PAT:' + token).toString('base64');
+    const headers = {
+        'Accept': 'application/json; api-version=5.0-preview.5; excludeUrls=true',
+        'Authorization': 'Basic ' + auth,
+    };
+    const json = JSON.stringify({
+        'definition': { 'id': buildDefinitionId },
+        'sourceBranch': sourceBranch,
+        'parameters': JSON.stringify(parameters),
+    });
+    headers['Content-Type'] = 'application/json';
+    headers['Content-Length'] = Buffer.byteLength(json);
+
+    const requestOptions = {
+        host: 'dev.azure.com',
+        port: '443',
+        path: `/${organization}/${project}/_apis/build/builds?ignoreWarnings=false&api-version=5.0-preview.5`,
+        method: 'POST',
+        headers: headers
+    };
+
+    return new Promise((resolve, reject) => {
+        const handleResponse = (res) => {
+            res.setEncoding('utf8');
+            var response = '';
+            res.on('data', (chunk) => {
+                response += chunk;
+            });
+            res.on('end', () => {
+                resolve(JSON.parse(response));
+            });
+            res.on('error', (err) => {
+                reject(err);
+            })
+        };
+
+        const request = https.request(requestOptions, handleResponse);
+        request.write(json);
+        request.end();
+    });
+}
+
+module.exports = {
+    triggerAzurePipeline
+}

GitGitGadget/validate-github-webhook.js

@@ -0,0 +1,27 @@
+const crypto = require('crypto');
+
+const validateGitHubWebHook = (context) => {
+    const secret = process.env['GITHUB_WEBHOOK_SECRET'];
+    if (!secret) {
+        throw new Error('Webhook secret not configured');
+    }
+    if (context.req.headers['content-type'] !== 'application/json') {
+        throw new Error('Unexpected content type: ' + context.req.headers['content-type']);
+    }
+    const signature = context.req.headers['x-hub-signature-256'];
+    if (!signature) {
+        throw new Error('Missing X-Hub-Signature');
+    }
+    const sha256 = signature.match(/^sha256=(.*)/);
+    if (!sha256) {
+        throw new Error('Unexpected X-Hub-Signature format: ' + signature);
+    }
+    const computed = crypto.createHmac('sha256', secret).update(context.req.rawBody).digest('hex');
+    if (sha256[1] !== computed) {
+        throw new Error('Incorrect X-Hub-Signature');
+    }
+}
+
+module.exports = {
+    validateGitHubWebHook
+}