Skip to content

Commit 70ffa0f

Browse files
anjannathpraveenkumar
authored andcommitted
version: use download.InMemory to fetch release-info.json
1 parent 51510f8 commit 70ffa0f

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

pkg/crc/version/version.go

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"net/http"
88
"os"
99
"path/filepath"
10-
"time"
1110

1211
"github.com/Masterminds/semver/v3"
1312
"github.com/crc-org/crc/pkg/crc/logging"
1413
crcPreset "github.com/crc-org/crc/pkg/crc/preset"
14+
"github.com/crc-org/crc/pkg/download"
1515
)
1616

1717
// The following variables are private fields and should be set when compiling with ldflags, for example --ldflags="-X github.com/crc-org/crc/pkg/version.crcVersion=vX.Y.Z
@@ -111,26 +111,13 @@ func InstallPath() string {
111111
}
112112

113113
func GetCRCLatestVersionFromMirror(transport http.RoundTripper) (*CrcReleaseInfo, error) {
114-
client := &http.Client{
115-
Timeout: 5 * time.Second,
116-
Transport: transport,
117-
}
118-
req, err := http.NewRequest(http.MethodGet, releaseInfoLink, nil)
119-
if err != nil {
120-
return nil, err
121-
}
122-
req.Header.Set("User-Agent", fmt.Sprintf("crc/%s", crcVersion))
123-
response, err := client.Do(req)
114+
response, err := download.InMemory(releaseInfoLink, UserAgent(), transport)
124115
if err != nil {
125116
return nil, err
126117
}
127-
defer response.Body.Close()
118+
defer response.Close()
128119

129-
if response.StatusCode != 200 {
130-
return nil, fmt.Errorf("HTTP error: %s: %d", response.Status, response.StatusCode)
131-
}
132-
133-
releaseMetaData, err := io.ReadAll(response.Body)
120+
releaseMetaData, err := io.ReadAll(response)
134121
if err != nil {
135122
return nil, err
136123
}
@@ -151,3 +138,7 @@ func GetDefaultPreset() crcPreset.Preset {
151138
}
152139
return preset
153140
}
141+
142+
func UserAgent() string {
143+
return fmt.Sprintf("crc/%s", crcVersion)
144+
}

0 commit comments

Comments
 (0)