refactor: no more error to validation handler

Author: cih9088

internal/validationresponsehandler.go

@@ -24,7 +24,6 @@ type ValidationResponseHandler interface {
 		ctx RevalidationContext,
 		req *http.Request,
 		resp *http.Response,
-		err error,
 	) (*http.Response, error)
 }
 
@@ -75,13 +74,7 @@ func (r *validationResponseHandler) HandleValidationResponse(
 	ctx RevalidationContext,
 	req *http.Request,
 	resp *http.Response,
-	err error,
 ) (*http.Response, error) {
-
-	if err != nil {
-		return nil, err
-	}
-
 	if req.Method == http.MethodGet && resp.StatusCode == http.StatusNotModified {
 		// RFC 9111 §4.3.3 Handling Validation Responses (304 Not Modified)
 		// RFC 9111 §4.3.4 Freshening Stored Responses upon Validation

roundtripper.go

@@ -340,6 +340,9 @@ func (r *transport) handleCacheHit(
 revalidate:
 	req = withConditionalHeaders(req, stored.Data.Header)
 	resp, start, end, err := r.roundTripTimed(req)
+	if err != nil {
+		return nil, err
+	}
 	ctx := internal.RevalidationContext{
 		URLKey:    urlKey,
 		Start:     start,
@@ -350,7 +353,7 @@ revalidate:
 		RefIndex:  refIndex,
 		Freshness: freshness,
 	}
-	return r.vrh.HandleValidationResponse(ctx, req, resp, err)
+	return r.vrh.HandleValidationResponse(ctx, req, resp)
 }
 
 func (r *transport) serveFromCache(
@@ -441,7 +444,7 @@ func (r *transport) backgroundRevalidate(
 			Freshness: freshness,
 		}
 		//nolint:bodyclose // The response is not used, so we don't need to close it.
-		_, err = r.vrh.HandleValidationResponse(revalCtx, req, resp, nil)
+		_, err = r.vrh.HandleValidationResponse(revalCtx, req, resp)
 		errc <- err
 	}()
 

roundtripper_test.go

@@ -64,8 +64,8 @@ func mockTransport(fields func(rt *transport)) *transport {
 		ci:   &internal.MockCacheInvalidator{},
 		rs:   &internal.MockResponseStorer{},
 		vrh: &internal.MockValidationResponseHandler{
-			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response, err error) (*http.Response, error) {
-				return resp, err
+			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response) (*http.Response, error) {
+				return resp, nil
 			},
 		},
 		clock: &internal.MockClock{NowResult: time.Now()},
@@ -224,9 +224,9 @@ func Test_transport_CacheHit_MustRevalidate_Stale(t *testing.T) {
 			},
 		}
 		rt.vrh = &internal.MockValidationResponseHandler{
-			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response, err error) (*http.Response, error) {
+			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response) (*http.Response, error) {
 				mockVHCalled = true
-				return resp, err
+				return resp, nil
 			},
 		}
 	})
@@ -259,9 +259,9 @@ func Test_transport_CacheHit_NoCacheUnqualified(t *testing.T) {
 			},
 		}
 		rt.vrh = &internal.MockValidationResponseHandler{
-			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response, err error) (*http.Response, error) {
+			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response) (*http.Response, error) {
 				mockVHCalled = true
-				return resp, err
+				return resp, nil
 			},
 		}
 	})
@@ -539,10 +539,10 @@ func Test_transport_RevalidationPath(t *testing.T) {
 			},
 		}
 		rt.vrh = &internal.MockValidationResponseHandler{
-			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response, err error) (*http.Response, error) {
+			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response) (*http.Response, error) {
 				mockVHCalled = true
 				internal.CacheStatusRevalidated.ApplyTo(resp.Header)
-				return resp, err
+				return resp, nil
 			},
 		}
 	})
@@ -596,9 +596,9 @@ func Test_transport_SWR_NormalPath(t *testing.T) {
 		rt.clock = &internal.MockClock{NowResult: base.Add(5 * time.Second), SinceResult: 0}
 		rt.siep = &internal.MockStaleIfErrorPolicy{}
 		rt.vrh = &internal.MockValidationResponseHandler{
-			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response, err error) (*http.Response, error) {
+			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response) (*http.Response, error) {
 				revalidateCalled <- struct{}{} // Signal that revalidation was called
-				return resp, err
+				return resp, nil
 			},
 		}
 		rt.swrTimeout = DefaultSWRTimeout
@@ -669,7 +669,7 @@ func Test_transport_SWR_NormalPathAndError(t *testing.T) {
 		rt.clock = &internal.MockClock{NowResult: base.Add(5 * time.Second), SinceResult: 0}
 		rt.swrTimeout = swrTimeout
 		rt.vrh = &internal.MockValidationResponseHandler{
-			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response, err error) (*http.Response, error) {
+			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response) (*http.Response, error) {
 				defer func() { revalidateCalled <- struct{}{} }() // Signal that revalidation was called
 				return nil, errors.New("revalidation error")
 			},
@@ -736,9 +736,9 @@ func Test_transport_SWR_Timeout(t *testing.T) {
 		rt.clock = &internal.MockClock{NowResult: base.Add(5 * time.Second), SinceResult: 0}
 		rt.swrTimeout = swrTimeout
 		rt.vrh = &internal.MockValidationResponseHandler{
-			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response, err error) (*http.Response, error) {
+			HandleValidationResponseFunc: func(ctx internal.RevalidationContext, req *http.Request, resp *http.Response) (*http.Response, error) {
 				revalidateCalled <- struct{}{} // Signal that revalidation was called
-				return resp, err
+				return resp, nil
 			},
 		}
 		rt.upstream = &internal.MockRoundTripper{