@@ -75,7 +75,7 @@ DOCKER_RUN_DOCKER := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"

 default: binary

 all: build ## validate all checks, build linux binaries, run all tests\ncross build non-linux binaries and generate archives

-	$(DOCKER_RUN_DOCKER) hack/make.sh

+	$(DOCKER_RUN_DOCKER) bash -c 'hack/validate/default && hack/make.sh'

 binary: build ## build the linux binaries

 	$(DOCKER_RUN_DOCKER) hack/make.sh binary

@@ -133,7 +133,7 @@ tgz: build ## build the archives (.zip on windows and .tgz\notherwise) containin

 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross tgz

 validate: build ## validate DCO, Seccomp profile generation, gofmt,\n./pkg/ isolation, golint, tests, tomls, go vet and vendor

-	$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-default-seccomp validate-gofmt validate-pkg validate-lint validate-test validate-toml validate-vet validate-vendor

+	$(DOCKER_RUN_DOCKER) hack/validate/all

 win: build ## cross build the binary for windows

 	$(DOCKER_RUN_DOCKER) hack/make.sh win

@@ -56,15 +56,6 @@ echo

 # List of bundles to create when no argument is passed

 DEFAULT_BUNDLES=(

-	validate-dco

-	validate-default-seccomp

-	validate-gofmt

-	validate-lint

-	validate-pkg

-	validate-test

-	validate-toml

-	validate-vet

-

 	binary-client

 	binary-daemon

 	dynbinary

deleted file mode 100644

@@ -1,33 +0,0 @@

-#!/bin/bash

-

-if [ -z "$VALIDATE_UPSTREAM" ]; then

-	# this is kind of an expensive check, so let's not do this twice if we

-	# are running more than one validate bundlescript

-

-	VALIDATE_REPO='https://github.com/docker/docker.git'

-	VALIDATE_BRANCH='master'

-

-	if [ "$TRAVIS" = 'true' -a "$TRAVIS_PULL_REQUEST" != 'false' ]; then

-		VALIDATE_REPO="https://github.com/${TRAVIS_REPO_SLUG}.git"

-		VALIDATE_BRANCH="${TRAVIS_BRANCH}"

-	fi

-

-	VALIDATE_HEAD="$(git rev-parse --verify HEAD)"

-

-	git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"

-	VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"

-

-	VALIDATE_COMMIT_LOG="$VALIDATE_UPSTREAM..$VALIDATE_HEAD"

-	VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"

-

-	validate_diff() {

-		if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then

-			git diff "$VALIDATE_COMMIT_DIFF" "$@"

-		fi

-	}

-	validate_log() {

-		if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then

-			git log "$VALIDATE_COMMIT_LOG" "$@"

-		fi

-	}

-fi

deleted file mode 100644

@@ -1,54 +0,0 @@

-#!/bin/bash

-

-source "${MAKEDIR}/.validate"

-

-adds=$(validate_diff --numstat | awk '{ s += $1 } END { print s }')

-dels=$(validate_diff --numstat | awk '{ s += $2 } END { print s }')

-#notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"

-

-: ${adds:=0}

-: ${dels:=0}

-

-# "Username may only contain alphanumeric characters or dashes and cannot begin with a dash"

-githubUsernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+'

-

-# https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work

-dcoPrefix='Signed-off-by:'

-dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($githubUsernameRegex)\\))?$"

-

-check_dco() {

-	grep -qE "$dcoRegex"

-}

-

-if [ $adds -eq 0 -a $dels -eq 0 ]; then

-	echo '0 adds, 0 deletions; nothing to validate! :)'

-else

-	commits=( $(validate_log --format='format:%H%n') )

-	badCommits=()

-	for commit in "${commits[@]}"; do

-		if [ -z "$(git log -1 --format='format:' --name-status "$commit")" ]; then

-			# no content (ie, Merge commit, etc)

-			continue

-		fi

-		if ! git log -1 --format='format:%B' "$commit" | check_dco; then

-			badCommits+=( "$commit" )

-		fi

-	done

-	if [ ${#badCommits[@]} -eq 0 ]; then

-		echo "Congratulations!  All commits are properly signed with the DCO!"

-	else

-		{

-			echo "These commits do not have a proper '$dcoPrefix' marker:"

-			for commit in "${badCommits[@]}"; do

-				echo " - $commit"

-			done

-			echo

-			echo 'Please amend each commit to include a properly formatted DCO marker.'

-			echo

-			echo 'Visit the following URL for information about the Docker DCO:'

-			echo ' https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work'

-			echo

-		} >&2

-		false

-	fi

-fi

deleted file mode 100644

@@ -1,27 +0,0 @@

-#!/bin/bash

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'profiles/seccomp' || true) )

