From eeec7e566a2d8e9c30b141bad529d54f2d46c71c Mon Sep 17 00:00:00 2001
From: Chris Crone <christopher.crone@docker.com>
Date: Tue, 5 Jan 2021 14:12:52 +0100
Subject: [PATCH] context: Add tarball e2e tests

Signed-off-by: Chris Crone <christopher.crone@docker.com>
(cherry picked from commit 18f33b337d7af97ba30ab03eeeab801574208e55)

Fixed expected output in test.

Signed-off-by: Tibor Vass <tibor@docker.com>
---
 e2e/context/context_test.go                   |  73 ++++++++++++++++++
 e2e/context/testdata/context-ls-notls.golden  |   3 +
 e2e/context/testdata/context-ls-tls.golden    |   3 +
 .../testdata/test-dockerconfig-tls.tar        | Bin 0 -> 8335 bytes
 e2e/context/testdata/test-dockerconfig.tar    | Bin 0 -> 1536 bytes
 5 files changed, 79 insertions(+)
 create mode 100644 e2e/context/testdata/context-ls-notls.golden
 create mode 100644 e2e/context/testdata/context-ls-tls.golden
 create mode 100644 e2e/context/testdata/test-dockerconfig-tls.tar
 create mode 100644 e2e/context/testdata/test-dockerconfig.tar

diff --git a/e2e/context/context_test.go b/e2e/context/context_test.go
index ce22f7b7c3..6212b98dea 100644
--- a/e2e/context/context_test.go
+++ b/e2e/context/context_test.go
@@ -1,8 +1,11 @@
 package context
 
 import (
+	"io/ioutil"
+	"os"
 	"testing"
 
+	"gotest.tools/v3/assert"
 	"gotest.tools/v3/golden"
 	"gotest.tools/v3/icmd"
 )
@@ -19,3 +22,73 @@ func TestContextList(t *testing.T) {
 	})
 	golden.Assert(t, result.Stdout(), "context-ls.golden")
 }
