From 980400db0bb8adc2339a04a090ecffa15e2b4367 Mon Sep 17 00:00:00 2001
From: Eric Chiang <eric.chiang@coreos.com>
Date: Thu, 14 Sep 2017 09:44:15 -0700
Subject: [PATCH] Makefile: error out if go files aren't correctly formatted

Noticed in #1058 that our gofmt make target isn't actually erroring
if someone commits misformatted code.
---
 Makefile                   | 2 +-
 connector/github/github.go | 6 +++---
 scripts/gofmt              | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100755 scripts/gofmt

diff --git a/Makefile b/Makefile
index 867b9b27b0..9792c5b167 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ vet:
 	@go vet $(shell go list ./... | grep -v '/vendor/')
 
 fmt:
-	@go fmt $(shell go list ./... | grep -v '/vendor/')
+	@./scripts/gofmt $(shell go list ./... | grep -v '/vendor/')
 
 lint:
 	@for package in $(shell go list ./... | grep -v '/vendor/' | grep -v '/api' | grep -v '/server/internal'); do \
diff --git a/connector/github/github.go b/connector/github/github.go
index 0579e42eef..ae0784121b 100644
--- a/connector/github/github.go
+++ b/connector/github/github.go
@@ -503,13 +503,13 @@ func (c *githubConnector) userEmail(ctx context.Context, client *http.Client) (s
 				advised them not to check for verified emails
 				(https://circleci.com/enterprise/changelog/#1-47-1).
 				In addition, GitHub Enterprise support replied to a support
-				ticket with "There is no way to verify an email address in 
-				GitHub Enterprise."			
+				ticket with "There is no way to verify an email address in
+				GitHub Enterprise."
 			*/
 			if c.hostName != "" {
 				email.Verified = true
 			}
-			
+
 			if email.Verified && email.Primary {
 				return email.Email, nil
 			}
diff --git a/scripts/gofmt b/scripts/gofmt
new file mode 100755
index 0000000000..8851bdab86
--- /dev/null
+++ b/scripts/gofmt
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+result=$( go fmt $@ )
+if [[ $result != "" ]]; then
+    >&2 echo "The following files are not formatted correctly: $result"
+    exit 1
+fi