feat: Self upgrade from metadata

Author: nicholasdille

cmd/uniget/self-upgrade.go

@@ -1,36 +1,21 @@
 package main
 
 import (
-	"context"
 	"fmt"
-	"io"
-	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
-	"regexp"
-	"runtime"
-	"sort"
 
-	"github.com/google/go-github/github"
 	"github.com/google/safearchive/tar"
-	goversion "github.com/hashicorp/go-version"
 	"github.com/spf13/cobra"
 
 	"github.com/uniget-org/cli/pkg/archive"
+	"github.com/uniget-org/cli/pkg/containers"
 	"github.com/uniget-org/cli/pkg/logging"
 )
 
-var requestedVersion string
-var allowPrereleaseVersion bool
-var dryRun bool
-
 func initSelfUpgradeCmd() {
 	rootCmd.AddCommand(selfUpgradeCmd)
-
-	selfUpgradeCmd.Flags().StringVar(&requestedVersion, "version", "latest", "Upgrade to a specific version")
-	selfUpgradeCmd.Flags().BoolVar(&allowPrereleaseVersion, "allow-prerelease", false, "Allow upgrading to prerelease version")
-	selfUpgradeCmd.Flags().BoolVar(&dryRun, "dry-run", false, "Do not perform the upgrade, only show what would be done")
 }
 
 var selfUpgradeCmd = &cobra.Command{
@@ -39,12 +24,20 @@ var selfUpgradeCmd = &cobra.Command{
 	Long:  header + "\nUpgrade " + projectName + " to latest version",
 	Args:  cobra.NoArgs,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		versionRegex, err := regexp.Compile(`^\d+\.\d+\.\d+(-[a-z]+\.\d+)?$`)
+		err := downloadMetadata()
 		if err != nil {
-			return fmt.Errorf("cannot compile regexp: %w", err)
+			return fmt.Errorf("error downloading metadata: %s", err)
 		}
-		if !versionRegex.MatchString(version) {
-			return fmt.Errorf("invalid version %s", version)
+		assertMetadataFileExists()
+		assertMetadataIsLoaded()
+		err = loadMetadata()
+		if err != nil {
+			return fmt.Errorf("error loading metadata: %s", err)
+		}
+
+		unigetTool, err := tools.GetByName("uniget")
+		if err != nil {
+			return fmt.Errorf("failed to get uniget tool: %s", err)
 		}
 
 		selfExe := filepath.Base(os.Args[0])
@@ -64,69 +57,7 @@ var selfUpgradeCmd = &cobra.Command{
 		logging.Debugf("%s is available at %s\n", selfExe, path)
 		selfDir := filepath.Dir(path)
 
-		if allowPrereleaseVersion && requestedVersion == "latest" {
-			logging.Debugf("Allowing prerelease version")
-
-			githubClient := github.NewClient(nil)
-			releases, _, err := githubClient.Repositories.ListReleases(context.Background(), githubOrganization, "cli", &github.ListOptions{PerPage: 100})
-			if err != nil {
-				return fmt.Errorf("failed to list releases: %s", err)
-			}
-
-			versions := make([]*goversion.Version, 0)
-			for _, release := range releases {
-				version, err := goversion.NewSemver(*release.TagName)
-				if err != nil {
-					continue
-				}
-
-				versions = append(versions, version)
-				sort.Sort(goversion.Collection(versions))
-			}
-			requestedVersion = versions[len(versions)-1].String()
-		}
-
-		var url string
-		if requestedVersion == "latest" {
-			url = fmt.Sprintf("https://github.com/%s/releases/%s/download/uniget_%s_%s.tar.gz", projectRepository, requestedVersion, runtime.GOOS, arch)
-		} else {
-			logging.Info.Printfln("Requested version %s", requestedVersion)
-			url = fmt.Sprintf("https://github.com/%s/releases/download/v%s/uniget_%s_%s.tar.gz", projectRepository, requestedVersion, runtime.GOOS, arch)
-		}
-
-		logging.Debugf("Downloading from %s", url)
-		if dryRun {
-			logging.Info.Printfln("Would download version %s from %s", requestedVersion, url)
-			return nil
-		}
-
-		resp, err := downloadReleaseAsset(url)
-		if err != nil {
-			return fmt.Errorf("failed to download %s: %s", url, err)
-		}
-		defer func() {
-			err := resp.Body.Close()
-			if err != nil {
-				logging.Warning.Printfln("failed to close response body: %s", err)
-			}
-		}()
-
-		if resp.StatusCode != 200 {
-			return fmt.Errorf("failed to download %s: %s", url, resp.Status)
-		}
-
-		requestedVersionVersion, err := goversion.NewVersion(requestedVersion)
-		if err != nil {
-			return fmt.Errorf("failed to parse version %s: %s", requestedVersion, err)
-		}
-		versionVersion, err := goversion.NewVersion(version)
-		if err != nil {
-			return fmt.Errorf("failed to parse current version %s: %s", version, err)
-		}
-		if requestedVersionVersion.LessThanOrEqual(versionVersion) {
-			logging.Info.Printfln("Latest version %s already installed.", version)
-			return nil
-		}
+		logging.Info.Printfln("Installing version %s", unigetTool.Version)
 
 		logging.Debugf("Extracting tar.gz")
 		err = os.Chdir(selfDir)
@@ -138,15 +69,18 @@ var selfUpgradeCmd = &cobra.Command{
 			return fmt.Errorf("failed to remove %s: %s", selfExe, err)
 		}
 
-		bodyGz, err := io.ReadAll(resp.Body)
+		registries, repositories := unigetTool.GetSourcesWithFallback(registry, imageRepository)
+		ref, err := containers.FindToolRef(registries, repositories, unigetTool.Name, "main")
 		if err != nil {
-			return fmt.Errorf("failed to read body: %s", err)
+			return fmt.Errorf("error finding tool %s:%s: %s", unigetTool.Name, unigetTool.Version, err)
 		}
-		body, err := archive.Gunzip(bodyGz)
+		logging.Debugf("Getting image %s", ref)
+		layer, err := toolCache.Get(ref)
 		if err != nil {
-			return fmt.Errorf("failed to gunzip body: %s", err)
+			return fmt.Errorf("unable to get image: %s", err)
 		}
-		err = archive.ProcessTarContents(body, func(tar *tar.Reader, header *tar.Header) error {
+
+		err = archive.ProcessTarContents(layer, func(tar *tar.Reader, header *tar.Header) error {
 			if header.Name == "uniget" {
 				logging.Debugf("Extracting %s", header.Name)
 				err := archive.CallbackExtractTarItem(tar, header)
@@ -161,34 +95,6 @@ var selfUpgradeCmd = &cobra.Command{
 			return fmt.Errorf("failed to extract tar.gz: %s", err)
 		}
 
-		logging.Info.Printfln("Upgraded to version %s", requestedVersion)
 		return nil
 	},
 }
-
-func downloadReleaseAsset(url string) (*http.Response, error) {
-	client := &http.Client{
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
-			re, err := regexp.Compile(`\/uniget-org\/cli\/releases\/download\/(v\d+\.\d+\.\d+)\/`)
-			if err != nil {
-				return fmt.Errorf("cannot compile regexp: %w", err)
-			}
-
-			if re.MatchString(req.URL.Path) {
-				requestedVersion = re.FindStringSubmatch(req.URL.Path)[1]
-			}
-			return nil
-		},
-	}
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create request: %s", err)
-	}
-	req.Header.Set("Accept", "application/octet-stream")
-	req.Header.Set("User-Agent", fmt.Sprintf("%s/%s", projectName, version))
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to download %s: %s", url, err)
-	}
-	return resp, nil
-}

go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/containerd/platforms v1.0.0-rc.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/docker/docker v28.3.2+incompatible
-	github.com/google/go-github v17.0.0+incompatible
 	github.com/google/safearchive v0.0.0-20241025131057-f7ce9d7b6f9c
 	github.com/google/safeopen v0.0.0-20240125081138-66b54d5181c6
 	github.com/hashicorp/go-version v1.7.0
@@ -75,7 +74,6 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
 	github.com/gorilla/css v1.0.1 // indirect

go.sum

@@ -175,14 +175,9 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
-github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
-github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/safearchive v0.0.0-20241025131057-f7ce9d7b6f9c h1:GzqKebXGmQ+9RUwNUCjt768fVW0mMkSjw+BTR7wlyLQ=
 github.com/google/safearchive v0.0.0-20241025131057-f7ce9d7b6f9c/go.mod h1:OqnQPv70Lm5prPo201C0t0krFmSjwgcWIAsA9S0xdQA=