Skip to content

Commit 528dfdb

Browse files
tchsskCopilot
andauthored
Use errors.Is() in templates (#3736)
* Use errors.Is() in templates * Update http/codegen/templates/client_sse.go.tpl Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 21839d6 commit 528dfdb

10 files changed

+59
-59
lines changed

codegen/example/templates/client_endpoint_init.go.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
}
1818
if err != nil {
19-
if err == flag.ErrHelp {
19+
if errors.Is(err, flag.ErrHelp) {
2020
os.Exit(0)
2121
}
2222
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-no-server.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func main() {
6161
}
6262
}
6363
if err != nil {
64-
if err == flag.ErrHelp {
64+
if errors.Is(err, flag.ErrHelp) {
6565
os.Exit(0)
6666
}
6767
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-multiple-hosts-with-variables.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func main() {
8080
}
8181
}
8282
if err != nil {
83-
if err == flag.ErrHelp {
83+
if errors.Is(err, flag.ErrHelp) {
8484
os.Exit(0)
8585
}
8686
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-multiple-hosts.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func main() {
6161
}
6262
}
6363
if err != nil {
64-
if err == flag.ErrHelp {
64+
if errors.Is(err, flag.ErrHelp) {
6565
os.Exit(0)
6666
}
6767
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-single-host-with-variables.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func main() {
7777
}
7878
}
7979
if err != nil {
80-
if err == flag.ErrHelp {
80+
if errors.Is(err, flag.ErrHelp) {
8181
os.Exit(0)
8282
}
8383
fmt.Fprintln(os.Stderr, err.Error())

codegen/example/testdata/client-single-server-single-host.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func main() {
6161
}
6262
}
6363
if err != nil {
64-
if err == flag.ErrHelp {
64+
if errors.Is(err, flag.ErrHelp) {
6565
os.Exit(0)
6666
}
6767
fmt.Fprintln(os.Stderr, err.Error())

http/codegen/templates/client_sse.go.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ func (s *{{ .Method.VarName }}StreamImpl) RecvWithContext(ctx context.Context) (
2929
var byts []byte
3030
byts, err = s.readEvent(ctx)
3131
if err != nil {
32-
if err == io.EOF || err == context.Canceled || err == context.DeadlineExceeded {
32+
if errors.Is(err, io.EOF) || errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
3333
// Clean up on EOF or context cancellation
3434
s.Close()
35-
if err == io.EOF {
35+
if errors.Is(err, io.EOF) {
3636
err = nil
3737
}
3838
}
@@ -117,7 +117,7 @@ func (s *{{ .Method.VarName }}StreamImpl) readEvent(ctx context.Context) ([]byte
117117
}
118118

119119
// Return partial data at EOF
120-
if err == io.EOF {
120+
if errors.Is(err, io.EOF) {
121121
if len(eventData) > 0 {
122122
return eventData, nil
123123
}

http/codegen/templates/partial/request_elements.go.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ qp := r.URL.Query()
296296
{{- range .Cookies }}
297297
c, {{ if not .Required }}_{{ else }}err{{ end }} = r.Cookie("{{ .HTTPName }}")
298298
{{- if and (or (eq .Type.Name "string") (eq .Type.Name "any")) .Required }}
299-
if err == http.ErrNoCookie {
299+
if errors.Is(err, http.ErrNoCookie) {
300300
err = goa.MergeErrors(err, goa.MissingFieldError("{{ .Name }}", "cookie"))
301301
} else {
302302
{{ .VarName }} = c.Value

http/codegen/templates/request_decoder.go.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ func {{ .RequestDecoder }}(mux goahttp.Muxer, decoder func(*http.Request) goahtt
1818
err = decoder(r).Decode(&body)
1919
if err != nil {
2020
{{- if .Payload.Request.MustHaveBody }}
21-
if err == io.EOF {
21+
if errors.Is(err, io.EOF) {
2222
return nil, goa.MissingPayloadError()
2323
}
2424
{{- else }}
25-
if err == io.EOF {
25+
if errors.Is(err, io.EOF) {
2626
err = nil
2727
} else {
2828
{{- end }}

0 commit comments

Comments
 (0)