Moved common HTTP body fetch code into a shared helper function.

internal/sources/openweather/observation.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -13,6 +12,7 @@ import (
 
 	"gitea.maximumdirect.net/ejr/feedkit/config"
 	"gitea.maximumdirect.net/ejr/feedkit/event"
+	"gitea.maximumdirect.net/ejr/weatherfeeder/internal/sources/common"
 	"gitea.maximumdirect.net/ejr/weatherfeeder/internal/standards"
 )
 
@@ -139,30 +139,9 @@ type openWeatherMeta struct {
 }
 
 func (s *ObservationSource) fetchRaw(ctx context.Context) (json.RawMessage, openWeatherMeta, error) {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, s.url, nil)
+	b, err := common.FetchBody(ctx, s.client, s.url, s.userAgent, "application/json")
 	if err != nil {
-		return nil, openWeatherMeta{}, err
-	}
-
-	req.Header.Set("User-Agent", s.userAgent)
-	req.Header.Set("Accept", "application/json")
-
-	res, err := s.client.Do(req)
-	if err != nil {
-		return nil, openWeatherMeta{}, err
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode < 200 || res.StatusCode >= 300 {
-		return nil, openWeatherMeta{}, fmt.Errorf("openweather_observation %q: HTTP %s", s.name, res.Status)
-	}
-
-	b, err := io.ReadAll(res.Body)
-	if err != nil {
-		return nil, openWeatherMeta{}, err
-	}
-	if len(b) == 0 {
-		return nil, openWeatherMeta{}, fmt.Errorf("openweather_observation %q: empty response body", s.name)
+		return nil, openWeatherMeta{}, fmt.Errorf("openweather_observation %q: %w", s.name, err)
 	}
 
 	raw := json.RawMessage(b)