Merge pull request #58 from tchssk/goa3.25.3

tchssk · web-flow · commit 0ba237e07ce4 · 2026-03-18T21:06:13.000+09:00
Bump goa.design/goa/v3 from 3.25.2 to 3.25.3
diff --git a/autotrailingslash/testdata/code.go b/autotrailingslash/testdata/code.go
@@ -250,13 +250,14 @@ func EncodeMethod2Response(encoder func(context.Context, http.ResponseWriter) go
 // Method2 endpoint.
 func DecodeMethod2Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service.Method2Payload, error) {
 	return func(r *http.Request) (*service.Method2Payload, error) {
+		var payload *service.Method2Payload
 		var (
 			param1 string
 
 			params = mux.Vars(r)
 		)
 		param1 = params["param1"]
-		payload := NewMethod2Payload(param1)
+		payload = NewMethod2Payload(param1)
 
 		return payload, nil
 	}
@@ -275,13 +276,14 @@ func EncodeMethod3Response(encoder func(context.Context, http.ResponseWriter) go
 // Method3 endpoint.
 func DecodeMethod3Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service.Method3Payload, error) {
 	return func(r *http.Request) (*service.Method3Payload, error) {
+		var payload *service.Method3Payload
 		var (
 			param2 string
 
 			params = mux.Vars(r)
 		)
 		param2 = params["param2"]
-		payload := NewMethod3Payload(param2)
+		payload = NewMethod3Payload(param2)
 
 		return payload, nil
 	}
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/stretchr/testify v1.11.1
-	goa.design/goa/v3 v3.25.2
+	goa.design/goa/v3 v3.25.3
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -43,8 +43,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/woodsbury/decimal128 v1.3.0 h1:8pffMNWIlC0O5vbyHWFZAt5yWvWcrHA+3ovIIjVWss0=
 github.com/woodsbury/decimal128 v1.3.0/go.mod h1:C5UTmyTjW3JftjUFzOVhC20BEQa2a4ZKOB5I6Zjb+ds=
-goa.design/goa/v3 v3.25.2 h1:8Sa8PtDsWAWU/Z2BDCAH+NM6VSEuwEuqj4AJwapVgOw=
-goa.design/goa/v3 v3.25.2/go.mod h1:VZ8CcXJRZh09ijtNJJS2gNyKufpmrM+Ul/Qy3viwcOU=
+goa.design/goa/v3 v3.25.3 h1:gnOm2Vu0HMvveKpcqL6aWYQTP2puiwrEJWLQc79/294=
+goa.design/goa/v3 v3.25.3/go.mod h1:VZ8CcXJRZh09ijtNJJS2gNyKufpmrM+Ul/Qy3viwcOU=
 golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
 golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
diff --git a/optionalbody/generate.go b/optionalbody/generate.go
@@ -104,7 +104,7 @@ func update(f *codegen.File) {
 			section.Source = strings.Replace(section.Source,
 				`	{{- if .Payload.Request.MustHaveBody }}
 			if errors.Is(err, io.EOF) {
-				return nil, goa.MissingPayloadError()
+				return payload, goa.MissingPayloadError()
 			}
 	{{- else }}
 			if errors.Is(err, io.EOF) {
@@ -113,18 +113,18 @@ func update(f *codegen.File) {
 	{{- end }}
 			var gerr *goa.ServiceError
 			if errors.As(err, &gerr) {
-				return nil, gerr
+				return payload, gerr
 			}
-			return nil, goa.DecodePayloadError(err.Error())
+			return payload, goa.DecodePayloadError(err.Error())
 	{{- if not .Payload.Request.MustHaveBody }}
 			}
 	{{- end }}`,
 				`			if !errors.Is(err, io.EOF) {
 				var gerr *goa.ServiceError
 				if errors.As(err, &gerr) {
-					return nil, gerr
+					return payload, gerr
 				}
-				return nil, goa.DecodePayloadError(err.Error())
+				return payload, goa.DecodePayloadError(err.Error())
 			}
 			emptyBody = true
 			err = nil`,
@@ -134,22 +134,22 @@ func update(f *codegen.File) {
 				`	{{- if .Payload.Request.ServerBody.ValidateRef }}
 		{{ .Payload.Request.ServerBody.ValidateRef }}
 		if err != nil {
-			return nil, err
+			return payload, err
 		}
 	{{- end }}`,
 				`	{{- if .Payload.Request.ServerBody.ValidateRef }}
 		if !emptyBody {
 			{{ .Payload.Request.ServerBody.ValidateRef }}
 			if err != nil {
-				return nil, err
+				return payload, err
 			}
 		}
 	{{- end }}`,
 				-1,
 			)
 			section.Source = strings.Replace(section.Source,
-				`	payload := {{ .Payload.Request.PayloadInit.Name }}({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})`,
-				`	payload := {{ .Payload.Request.PayloadInit.Name }}`+serverPayloadInitNameSuffix+`({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})
+				`	payload = {{ .Payload.Request.PayloadInit.Name }}({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})`,
+				`	payload = {{ .Payload.Request.PayloadInit.Name }}`+serverPayloadInitNameSuffix+`({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})
 	if !emptyBody {
 		payload = {{ .Payload.Request.PayloadInit.Name }}({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})
 	}`,
diff --git a/optionalbody/testdata/code.go b/optionalbody/testdata/code.go
@@ -87,6 +87,7 @@ func EncodeMethod1Response(encoder func(context.Context, http.ResponseWriter) go
 // Method1 endpoint.
 func DecodeMethod1Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service1.Payload, error) {
 	return func(r *http.Request) (*service1.Payload, error) {
+		var payload *service1.Payload
 		var (
 			body      Method1RequestBody
 			emptyBody bool
@@ -97,20 +98,20 @@ func DecodeMethod1Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp
 			if !errors.Is(err, io.EOF) {
 				var gerr *goa.ServiceError
 				if errors.As(err, &gerr) {
-					return nil, gerr
+					return payload, gerr
 				}
-				return nil, goa.DecodePayloadError(err.Error())
+				return payload, goa.DecodePayloadError(err.Error())
 			}
 			emptyBody = true
 			err = nil
 		}
 		if !emptyBody {
 			err = ValidateMethod1RequestBody(&body)
 			if err != nil {
-				return nil, err
+				return payload, err
 			}
 		}
-		payload := NewMethod1PayloadWithOptionalBody(&body)
+		payload = NewMethod1PayloadWithOptionalBody(&body)
 		if !emptyBody {
 			payload = NewMethod1Payload(&body)
 		}
@@ -132,26 +133,27 @@ func EncodeMethod2Response(encoder func(context.Context, http.ResponseWriter) go
 // Method2 endpoint.
 func DecodeMethod2Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service1.Payload, error) {
 	return func(r *http.Request) (*service1.Payload, error) {
+		var payload *service1.Payload
 		var (
 			body Method2RequestBody
 			err  error
 		)
 		err = decoder(r).Decode(&body)
 		if err != nil {
 			if errors.Is(err, io.EOF) {
-				return nil, goa.MissingPayloadError()
+				return payload, goa.MissingPayloadError()
 			}
 			var gerr *goa.ServiceError
 			if errors.As(err, &gerr) {
-				return nil, gerr
+				return payload, gerr
 			}
-			return nil, goa.DecodePayloadError(err.Error())
+			return payload, goa.DecodePayloadError(err.Error())
 		}
 		err = ValidateMethod2RequestBody(&body)
 		if err != nil {
-			return nil, err
+			return payload, err
 		}
-		payload := NewMethod2Payload(&body)
+		payload = NewMethod2Payload(&body)
 
 		return payload, nil
 	}
@@ -172,26 +174,27 @@ func EncodeMethod1Response(encoder func(context.Context, http.ResponseWriter) go
 // Method1 endpoint.
 func DecodeMethod1Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service2.Payload, error) {
 	return func(r *http.Request) (*service2.Payload, error) {
+		var payload *service2.Payload
 		var (
 			body Method1RequestBody
 			err  error
 		)
 		err = decoder(r).Decode(&body)
 		if err != nil {
 			if errors.Is(err, io.EOF) {
-				return nil, goa.MissingPayloadError()
+				return payload, goa.MissingPayloadError()
 			}
 			var gerr *goa.ServiceError
 			if errors.As(err, &gerr) {
-				return nil, gerr
+				return payload, gerr
 			}
-			return nil, goa.DecodePayloadError(err.Error())
+			return payload, goa.DecodePayloadError(err.Error())
 		}
 		err = ValidateMethod1RequestBody(&body)
 		if err != nil {
-			return nil, err
+			return payload, err
 		}
-		payload := NewMethod1Payload(&body)
+		payload = NewMethod1Payload(&body)
 
 		return payload, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.24.0`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/stretchr/testify v1.11.1`
`7`		`- goa.design/goa/v3 v3.25.2`
	`7`	`+ goa.design/goa/v3 v3.25.3`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ func EncodeMethod1Response(encoder func(context.Context, http.ResponseWriter) go`
`87`	`87`	`// Method1 endpoint.`
`88`	`88`	`func DecodeMethod1Request(mux goahttp.Muxer, decoder func(http.Request) goahttp.Decoder) func(http.Request) (*service1.Payload, error) {`
`89`	`89`	`return func(r http.Request) (service1.Payload, error) {`
	`90`	`+ var payload *service1.Payload`
`90`	`91`	`var (`
`91`	`92`	`body Method1RequestBody`
`92`	`93`	`emptyBody bool`
`@@ -97,20 +98,20 @@ func DecodeMethod1Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp`
`97`	`98`	`if !errors.Is(err, io.EOF) {`
`98`	`99`	`var gerr *goa.ServiceError`
`99`	`100`	`if errors.As(err, &gerr) {`
`100`		`- return nil, gerr`
	`101`	`+ return payload, gerr`
`101`	`102`	`}`
`102`		`- return nil, goa.DecodePayloadError(err.Error())`
	`103`	`+ return payload, goa.DecodePayloadError(err.Error())`
`103`	`104`	`}`
`104`	`105`	`emptyBody = true`
`105`	`106`	`err = nil`
`106`	`107`	`}`
`107`	`108`	`if !emptyBody {`
`108`	`109`	`err = ValidateMethod1RequestBody(&body)`
`109`	`110`	`if err != nil {`
`110`		`- return nil, err`
	`111`	`+ return payload, err`
`111`	`112`	`}`
`112`	`113`	`}`
`113`		`- payload := NewMethod1PayloadWithOptionalBody(&body)`
	`114`	`+ payload = NewMethod1PayloadWithOptionalBody(&body)`
`114`	`115`	`if !emptyBody {`
`115`	`116`	`payload = NewMethod1Payload(&body)`
`116`	`117`	`}`
`@@ -132,26 +133,27 @@ func EncodeMethod2Response(encoder func(context.Context, http.ResponseWriter) go`
`132`	`133`	`// Method2 endpoint.`
`133`	`134`	`func DecodeMethod2Request(mux goahttp.Muxer, decoder func(http.Request) goahttp.Decoder) func(http.Request) (*service1.Payload, error) {`
`134`	`135`	`return func(r http.Request) (service1.Payload, error) {`
	`136`	`+ var payload *service1.Payload`
`135`	`137`	`var (`
`136`	`138`	`body Method2RequestBody`
`137`	`139`	`err error`
`138`	`140`	`)`
`139`	`141`	`err = decoder(r).Decode(&body)`
`140`	`142`	`if err != nil {`
`141`	`143`	`if errors.Is(err, io.EOF) {`
`142`		`- return nil, goa.MissingPayloadError()`
	`144`	`+ return payload, goa.MissingPayloadError()`
`143`	`145`	`}`
`144`	`146`	`var gerr *goa.ServiceError`
`145`	`147`	`if errors.As(err, &gerr) {`
`146`		`- return nil, gerr`
	`148`	`+ return payload, gerr`
`147`	`149`	`}`
`148`		`- return nil, goa.DecodePayloadError(err.Error())`
	`150`	`+ return payload, goa.DecodePayloadError(err.Error())`
`149`	`151`	`}`
`150`	`152`	`err = ValidateMethod2RequestBody(&body)`
`151`	`153`	`if err != nil {`
`152`		`- return nil, err`
	`154`	`+ return payload, err`
`153`	`155`	`}`
`154`		`- payload := NewMethod2Payload(&body)`
	`156`	`+ payload = NewMethod2Payload(&body)`
`155`	`157`
`156`	`158`	`return payload, nil`
`157`	`159`	`}`
`@@ -172,26 +174,27 @@ func EncodeMethod1Response(encoder func(context.Context, http.ResponseWriter) go`
`172`	`174`	`// Method1 endpoint.`
`173`	`175`	`func DecodeMethod1Request(mux goahttp.Muxer, decoder func(http.Request) goahttp.Decoder) func(http.Request) (*service2.Payload, error) {`
`174`	`176`	`return func(r http.Request) (service2.Payload, error) {`
	`177`	`+ var payload *service2.Payload`
`175`	`178`	`var (`
`176`	`179`	`body Method1RequestBody`
`177`	`180`	`err error`
`178`	`181`	`)`
`179`	`182`	`err = decoder(r).Decode(&body)`
`180`	`183`	`if err != nil {`
`181`	`184`	`if errors.Is(err, io.EOF) {`
`182`		`- return nil, goa.MissingPayloadError()`
	`185`	`+ return payload, goa.MissingPayloadError()`
`183`	`186`	`}`
`184`	`187`	`var gerr *goa.ServiceError`
`185`	`188`	`if errors.As(err, &gerr) {`
`186`		`- return nil, gerr`
	`189`	`+ return payload, gerr`
`187`	`190`	`}`
`188`		`- return nil, goa.DecodePayloadError(err.Error())`
	`191`	`+ return payload, goa.DecodePayloadError(err.Error())`
`189`	`192`	`}`
`190`	`193`	`err = ValidateMethod1RequestBody(&body)`
`191`	`194`	`if err != nil {`
`192`		`- return nil, err`
	`195`	`+ return payload, err`
`193`	`196`	`}`
`194`		`- payload := NewMethod1Payload(&body)`
	`197`	`+ payload = NewMethod1Payload(&body)`
`195`	`198`
`196`	`199`	`return payload, nil`
`197`	`200`	`}`