Address review comments

Author: bergundy

internal/error_test.go

@@ -30,6 +30,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/nexus-rpc/sdk-go/nexus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	commandpb "go.temporal.io/api/command/v1"
@@ -1021,7 +1022,34 @@ func Test_convertErrorToFailure_ChildWorkflowExecutionError(t *testing.T) {
 	require.Equal(err.startedEventID, childWorkflowExecutionErr.startedEventID)
 }
 
-func Test_convertErrorToFailure_UnknowError(t *testing.T) {
+func Test_convertErrorToFailure_NexusHandlerError(t *testing.T) {
+	require := require.New(t)
+	fc := GetDefaultFailureConverter()
+
+	f := fc.ErrorToFailure(&nexus.HandlerError{
+		Type:          nexus.HandlerErrorTypeInternal,
+		Cause:         errors.New("custom cause"),
+		RetryBehavior: nexus.HandlerErrorRetryBehaviorNonRetryable,
+	})
+	require.Equal("handler error (INTERNAL): custom cause", f.GetMessage())
+	require.Equal(string(nexus.HandlerErrorTypeInternal), f.GetNexusHandlerFailureInfo().Type)
+	require.Equal(enumspb.NEXUS_HANDLER_ERROR_RETRY_BEHAVIOR_NON_RETRYABLE, f.GetNexusHandlerFailureInfo().RetryBehavior)
+	require.Equal("", f.Cause.GetApplicationFailureInfo().Type)
+	require.Equal("custom cause", f.Cause.Message)
+
+	err := fc.FailureToError(f)
+	var handlerErr *nexus.HandlerError
+	require.ErrorAs(err, &handlerErr)
+	require.Equal(nexus.HandlerErrorTypeInternal, handlerErr.Type)
+	require.Equal(nexus.HandlerErrorRetryBehaviorNonRetryable, handlerErr.RetryBehavior)
+	require.Equal("handler error (INTERNAL): custom cause", handlerErr.Error())
+
+	var applicationErr *ApplicationError
+	require.ErrorAs(handlerErr.Cause, &applicationErr)
+	require.Equal("custom cause", applicationErr.Error())
+}
+
+func Test_convertErrorToFailure_UnknownError(t *testing.T) {
 	require := require.New(t)
 	fc := GetDefaultFailureConverter()
 

temporalnexus/token.go

@@ -37,6 +37,9 @@ const (
 
 // workflowRunOperationToken is the decoded form of the workflow run operation token.
 type workflowRunOperationToken struct {
+	// Version of the token, by default we assume we're on version 1, this field is not emitted as part of the output,
+	// it's only used to reject newer token versions on load.
+	Version int `json:"v"`
 	// Type of the operation. Must be operationTypeWorkflowRun.
 	Type          operationTokenType `json:"t"`
 	NamespaceName string             `json:"ns"`
@@ -71,6 +74,9 @@ func loadWorkflowRunOperationToken(data string) (workflowRunOperationToken, erro
 	if token.Type != operationTokenTypeWorkflowRun {
 		return token, fmt.Errorf("invalid workflow token type: %v, expected: %v", token.Type, operationTokenTypeWorkflowRun)
 	}
+	if token.Version != 0 {
+		return token, fmt.Errorf(`invalid workflow run token: "v" field should not be present`)
+	}
 	if token.WorkflowID == "" {
 		return token, errors.New("invalid workflow run token: missing workflow ID (wid)")
 	}

temporalnexus/token_test.go

@@ -62,4 +62,8 @@ func TestDecodeWorkflowRunOperationTokenErrors(t *testing.T) {
 	missingWIDToken := base64.URLEncoding.WithPadding(base64.NoPadding).EncodeToString([]byte(`{"t":1}`))
 	_, err = loadWorkflowRunOperationToken(missingWIDToken)
 	require.ErrorContains(t, err, "invalid workflow run token: missing workflow ID (wid)")
+
+	versionedToken := base64.URLEncoding.WithPadding(base64.NoPadding).EncodeToString([]byte(`{"v":1, "t":1,"wid": "workflow-id"}`))
+	_, err = loadWorkflowRunOperationToken(versionedToken)
+	require.ErrorContains(t, err, `invalid workflow run token: "v" field should not be present`)
 }