Skip to content

Commit 56b601d

Browse files
authoredOct 24, 2024··
Bump Nexus sdk-go to v0.0.11 (#1685)
1 parent 1a13bf3 commit 56b601d

File tree

18 files changed

+49
-48
lines changed

18 files changed

+49
-48
lines changed
 

‎contrib/datadog/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/google/uuid v1.6.0 // indirect
3131
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
3232
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
33-
github.com/nexus-rpc/sdk-go v0.0.10 // indirect
33+
github.com/nexus-rpc/sdk-go v0.0.11 // indirect
3434
github.com/outcaste-io/ristretto v0.2.3 // indirect
3535
github.com/pborman/uuid v1.2.1 // indirect
3636
github.com/philhofer/fwd v1.1.2 // indirect

‎contrib/datadog/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
8585
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
8686
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
8787
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
88-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
89-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
88+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
89+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
9090
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
9191
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
9292
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=

‎contrib/opentelemetry/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
require (
1414
github.com/go-logr/logr v1.4.1 // indirect
1515
github.com/go-logr/stdr v1.2.2 // indirect
16-
github.com/nexus-rpc/sdk-go v0.0.10 // indirect
16+
github.com/nexus-rpc/sdk-go v0.0.11 // indirect
1717
golang.org/x/sync v0.8.0 // indirect
1818
)
1919

‎contrib/opentelemetry/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
5252
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
5353
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
5454
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
55-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
56-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
55+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
56+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
5757
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
5858
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
5959
github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

‎contrib/opentracing/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/google/uuid v1.6.0 // indirect
1919
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
2020
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
21-
github.com/nexus-rpc/sdk-go v0.0.10 // indirect
21+
github.com/nexus-rpc/sdk-go v0.0.11 // indirect
2222
github.com/pborman/uuid v1.2.1 // indirect
2323
github.com/pmezard/go-difflib v1.0.0 // indirect
2424
github.com/robfig/cron v1.2.0 // indirect

‎contrib/opentracing/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
4747
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
4848
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
4949
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
50-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
51-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
50+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
51+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
5252
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
5353
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
5454
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=

‎contrib/resourcetuner/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
2626
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
2727
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
28-
github.com/nexus-rpc/sdk-go v0.0.10 // indirect
28+
github.com/nexus-rpc/sdk-go v0.0.11 // indirect
2929
github.com/opencontainers/runtime-spec v1.0.2 // indirect
3030
github.com/pborman/uuid v1.2.1 // indirect
3131
github.com/pmezard/go-difflib v1.0.0 // indirect

‎contrib/resourcetuner/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
6262
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
6363
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
6464
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
65-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
66-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
65+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
66+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
6767
github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
6868
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
6969
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

‎contrib/tally/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/google/uuid v1.6.0 // indirect
1919
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
2020
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
21-
github.com/nexus-rpc/sdk-go v0.0.10 // indirect
21+
github.com/nexus-rpc/sdk-go v0.0.11 // indirect
2222
github.com/pborman/uuid v1.2.1 // indirect
2323
github.com/pmezard/go-difflib v1.0.0 // indirect
2424
github.com/robfig/cron v1.2.0 // indirect

‎contrib/tally/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
9292
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
9393
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
9494
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
95-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
96-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
95+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
96+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
9797
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
9898
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
9999
github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/gogo/protobuf v1.3.2
1010
github.com/golang/mock v1.6.0
1111
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
12-
github.com/nexus-rpc/sdk-go v0.0.10
12+
github.com/nexus-rpc/sdk-go v0.0.11
1313
github.com/pborman/uuid v1.2.1
1414
github.com/robfig/cron v1.2.0
1515
github.com/stretchr/testify v1.9.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
4747
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
4848
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
4949
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
50-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
51-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
50+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
51+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
5252
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
5353
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
5454
github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

‎internal/cmd/build/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/google/uuid v1.6.0 // indirect
1818
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
1919
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
20-
github.com/nexus-rpc/sdk-go v0.0.10 // indirect
20+
github.com/nexus-rpc/sdk-go v0.0.11 // indirect
2121
github.com/pborman/uuid v1.2.1 // indirect
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
2323
github.com/robfig/cron v1.2.0 // indirect

‎internal/cmd/build/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
5151
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
5252
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
5353
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
54-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
55-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
54+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
55+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
5656
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
5757
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
5858
github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

‎internal/internal_nexus_task_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ func convertServiceError(err error) error {
478478
case codes.Unimplemented:
479479
return nexus.HandlerErrorf(nexus.HandlerErrorTypeNotImplemented, errMessage)
480480
case codes.DeadlineExceeded:
481-
return nexus.HandlerErrorf(nexus.HandlerErrorTypeDownstreamTimeout, errMessage)
481+
return nexus.HandlerErrorf(nexus.HandlerErrorTypeUpstreamTimeout, errMessage)
482482
}
483483

484484
return err

‎test/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.21.1
77
require (
88
github.com/golang/mock v1.6.0
99
github.com/google/uuid v1.6.0
10-
github.com/nexus-rpc/sdk-go v0.0.10
10+
github.com/nexus-rpc/sdk-go v0.0.11
1111
github.com/opentracing/opentracing-go v1.2.0
1212
github.com/pborman/uuid v1.2.1
1313
github.com/stretchr/testify v1.9.0

‎test/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
112112
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
113113
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
114114
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
115-
github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA=
116-
github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
115+
github.com/nexus-rpc/sdk-go v0.0.11 h1:qH3Us3spfp50t5ca775V1va2eE6z1zMQDZY4mvbw0CI=
116+
github.com/nexus-rpc/sdk-go v0.0.11/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ=
117117
github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
118118
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
119119
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

‎test/nexus_test.go

+24-23
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,10 @@ func TestNexusSyncOperation(t *testing.T) {
264264
t.Run("fmt-errorf", func(t *testing.T) {
265265
tc.metricsHandler.Clear()
266266
_, err := nexus.ExecuteOperation(ctx, nc, syncOp, "fmt-errorf", nexus.ExecuteOperationOptions{})
267-
var unexpectedResponseErr *nexus.UnexpectedResponseError
268-
require.ErrorAs(t, err, &unexpectedResponseErr)
269-
require.Contains(t, unexpectedResponseErr.Message, `"500 Internal Server Error": arbitrary error message`)
267+
var handlerErr *nexus.HandlerError
268+
require.ErrorAs(t, err, &handlerErr)
269+
require.Equal(t, nexus.HandlerErrorTypeInternal, handlerErr.Type)
270+
require.Contains(t, handlerErr.Failure.Message, "arbitrary error message")
270271

271272
require.EventuallyWithT(t, func(t *assert.CollectT) {
272273
tc.requireTimer(t, metrics.NexusTaskEndToEndLatency, service.Name, syncOp.Name())
@@ -278,10 +279,10 @@ func TestNexusSyncOperation(t *testing.T) {
278279

279280
t.Run("handlererror", func(t *testing.T) {
280281
_, err := nexus.ExecuteOperation(ctx, nc, syncOp, "handlererror", nexus.ExecuteOperationOptions{})
281-
var unexpectedResponseErr *nexus.UnexpectedResponseError
282-
require.ErrorAs(t, err, &unexpectedResponseErr)
283-
require.Equal(t, http.StatusBadRequest, unexpectedResponseErr.Response.StatusCode)
284-
require.Contains(t, unexpectedResponseErr.Message, `"400 Bad Request": handlererror`)
282+
var handlerErr *nexus.HandlerError
283+
require.ErrorAs(t, err, &handlerErr)
284+
require.Equal(t, nexus.HandlerErrorTypeBadRequest, handlerErr.Type)
285+
require.Contains(t, handlerErr.Failure.Message, "handlererror")
285286

286287
require.EventuallyWithT(t, func(t *assert.CollectT) {
287288
tc.requireTimer(t, metrics.NexusTaskEndToEndLatency, service.Name, syncOp.Name())
@@ -293,10 +294,10 @@ func TestNexusSyncOperation(t *testing.T) {
293294

294295
t.Run("already-started", func(t *testing.T) {
295296
_, err := nexus.ExecuteOperation(ctx, nc, syncOp, "already-started", nexus.ExecuteOperationOptions{})
296-
var unexpectedResponseErr *nexus.UnexpectedResponseError
297-
require.ErrorAs(t, err, &unexpectedResponseErr)
298-
require.Equal(t, http.StatusBadRequest, unexpectedResponseErr.Response.StatusCode)
299-
require.Contains(t, unexpectedResponseErr.Message, `"400 Bad Request": faking workflow already started`)
297+
var handlerErr *nexus.HandlerError
298+
require.ErrorAs(t, err, &handlerErr)
299+
require.Equal(t, nexus.HandlerErrorTypeBadRequest, handlerErr.Type)
300+
require.Contains(t, handlerErr.Failure.Message, "faking workflow already started")
300301

301302
require.EventuallyWithT(t, func(t *assert.CollectT) {
302303
tc.requireTimer(t, metrics.NexusTaskEndToEndLatency, service.Name, syncOp.Name())
@@ -308,10 +309,10 @@ func TestNexusSyncOperation(t *testing.T) {
308309

309310
t.Run("retryable-application-error", func(t *testing.T) {
310311
_, err := nexus.ExecuteOperation(ctx, nc, syncOp, "retryable-application-error", nexus.ExecuteOperationOptions{})
311-
var unexpectedResponseErr *nexus.UnexpectedResponseError
312-
require.ErrorAs(t, err, &unexpectedResponseErr)
313-
require.Equal(t, http.StatusInternalServerError, unexpectedResponseErr.Response.StatusCode)
314-
require.Contains(t, unexpectedResponseErr.Message, `"500 Internal Server Error": fake app error for test`)
312+
var handlerErr *nexus.HandlerError
313+
require.ErrorAs(t, err, &handlerErr)
314+
require.Equal(t, nexus.HandlerErrorTypeInternal, handlerErr.Type)
315+
require.Contains(t, handlerErr.Failure.Message, "fake app error for test")
315316

316317
require.EventuallyWithT(t, func(t *assert.CollectT) {
317318
tc.requireTimer(t, metrics.NexusTaskEndToEndLatency, service.Name, syncOp.Name())
@@ -323,10 +324,10 @@ func TestNexusSyncOperation(t *testing.T) {
323324

324325
t.Run("non-retryable-application-error", func(t *testing.T) {
325326
_, err := nexus.ExecuteOperation(ctx, nc, syncOp, "non-retryable-application-error", nexus.ExecuteOperationOptions{})
326-
var unexpectedResponseErr *nexus.UnexpectedResponseError
327-
require.ErrorAs(t, err, &unexpectedResponseErr)
328-
require.Equal(t, http.StatusBadRequest, unexpectedResponseErr.Response.StatusCode)
329-
require.Contains(t, unexpectedResponseErr.Message, `"400 Bad Request": fake app error for test`)
327+
var handlerErr *nexus.HandlerError
328+
require.ErrorAs(t, err, &handlerErr)
329+
require.Equal(t, nexus.HandlerErrorTypeBadRequest, handlerErr.Type)
330+
require.Contains(t, handlerErr.Failure.Message, "fake app error for test")
330331

331332
require.EventuallyWithT(t, func(t *assert.CollectT) {
332333
tc.requireTimer(t, metrics.NexusTaskEndToEndLatency, service.Name, syncOp.Name())
@@ -338,10 +339,10 @@ func TestNexusSyncOperation(t *testing.T) {
338339

339340
t.Run("panic", func(t *testing.T) {
340341
_, err := nexus.ExecuteOperation(ctx, nc, syncOp, "panic", nexus.ExecuteOperationOptions{})
341-
var unexpectedResponseErr *nexus.UnexpectedResponseError
342-
require.ErrorAs(t, err, &unexpectedResponseErr)
343-
require.Equal(t, 500, unexpectedResponseErr.Response.StatusCode)
344-
require.Contains(t, unexpectedResponseErr.Message, "panic: panic requested")
342+
var handlerErr *nexus.HandlerError
343+
require.ErrorAs(t, err, &handlerErr)
344+
require.Equal(t, nexus.HandlerErrorTypeInternal, handlerErr.Type)
345+
require.Contains(t, handlerErr.Failure.Message, "panic: panic requested")
345346

346347
require.EventuallyWithT(t, func(t *assert.CollectT) {
347348
tc.requireTimer(t, metrics.NexusTaskEndToEndLatency, service.Name, syncOp.Name())

0 commit comments

Comments
 (0)
Please sign in to comment.