@@ -24,19 +24,35 @@ import (
2424// ErrInvalidContentType is returned when the content-type is not a JSON body.
2525var ErrInvalidContentType = errors .New ("form parameter encoding not supported, please change the hook to send JSON payloads" )
2626
27- type PagerDutyInterceptor struct {}
27+ type ErrorCodeWithReason struct {
28+ ErrorCode int
29+ Reason string
30+ }
2831
29- func (pdi PagerDutyInterceptor ) ServeHTTP (w http.ResponseWriter , r * http.Request ) {
30- b , err := pdi .executeInterceptor (r )
31- if err != nil {
32- var e Error
33- if errors .As (err , & e ) {
34- logging .Infof ("HTTP %d - %s" , e .Status (), e )
35- http .Error (w , e .Error (), e .Status ())
36- } else {
37- logging .Errorf ("Non Status Error: %s" , err )
38- http .Error (w , http .StatusText (http .StatusInternalServerError ), http .StatusInternalServerError )
39- }
32+ type InterceptorStats struct {
33+ RequestsCount uint64
34+ CodeWithReasonToErrorsCount map [ErrorCodeWithReason ]int
35+ }
36+
37+ func CreateInterceptorStats () * InterceptorStats {
38+ return & InterceptorStats {CodeWithReasonToErrorsCount : make (map [ErrorCodeWithReason ]int )}
39+ }
40+
41+ type interceptorHandler struct {
42+ stats * InterceptorStats
43+ }
44+
45+ func CreateInterceptorHandler (stats * InterceptorStats ) http.Handler {
46+ return & interceptorHandler {stats }
47+ }
48+
49+ func (pdi interceptorHandler ) ServeHTTP (w http.ResponseWriter , r * http.Request ) {
50+ pdi .stats .RequestsCount ++
51+
52+ b , httpErr := pdi .executeInterceptor (r )
53+ if httpErr != nil {
54+ logging .Infof ("HTTP %d - %s" , httpErr .code , httpErr .err )
55+ http .Error (w , httpErr .err .Error (), httpErr .code )
4056 }
4157
4258 w .Header ().Add ("Content-Type" , "application/json" )
@@ -45,46 +61,35 @@ func (pdi PagerDutyInterceptor) ServeHTTP(w http.ResponseWriter, r *http.Request
4561 }
4662}
4763
48- // Error represents a handler error. It provides methods for a HTTP status
49- // code and embeds the built-in error interface.
50- type Error interface {
51- error
52- Status () int
64+ // httpError represents an error with an associated HTTP status code.
65+ type httpError struct {
66+ code int
67+ err error
5368}
5469
55- // HTTPError represents an error with an associated HTTP status code.
56- type HTTPError struct {
57- Code int
58- Err error
59- }
60-
61- // Allows HTTPError to satisfy the error interface.
62- func (se HTTPError ) Error () string {
63- return se .Err .Error ()
64- }
70+ func (pdi * interceptorHandler ) httpError (errorCode int , reason string , err error ) * httpError {
71+ pdi .stats .CodeWithReasonToErrorsCount [ErrorCodeWithReason {errorCode , reason }]++
6572
66- // Returns our HTTP status code.
67- func (se HTTPError ) Status () int {
68- return se .Code
73+ return & httpError {code : errorCode , err : fmt .Errorf ("%s: %w" , reason , err )}
6974}
7075
71- func badRequest (err error ) HTTPError {
72- return HTTPError { Code : http .StatusBadRequest , Err : err }
76+ func ( pdi * interceptorHandler ) badRequest (reason string , err error ) * httpError {
77+ return pdi . httpError ( http .StatusBadRequest , reason , err )
7378}
7479
75- func internal (err error ) HTTPError {
76- return HTTPError { Code : http .StatusInternalServerError , Err : err }
80+ func ( pdi * interceptorHandler ) internal (reason string , err error ) * httpError {
81+ return pdi . httpError ( http .StatusInternalServerError , reason , err )
7782}
7883
79- func (pdi * PagerDutyInterceptor ) executeInterceptor (r * http.Request ) ([]byte , error ) {
84+ func (pdi * interceptorHandler ) executeInterceptor (r * http.Request ) ([]byte , * httpError ) {
8085 // Create a context
8186 ctx , cancel := context .WithTimeout (r .Context (), 3 * time .Second )
8287 defer cancel ()
8388
8489 var body bytes.Buffer
8590 defer r .Body .Close () //nolint:errcheck
8691 if _ , err := io .Copy (& body , r .Body ); err != nil {
87- return nil , internal (fmt . Errorf ( "failed to read body: %w " , err ) )
92+ return nil , pdi . internal ("failed to read body" , err )
8893 }
8994 r .Body = io .NopCloser (bytes .NewReader (body .Bytes ()))
9095
@@ -95,12 +100,12 @@ func (pdi *PagerDutyInterceptor) executeInterceptor(r *http.Request) ([]byte, er
95100 Header map [string ][]string `json:"header"`
96101 }
97102 if err := json .Unmarshal (body .Bytes (), & originalReq ); err != nil {
98- return nil , badRequest (fmt . Errorf ( "failed to parse request body: %w " , err ) )
103+ return nil , pdi . badRequest ("failed to parse body" , err )
99104 }
100105
101106 extractedRequest , err := http .NewRequestWithContext (ctx , r .Method , r .URL .String (), bytes .NewReader ([]byte (originalReq .Body )))
102107 if err != nil {
103- return nil , internal (fmt . Errorf ( "malformed body/header in unwrapped request: %w " , err ) )
108+ return nil , pdi . internal ("malformed body/header in unwrapped request" , err )
104109 }
105110
106111 for k , v := range originalReq .Header {
@@ -117,26 +122,26 @@ func (pdi *PagerDutyInterceptor) executeInterceptor(r *http.Request) ([]byte, er
117122
118123 err = webhookv3 .VerifySignature (extractedRequest , token )
119124 if err != nil {
120- return nil , badRequest (fmt . Errorf ( "failed to verify signature: %w " , err ) )
125+ return nil , pdi . badRequest ("failed to verify signature" , err )
121126 }
122127
123128 logging .Info ("Signature verified successfully" )
124129
125130 if err := json .Unmarshal (body .Bytes (), & ireq ); err != nil {
126- return nil , badRequest (fmt . Errorf ( "failed to parse body as InterceptorRequest: %w " , err ) )
131+ return nil , pdi . badRequest ("failed to parse body as InterceptorRequest" , err )
127132 }
128133 logging .Debugf ("Interceptor request body is: %s" , ireq .Body )
129134
130- iresp := pdi .Process (ctx , & ireq )
135+ iresp := pdi .process (ctx , & ireq )
131136 logging .Debugf ("Interceptor response is: %+v" , iresp )
132137 respBytes , err := json .Marshal (iresp )
133138 if err != nil {
134- return nil , internal (err )
139+ return nil , pdi . internal ("failed to encode response" , err )
135140 }
136141 return respBytes , nil
137142}
138143
139- func (pdi * PagerDutyInterceptor ) Process (ctx context.Context , r * triggersv1.InterceptorRequest ) * triggersv1.InterceptorResponse {
144+ func (pdi * interceptorHandler ) process (ctx context.Context , r * triggersv1.InterceptorRequest ) * triggersv1.InterceptorResponse {
140145 pdClient , err := pagerduty .GetPDClient ([]byte (r .Body ))
141146 if err != nil {
142147 return interceptors .Failf (codes .InvalidArgument , "could not initialize pagerduty client: %v" , err )
![openshift-merge-bot[bot]](https://avatars.githubusercontent.com/in/412865?v=4&size=40){kind=avatar}
0 commit comments