From 4c822cc9c9f0a7fd748a4f99d57fba7bef0df991 Mon Sep 17 00:00:00 2001 From: CF Buildpacks Team CI Server Date: Wed, 9 Oct 2019 19:08:15 +0000 Subject: [PATCH] Update go module github.com/cloudfoundry/dagger --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/cloudfoundry/dagger/app.go | 4 ++-- vendor/github.com/cloudfoundry/dagger/executable.go | 7 +++---- vendor/modules.txt | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 621d6ee..263a4d6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( github.com/buildpack/libbuildpack v1.24.5 - github.com/cloudfoundry/dagger v0.0.0-20191008214257-082243eedf72 + github.com/cloudfoundry/dagger v0.0.0-20191009190047-e65ce4cd4ad0 github.com/cloudfoundry/libcfbuildpack v1.89.0 github.com/golang/mock v1.3.1 github.com/google/go-cmp v0.3.1 diff --git a/go.sum b/go.sum index 064380c..1870327 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ github.com/buildpack/libbuildpack v1.24.3/go.mod h1:16+PwmWtgcwzIVcCzwxwc9yi1g/N github.com/buildpack/libbuildpack v1.24.5 h1:r7AM7r8ff7ocI1KOopVHEC3EDTCdrj0YeTXkfYuqH0I= github.com/buildpack/libbuildpack v1.24.5/go.mod h1:cBmq8aozSDfy+RiKCERQbT6lk0M/Xf3aJWK2PLbPG1g= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudfoundry/dagger v0.0.0-20191008214257-082243eedf72 h1:6o2X5yXYyK18Nfyzp7N0luUwZn+9fsQw2vOu/byUI0M= -github.com/cloudfoundry/dagger v0.0.0-20191008214257-082243eedf72/go.mod h1:5SsFi1j50yJ8GEcvyX/Ftg+FsT4HX0dw9VjH3nDCb/o= +github.com/cloudfoundry/dagger v0.0.0-20191009190047-e65ce4cd4ad0 h1:jN7q7R0ggYf0q9VwKOjJDXnQfBaZxQ5LLrKNqIC2RQs= +github.com/cloudfoundry/dagger v0.0.0-20191009190047-e65ce4cd4ad0/go.mod h1:5SsFi1j50yJ8GEcvyX/Ftg+FsT4HX0dw9VjH3nDCb/o= github.com/cloudfoundry/libbuildpack v0.0.0-20191007182113-c10f57166e5b h1:W/ieO8SAZfeRlxpla9WF4INqBCWXTELoa12+akON6mI= github.com/cloudfoundry/libbuildpack v0.0.0-20191007182113-c10f57166e5b/go.mod h1:F89xsc6s04sSmwubA99WA9m5uvcLBFeNln17bT8xap0= github.com/cloudfoundry/libcfbuildpack v1.76.0 h1:oMTv35mjk5Jogzy2sshVXHyolDWnWHMfANQ0UooXJq0= diff --git a/vendor/github.com/cloudfoundry/dagger/app.go b/vendor/github.com/cloudfoundry/dagger/app.go index 4ddbc2d..61deeb2 100644 --- a/vendor/github.com/cloudfoundry/dagger/app.go +++ b/vendor/github.com/cloudfoundry/dagger/app.go @@ -323,13 +323,13 @@ func getCacheVolumes() ([]string, error) { func DockerArtifactExists(name string) (bool, error) { dockerLogger := lager.NewLogger("docker") - log, _, err := docker.NewDockerExecutable(dockerLogger).Execute( + _, errLog, err := docker.NewDockerExecutable(dockerLogger).Execute( docker.ExecuteOptions{}, "inspect", name, ) if err != nil { - if strings.Contains(log, "No such object") { + if strings.Contains(errLog, "No such object") { return false, nil } diff --git a/vendor/github.com/cloudfoundry/dagger/executable.go b/vendor/github.com/cloudfoundry/dagger/executable.go index 0c2e2fe..ad65a54 100644 --- a/vendor/github.com/cloudfoundry/dagger/executable.go +++ b/vendor/github.com/cloudfoundry/dagger/executable.go @@ -35,10 +35,9 @@ func (p PackExecutable) Execute(options executable.ExecuteOptions, args ...strin packCmd.Stderr = stderr p.logger.Info("") - if err := packCmd.Run(); err != nil { - return "", "", err - } - return stdout.String(), stderr.String(), nil + err := packCmd.Run() + + return stdout.String(), stderr.String(), err } diff --git a/vendor/modules.txt b/vendor/modules.txt index f84cf03..5994822 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -19,7 +19,7 @@ github.com/buildpack/libbuildpack/buildpack github.com/buildpack/libbuildpack/platform github.com/buildpack/libbuildpack/services github.com/buildpack/libbuildpack/stack -# github.com/cloudfoundry/dagger v0.0.0-20191008214257-082243eedf72 +# github.com/cloudfoundry/dagger v0.0.0-20191009190047-e65ce4cd4ad0 github.com/cloudfoundry/dagger github.com/cloudfoundry/dagger/utils # github.com/cloudfoundry/libbuildpack v0.0.0-20191007182113-c10f57166e5b