From ea24174fccdafba0347918b4571096215d503f1b Mon Sep 17 00:00:00 2001
From: Duco van Amstel <duco.vanamstel@gmail.com>
Date: Fri, 22 Mar 2019 14:20:03 +0000
Subject: [PATCH] Move configmap testdata into zip

Paths names starting with '..' are triggering errors when using Go
modules in Go >= 1.11 (1). To work around this we move the testdata
into an archive which is unzipped as part of the test.

(1) See: https://github.com/golang/go/issues/24573
---
 configmap/testdata.zip                           | Bin 0 -> 2757 bytes
 .../..1289_09_10_03_32_32.039823124/some_dynint  |   1 -
 .../..1289_09_10_03_32_32.039823124/some_int     |   1 -
 .../..9289_09_10_03_32_32.039823124/some_dynint  |   1 -
 .../..9289_09_10_03_32_32.039823124/some_int     |   1 -
 .../..9989_09_09_07_32_32.099817316/some_dynint  |   1 -
 .../..9989_09_09_07_32_32.099817316/some_int     |   1 -
 configmap/testdata/..data                        |   1 -
 configmap/testdata/some_dynint                   |   1 -
 configmap/testdata/some_int                      |   1 -
 configmap/updater_test.go                        |   2 +-
 11 files changed, 1 insertion(+), 10 deletions(-)
 create mode 100644 configmap/testdata.zip
 delete mode 100644 configmap/testdata/..1289_09_10_03_32_32.039823124/some_dynint
 delete mode 100644 configmap/testdata/..1289_09_10_03_32_32.039823124/some_int
 delete mode 100644 configmap/testdata/..9289_09_10_03_32_32.039823124/some_dynint
 delete mode 100644 configmap/testdata/..9289_09_10_03_32_32.039823124/some_int
 delete mode 100644 configmap/testdata/..9989_09_09_07_32_32.099817316/some_dynint
 delete mode 100644 configmap/testdata/..9989_09_09_07_32_32.099817316/some_int
 delete mode 120000 configmap/testdata/..data
 delete mode 120000 configmap/testdata/some_dynint
 delete mode 120000 configmap/testdata/some_int