-unset IFS

-

-if [ ${#files[@]} -gt 0 ]; then

-	# We run vendor.sh to and see if we have a diff afterwards

-	go generate ./profiles/seccomp/ >/dev/null

-	# Let see if the working directory is clean

-	diffs="$(git status --porcelain -- profiles/seccomp 2>/dev/null)"

-	if [ "$diffs" ]; then

-		{

-			echo 'The result of go generate ./profiles/seccomp/ differs'

-			echo

-			echo "$diffs"

-			echo

-			echo 'Please re-run go generate ./profiles/seccomp/'

-			echo

-		} >&2

-		false

-	else

-		echo 'Congratulations! Seccomp profile generation is done correctly.'

-	fi

-fi

deleted file mode 100644

@@ -1,30 +0,0 @@

-#!/bin/bash

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) )

-unset IFS

-

-badFiles=()

-for f in "${files[@]}"; do

-	# we use "git show" here to validate that what's committed is formatted

-	if [ "$(git show "$VALIDATE_HEAD:$f" | gofmt -s -l)" ]; then

-		badFiles+=( "$f" )

-	fi

-done

-

-if [ ${#badFiles[@]} -eq 0 ]; then

-	echo 'Congratulations!  All Go source files are properly formatted.'

-else

-	{

-		echo "These files are not properly gofmt'd:"

-		for f in "${badFiles[@]}"; do

-			echo " - $f"

-		done

-		echo

-		echo 'Please reformat the above files using "gofmt -s -w" and commit the result.'

-		echo

-	} >&2

-	false

-fi

deleted file mode 100644

@@ -1,30 +0,0 @@

-#!/bin/bash

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/' || true) )

-unset IFS

-

-errors=()

-for f in "${files[@]}"; do

-	failedLint=$(golint "$f")

-	if [ "$failedLint" ]; then

-		errors+=( "$failedLint" )

-	fi

-done

-

-if [ ${#errors[@]} -eq 0 ]; then

-	echo 'Congratulations!  All Go source files have been linted.'

-else

-	{

-		echo "Errors from golint:"

-		for err in "${errors[@]}"; do

-			echo "$err"

-		done

-		echo

-		echo 'Please fix the above errors. You can test via "golint" and commit the result.'

-		echo

-	} >&2

-	false

-fi

deleted file mode 100644

@@ -1,32 +0,0 @@

-#!/bin/bash

-set -e

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'pkg/*.go' || true) )

-unset IFS

-

-badFiles=()

-for f in "${files[@]}"; do

-	IFS=$'\n'

-	badImports=( $(go list -e -f '{{ join .Deps "\n" }}' "$f" | sort -u | grep -vE '^github.com/docker/docker/pkg/' | grep -E '^github.com/docker/docker' || true) )

-	unset IFS

-

-	for import in "${badImports[@]}"; do

-		badFiles+=( "$f imports $import" )

-	done

-done

-

-if [ ${#badFiles[@]} -eq 0 ]; then

-	echo 'Congratulations! "./pkg/..." is safely isolated from internal code.'

-else

-	{

-		echo 'These files import internal code: (either directly or indirectly)'

-		for f in "${badFiles[@]}"; do

-			echo " - $f"

-		done

-		echo

-	} >&2

-	false

-fi

deleted file mode 100644

@@ -1,38 +0,0 @@

-#!/bin/bash

-

-# Make sure we're not using gos' Testing package any more in integration-cli

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'integration-cli/*.go' || true) )

-unset IFS

-

-badFiles=()

-for f in "${files[@]}"; do

-	# skip check_test.go since it *does* use the testing package

-	if [ "$f" = "integration-cli/check_test.go" ]; then

-		continue

-	fi

-

-	# we use "git show" here to validate that what's committed doesn't contain golang built-in testing

-	if git show "$VALIDATE_HEAD:$f" | grep -q testing.T; then

-		if [ "$(echo $f | grep '_test')" ]; then

-			# allow testing.T for non- _test files

-			badFiles+=( "$f" )

-		fi

-	fi

-done

-

-if [ ${#badFiles[@]} -eq 0 ]; then

-	echo 'Congratulations! No testing.T found.'

-else

-	{

-		echo "These files use the wrong testing infrastructure:"

-		for f in "${badFiles[@]}"; do

-			echo " - $f"

-		done

-		echo

-	} >&2

-	false

-fi

deleted file mode 100644

@@ -1,30 +0,0 @@

-#!/bin/bash

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'MAINTAINERS' || true) )

-unset IFS

-

-badFiles=()

-for f in "${files[@]}"; do

-	# we use "git show" here to validate that what's committed has valid toml syntax

-	if ! git show "$VALIDATE_HEAD:$f" | tomlv /proc/self/fd/0 ; then

-		badFiles+=( "$f" )

-	fi

-done

-

-if [ ${#badFiles[@]} -eq 0 ]; then

-	echo 'Congratulations!  All toml source files changed here have valid syntax.'

-else

-	{

-		echo "These files are not valid toml:"

-		for f in "${badFiles[@]}"; do

-			echo " - $f"

-		done

-		echo

-		echo 'Please reformat the above files as valid toml'

-		echo

-	} >&2

-	false

-fi

deleted file mode 100644

@@ -1,27 +0,0 @@

-#!/bin/bash

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'hack/vendor.sh' 'hack/.vendor-helpers.sh' 'vendor/' || true) ) 

-unset IFS

-

-if [ ${#files[@]} -gt 0 ]; then

-	# We run vendor.sh to and see if we have a diff afterwards

-	./hack/vendor.sh >/dev/null

-	# Let see if the working directory is clean

-	diffs="$(git status --porcelain -- vendor 2>/dev/null)"

-	if [ "$diffs" ]; then

-		{

-			echo 'The result of ./hack/vendor.sh differs'

-			echo

-			echo "$diffs"

-			echo

-			echo 'Please vendor your package with ./hack/vendor.sh.'

-			echo

-		} >&2

-		false

-	else

-		echo 'Congratulations! All vendoring changes are done the right way.'

-	fi

-fi

deleted file mode 100644

@@ -1,31 +0,0 @@

-#!/bin/bash

-

-source "${MAKEDIR}/.validate"

-

-IFS=$'\n'

-files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) )

-unset IFS

-

-errors=()

-for f in "${files[@]}"; do

-	failedVet=$(go vet "$f")

-	if [ "$failedVet" ]; then

-		errors+=( "$failedVet" )

-	fi

-done

-

-

-if [ ${#errors[@]} -eq 0 ]; then

-	echo 'Congratulations!  All Go source files have been vetted.'

-else

-	{

-		echo "Errors from go vet:"

-		for err in "${errors[@]}"; do

-			echo " - $err"

-		done

-		echo

-		echo 'Please fix the above errors. You can test via "go vet" and commit the result.'

-		echo

-	} >&2

-	false

-fi

new file mode 100644

@@ -0,0 +1,30 @@

+#!/bin/bash

+

+set -e -o pipefail

+

+if [ -z "$VALIDATE_UPSTREAM" ]; then

+	# this is kind of an expensive check, so let's not do this twice if we

+	# are running more than one validate bundlescript

+

+	VALIDATE_REPO='https://github.com/docker/docker.git'

+	VALIDATE_BRANCH='master'

+

+	VALIDATE_HEAD="$(git rev-parse --verify HEAD)"

+

+	git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"

+	VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"

+

+	VALIDATE_COMMIT_LOG="$VALIDATE_UPSTREAM..$VALIDATE_HEAD"

+	VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"

+

+	validate_diff() {

+		if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then

+			git diff "$VALIDATE_COMMIT_DIFF" "$@"

+		fi

+	}

+	validate_log() {

+		if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then

+			git log "$VALIDATE_COMMIT_LOG" "$@"

+		fi

+	}

+fi

new file mode 100755

@@ -0,0 +1,8 @@

+#!/bin/bash

+#

+# Run all validation

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+

+. $SCRIPTDIR/default

+. $SCRIPTDIR/vendor

new file mode 100755

@@ -0,0 +1,55 @@

+#!/bin/bash

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+adds=$(validate_diff --numstat | awk '{ s += $1 } END { print s }')

+dels=$(validate_diff --numstat | awk '{ s += $2 } END { print s }')

+#notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"

+

+: ${adds:=0}

+: ${dels:=0}

+

+# "Username may only contain alphanumeric characters or dashes and cannot begin with a dash"

+githubUsernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+'

+

+# https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work

+dcoPrefix='Signed-off-by:'

+dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($githubUsernameRegex)\\))?$"

+

+check_dco() {

+	grep -qE "$dcoRegex"

+}

+

+if [ $adds -eq 0 -a $dels -eq 0 ]; then

+	echo '0 adds, 0 deletions; nothing to validate! :)'

+else

+	commits=( $(validate_log --format='format:%H%n') )

+	badCommits=()

+	for commit in "${commits[@]}"; do

+		if [ -z "$(git log -1 --format='format:' --name-status "$commit")" ]; then

+			# no content (ie, Merge commit, etc)

+			continue

+		fi

+		if ! git log -1 --format='format:%B' "$commit" | check_dco; then

+			badCommits+=( "$commit" )

+		fi

+	done

+	if [ ${#badCommits[@]} -eq 0 ]; then

+		echo "Congratulations!  All commits are properly signed with the DCO!"

+	else

+		{

+			echo "These commits do not have a proper '$dcoPrefix' marker:"

+			for commit in "${badCommits[@]}"; do

+				echo " - $commit"

+			done

+			echo

+			echo 'Please amend each commit to include a properly formatted DCO marker.'

+			echo

+			echo 'Visit the following URL for information about the Docker DCO:'

+			echo ' https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work'

+			echo

+		} >&2

+		false

+	fi

+fi

new file mode 100755

@@ -0,0 +1,14 @@

+#!/bin/bash

+#

+# Run default validation, exclude vendor because it's slow

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+

+. $SCRIPTDIR/dco

+. $SCRIPTDIR/default-seccomp

+. $SCRIPTDIR/gofmt

+. $SCRIPTDIR/lint

+. $SCRIPTDIR/pkg-imports

+. $SCRIPTDIR/test-imports

+. $SCRIPTDIR/toml

+. $SCRIPTDIR/vet

new file mode 100755

@@ -0,0 +1,28 @@

+#!/bin/bash

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- 'profiles/seccomp' || true) )

+unset IFS

+

+if [ ${#files[@]} -gt 0 ]; then

+	# We run 'go generate' and see if we have a diff afterwards

+	go generate ./profiles/seccomp/ >/dev/null

+	# Let see if the working directory is clean

+	diffs="$(git status --porcelain -- profiles/seccomp 2>/dev/null)"

+	if [ "$diffs" ]; then

+		{

+			echo 'The result of go generate ./profiles/seccomp/ differs'

+			echo

+			echo "$diffs"

+			echo

+			echo 'Please re-run go generate ./profiles/seccomp/'

+			echo

+		} >&2

+		false

+	else

+		echo 'Congratulations! Seccomp profile generation is done correctly.'

+	fi

+fi

new file mode 100755

@@ -0,0 +1,31 @@

+#!/bin/bash

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) )

+unset IFS

+

+badFiles=()

+for f in "${files[@]}"; do

+	# we use "git show" here to validate that what's committed is formatted

+	if [ "$(git show "$VALIDATE_HEAD:$f" | gofmt -s -l)" ]; then

+		badFiles+=( "$f" )

+	fi

+done

+

+if [ ${#badFiles[@]} -eq 0 ]; then

+	echo 'Congratulations!  All Go source files are properly formatted.'

+else

+	{

+		echo "These files are not properly gofmt'd:"

+		for f in "${badFiles[@]}"; do

+			echo " - $f"

+		done

+		echo

+		echo 'Please reformat the above files using "gofmt -s -w" and commit the result.'

+		echo

+	} >&2

+	false

+fi

new file mode 100755

@@ -0,0 +1,31 @@

+#!/bin/bash

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/' || true) )

+unset IFS

+

+errors=()

+for f in "${files[@]}"; do

+	failedLint=$(golint "$f")

+	if [ "$failedLint" ]; then

+		errors+=( "$failedLint" )

+	fi

+done

+

+if [ ${#errors[@]} -eq 0 ]; then

+	echo 'Congratulations!  All Go source files have been linted.'

+else

+	{

+		echo "Errors from golint:"

+		for err in "${errors[@]}"; do

+			echo "$err"

+		done

+		echo

+		echo 'Please fix the above errors. You can test via "golint" and commit the result.'

+		echo

+	} >&2

+	false

+fi

new file mode 100755

@@ -0,0 +1,33 @@

+#!/bin/bash

+set -e

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- 'pkg/*.go' || true) )

+unset IFS

+

+badFiles=()

+for f in "${files[@]}"; do

+	IFS=$'\n'

+	badImports=( $(go list -e -f '{{ join .Deps "\n" }}' "$f" | sort -u | grep -vE '^github.com/docker/docker/pkg/' | grep -E '^github.com/docker/docker' || true) )

+	unset IFS

+

+	for import in "${badImports[@]}"; do

+		badFiles+=( "$f imports $import" )

+	done

+done

+

+if [ ${#badFiles[@]} -eq 0 ]; then

+	echo 'Congratulations!  "./pkg/..." is safely isolated from internal code.'

+else

+	{

+		echo 'These files import internal code: (either directly or indirectly)'

+		for f in "${badFiles[@]}"; do

+			echo " - $f"

+		done

+		echo

+	} >&2

+	false

+fi

new file mode 100755

@@ -0,0 +1,38 @@

+#!/bin/bash

+# Make sure we're not using gos' Testing package any more in integration-cli

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- 'integration-cli/*.go' || true) )

+unset IFS

+

+badFiles=()

+for f in "${files[@]}"; do

+	# skip check_test.go since it *does* use the testing package

+	if [ "$f" = "integration-cli/check_test.go" ]; then

+		continue

+	fi

+

+	# we use "git show" here to validate that what's committed doesn't contain golang built-in testing

+	if git show "$VALIDATE_HEAD:$f" | grep -q testing.T; then

+		if [ "$(echo $f | grep '_test')" ]; then

+			# allow testing.T for non- _test files

+			badFiles+=( "$f" )

+		fi

+	fi

+done

+

+if [ ${#badFiles[@]} -eq 0 ]; then

+	echo 'Congratulations!  No testing.T found.'

+else

+	{

+		echo "These files use the wrong testing infrastructure:"

+		for f in "${badFiles[@]}"; do

+			echo " - $f"

+		done

+		echo

+	} >&2

+	false

+fi

new file mode 100755

@@ -0,0 +1,31 @@

+#!/bin/bash

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- 'MAINTAINERS' || true) )

+unset IFS

+

+badFiles=()

+for f in "${files[@]}"; do

+	# we use "git show" here to validate that what's committed has valid toml syntax

+	if ! git show "$VALIDATE_HEAD:$f" | tomlv /proc/self/fd/0 ; then

+		badFiles+=( "$f" )

+	fi

+done

+

+if [ ${#badFiles[@]} -eq 0 ]; then

+	echo 'Congratulations!  All toml source files changed here have valid syntax.'

+else

+	{

+		echo "These files are not valid toml:"

+		for f in "${badFiles[@]}"; do

+			echo " - $f"

+		done

+		echo

+		echo 'Please reformat the above files as valid toml'

+		echo

+	} >&2

+	false

+fi

new file mode 100755

@@ -0,0 +1,30 @@

+#!/bin/bash

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- 'hack/vendor.sh' 'hack/.vendor-helpers.sh' 'vendor/' || true) ) 

+unset IFS

+

+if [ ${#files[@]} -gt 0 ]; then

+	# We run vendor.sh to and see if we have a diff afterwards

+	./hack/vendor.sh >/dev/null

+	# Let see if the working directory is clean

+	diffs="$(git status --porcelain -- vendor 2>/dev/null)"

+	if [ "$diffs" ]; then

+		{

+			echo 'The result of ./hack/vendor.sh differs'

+			echo

+			echo "$diffs"

+			echo

+			echo 'Please vendor your package with ./hack/vendor.sh.'

+			echo

+		} >&2

+		false

+	else

+		echo 'Congratulations! All vendoring changes are done the right way.'

+	fi

+else

+    echo 'No vendor changes in diff.'

+fi

new file mode 100755

@@ -0,0 +1,32 @@

+#!/bin/bash

+

+export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

+source "${SCRIPTDIR}/.validate"

+

+IFS=$'\n'

+files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) )

+unset IFS

+

+errors=()

+for f in "${files[@]}"; do

+	failedVet=$(go vet "$f")

+	if [ "$failedVet" ]; then

+		errors+=( "$failedVet" )

+	fi

+done

+

+

+if [ ${#errors[@]} -eq 0 ]; then

+	echo 'Congratulations!  All Go source files have been vetted.'

+else

+	{

+		echo "Errors from go vet:"

+		for err in "${errors[@]}"; do

+			echo " - $err"

+		done

+		echo

+		echo 'Please fix the above errors. You can test via "go vet" and commit the result.'

+		echo

+	} >&2

+	false

+fi