+
+func TestContextImportNoTLS(t *testing.T) {
+	d, _ := ioutil.TempDir("", "")
+	defer func() {
+		os.RemoveAll(d)
+	}()
+	cmd := icmd.Command("docker", "context", "import", "remote", "./testdata/test-dockerconfig.tar")
+	cmd.Env = append(cmd.Env,
+		"DOCKER_CONFIG="+d,
+	)
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	cmd = icmd.Command("docker", "context", "ls")
+	cmd.Env = append(cmd.Env,
+		"DOCKER_CONFIG="+d,
+		"KUBECONFIG=./testdata/test-kubeconfig", // Allows reuse of context-ls.golden
+	)
+	result := icmd.RunCmd(cmd).Assert(t, icmd.Success)
+	golden.Assert(t, result.Stdout(), "context-ls.golden")
+}
+
+func TestContextImportTLS(t *testing.T) {
+	d, _ := ioutil.TempDir("", "")
+	defer func() {
+		os.RemoveAll(d)
+	}()
+	cmd := icmd.Command("docker", "context", "import", "test", "./testdata/test-dockerconfig-tls.tar")
+	cmd.Env = append(cmd.Env,
+		"DOCKER_CONFIG="+d,
+	)
+	icmd.RunCmd(cmd).Assert(t, icmd.Success)
+
+	cmd = icmd.Command("docker", "context", "ls")
+	cmd.Env = append(cmd.Env,
+		"DOCKER_CONFIG="+d,
+	)
+	result := icmd.RunCmd(cmd).Assert(t, icmd.Success)
+	golden.Assert(t, result.Stdout(), "context-ls-tls.golden")
+
+	b, err := ioutil.ReadFile(d + "/contexts/tls/9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08/kubernetes/key.pem")
+	assert.NilError(t, err)
+	assert.Equal(t, string(b), `-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEArQk77K5sgrQYY6HiQ1y7AC+67HrRB36oEvR+Fq60RsFcc3cZ
+xAvMkRSBPjQyskjdYY7kfykGHhfJxGKopb3cDJx3eDBxjgAniwnnOMmHVWbf8Eik
+o0sNxkgzQPGq83nL3QvVxm3xgqe4nlTdR/Swoq6Pv0oaVYvPPMnaZIF89SJ/wlNT
+myCs6Uq00dICi20II+M2Nw9b+EVEK4ENl+SlrsK7iuoBIh/H0ZghxOthO9J/HeBb
+hmM4wcs1OonhPDYKHEaChYA7/Q3/8OBp3bAdlQJ1ziyP3ROAKHL2NwwkGZ8o8HP8
+u0ex/NAb8w5J5WNePqYQd/sqfisfNpA5VIKcEQIDAQABAoIBABLo4W2aGi2mdMve
+kxV9esoobSsOuO0ywDdiFK1x5i2dT/cmWuB70Z1BOmaL2cZ2BAt3TC1BVHPRcbFO
+ftOuDfAq4Tt3P9Ge3rNpH6WrEGka1voxVhyqRRUYKtG8F0yIUOkVNAV9WllG7vwO
+ligY63y7yuXCuWID51/jR0SYiglXz6G4gcJKFXtugXXiLUIg08GVWkwOsrACC+hR
+mhcHly1926VhN5+ozjNU/GZ1LaTuK6erBZakH5bqlN97s5rrk0ZRwk/JtnkoRRdI
+cq0918Za2vqGDHZ3MqLttL52YfDXPIEJPwlFdvC/+sXK2NhUB/xY4yuliU3sY0sf
+XsIvIWECgYEAwD8AnZI0hnGv8hc6zJppHFRwhrtLZ+09SJwPv5Y4wxuuk5dzNkpf
+xCNo5hjSVYA1MMmWG8p/sEXo2IyCT8sWDNCn9kieTXihxRxbj88Y2qA5O4N46Zy4
+kPngjkP5PPDMkwaQQgUr9LvlWS7P6OJkH18ZN8s3QhMaKcHu9FFT44UCgYEA5mte
+mMSDf9hUK3IK+yrGX62qc2H+ecXN3Zf3nehyiz+dX4ZXhBwBkwJ/mHvuAZPfoFUN
+Xg6cdyWFJg9ynm45JXnDjmYPGmFLn0mP3Mje/+SbbW2fdFWHJW/maqj4uUqqgQd+
+pGNzKXq34MzDrpsqIJ7AHu3LYVMOoLAVqC7LXh0CgYEAnLF9ZfFqQH7fgvouIeBl
+dgLZKOf2AUJcJheVunnN0DF67K+P55tdTTfzY0CuB6SVNivI3uQBiYKh1AdKm5ET
+auSTUmlEJi8B4/BGLQQG5QOdQoXZgsgLo5cX0b1To7k9dUTvRfCDMFoKCNPgAJiu
+NOfFXTWU15VMSObaRmcXciUCgYEA5e1cXwsxwUAodZX+eTXs8ArHHQ47Nl55GFeN
+wufybRuUuX7AE9cyhvUmSA3aqX5a144noaTo40fwftNJZ+jLY6cGyjDzfzp5kMCC
+KynSxPzlUCPkytyR2Hy6K9LjJ1rnm4vUBswqXcjUdiE+Xxz8w8JGKlbV7Q9JeHVd
+lw7i5s0CgYAn9T9ySI3xCbrUa/XV/ZY2hopUdH5CDPeTd2eH+L+lctkD9nlzLrpj
+qij+jaEUweymNx0uttgv02J3DYcIIvVq3RNAwORy5Mp9KasHmjbW2xq+HAq5yFOO
+1ma82F5zeUl+bKqjMRCY8IVZ349VxRZtb2RVVEKyVswb7HmKp6gGbA==
+-----END RSA PRIVATE KEY-----
+`)
+}
diff --git a/e2e/context/testdata/context-ls-notls.golden b/e2e/context/testdata/context-ls-notls.golden
new file mode 100644
index 0000000000..1747503305
--- /dev/null
+++ b/e2e/context/testdata/context-ls-notls.golden
@@ -0,0 +1,3 @@
+NAME        DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT            ORCHESTRATOR
+default *   Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                                  swarm
+remote      my remote cluster                         ssh://someserver              https://someserver (default)   kubernetes
diff --git a/e2e/context/testdata/context-ls-tls.golden b/e2e/context/testdata/context-ls-tls.golden
new file mode 100644
index 0000000000..0fd47df364
--- /dev/null
+++ b/e2e/context/testdata/context-ls-tls.golden
@@ -0,0 +1,3 @@
+NAME                DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT                                 ORCHESTRATOR
+default *           Current DOCKER_HOST based configuration   unix:///var/run/docker.sock                                                       swarm
+test                                                          unix:///var/run/docker.sock   https://kubernetes.docker.internal:6443 (default)   swarm
diff --git a/e2e/context/testdata/test-dockerconfig-tls.tar b/e2e/context/testdata/test-dockerconfig-tls.tar
new file mode 100644
index 0000000000000000000000000000000000000000..6dc21a601421ecbbb22119a38f2b0d175e46a152
GIT binary patch
literal 8335
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

literal 0
HcmV?d00001

diff --git a/e2e/context/testdata/test-dockerconfig.tar b/e2e/context/testdata/test-dockerconfig.tar
new file mode 100644
index 0000000000000000000000000000000000000000..92eab23bda94661456a55c023f3c8dc4b227ff37
GIT binary patch
literal 1536
zcmd^8O;5ux4DC;;a$dU@_JMk45(hpGLtGGtkh(OqO{&-(Ow;~54i#G22~FxQ_>efx
z^Rr(RH$XCeM{9!dEMZ&BW`W<?j`w77G5?A6_i373ra_pD*V2KxLz0fmA0nrD-_i!+
zPGdQH)=u2Z21F(tG?qY2#2x>LT#^*oPFw>jr(4q2Fr?XrJt|Z+KN~nkuSu%v!Ko6E
zoFwZQS9P!83=p8$PsGaPt<{Fm6XsS`oX6gcMPe*snN6o?8$fWIp0d*I<L&whoG!K^
zD`btpJOkE4dP&scUkE0wrI1}sUM{v$dChqrVi~JXP`)c=n?{<P?@I8pBiT_2hP3k9
zBKd&~mhO$kJPWcF7(Pdu7pO2&g?M4lY(!?dx@KgnSqApcr)tei@qm%zadm~Uw$n{2
s>$a4s*t4DS7f_9(SM#H>9E`@%sQBaW`A?S1bP<H}(L3V;|9t+x09&E32><{9

literal 0
HcmV?d00001