From 644489b6e7e5d5c3917206a9c90a1744d049b3a7 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Mon, 23 Apr 2018 17:18:54 -0700
Subject: [PATCH 1/3] virtcontainers: Fix gofmt issues for Go 1.10

Now that our CI has moved to Go 1.10, we need to update one file
that is not formatted as the new gofmt (1.10) expects it to be
formatted.

Fixes #249

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 virtcontainers/cc_proxy_test.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/virtcontainers/cc_proxy_test.go b/virtcontainers/cc_proxy_test.go
index ba295178a2..43bf530646 100644
--- a/virtcontainers/cc_proxy_test.go
+++ b/virtcontainers/cc_proxy_test.go
@@ -46,10 +46,9 @@ func TestCCProxyStart(t *testing.T) {
 		{
 			Sandbox{
 				config: &SandboxConfig{
-					ProxyType:   CCProxyType,
-					ProxyConfig: ProxyConfig{
+					ProxyType: CCProxyType,
 					// invalid - no path
-					},
+					ProxyConfig: ProxyConfig{},
 				},
 			}, "", true,
 		},

From 9830810684a44c77a587cb23282cb7c6398b9189 Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Wed, 25 Apr 2018 12:26:28 -0500
Subject: [PATCH 2/3] vendor: update covertool.

Update covertool to allow run tests with go 1.10

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 Gopkg.lock                                              | 4 ++--
 vendor/github.com/dlespiau/covertool/pkg/cover/cover.go | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index b7518ad75d..3413b682c0 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -47,7 +47,7 @@
   branch = "master"
   name = "github.com/dlespiau/covertool"
   packages = ["pkg/cover"]
-  revision = "d45792f23e9014540f89404081285a1b4d097234"
+  revision = "b0c4c6d0583aae4e3b5d12b6ec47767670548cc4"
 
 [[projects]]
   name = "github.com/go-ini/ini"
@@ -257,6 +257,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "1d1c6e1edc48dac73618d0ce04d505e22276ad5a3e299dd0964eca608fe8e2f1"
+  inputs-digest = "cc11dcb278b249e203b53c823a9a27d5e5210b56fcaedab509651f25a5163d03"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/vendor/github.com/dlespiau/covertool/pkg/cover/cover.go b/vendor/github.com/dlespiau/covertool/pkg/cover/cover.go
index 81687f0ebd..cc712184fc 100644
--- a/vendor/github.com/dlespiau/covertool/pkg/cover/cover.go
+++ b/vendor/github.com/dlespiau/covertool/pkg/cover/cover.go
@@ -47,6 +47,8 @@ type dummyTestDeps func(pat, str string) (bool, error)
 func (d dummyTestDeps) MatchString(pat, str string) (bool, error)   { return false, nil }
 func (d dummyTestDeps) StartCPUProfile(io.Writer) error             { return nil }
 func (d dummyTestDeps) StopCPUProfile()                             {}
+func (f dummyTestDeps) StartTestLog(w io.Writer)                    {}
+func (f dummyTestDeps) StopTestLog() error                          { return nil }
 func (d dummyTestDeps) WriteHeapProfile(io.Writer) error            { return nil }
 func (d dummyTestDeps) WriteProfileTo(string, io.Writer, int) error { return nil }
 func (f dummyTestDeps) ImportPath() string                          { return "" }

From 20432dd99f119567a2af1a8261a2192ddcef2644 Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Thu, 26 Apr 2018 11:39:07 -0500
Subject: [PATCH 3/3] versions: ci: Move to go 1.10

Change the latest working go version for kata.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 versions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.yaml b/versions.yaml
index 3cf46df98b..dbd8467f27 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -139,7 +139,7 @@ languages:
     notes: "'version' is the default minimum version used by this project."
     version: "1.8.3"
     meta:
-      newest-version: "1.9.2"
+      newest-version: "1.10"
 
 specs:
   description: "Details of important specifications"