Vendor Docker CLI to 6318939f30e01585b34eb6a68a54b890a8d54eb0 & gojso…

…nschema to v1.2.0

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

Gopkg.toml

@@ -50,7 +50,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/cli"
-  revision = "d83cd90464377d4164c8f70248d064b979e5ca98"
+  revision = "6318939f30e01585b34eb6a68a54b890a8d54eb0"
 
 [[override]]
   name = "github.com/deislabs/cnab-go"
@@ -70,7 +70,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/xeipuuv/gojsonschema"
-  revision = "93e72a773fade158921402d6a24c819b48aba29d"
+  version = "v1.2.0"
 
 [[override]]
   name = "github.com/docker/go-metrics"
@@ -113,6 +113,10 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/opencontainers/runtime-spec"
   revision = "29686dbc5559d93fb1ef402eeda3e35c38d75af4"
 
+[[override]]
+  name = "github.com/Microsoft/hcsshim"
+  revision = "2226e083fc390003ae5aa8325c3c92789afa0e7a"
+
 [[constraint]]
   name = "github.com/spf13/pflag"
   branch = "master"

render/render_test.go

@@ -300,7 +300,7 @@ unknown-property: value`)
 	assert.NilError(t, err)
 	c, err := Render(app, nil, nil)
 	assert.Assert(t, is.Nil(c))
-	assert.Error(t, err, "failed to load Compose file: unknown-property Additional property unknown-property is not allowed")
+	assert.Error(t, err, "failed to load Compose file: (root) Additional property unknown-property is not allowed")
 }
 
 func TestValidateRenderedApplication(t *testing.T) {

specification/schema_test.go

@@ -15,7 +15,7 @@ func TestValidateInvalidMetadata(t *testing.T) {
 		"name": "_INVALID",
 	}
 	assert.Error(t, Validate(metadata, "v0.2"),
-		`- version: version is required`)
+		`- (root): version is required`)
 }
 
 func TestValidateMetadata(t *testing.T) {
@@ -32,7 +32,7 @@ func TestValidateMetadataNoName(t *testing.T) {
 		// MUST fail! No name
 		"version": "my-version",
 	}
-	assert.Error(t, Validate(metadata, "v0.2"), "- name: name is required")
+	assert.Error(t, Validate(metadata, "v0.2"), "- (root): name is required")
 }
 
 func TestValidateMetadataNoVersion(t *testing.T) {
@@ -41,7 +41,7 @@ func TestValidateMetadataNoVersion(t *testing.T) {
 		//"version": "my-version",
 		// MUST fail! No version
 	}
-	assert.Error(t, Validate(metadata, "v0.2"), "- version: version is required")
+	assert.Error(t, Validate(metadata, "v0.2"), "- (root): version is required")
 }
 
 func TestValidateMetadataV0_2(t *testing.T) {

types/types_test.go

@@ -227,8 +227,8 @@ unknown: property`)
 	app := &App{Path: "my-app"}
 	err := Metadata(r)(app)
 	assert.Error(t, err, `failed to validate metadata:
-- maintainers.2.email: Does not match format 'email'
-- version: version is required`)
+- (root): version is required
+- maintainers.2.email: Does not match format 'email'`)
 }
 
 func TestValidateBrokenParameters(t *testing.T) {