Copy original error ID in the error handler if not verbose (goadesign#641)

Author: bits01

middleware/error_handler.go

@@ -43,6 +43,11 @@ func ErrorHandler(service *goa.Service, verbose bool) goa.Middleware {
 					rw.Header().Set("Content-Type", goa.ErrorMediaIdentifier)
 					msg := fmt.Sprintf("%s [%s]", http.StatusText(http.StatusInternalServerError), reqID)
 					respBody = goa.ErrInternal(msg)
+					// Preserve the ID of the original error as that's what gets logged, the client
+					// received error ID must match the original
+					if origErrID := goa.ContextResponse(ctx).ErrorCode; origErrID != "" {
+						respBody.(*goa.ErrorResponse).ID = origErrID
+					}
 				}
 			}
 			return service.Send(ctx, status, respBody)

middleware/error_handler_test.go

@@ -98,6 +98,29 @@ var _ = Describe("ErrorHandler", func() {
 				msg = `\[.*\]` + msg[endIDidx+1:]
 				Ω(fmt.Sprintf("%v", decoded.Error())).Should(MatchRegexp(msg))
 			})
+
+			Context("and goa 500 error", func() {
+				var origID string
+
+				BeforeEach(func() {
+					verbose = false
+					h = func(ctx context.Context, rw http.ResponseWriter, req *http.Request) error {
+						e := goa.ErrInternal("goa-500-boom")
+						origID = e.(goa.ServiceError).Token()
+						return e
+					}
+				})
+
+				It("preserves the error ID from the original error", func() {
+					var decoded errorResponse
+					Ω(origID).ShouldNot(Equal(""))
+					Ω(rw.Status).Should(Equal(500))
+					Ω(rw.ParentHeader["Content-Type"]).Should(Equal([]string{goa.ErrorMediaIdentifier}))
+					err := service.Decoder.Decode(&decoded, bytes.NewBuffer(rw.Body), "application/json")
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(decoded.ID).Should(Equal(origID))
+				})
+			})
 		})
 	})