Fixed GitHub webhook being set all the time due to OAuth token

Author: squidfunk

Makefile

@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-all: clean lint | build
+all: lint | build
 
 # -----------------------------------------------------------------------------
 # Prerequisites

aws-lambda/.eslintignore

@@ -20,6 +20,3 @@
 
 # Distribution files
 /dist
-
-# ES5 files
-/webpack.config.js

aws-lambda/src/status.js

@@ -138,7 +138,7 @@ export default (event, context, cb) => {
         return new Promise((resolve, reject) => {
           if (ref === "master" && BADGES[state]) {
             s3.putObject({
-              Bucket: process.env.STATUS_BUCKET,
+              Bucket: process.env.CODEBUILD_BUCKET,
               Key: `${repo}/status.svg`,
               Body: BADGES[state],
               ACL: "public-read",

aws-lambda/webpack.config.js

@@ -39,15 +39,14 @@ const EventHooksPlugin = require("event-hooks-webpack-plugin")
  * @return {Array<string>} Paths of dependent modules
  */
 const resolve = module => {
-  const package = require(path.resolve(module, "package.json"))
-  return Object.keys(package.dependencies || {}).reduce(
+  const metadata = require(path.resolve(module, "package.json"))
+  return Object.keys(metadata.dependencies || {}).reduce(
     (dependencies, name) => {
       const dependency = path.resolve([module, __dirname].find(base => {
         return fs.existsSync(path.resolve(base, "node_modules", name))
       }), "node_modules", name)
       return [...dependencies, dependency, ...resolve(dependency)]
-    },
-  [])
+    }, [])
 }
 
 /* ----------------------------------------------------------------------------
@@ -59,7 +58,7 @@ module.exports = {
 
   /* Entrypoints */
   entry: {
-    push:   path.resolve(__dirname, "src/push.js"),
+    push: path.resolve(__dirname, "src/push.js"),
     status: path.resolve(__dirname, "src/status.js")
   },
 
@@ -90,7 +89,7 @@ module.exports = {
 
     /* Post-compilation hook to bundle sources with dependencies */
     new EventHooksPlugin({
-      'done': stats => {
+      done: stats => {
         Object.keys(stats.compilation.entrypoints).forEach(name => {
           const entrypoint = stats.compilation.entrypoints[name]
           entrypoint.chunks.forEach(chunk => {
@@ -106,15 +105,15 @@ module.exports = {
 
                 /* Bundle all non-native modules, except aws-sdk */
                 if (dependency.request && dependency.request !== "aws-sdk" &&
-                    dependency.request.match(/^[^\.]/)) {
+                    dependency.request.match(/^[^.]/)) {
                   const external = path.resolve(
                     __dirname, "node_modules", dependency.request)
                   if (fs.existsSync(external)) {
                     archive.directory(external,
                       path.join("node_modules", dependency.request))
 
                     /* Bundle nested dependencies */
-                    resolve(external).map(subexternal => {
+                    resolve(external).forEach(subexternal => {
                       archive.directory(subexternal,
                         path.relative(__dirname, subexternal))
                     })
@@ -124,7 +123,7 @@ module.exports = {
             })
 
             /* Append compiled sources to archive */
-            archive.directory(path.resolve(__dirname, "dist", name), false);
+            archive.directory(path.resolve(__dirname, "dist", name), false)
 
             /* Finalize and write archive */
             archive.pipe(zipfile)

main.tf

@@ -309,7 +309,7 @@ resource "aws_lambda_function" "webhook_status" {
     variables = {
       GITHUB_OAUTH_TOKEN = "${var.github_oauth_token}"
       GITHUB_REPORTER    = "${var.github_reporter}"
-      STATUS_BUCKET      = "${aws_s3_bucket.codebuild.bucket}"
+      CODEBUILD_BUCKET   = "${aws_s3_bucket.codebuild.bucket}"
     }
   }
 }
@@ -340,4 +340,9 @@ resource "github_repository_webhook" "webhook" {
   }
 
   events = ["push", "pull_request"]
+
+  # Ignore, if the webhook already exists
+  lifecycle {
+    ignore_changes = ["*"]
+  }
 }