From feaca9816abd8949d0583fcb9964b6756f2b2e9e Mon Sep 17 00:00:00 2001
From: moby <moby@example.com>
Date: Wed, 15 Jul 2020 13:45:41 +0200
Subject: [PATCH] hack/vendor: add check for vendored archive/tar

Also allow re-vendoring using `./hack/vendor.sh archive/tar`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 31b2c3bbd920d415283a478170c0efe9ef7bf8e7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Dockerfile           |  1 +
 hack/validate/vendor |  3 ++-
 hack/vendor.sh       | 15 ++++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2855a64280..67e6ff1f77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -280,6 +280,7 @@ RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \
             libnl-3-200 \
             libprotobuf-c1 \
             net-tools \
+            patch \
             pigz \
             python3-pip \
             python3-setuptools \
diff --git a/hack/validate/vendor b/hack/validate/vendor
index 37edcd4743..5da3b89715 100755
--- a/hack/validate/vendor
+++ b/hack/validate/vendor
@@ -5,12 +5,13 @@ source "${SCRIPTDIR}/.validate"
 
 validate_vendor_diff(){
 	IFS=$'\n'
+	# shellcheck disable=SC2207
 	files=( $(validate_diff --diff-filter=ACMR --name-only -- 'vendor.conf' 'vendor/' || true) )
 	unset IFS
 
 	if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
 		# recreate vendor/
-		vndr -whitelist=^archive/tar
+		./hack/vendor.sh
 		# check if any files have changed
 		diffs="$(git status --porcelain -- vendor 2>/dev/null)"
 		mfiles="$(echo "$diffs" | awk '/^ M / {print $2}')"
diff --git a/hack/vendor.sh b/hack/vendor.sh
index 62cbeb545e..67b9f738c2 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -12,4 +12,17 @@ if ! hash vndr; then
 	exit 1
 fi
 
-vndr -whitelist=^archive/tar "$@"
+if [ $# -eq 0 ] || [ "$1" = "archive/tar" ]; then
+	echo "update vendored copy of archive/tar"
+	: "${GO_VERSION:=$(awk -F '[ =]' '$1 == "ARG" && $2 == "GO_VERSION" { print $3; exit }' ./Dockerfile)}"
+	rm -rf vendor/archive
+	mkdir -p ./vendor/archive/tar
+	echo "downloading: https://golang.org/dl/go${GO_VERSION}.src.tar.gz"
+	curl -fsSL "https://golang.org/dl/go${GO_VERSION}.src.tar.gz" \
+		| tar --extract --gzip --directory=vendor/archive/tar --strip-components=4 go/src/archive/tar
+	patch --strip=4 --directory=vendor/archive/tar --input="$PWD/patches/0001-archive-tar-do-not-populate-user-group-names.patch"
+fi
+
+if [ $# -eq 0 ] || [ "$1" != "archive/tar" ]; then
+	vndr -whitelist=^archive/tar "$@"
+fi