From a95814b593254225cc8c51f39b1755980ce8183b Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Thu, 2 Jul 2015 14:03:02 -0700
Subject: [PATCH 1/2] make swagger presubmit not spew noise

---
 hack/lib/etcd.sh            |  4 ++--
 hack/update-swagger-spec.sh | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index f0ab3bc1fa0..581b9265baa 100644
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -40,13 +40,13 @@ kube::etcd::start() {
 
   # Start etcd
   ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
-  kube::log::usage "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
+  kube::log::info "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
   etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
   ETCD_PID=$!
 
   echo "Waiting for etcd to come up."
   kube::util::wait_for_url "http://${host}:${port}/v2/machines" "etcd: " 0.25 80
-  curl -X PUT "http://${host}:${port}/v2/keys/_test"
+  curl -fs -X PUT "http://${host}:${port}/v2/keys/_test"
 }
 
 kube::etcd::stop() {
diff --git a/hack/update-swagger-spec.sh b/hack/update-swagger-spec.sh
index e85abd4b595..edc22c1afea 100755
--- a/hack/update-swagger-spec.sh
+++ b/hack/update-swagger-spec.sh
@@ -54,17 +54,17 @@ KUBE_API_VERSIONS="v1,v1beta3" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
   --public_address_override="127.0.0.1" \
   --kubelet_port=${KUBELET_PORT} \
   --runtime_config=api/v1beta3 \
-  --service-cluster-ip-range="10.0.0.0/24" 1>&2 &
+  --service-cluster-ip-range="10.0.0.0/24" >/dev/null 2>&1 &
 APISERVER_PID=$!
 
 kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: "
 
 SWAGGER_API_PATH="http://127.0.0.1:${API_PORT}/swaggerapi/"
 kube::log::status "Updating " ${SWAGGER_ROOT_DIR}
-curl ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json
-curl ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json
-curl ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json
-curl ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json
-curl ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json
+curl -fs ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json
+curl -fs ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json
+curl -fs ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json
+curl -fs ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json
+curl -fs ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json
 
 kube::log::status "SUCCESS"

From efa76b72ae4c5d50b1ba416638e0097651fc0bd3 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Thu, 2 Jul 2015 14:29:59 -0700
Subject: [PATCH 2/2] Run the build once during presubmit

---
 hack/verify-gendocs.sh               |  1 -
 hack/verify-generated-conversions.sh |  1 -
 hack/verify-generated-deep-copies.sh |  1 -
 hack/verify-swagger-spec.sh          |  1 -
 hooks/pre-commit                     | 17 +++++++++++++++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/hack/verify-gendocs.sh b/hack/verify-gendocs.sh
index 67db0ea4160..a8db1f2ed3a 100755
--- a/hack/verify-gendocs.sh
+++ b/hack/verify-gendocs.sh
@@ -22,7 +22,6 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
-"${KUBE_ROOT}/hack/build-go.sh" cmd/gendocs cmd/genman cmd/genbashcomp
 
 gendocs=$(kube::util::find-binary "gendocs")
 genman=$(kube::util::find-binary "genman")
diff --git a/hack/verify-generated-conversions.sh b/hack/verify-generated-conversions.sh
index 9e619c7b939..5c0bb2efa22 100755
--- a/hack/verify-generated-conversions.sh
+++ b/hack/verify-generated-conversions.sh
@@ -22,7 +22,6 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
-"${KUBE_ROOT}/hack/build-go.sh" cmd/genconversion
 
 genconversion=$(kube::util::find-binary "genconversion")
 
diff --git a/hack/verify-generated-deep-copies.sh b/hack/verify-generated-deep-copies.sh
index 20a25089327..373fc7670b8 100755
--- a/hack/verify-generated-deep-copies.sh
+++ b/hack/verify-generated-deep-copies.sh
@@ -22,7 +22,6 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
-"${KUBE_ROOT}/hack/build-go.sh" cmd/gendeepcopy
 
 genconversion=$(kube::util::find-binary "gendeepcopy")
 
diff --git a/hack/verify-swagger-spec.sh b/hack/verify-swagger-spec.sh
index 7e92929a2b5..1857614fd65 100755
--- a/hack/verify-swagger-spec.sh
+++ b/hack/verify-swagger-spec.sh
@@ -30,7 +30,6 @@ _tmp="${KUBE_ROOT}/_tmp"
 mkdir -p "${_tmp}"
 cp -a "${SPECROOT}" "${TMP_SPECROOT}"
 
-"${KUBE_ROOT}/hack/build-go.sh"
 "${KUBE_ROOT}/hack/update-swagger-spec.sh"
 echo "diffing ${SPECROOT} against freshly generated swagger spec"
 ret=0
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 14663691fba..48965e4d3b6 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -8,12 +8,22 @@ KUBE_HOOKS_DIR="$(dirname "$(test -L "$0" && echo "$(dirname $0)/$(readlink "$0"
 
 exit_code=0
 
+echo -ne "Checking that it builds... "
+if ! OUT=$("hack/build-go.sh" 2>&1); then
+  echo
+  echo "${red}${OUT}"
+  exit_code=1
+else
+  echo "${green}OK"
+fi
+echo "${reset}"
+
 echo -ne "Checking for files that need gofmt... "
 files_need_gofmt=()
 files=($(git diff --cached --name-only --diff-filter ACM | grep "\.go" | grep -v -e "third_party" -e "Godeps"))
 for file in "${files[@]}"; do
   # Check for files that fail gofmt.
-  diff="$(git show ":${file}" | gofmt -s -d)"
+  diff="$(git show ":${file}" | gofmt -s -d 2>&1)"
   if [[ -n "$diff" ]]; then
     files_need_gofmt+=("${file}")
   fi
@@ -135,4 +145,7 @@ else
 fi
 echo "${reset}"
 
-exit $exit_code
+if [[ "${exit_code}" != 0 ]]; then
+  echo "${red}Aborting commit${reset}"
+fi
+exit ${exit_code}