1
0
mirror of synced 2026-02-06 19:05:55 +00:00

manifestgen/install: use clean default HTTP client

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals
2023-08-22 13:50:44 +02:00
parent 8801031f06
commit 00c6ac81b9
3 changed files with 7 additions and 4 deletions

View File

@@ -27,6 +27,7 @@ import (
"time"
securejoin "github.com/cyphar/filepath-securejoin"
"github.com/hashicorp/go-cleanhttp"
"github.com/fluxcd/flux2/v2/pkg/manifestgen"
)
@@ -91,7 +92,7 @@ func Generate(options Options, manifestsBase string) (*manifestgen.Manifest, err
// GetLatestVersion calls the GitHub API and returns the latest released version.
func GetLatestVersion() (string, error) {
ghURL := "https://api.github.com/repos/fluxcd/flux2/releases/latest"
c := http.DefaultClient
c := cleanhttp.DefaultClient()
c.Timeout = 15 * time.Second
res, err := c.Get(ghURL)
@@ -121,7 +122,7 @@ func ExistingVersion(version string) (bool, error) {
}
ghURL := fmt.Sprintf("https://api.github.com/repos/fluxcd/flux2/releases/tags/%s", version)
c := http.DefaultClient
c := cleanhttp.DefaultClient()
c.Timeout = 15 * time.Second
res, err := c.Get(ghURL)

View File

@@ -26,6 +26,8 @@ import (
"path/filepath"
"strings"
"github.com/hashicorp/go-cleanhttp"
"github.com/fluxcd/pkg/kustomize/filesys"
"github.com/fluxcd/pkg/tar"
@@ -44,7 +46,7 @@ func fetch(ctx context.Context, url, version, dir string) error {
}
// download
resp, err := http.DefaultClient.Do(req.WithContext(ctx))
resp, err := cleanhttp.DefaultClient().Do(req.WithContext(ctx))
if err != nil {
return fmt.Errorf("failed to download manifests.tar.gz from %s, error: %w", ghURL, err)
}