Fix issues found by building the examples (#3743)

* Fix issues found by building the examples

* Fix tests

Author: raphael

codegen/service/templates/server_interceptor_stream_wrapper_types.go.tpl

@@ -1,9 +1,3 @@
-{{- if .WrappedServerStreams }}
-type Unwrap interface {
-	Unwrap() interface{}
-}
-{{- end }}
-
 {{- range .WrappedServerStreams }}
 
 {{ comment (printf "wrapped%s is a server interceptor wrapper for the %s stream." .Interface .Interface) }}

codegen/service/templates/server_interceptor_stream_wrappers.go.tpl

@@ -1,7 +1,7 @@
 {{- range .WrappedServerStreams }}
 
 {{ comment (print "Unwrap returns the underlying stream type.") }}
-func (w *wrapped{{ .Interface }}) Unwrap() interface{} {
+func (w *wrapped{{ .Interface }}) Unwrap() any {
 	return w.stream
 }
 

codegen/service/testdata/interceptors/streaming-interceptors-with-read-payload-and-read-streaming-payload_interceptor_wrappers.go.golden

@@ -1,7 +1,4 @@
 
-type Unwrap interface {
-	Unwrap() interface{}
-}
 
 // wrappedMethodServerStream is a server interceptor wrapper for the
 // MethodServerStream stream.
@@ -84,7 +81,7 @@ func wrapClientMethodLogging(endpoint goa.Endpoint, i ClientInterceptors) goa.En
 }
 
 // Unwrap returns the underlying stream type.
-func (w *wrappedMethodServerStream) Unwrap() interface{} {
+func (w *wrappedMethodServerStream) Unwrap() any {
 	return w.stream
 }
 

codegen/service/testdata/interceptors/streaming-interceptors-with-read-streaming-result_interceptor_wrappers.go.golden

@@ -1,7 +1,4 @@
 
-type Unwrap interface {
-	Unwrap() interface{}
-}
 
 // wrappedMethodServerStream is a server interceptor wrapper for the
 // MethodServerStream stream.
@@ -72,7 +69,7 @@ func wrapClientMethodLogging(endpoint goa.Endpoint, i ClientInterceptors) goa.En
 }
 
 // Unwrap returns the underlying stream type.
-func (w *wrappedMethodServerStream) Unwrap() interface{} {
+func (w *wrappedMethodServerStream) Unwrap() any {
 	return w.stream
 }
 

codegen/service/testdata/interceptors/streaming-interceptors_interceptor_wrappers.go.golden

@@ -1,7 +1,4 @@
 
-type Unwrap interface {
-	Unwrap() interface{}
-}
 
 // wrappedMethodServerStream is a server interceptor wrapper for the
 // MethodServerStream stream.
@@ -99,7 +96,7 @@ func wrapClientMethodLogging(endpoint goa.Endpoint, i ClientInterceptors) goa.En
 }
 
 // Unwrap returns the underlying stream type.
-func (w *wrappedMethodServerStream) Unwrap() interface{} {
+func (w *wrappedMethodServerStream) Unwrap() any {
 	return w.stream
 }
 

http/codegen/sse_client.go

@@ -35,6 +35,7 @@ func sseClientFile(genpkg string, svc *expr.HTTPServiceExpr, services *ServicesD
 				{Path: "bytes"},
 				{Path: "context"},
 				{Path: "encoding/json"},
+				{Path: "errors"},
 				{Path: "io"},
 				{Path: "net/http"},
 				{Path: "fmt"},

http/codegen/templates/server_handler_init.go.tpl

@@ -94,7 +94,7 @@ func {{ .HandlerInit }}(
 		if err != nil {
 			{{- if isWebSocketEndpoint . }}
 			var stream *{{ .ServerWebSocket.VarName }}
-			if wrapper, ok := v.Stream.({{ .ServicePkgName }}.Unwrap); ok {
+			if wrapper, ok := v.Stream.(interface{ Unwrap() any }); ok {
 				stream = wrapper.Unwrap().(*{{ .ServerWebSocket.VarName }})
 			} else {
 				stream = v.Stream.(*{{ .ServerWebSocket.VarName }})

http/codegen/testdata/streaming_code.go

@@ -59,7 +59,7 @@ func NewStreamingResultMethodHandler(
 		_, err = endpoint(ctx, v)
 		if err != nil {
 			var stream *StreamingResultMethodServerStream
-			if wrapper, ok := v.Stream.(streamingresultservice.Unwrap); ok {
+			if wrapper, ok := v.Stream.(interface{ Unwrap() any }); ok {
 				stream = wrapper.Unwrap().(*StreamingResultMethodServerStream)
 			} else {
 				stream = v.Stream.(*StreamingResultMethodServerStream)
@@ -217,7 +217,7 @@ func NewStreamingResultNoPayloadMethodHandler(
 		_, err = endpoint(ctx, v)
 		if err != nil {
 			var stream *StreamingResultNoPayloadMethodServerStream
-			if wrapper, ok := v.Stream.(streamingresultnopayloadservice.Unwrap); ok {
+			if wrapper, ok := v.Stream.(interface{ Unwrap() any }); ok {
 				stream = wrapper.Unwrap().(*StreamingResultNoPayloadMethodServerStream)
 			} else {
 				stream = v.Stream.(*StreamingResultNoPayloadMethodServerStream)
@@ -1105,7 +1105,7 @@ func NewStreamingPayloadMethodHandler(
 		_, err = endpoint(ctx, v)
 		if err != nil {
 			var stream *StreamingPayloadMethodServerStream
-			if wrapper, ok := v.Stream.(streamingpayloadservice.Unwrap); ok {
+			if wrapper, ok := v.Stream.(interface{ Unwrap() any }); ok {
 				stream = wrapper.Unwrap().(*StreamingPayloadMethodServerStream)
 			} else {
 				stream = v.Stream.(*StreamingPayloadMethodServerStream)
@@ -1300,7 +1300,7 @@ func NewStreamingPayloadNoPayloadMethodHandler(
 		_, err = endpoint(ctx, v)
 		if err != nil {
 			var stream *StreamingPayloadNoPayloadMethodServerStream
-			if wrapper, ok := v.Stream.(streamingpayloadnopayloadservice.Unwrap); ok {
+			if wrapper, ok := v.Stream.(interface{ Unwrap() any }); ok {
 				stream = wrapper.Unwrap().(*StreamingPayloadNoPayloadMethodServerStream)
 			} else {
 				stream = v.Stream.(*StreamingPayloadNoPayloadMethodServerStream)
@@ -2585,7 +2585,7 @@ func NewBidirectionalStreamingMethodHandler(
 		_, err = endpoint(ctx, v)
 		if err != nil {
 			var stream *BidirectionalStreamingMethodServerStream
-			if wrapper, ok := v.Stream.(bidirectionalstreamingservice.Unwrap); ok {
+			if wrapper, ok := v.Stream.(interface{ Unwrap() any }); ok {
 				stream = wrapper.Unwrap().(*BidirectionalStreamingMethodServerStream)
 			} else {
 				stream = v.Stream.(*BidirectionalStreamingMethodServerStream)
@@ -2823,7 +2823,7 @@ func NewBidirectionalStreamingNoPayloadMethodHandler(
 		_, err = endpoint(ctx, v)
 		if err != nil {
 			var stream *BidirectionalStreamingNoPayloadMethodServerStream
-			if wrapper, ok := v.Stream.(bidirectionalstreamingnopayloadservice.Unwrap); ok {
+			if wrapper, ok := v.Stream.(interface{ Unwrap() any }); ok {
 				stream = wrapper.Unwrap().(*BidirectionalStreamingNoPayloadMethodServerStream)
 			} else {
 				stream = v.Stream.(*BidirectionalStreamingNoPayloadMethodServerStream)