Create client inside DownloadImage function

Author: MatteoPologruto

download.go

@@ -52,8 +52,7 @@ func runDownloadCommand(ctx context.Context, args []string, destDir string) {
 		feedback.Fatal(i18n.Tr("error: %s is not a directory. Please, select an existing directory.", destDir), feedback.ErrBadArgument)
 	}
 
-	client := updater.NewClient()
-	downloadPath, _, err := updater.DownloadImage(ctx, client, targetVersion, downloadPath)
+	downloadPath, _, err := updater.DownloadImage(ctx, targetVersion, downloadPath)
 	if err != nil {
 		feedback.Fatal(i18n.Tr("error downloading the image: %v", err), feedback.ErrBadArgument)
 	}

updater/download_image.go

@@ -46,17 +46,12 @@ type Release struct {
 // DownloadConfirmCB is a function that is called when a Debian image is ready to be downloaded.
 type DownloadConfirmCB func(target string) (bool, error)
 
-func DownloadAndExtract(ctx context.Context, client *Client, targetVersion string, temp *paths.Path) (*paths.Path, string, error) {
-	tmpZip, version, err := DownloadImage(ctx, client, targetVersion, temp)
+func DownloadAndExtract(ctx context.Context, targetVersion string, temp *paths.Path) (*paths.Path, string, error) {
+	tmpZip, version, err := DownloadImage(ctx, targetVersion, temp)
 	if err != nil {
 		return nil, "", fmt.Errorf("error downloading the image: %v", err)
 	}
 
-	// Download not confirmed
-	if tmpZip == nil {
-		return nil, "", nil
-	}
-
 	err = ExtractImage(ctx, tmpZip, tmpZip.Parent())
 	if err != nil {
 		return nil, "", fmt.Errorf("error extracting the image: %v", err)
@@ -69,10 +64,10 @@ func DownloadAndExtract(ctx context.Context, client *Client, targetVersion strin
 	return imagePath, version, nil
 }
 
-func DownloadImage(ctx context.Context, client *Client, targetVersion string, downloadPath *paths.Path) (*paths.Path, string, error) {
+func DownloadImage(ctx context.Context, targetVersion string, downloadPath *paths.Path) (*paths.Path, string, error) {
 	var err error
 
-	feedback.Print(i18n.Tr("Checking for Debian image releases"))
+	client := NewClient()
 	manifest, err := client.GetInfoManifest(ctx)
 	if err != nil {
 		return nil, "", err

updater/flasher.go

@@ -35,8 +35,6 @@ const ExtractDiskSpace = uint64(10)
 
 func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes bool, tempDir string) error {
 	if !imagePath.Exist() {
-		client := NewClient()
-
 		temp, err := SetTempDir("download-", tempDir)
 		if err != nil {
 			return fmt.Errorf("error creating a temporary directory to extract the archive: %v", err)
@@ -52,19 +50,12 @@ func Flash(ctx context.Context, imagePath *paths.Path, version string, forceYes
 			return fmt.Errorf("download and extraction requires up to %d GiB of free space", DownloadDiskSpace)
 		}
 
-		tempImagePath, v, err := DownloadAndExtract(ctx, client, version, temp)
+		tempImagePath, v, err := DownloadAndExtract(ctx, version, temp)
 
 		if err != nil {
 			return fmt.Errorf("could not download and extract the image: %v", err)
 		}
 
-		// Download not confirmed
-		if tempImagePath == nil {
-			return nil
-		}
-
-		defer func() { _ = tempImagePath.Parent().RemoveAll() }()
-
 		version = v
 		imagePath = tempImagePath
 	} else if !imagePath.IsDir() {