diff --git a/configmap/testdata.zip b/configmap/testdata.zip
new file mode 100644
index 0000000000000000000000000000000000000000..cb3235529ef9400d56fb4f2bf3480ef3fd90d103
GIT binary patch
literal 2757
zcmWIWW@h1H0D-LPVm~kgN^mmBFqEVgm!u??B<hETa56AQa7~O!emNzkw1S&~k>v$5
z0|S@{fE(c)RP5LMcjf~jpb;P}f^0-_er{@fN@ZSVUJ2N=y9X!4EWtEQPY-M%l4^wc
znP^VbL^fYf&(O%iGTy*4-q0Z4z&PI62#E9yj4dsUj17%UAYKS1<OPrwmwk6LumYVA
z!X~6xf#hhg7eTf$zQPDFLjwZ?LsVaFb&L!LMFR*Ml58a`NI~|oVcG|BR&hyYQC>Q#
zr9ivj04*pjsT7nu(}eEf2ul1`U<*nPOs^RMgVG4qSDRigy2%3c7YL&TB@tF42PG$_
zeU=vHW(ey*>0SL~m>NIODi9V#jybRoV8#)V*nvtBCKE{MmX?r|4ovI@=CG6w6f`t9
zHZ-G7O2=;nw&?kenVGSq^u-Sz&&Cx!czuNuo}iTe4U2t7#wMtNSjh7@Lmn74Ak2>(
zJ&<w+o=vfqM0mp>z?+dtju}_kDFL((1Oyn~I)Z4Vl9Uxvl46vi2;(rzQJ8TI4F4B8
zBO8Yj5kQkc2@Q|QnCS{;GRUEekxeFCo&v1{#RCEBP)k#Yb&NoZmNc>fDR{ULvJTy&
zMA(d4s3O~3NwUr0j7*$|fqsJnO$OxfeTQl-{^BS!ggEO^i&$h|1~Q?9FMjLD2w&8a
z7TM+_B->16_+pm0u<!-t3}axE1fHM}<prhLq8Hg%Jw3do0<iEUF4}Nsiw~q&M@F=v
zmcYo-mJBSI;o(QfqbT7^L~cYaiIJo25~{VJ_8;z0WMu<oE?yuk1vV_KK#dCq0JU6W
Ae*gdg

literal 0
HcmV?d00001

diff --git a/configmap/testdata/..1289_09_10_03_32_32.039823124/some_dynint b/configmap/testdata/..1289_09_10_03_32_32.039823124/some_dynint
deleted file mode 100644
index 7d37299..0000000
--- a/configmap/testdata/..1289_09_10_03_32_32.039823124/some_dynint
+++ /dev/null
@@ -1 +0,0 @@
-10001
\ No newline at end of file
diff --git a/configmap/testdata/..1289_09_10_03_32_32.039823124/some_int b/configmap/testdata/..1289_09_10_03_32_32.039823124/some_int
deleted file mode 100644
index e01a276..0000000
--- a/configmap/testdata/..1289_09_10_03_32_32.039823124/some_int
+++ /dev/null
@@ -1 +0,0 @@
-somestirng
\ No newline at end of file
diff --git a/configmap/testdata/..9289_09_10_03_32_32.039823124/some_dynint b/configmap/testdata/..9289_09_10_03_32_32.039823124/some_dynint
deleted file mode 100644
index c777860..0000000
--- a/configmap/testdata/..9289_09_10_03_32_32.039823124/some_dynint
+++ /dev/null
@@ -1 +0,0 @@
-20002
\ No newline at end of file
diff --git a/configmap/testdata/..9289_09_10_03_32_32.039823124/some_int b/configmap/testdata/..9289_09_10_03_32_32.039823124/some_int
deleted file mode 100644
index e7d2b03..0000000
--- a/configmap/testdata/..9289_09_10_03_32_32.039823124/some_int
+++ /dev/null
@@ -1 +0,0 @@
-9876
\ No newline at end of file
diff --git a/configmap/testdata/..9989_09_09_07_32_32.099817316/some_dynint b/configmap/testdata/..9989_09_09_07_32_32.099817316/some_dynint
deleted file mode 100644
index 7d37299..0000000
--- a/configmap/testdata/..9989_09_09_07_32_32.099817316/some_dynint
+++ /dev/null
@@ -1 +0,0 @@
-10001
\ No newline at end of file
diff --git a/configmap/testdata/..9989_09_09_07_32_32.099817316/some_int b/configmap/testdata/..9989_09_09_07_32_32.099817316/some_int
deleted file mode 100644
index 274c005..0000000
--- a/configmap/testdata/..9989_09_09_07_32_32.099817316/some_int
+++ /dev/null
@@ -1 +0,0 @@
-1234
\ No newline at end of file
diff --git a/configmap/testdata/..data b/configmap/testdata/..data
deleted file mode 120000
index c6a3cbb..0000000
--- a/configmap/testdata/..data
+++ /dev/null
@@ -1 +0,0 @@
-..9989_09_09_07_32_32.099817316
\ No newline at end of file
diff --git a/configmap/testdata/some_dynint b/configmap/testdata/some_dynint
deleted file mode 120000
index 3631da0..0000000
--- a/configmap/testdata/some_dynint
+++ /dev/null
@@ -1 +0,0 @@
-..data/some_dynint
\ No newline at end of file
diff --git a/configmap/testdata/some_int b/configmap/testdata/some_int
deleted file mode 120000
index 95d9829..0000000
--- a/configmap/testdata/some_int
+++ /dev/null
@@ -1 +0,0 @@
-..data/some_int
\ No newline at end of file
diff --git a/configmap/updater_test.go b/configmap/updater_test.go
index f1c4d3b..bb947e1 100644
--- a/configmap/updater_test.go
+++ b/configmap/updater_test.go
@@ -65,7 +65,7 @@ func (s *updaterTestSuite) TearDownTest() {
 }
 
 func (s *updaterTestSuite) copyTestDataToDir() {
-	copyCmd := exec.Command("cp", "--archive", "testdata", s.tempDir)
+	copyCmd := exec.Command("unzip", "testdata.zip", "-d", s.tempDir)
 	require.NoError(s.T(), copyCmd.Run(), "copying testdata directory to tempdir must not fail")
 }