From 30638351f8e39b60169bc6f8114041adf7923656 Mon Sep 17 00:00:00 2001
From: Denis Bilenko <denis.bilenko@databricks.com>
Date: Mon, 9 Dec 2024 14:29:51 +0100
Subject: [PATCH] clean up

---
 libs/dyn/pattern.go  | 5 +++--
 libs/dyn/walk.go     | 5 +++--
 libs/process/stub.go | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/libs/dyn/pattern.go b/libs/dyn/pattern.go
index fb9758559..855d59dfc 100644
--- a/libs/dyn/pattern.go
+++ b/libs/dyn/pattern.go
@@ -69,8 +69,9 @@ func (c anyKeyComponent) visit(v Value, prefix Path, suffix Pattern, opts visitO
 			return InvalidValue, err
 		}
 
-		if err := m.Set(pk, nv); err != nil {
-			panic(err)
+		err = m.Set(pk, nv)
+		if err != nil {
+			return InvalidValue, err
 		}
 	}
 
diff --git a/libs/dyn/walk.go b/libs/dyn/walk.go
index 94e2a36c0..e61bbb0d9 100644
--- a/libs/dyn/walk.go
+++ b/libs/dyn/walk.go
@@ -45,8 +45,9 @@ func walk(v Value, p Path, fn func(p Path, v Value) (Value, error)) (Value, erro
 			if err != nil {
 				return InvalidValue, err
 			}
-			if err := out.Set(pk, nv); err != nil {
-				panic(err)
+			err = out.Set(pk, nv)
+			if err != nil {
+				return InvalidValue, err
 			}
 		}
 		v.v = out
diff --git a/libs/process/stub.go b/libs/process/stub.go
index 3f80a91ba..8ab6fd705 100644
--- a/libs/process/stub.go
+++ b/libs/process/stub.go
@@ -170,10 +170,12 @@ func (s *processStub) run(cmd *exec.Cmd) error {
 	if s.reponseStub == zeroStub {
 		return fmt.Errorf("no default process stub")
 	}
+	err := s.reponseStub.err
 	if s.reponseStub.stdout != "" {
-		if _, err := cmd.Stdout.Write([]byte(s.reponseStub.stdout)); err != nil {
-			return err
+		_, err1 := cmd.Stdout.Write([]byte(s.reponseStub.stdout))
+		if err == nil {
+			err = err1
 		}
 	}
-	return s.reponseStub.err
+	return err
 }