fsthttp: imageopto does not require guest caching (#214)

Author: dgryski

fsthttp/request.go

@@ -425,6 +425,15 @@ func (req *Request) Send(ctx context.Context, backend string) (*Response, error)
 		}
 	}
 
+	if req.ImageOptimizerOptions != nil {
+		response, err := req.sendToImageOpto(ctx, backend)
+		if err != nil {
+			return nil, fmt.Errorf("send to image optimizer: %w", err)
+		}
+
+		return response, nil
+	}
+
 	if ok, err := req.shouldUseGuestCaching(); err != nil {
 		// can't determine if we should use guest cache or host cache
 		return nil, err
@@ -541,31 +550,31 @@ func pendingToABIResponse(ctx context.Context, errc chan error, abiPending *fast
 	}
 }
 
-var guestCacheSWRPending sync.WaitGroup
+func (req *Request) sendToImageOpto(ctx context.Context, backend string) (*Response, error) {
+	// Send this request through the Image Optimizer infrastructure
+	query, err := req.ImageOptimizerOptions.QueryString()
+	if err != nil {
+		return nil, err
+	}
 
-func (req *Request) sendWithGuestCache(ctx context.Context, backend string) (*Response, error) {
-	// use guest cache
+	abiResp, abiBody, err := req.abi.req.SendToImageOpto(req.abi.body, backend, query)
+	if err != nil {
+		return nil, err
 
-	if req.ImageOptimizerOptions != nil {
-		// Send this request through the Image Optimizer infrastructure
-		query, err := req.ImageOptimizerOptions.QueryString()
-		if err != nil {
-			return nil, err
-		}
+	}
 
-		abiResp, abiBody, err := req.abi.req.SendToImageOpto(req.abi.body, backend, query)
-		if err != nil {
-			return nil, err
+	resp, err := newResponse(req, backend, abiResp, abiBody)
+	if err != nil {
+		return nil, fmt.Errorf("construct response: %w", err)
+	}
 
-		}
+	return resp, nil
+}
 
-		resp, err := newResponse(req, backend, abiResp, abiBody)
-		if err != nil {
-			return nil, fmt.Errorf("construct response: %w", err)
-		}
+var guestCacheSWRPending sync.WaitGroup
 
-		return resp, nil
-	}
+func (req *Request) sendWithGuestCache(ctx context.Context, backend string) (*Response, error) {
+	// use guest cache
 
 	if ok, err := fastly.HTTPCacheIsRequestCacheable(req.abi.req); err != nil {
 		return nil, fmt.Errorf("request not cacheable: %v", err)
@@ -803,6 +812,11 @@ func (req *Request) shouldUseGuestCaching() (bool, error) {
 		return false, nil
 	}
 
+	if req.ImageOptimizerOptions != nil {
+		// request should go through imageopto
+		return false, nil
+	}
+
 	mustUseHostCaching, err := req.mustUseHostCaching()
 	// check for hostcall unsupported error
 	if err != nil {