From bf526f359e95749ccad01a4513fab4902848caab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sat, 29 Nov 2025 21:46:52 -0500 Subject: [PATCH] sources: Always use custom HTTP client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- sources/almalinux-http.go | 2 +- sources/alpine-http.go | 2 +- sources/apertis-http.go | 4 ++-- sources/centos-http.go | 2 +- sources/fedora-http.go | 2 +- sources/gentoo.go | 2 +- sources/openeuler-http.go | 2 +- sources/opensuse-http.go | 4 ++-- sources/openwrt-http.go | 4 ++-- sources/oraclelinux-http.go | 4 ++-- sources/rocky-http.go | 3 +-- sources/ubuntu-http.go | 6 +++--- sources/voidlinux-http.go | 2 +- 13 files changed, 19 insertions(+), 20 deletions(-) diff --git a/sources/almalinux-http.go b/sources/almalinux-http.go index 4584e05..764d154 100644 --- a/sources/almalinux-http.go +++ b/sources/almalinux-http.go @@ -212,7 +212,7 @@ func (s *almalinux) getRelease(URL, release, variant, arch string) (string, erro ) err = shared.Retry(func() error { - resp, err = http.Get(fullURL) + resp, err = s.client.Get(fullURL) if err != nil { return fmt.Errorf("Failed to GET %q: %w", fullURL, err) } diff --git a/sources/alpine-http.go b/sources/alpine-http.go index 954c38c..7225e89 100644 --- a/sources/alpine-http.go +++ b/sources/alpine-http.go @@ -159,7 +159,7 @@ func (s *alpineLinux) getLatestRelease(baseURL, release string, arch string) (st ) err = shared.Retry(func() error { - resp, err = http.Get(baseURL) + resp, err = s.client.Get(baseURL) if err != nil { return fmt.Errorf("Failed to GET %q: %w", baseURL, err) } diff --git a/sources/apertis-http.go b/sources/apertis-http.go index b618064..c64c126 100644 --- a/sources/apertis-http.go +++ b/sources/apertis-http.go @@ -32,7 +32,7 @@ func (s *apertis) Run() error { ) err = shared.Retry(func() error { - resp, err = http.Head(baseURL) + resp, err = s.client.Head(baseURL) if err != nil { return fmt.Errorf("Failed to HEAD %q: %w", baseURL, err) } @@ -94,7 +94,7 @@ func (s *apertis) getLatestRelease(baseURL, release string) (string, error) { ) err = shared.Retry(func() error { - resp, err = http.Get(baseURL) + resp, err = s.client.Get(baseURL) if err != nil { return fmt.Errorf("Failed to GET %q: %w", baseURL, err) } diff --git a/sources/centos-http.go b/sources/centos-http.go index 6830e0b..35188d1 100644 --- a/sources/centos-http.go +++ b/sources/centos-http.go @@ -414,7 +414,7 @@ func (s *centOS) getRelease(URL, release, variant, arch string) (string, error) ) err = shared.Retry(func() error { - resp, err = http.Get(u) + resp, err = s.client.Get(u) if err != nil { return fmt.Errorf("Failed to get URL %q: %w", u, err) } diff --git a/sources/fedora-http.go b/sources/fedora-http.go index 5f9b307..38824b1 100644 --- a/sources/fedora-http.go +++ b/sources/fedora-http.go @@ -181,7 +181,7 @@ func (s *fedora) getLatestBuild(URL, release string) (string, error) { ) err = shared.Retry(func() error { - resp, err = http.Get(fmt.Sprintf("%s/%s", URL, release)) + resp, err = s.client.Get(fmt.Sprintf("%s/%s", URL, release)) if err != nil { return fmt.Errorf("Failed to GET %q: %w", fmt.Sprintf("%s/%s", URL, release), err) } diff --git a/sources/gentoo.go b/sources/gentoo.go index 37f97f8..86b94ae 100644 --- a/sources/gentoo.go +++ b/sources/gentoo.go @@ -158,7 +158,7 @@ func (s *gentoo) getLatestBuild(baseURL, arch, variant string) (string, error) { ) err = shared.Retry(func() error { - resp, err = http.Get(baseURL) + resp, err = s.client.Get(baseURL) if err != nil { return fmt.Errorf("Failed to GET %q: %w", baseURL, err) } diff --git a/sources/openeuler-http.go b/sources/openeuler-http.go index 87bebe4..d2aba0c 100644 --- a/sources/openeuler-http.go +++ b/sources/openeuler-http.go @@ -37,7 +37,7 @@ func (s *openEuler) getLatestRelease(baseURL, release string) (string, error) { return "", fmt.Errorf("Failed to parse URL %s: %w", baseURL, err) } - resp, err = http.Get(baseURL) + resp, err = s.client.Get(baseURL) if err != nil { return "", fmt.Errorf("Failed to read url: %w", err) } diff --git a/sources/opensuse-http.go b/sources/opensuse-http.go index abb49bd..11f1877 100644 --- a/sources/opensuse-http.go +++ b/sources/opensuse-http.go @@ -41,7 +41,7 @@ func (s *opensuse) Run() error { var resp *http.Response err = shared.Retry(func() error { - resp, err = http.Head(tarballPath) + resp, err = s.client.Head(tarballPath) if err != nil { return fmt.Errorf("Failed to HEAD %q: %w", tarballPath, err) } @@ -226,7 +226,7 @@ func (s *opensuse) getTarballName(u *url.URL, release, arch string) (string, err func (s *opensuse) validateURL(u url.URL, tarball string) bool { u.Path = path.Join(u.Path, tarball) - resp, err := http.Head(u.String()) + resp, err := s.client.Head(u.String()) if err != nil { return false } diff --git a/sources/openwrt-http.go b/sources/openwrt-http.go index a8840b4..c6dd0e7 100644 --- a/sources/openwrt-http.go +++ b/sources/openwrt-http.go @@ -104,7 +104,7 @@ func (s *openwrt) Run() error { ) err = shared.Retry(func() error { - resp, err = http.Head(baseURL) + resp, err = s.client.Head(baseURL) if err != nil { return fmt.Errorf("Failed to HEAD %q: %w", baseURL, err) } @@ -183,7 +183,7 @@ func (s *openwrt) getLatestServiceRelease(baseURL, release string) (string, erro ) err = shared.Retry(func() error { - resp, err = http.Get(baseURL) + resp, err = s.client.Get(baseURL) if err != nil { return fmt.Errorf("Failed to GET %q: %w", baseURL, err) } diff --git a/sources/oraclelinux-http.go b/sources/oraclelinux-http.go index 0cf46bf..7b52098 100644 --- a/sources/oraclelinux-http.go +++ b/sources/oraclelinux-http.go @@ -65,7 +65,7 @@ func (s *oraclelinux) Run() error { ) err = shared.Retry(func() error { - resp, err = http.Head(fullURL) + resp, err = s.client.Head(fullURL) if err != nil { return errors.New("") } @@ -100,7 +100,7 @@ func (s *oraclelinux) Run() error { ) err = shared.Retry(func() error { - resp, err = http.Head(fullURL) + resp, err = s.client.Head(fullURL) if err != nil { return errors.New("") } diff --git a/sources/rocky-http.go b/sources/rocky-http.go index d41e7c8..83e4b96 100644 --- a/sources/rocky-http.go +++ b/sources/rocky-http.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "net/http" "net/url" "path" "path/filepath" @@ -251,7 +250,7 @@ rm -rf /rootfs/var/cache/yum func (s *rockylinux) getRelease(URL, release, variant, arch string) (string, error) { u := URL + path.Join("/", strings.ToLower(release), "isos", arch) - resp, err := http.Get(u) + resp, err := s.client.Get(u) if err != nil { return "", fmt.Errorf("Failed to GET %q: %w", u, err) } diff --git a/sources/ubuntu-http.go b/sources/ubuntu-http.go index 1158a04..8202686 100644 --- a/sources/ubuntu-http.go +++ b/sources/ubuntu-http.go @@ -46,7 +46,7 @@ func (s *ubuntu) downloadImage(definition shared.Definition) error { s.definition.Image.Release, s.definition.Image.ArchitectureMapped) } else { // if release is non-numerical, find the latest release - s.fname, err = getLatestRelease(baseURL, + s.fname, err = s.getLatestRelease(baseURL, s.definition.Image.Release, s.definition.Image.ArchitectureMapped) if err != nil { return fmt.Errorf("Failed to get latest release: %w", err) @@ -125,14 +125,14 @@ func (s ubuntu) unpack(filePath, rootDir string) error { return nil } -func getLatestRelease(baseURL, release, arch string) (string, error) { +func (s ubuntu) getLatestRelease(baseURL, release, arch string) (string, error) { var ( resp *http.Response err error ) err = shared.Retry(func() error { - resp, err = http.Get(baseURL) + resp, err = s.client.Get(baseURL) if err != nil { return fmt.Errorf("Failed to GET %q: %w", baseURL, err) } diff --git a/sources/voidlinux-http.go b/sources/voidlinux-http.go index dbf0dbc..9de3e28 100644 --- a/sources/voidlinux-http.go +++ b/sources/voidlinux-http.go @@ -98,7 +98,7 @@ func (s *voidlinux) getLatestBuild(baseURL, arch, variant string) (string, error ) err = shared.Retry(func() error { - resp, err = http.Get(baseURL) + resp, err = s.client.Get(baseURL) if err != nil { return fmt.Errorf("Failed to GET %q: %w", baseURL, err) }