From 5754d6084cd3f721d63f7fc60c494429db0a66e1 Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Mon, 22 Nov 2021 17:46:37 +0100 Subject: [PATCH] Bump compose-go to v1.0.7 Signed-off-by: Mathieu Champlon --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/e2e/metrics_test.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index a1b52c33c..3cf83c2c6 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/AlecAivazis/survey/v2 v2.2.3 github.com/buger/goterm v1.0.0 github.com/cnabio/cnab-to-oci v0.3.1-beta1 - github.com/compose-spec/compose-go v1.0.5 + github.com/compose-spec/compose-go v1.0.7 github.com/containerd/console v1.0.2 github.com/containerd/containerd v1.5.8 github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e @@ -47,7 +47,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.1 // indirect github.com/cnabio/cnab-go v0.10.0-beta1 // indirect - github.com/compose-spec/godotenv v1.1.0 // indirect + github.com/compose-spec/godotenv v1.1.1 // indirect github.com/containerd/cgroups v1.0.1 // indirect github.com/containerd/continuity v0.1.0 // indirect github.com/containerd/typeurl v1.0.2 // indirect diff --git a/go.sum b/go.sum index bdfb55b80..c599b0753 100644 --- a/go.sum +++ b/go.sum @@ -197,10 +197,10 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/compose-spec/compose-go v1.0.5 h1:WtfK7tJsk5C8h12iggum7p28kTxeXH7Xi5c/pLfnBwk= -github.com/compose-spec/compose-go v1.0.5/go.mod h1:LQ/JAjSIyh8bTu4RV6nkyf0Ow/Yf3qpvzrdEigxduiw= -github.com/compose-spec/godotenv v1.1.0 h1:wzShe5P6L/Aw3wsV357eWlZdMcPaOe2V2+3+qGwMEL4= -github.com/compose-spec/godotenv v1.1.0/go.mod h1:zF/3BOa18Z24tts5qnO/E9YURQanJTBUf7nlcCTNsyc= +github.com/compose-spec/compose-go v1.0.7 h1:cgvJPo9/osD/CXSbWrSyZrN7rV5ZfOn3j5csZtYV0i0= +github.com/compose-spec/compose-go v1.0.7/go.mod h1:REnCbBugoIdHB7S1sfkN/aJ7AJpNApGNjNiVjA9L8x4= +github.com/compose-spec/godotenv v1.1.1 h1:lp+WpAInnw06YN9sV/XLUOV/9z4C+6wjJdWlrdVac7o= +github.com/compose-spec/godotenv v1.1.1/go.mod h1:zF/3BOa18Z24tts5qnO/E9YURQanJTBUf7nlcCTNsyc= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= diff --git a/pkg/e2e/metrics_test.go b/pkg/e2e/metrics_test.go index 6af519545..b1a9e667f 100644 --- a/pkg/e2e/metrics_test.go +++ b/pkg/e2e/metrics_test.go @@ -36,7 +36,7 @@ func TestComposeMetrics(t *testing.T) { res = c.RunDockerOrExitError("compose", "-f", "fixtures/wrong-composefile/compose.yaml", "up", "-d") res.Assert(t, icmd.Expected{ExitCode: 15, Err: "services.simple Additional property wrongField is not allowed"}) res = c.RunDockerOrExitError("compose", "up") - res.Assert(t, icmd.Expected{ExitCode: 14, Err: "can't find a suitable configuration file in this directory or any parent: not found"}) + res.Assert(t, icmd.Expected{ExitCode: 14, Err: "no configuration file provided: not found"}) res = c.RunDockerOrExitError("compose", "up", "-f", "fixtures/wrong-composefile/compose.yaml") res.Assert(t, icmd.Expected{ExitCode: 16, Err: "unknown shorthand flag: 'f' in -f"}) res = c.RunDockerOrExitError("compose", "up", "--file", "fixtures/wrong-composefile/compose.yaml")