From fec94aa53adb0b784ba52bb208b881b7e2f32417 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Sun, 12 Jan 2020 19:35:11 -0500 Subject: [PATCH] engine, lang: Fix simple test failures Two bugs sneaked in while pushing old stuff. --- engine/resources/docker_container.go | 2 +- lang/funcs/core/deploy/readfile_func.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/resources/docker_container.go b/engine/resources/docker_container.go index e2683952..54fca968 100644 --- a/engine/resources/docker_container.go +++ b/engine/resources/docker_container.go @@ -402,7 +402,7 @@ func (obj *DockerContainerRes) Cmp(r engine.Res) error { return fmt.Errorf("the APIVersion differs") } if obj.Force != res.Force { - return fmt.Errorf("The Force field differs") + return fmt.Errorf("the Force field differs") } return nil } diff --git a/lang/funcs/core/deploy/readfile_func.go b/lang/funcs/core/deploy/readfile_func.go index a0c84493..e6f0e4e8 100644 --- a/lang/funcs/core/deploy/readfile_func.go +++ b/lang/funcs/core/deploy/readfile_func.go @@ -135,7 +135,7 @@ func (obj *ReadFileFunc) Stream() error { // We could use it directly, but it feels like less correct. //content, err := obj.data.Fs.ReadFile(path) // open the remote file system if err != nil { - return errwrap.Wrapf(err, "can't read file `%s` (%s)", obj.filename, path) + return errwrap.Wrapf(err, "can't read file `%s` (%s)", *obj.filename, path) } result := string(content) // convert to string