Set last exit code outside interactive mode

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
zowe · Feb 26, 2025 · cc3e92b · cc3e92b
1 parent 87599ab
commit cc3e92b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/native/golang/cmds/cmds.go b/native/golang/cmds/cmds.go
@@ -18,16 +18,18 @@ import (
 )
 
 // HandleConsoleCommandRequest handles a ConsoleCommandRequest by invoking the `zowex console issue` command
-func HandleConsoleCommandRequest(_conn utils.StdioConn, params []byte) (result any, e error) {
+func HandleConsoleCommandRequest(conn utils.StdioConn, params []byte) (result any, e error) {
 	request, err := utils.ParseCommandRequest[cmdTypes.IssueConsoleRequest](params)
 	if err != nil {
 		return nil, err
 	}
 
 	args := []string{"console", "issue", request.CommandText, "--cn", request.ConsoleName}
-	out, err := utils.BuildCommandAuthorized(args).Output()
+	cmd := utils.BuildCommandAuthorized(args)
+	out, err := cmd.Output()
 	if err != nil {
 		e = fmt.Errorf("Failed to execute command: %v", err)
+		*conn.LastExitCode = cmd.ProcessState.ExitCode()
 		return
 	}
 

diff --git a/native/golang/cmds/ds.go b/native/golang/cmds/ds.go
@@ -52,7 +52,7 @@ func HandleReadDatasetRequest(conn utils.StdioConn, params []byte) (result any,
 }
 
 // HandleWriteDatasetRequest handles a WriteDatasetRequest by invoking the `zowex data-set write` command
-func HandleWriteDatasetRequest(_conn utils.StdioConn, params []byte) (result any, e error) {
+func HandleWriteDatasetRequest(conn utils.StdioConn, params []byte) (result any, e error) {
 	request, err := utils.ParseCommandRequest[ds.WriteDatasetRequest](params)
 	if err != nil {
 		return nil, err
@@ -88,6 +88,7 @@ func HandleWriteDatasetRequest(_conn utils.StdioConn, params []byte) (result any
 	_, err = cmd.Output()
 	if err != nil {
 		e = fmt.Errorf("Failed to pipe stdin to command: %v", err)
+		*conn.LastExitCode = cmd.ProcessState.ExitCode()
 		return
 	}
 

diff --git a/native/golang/cmds/jobs.go b/native/golang/cmds/jobs.go
@@ -253,6 +253,7 @@ func HandleSubmitJclRequest(conn utils.StdioConn, params []byte) (result any, e
 	out, err := cmd.Output()
 	if err != nil {
 		e = fmt.Errorf("Failed to submit JCL: %v", err)
+		*conn.LastExitCode = cmd.ProcessState.ExitCode()
 		return
 	}
 

diff --git a/native/golang/cmds/uss.go b/native/golang/cmds/uss.go
@@ -105,7 +105,7 @@ func HandleReadFileRequest(conn utils.StdioConn, params []byte) (result any, e e
 }
 
 // HandleWriteFileRequest handles a WriteFileRequest by invoking the `zowex uss write` command
-func HandleWriteFileRequest(_conn utils.StdioConn, params []byte) (result any, e error) {
+func HandleWriteFileRequest(conn utils.StdioConn, params []byte) (result any, e error) {
 	request, err := utils.ParseCommandRequest[uss.WriteFileRequest](params)
 	if err != nil {
 		return nil, err
@@ -142,6 +142,7 @@ func HandleWriteFileRequest(_conn utils.StdioConn, params []byte) (result any, e
 	_, err = cmd.Output()
 	if err != nil {
 		e = fmt.Errorf("[WriteFileRequest] Error piping stdin to command: %v", err)
+		*conn.LastExitCode = cmd.ProcessState.ExitCode()
 		return
 	}