From 04372f619c380af138ee97da0e9caf7a97a0fd61 Mon Sep 17 00:00:00 2001 From: Marius Kimmina <38843153+mariuskimmina@users.noreply.github.com> Date: Thu, 9 Nov 2023 13:32:52 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20use=20mondoo.com=20instead=20of?= =?UTF-8?q?=20github=20for=20latest=20release=20version=20(#2543)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cnquery.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cnquery.go b/cnquery.go index 194c8b8ed8..8f64286f19 100644 --- a/cnquery.go +++ b/cnquery.go @@ -9,7 +9,6 @@ import ( "io" "net/http" "regexp" - "strings" ) // Version is set via ldflags @@ -49,10 +48,11 @@ func GetVersion() string { // Release represents a GitHub release type Release struct { - Name string `json:"name"` + Name string `json:"name"` + Version string `json:"version"` } -var cnqueryGithubReleaseUrl = "https://api.github.com/repos/mondoohq/cnquery/releases/latest" +var cnqueryGithubReleaseUrl = "https://releases.mondoo.com/cnquery/latest.json?ignoreCache=1" // GetLatestReleaseName fetches the name of the latest release from the specified GitHub repository func GetLatestReleaseName(url string) (string, error) { @@ -76,7 +76,7 @@ func GetLatestReleaseName(url string) (string, error) { return "", fmt.Errorf("error unmarshalling response: %v", err) } - return release.Name, nil + return release.Version, nil } // GetLatestVersion returns the latest version available on Github @@ -85,8 +85,7 @@ func GetLatestVersion() (string, error) { if err != nil { return "", err } - cleanVersion := strings.TrimPrefix(releaseName, "v") - return cleanVersion, nil + return releaseName, nil } var coreSemverRegex = regexp.MustCompile(`^(\d+.\d+.\d+)`)