fix error formatting (#40)

annetutil · Feb 12, 2024 · ec24a1c · ec24a1c
1 parent 15ce03e
commit ec24a1c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pkg/device/genericcli/genericcli.go b/pkg/device/genericcli/genericcli.go
@@ -234,7 +234,7 @@ func (m *GenericDevice) connectCLI(ctx context.Context) (err error) {
 					answered = true
 					err := m.connector.Write(ans)
 					if err != nil {
-						return fmt.Errorf("write error %v", err)
+						return fmt.Errorf("write error %w", err)
 					}
 					break
 				}
@@ -490,23 +490,23 @@ func GenericExecute(command cmd.Cmd, connector streamer.Connector, cli GenericCL
 			}
 			err = connector.Write([]byte(` `))
 			if err != nil {
-				return nil, fmt.Errorf("write error %v", err)
+				return nil, fmt.Errorf("write error %w", err)
 			}
 		} else if matchName == "question" { // question
 			question := match.GetMatched()
 			answer, err := command.QuestionHandler(question)
 			if err != nil {
-				return nil, fmt.Errorf("QuestionHandler error %v", err)
+				return nil, fmt.Errorf("QuestionHandler error %w", err)
 			}
 			if len(answer) > 0 {
 				err := connector.Write(answer)
 				if err != nil {
-					return nil, fmt.Errorf("write error %v", err)
+					return nil, fmt.Errorf("write error %w", err)
 				}
 			}
 			err = connector.Write([]byte("\n"))
 			if err != nil {
-				return nil, fmt.Errorf("write error %v", err)
+				return nil, fmt.Errorf("write error %w", err)
 			}
 		} else if matchName == "cb" { // ExprCallback
 			if cbLimit == 0 { // reset cbLimit in other cases
@@ -516,7 +516,7 @@ func GenericExecute(command cmd.Cmd, connector streamer.Connector, cli GenericCL
 			wr := exprsAddMap[exprsAdd[match.GetPatternNo()-3]]
 			err := connector.Write([]byte(wr))
 			if err != nil {
-				return nil, fmt.Errorf("write error %v", err)
+				return nil, fmt.Errorf("write error %w", err)
 			}
 		} else {
 			panic("unknown option")

diff --git a/pkg/streamer/ssh/ssh.go b/pkg/streamer/ssh/ssh.go
@@ -711,10 +711,10 @@ func (m *Streamer) startForwarding(sess *ssh.Session) error {
 	}
 
 	if err := agent.RequestAgentForwarding(sess); err != nil {
-		return fmt.Errorf("error RequestAgentForwarding: %v", err)
+		return fmt.Errorf("error RequestAgentForwarding: %w", err)
 	}
 	if err := agent.ForwardToAgent(m.conn, keyring); err != nil {
-		return fmt.Errorf("error ForwardToAgent: %v", err)
+		return fmt.Errorf("error ForwardToAgent: %w", err)
 	}
 	m.forwardAgent = keyring
 

diff --git a/pkg/testutils/mock/main_mock.go b/pkg/testutils/mock/main_mock.go
@@ -173,7 +173,7 @@ func RunCmd(devMaker deviceMaker, dialog []Action, commands []cmd.Cmd, logger *z
 
 	err = dev.Connect(connCtx)
 	if err != nil {
-		return nil, nil, nil, fmt.Errorf("failed to connect to device: %v", err)
+		return nil, nil, nil, fmt.Errorf("failed to connect to device: %w", err)
 	}
 	cmdRes = []cmd.CmdRes{}
 	for _, command := range commands {