fix: improve error messages when waiting for container

Author: asalkeld

pkg/codeconfig/collect.go

@@ -30,6 +30,7 @@ import (
 
 	v1 "github.com/nitrictech/apis/go/nitric/v1"
 	"github.com/nitrictech/newcli/pkg/containerengine"
+	"github.com/nitrictech/newcli/pkg/utils"
 )
 
 func ImageNameFromExt(ext string) string {
@@ -109,18 +110,20 @@ func Collect(ctx string, handler string, stack *Stack) error {
 	waitChan, cErrChan := ce.ContainerWait(cID, container.WaitConditionNextExit)
 	select {
 	case done := <-waitChan:
-		if done.Error != nil || done.StatusCode != 0 {
-			fmt.Printf("error executing container (code %d) %v\n", done.StatusCode, done.Error)
+		msg := ""
+		if done.Error != nil {
+			msg = done.Error.Message
 		}
-	case cErr := <-cErrChan:
-		if err != nil {
-			fmt.Printf("error waiting for container %v\n", cErr)
+		if msg != "" || done.StatusCode != 0 {
+			err = utils.WrapError(err, fmt.Errorf("error executing container (code %d) %s", done.StatusCode, msg))
 		}
+	case cErr := <-cErrChan:
+		err = utils.WrapError(err, cErr)
 	}
 
 	// 3 - When the container exits stop the server
 	grpcSrv.Stop()
-	err = <-errChan
+	err = utils.WrapError(err, <-errChan)
 
 	// 4 - Add the function to the stack
 	stack.AddFunction(fun)

pkg/utils/errors.go

@@ -0,0 +1,30 @@
+// Copyright Nitric Pty Ltd.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at:
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package utils
+
+import "github.com/pkg/errors"
+
+// WrapError is just a convienance function to prevent checking of nils.
+func WrapError(errFirst, errSecond error) error {
+	if errFirst != nil && errSecond != nil {
+		return errors.Wrap(errFirst, errSecond.Error())
+	}
+	if errFirst != nil {
+		return errFirst
+	}
+	return errSecond
+}