use CobraCmd context in the upgrade flow

(cherry picked from commit ed3c336)

cmd/vclusterctl/cmd/upgrade.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"context"
+
 	"github.com/loft-sh/log"
 	"github.com/loft-sh/vcluster/pkg/upgrade"
 	"github.com/pkg/errors"
@@ -28,16 +30,18 @@ func NewUpgradeCmd() *cobra.Command {
 Upgrades the vcluster CLI to the newest version
 #######################################################`,
 		Args: cobra.NoArgs,
-		RunE: cmd.Run,
+		RunE: func(cobraCmd *cobra.Command, _ []string) error {
+			return cmd.Run(cobraCmd.Context())
+		},
 	}
 
 	upgradeCmd.Flags().StringVar(&cmd.Version, "version", "", "The version to update vcluster to. Defaults to the latest stable version available")
 	return upgradeCmd
 }
 
 // Run executes the command logic
-func (cmd *UpgradeCmd) Run(*cobra.Command, []string) error {
-	err := upgrade.Upgrade(cmd.Version, cmd.log)
+func (cmd *UpgradeCmd) Run(ctx context.Context) error {
+	err := upgrade.Upgrade(ctx, cmd.Version, cmd.log)
 	if err != nil {
 		return errors.Errorf("Couldn't upgrade: %v", err)
 	}

pkg/upgrade/helpers.go

@@ -16,9 +16,8 @@ import (
 	"golang.org/x/oauth2"
 )
 
-func fetchReleaseByTag(owner, repo, tag string) (*github.RepositoryRelease, error) {
+func fetchReleaseByTag(ctx context.Context, owner, repo, tag string) (*github.RepositoryRelease, error) {
 	var (
-		ctx   = context.Background()
 		token string
 		hc    *http.Client
 

pkg/upgrade/upgrade.go

@@ -1,6 +1,7 @@
 package upgrade
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"regexp"
@@ -116,15 +117,15 @@ func NewerVersionAvailable() string {
 }
 
 // Upgrade downloads the latest release from github and replaces vcluster if a new version is found
-func Upgrade(flagVersion string, log log.Logger) error {
+func Upgrade(ctx context.Context, flagVersion string, log log.Logger) error {
 	updater, err := selfupdate.NewUpdater(selfupdate.Config{
 		Filters: []string{"vcluster"},
 	})
 	if err != nil {
 		return fmt.Errorf("failed to initialize updater: %w", err)
 	}
 	if flagVersion != "" {
-		release, found, err := DetectVersion(githubSlug, flagVersion)
+		release, found, err := DetectVersion(ctx, githubSlug, flagVersion)
 		if err != nil {
 			return errors.Wrap(err, "find version")
 		} else if !found {
@@ -188,7 +189,7 @@ func Upgrade(flagVersion string, log log.Logger) error {
 	return nil
 }
 
-func DetectVersion(slug string, version string) (*selfupdate.Release, bool, error) {
+func DetectVersion(ctx context.Context, slug string, version string) (*selfupdate.Release, bool, error) {
 	var (
 		release *selfupdate.Release
 		found   bool
@@ -200,7 +201,7 @@ func DetectVersion(slug string, version string) (*selfupdate.Release, bool, erro
 		return nil, false, fmt.Errorf("invalid slug format. It should be 'owner/name': %s", slug)
 	}
 
-	githubRelease, err := fetchReleaseByTag(repo[0], repo[1], version)
+	githubRelease, err := fetchReleaseByTag(ctx, repo[0], repo[1], version)
 	if err != nil {
 		return nil, false, fmt.Errorf("repository or release not found: %w", err)
 	}

pkg/upgrade/upgrade_test.go

@@ -1,6 +1,7 @@
 package upgrade
 
 import (
+	"context"
 	"os"
 	"strings"
 	"testing"
@@ -75,7 +76,8 @@ func TestUpgrade(t *testing.T) {
 	defer func() { version = versionBackup }()
 
 	// Newest version already reached
-	err = Upgrade("", log.GetInstance())
+	ctx := context.Background()
+	err = Upgrade(ctx, "", log.GetInstance())
 	assert.Equal(t, false, err != nil, "Upgrade returned error if newest version already reached")
 	err = logFile.Close()
 	if err != nil {
@@ -91,6 +93,6 @@ func TestUpgrade(t *testing.T) {
 	githubSlugBackup := githubSlug
 	githubSlug = ""
 	defer func() { githubSlug = githubSlugBackup }()
-	err = Upgrade("", log.GetInstance())
+	err = Upgrade(ctx, "", log.GetInstance())
 	assert.Equal(t, true, err != nil, "No error returned if DetectLatest returns one.")
 }