From 55ff66d967b9134f42aa5a9b28adde87fbfeca6e Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 12 Jul 2018 01:31:23 +0200
Subject: [PATCH] Extend version-align test with components

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .../testdata/docker-client-version.golden     | 36 +++++++++++
 cli/command/system/version_test.go            | 59 +++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/cli/command/system/testdata/docker-client-version.golden b/cli/command/system/testdata/docker-client-version.golden
index 4079d5de02..414b7176a0 100644
--- a/cli/command/system/testdata/docker-client-version.golden
+++ b/cli/command/system/testdata/docker-client-version.golden
@@ -6,3 +6,39 @@ Client:
  Built:        Wed May 30 22:21:05 2018
  OS/Arch:      linux/amd64
  Experimental: true
+
+Server: Docker Enterprise Edition (EE) 2.0
+ Engine:
+  Version:      17.06.2-ee-15
+  API version:  1.30 (minimum version 1.12)
+  Go version:   go1.8.7
+  Git commit:   64ddfa6
+  Built:        Mon Jul  9 23:38:38 2018
+  OS/Arch:      linux/amd64
+  Experimental: false
+ Universal Control Plane:
+  Version:       17.06.2-ee-15
+  ApiVersion:    1.30
+  Arch:          amd64
+  BuildTime:     Mon Jul  2 21:24:07 UTC 2018
+  GitCommit:     4513922
+  GoVersion:     go1.9.4
+  MinApiVersion: 1.20
+  Os:            linux
+  Version:       3.0.3-tp2
+ Kubernetes:
+  Version:      1.8+
+  buildDate:    2018-04-26T16:51:21Z
+  compiler:     gc
+  gitCommit:    8d637aedf46b9c21dde723e29c645b9f27106fa5
+  gitTreeState: clean
+  gitVersion:   v1.8.11-docker-8d637ae
+  goVersion:    go1.8.3
+  major:        1
+  minor:        8+
+  platform:     linux/amd64
+ Calico:
+  Version:          v3.0.8
+  cni:              v2.0.6
+  kube-controllers: v2.0.5
+  node:             v3.0.8
diff --git a/cli/command/system/version_test.go b/cli/command/system/version_test.go
index b8163861b9..0a4f47e34a 100644
--- a/cli/command/system/version_test.go
+++ b/cli/command/system/version_test.go
@@ -43,8 +43,67 @@ func TestVersionAlign(t *testing.T) {
 			BuildTime:         "Wed May 30 22:21:05 2018",
 			Experimental:      true,
 		},
+		Server: &types.Version{},
 	}
 
+	vi.Server.Platform.Name = "Docker Enterprise Edition (EE) 2.0"
+
+	vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
+		Name:    "Engine",
+		Version: "17.06.2-ee-15",
+		Details: map[string]string{
+			"ApiVersion":    "1.30",
+			"MinAPIVersion": "1.12",
+			"GitCommit":     "64ddfa6",
+			"GoVersion":     "go1.8.7",
+			"Os":            "linux",
+			"Arch":          "amd64",
+			"BuildTime":     "Mon Jul  9 23:38:38 2018",
+			"Experimental":  "false",
+		},
+	})
+
+	vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
+		Name:    "Universal Control Plane",
+		Version: "17.06.2-ee-15",
+		Details: map[string]string{
+			"Version":       "3.0.3-tp2",
+			"ApiVersion":    "1.30",
+			"Arch":          "amd64",
+			"BuildTime":     "Mon Jul  2 21:24:07 UTC 2018",
+			"GitCommit":     "4513922",
+			"GoVersion":     "go1.9.4",
+			"MinApiVersion": "1.20",
+			"Os":            "linux",
+		},
+	})
+
+	vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
+		Name:    "Kubernetes",
+		Version: "1.8+",
+		Details: map[string]string{
+			"buildDate":    "2018-04-26T16:51:21Z",
+			"compiler":     "gc",
+			"gitCommit":    "8d637aedf46b9c21dde723e29c645b9f27106fa5",
+			"gitTreeState": "clean",
+			"gitVersion":   "v1.8.11-docker-8d637ae",
+			"goVersion":    "go1.8.3",
+			"major":        "1",
+			"minor":        "8+",
+			"platform":     "linux/amd64",
+		},
+	})
+
+	vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
+		Name:    "Calico",
+		Version: "v3.0.8",
+		Details: map[string]string{
+			"cni":              "v2.0.6",
+			"kube-controllers": "v2.0.5",
+			"node":             "v3.0.8",
+		},
+	})
+
 	cli := test.NewFakeCli(&fakeClient{})
 	tmpl, err := newVersionTemplate("")
 	assert.NilError(t, err)