Merge pull request #71 from openHPI/fix/#44-unwrapping-error

Unwrap Nomad Error for Allocation Exec

internal/nomad/api_querier.go

@@ -100,11 +100,14 @@ func (nc *nomadAPIClient) Execute(runnerID string,
 		return 1, fmt.Errorf("error retrieving allocation info: %w", err)
 	}
 	exitCode, err := nc.client.Allocations().Exec(ctx, allocation, TaskName, tty, command, stdin, stdout, stderr, nil, nil)
-	if err != nil && websocket.IsCloseError(err, websocket.CloseNormalClosure) {
+	if err != nil {
-		log.WithError(err).Info("The exit code could not be received.")
+		rootCause := errors.Unwrap(err)
-		return 0, nil
+		if rootCause != nil && websocket.IsCloseError(rootCause, websocket.CloseNormalClosure) {
-	} else if err != nil {
+			log.WithError(err).Info("The exit code could not be received.")
-		return 1, fmt.Errorf("error executing command in allocation: %w", err)
+			return 0, nil
+		} else {
+			return 1, fmt.Errorf("error executing command in allocation: %w", err)
+		}
 	}
 	return exitCode, nil
 }

internal/nomad/api_querier_test.go

@@ -0,0 +1,18 @@
+package nomad
+
+import (
+	"errors"
+	"fmt"
+	"github.com/gorilla/websocket"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestWebsocketErrorNeedsToBeUnwrapped(t *testing.T) {
+	rawError := &websocket.CloseError{Code: websocket.CloseNormalClosure}
+	err := fmt.Errorf("websocket closed before receiving exit code: %w", rawError)
+
+	assert.False(t, websocket.IsCloseError(err, websocket.CloseNormalClosure))
+	rootCause := errors.Unwrap(err)
+	assert.True(t, websocket.IsCloseError(rootCause, websocket.CloseNormalClosure))
+}