Factored fetchInfo function to retrieve information about the latest update

Author: cmaglie

updater/updater.go

@@ -15,6 +15,18 @@
 
 package updater
 
+import (
+	"crypto/sha256"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"runtime"
+
+	log "github.com/sirupsen/logrus"
+)
+
 // Start checks if an update has been downloaded and if so returns the path to the
 // binary to be executed to perform the update. If no update has been downloaded
 // it returns an empty string.
@@ -27,3 +39,41 @@ func Start(src string) string {
 func CheckForUpdates(currentVersion string, updateAPIURL, updateBinURL string, cmdName string) (string, error) {
 	return checkForUpdates(currentVersion, updateAPIURL, updateBinURL, cmdName)
 }
+
+const (
+	plat = runtime.GOOS + "-" + runtime.GOARCH
+)
+
+func fetchInfo(updateAPIURL string, cmdName string) (*availableUpdateInfo, error) {
+	r, err := fetch(updateAPIURL + cmdName + "/" + plat + ".json")
+	if err != nil {
+		return nil, err
+	}
+	defer r.Close()
+
+	var res availableUpdateInfo
+	if err := json.NewDecoder(r).Decode(&res); err != nil {
+		return nil, err
+	}
+	if len(res.Sha256) != sha256.Size {
+		return nil, errors.New("bad cmd hash in info")
+	}
+	return &res, nil
+}
+
+type availableUpdateInfo struct {
+	Version string
+	Sha256  []byte
+}
+
+func fetch(url string) (io.ReadCloser, error) {
+	resp, err := http.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != 200 {
+		log.Errorf("bad http status from %s: %v", url, resp.Status)
+		return nil, fmt.Errorf("bad http status from %s: %v", url, resp.Status)
+	}
+	return resp.Body, nil
+}

updater/updater_default.go

@@ -21,14 +21,12 @@ import (
 	"bytes"
 	"compress/gzip"
 	"crypto/sha256"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 
 	"github.com/kr/binarydist"
@@ -62,10 +60,6 @@ import (
 //
 //
 
-const (
-	plat = runtime.GOOS + "-" + runtime.GOARCH
-)
-
 var errHashMismatch = errors.New("new file hash mismatch after patch")
 var errDiffURLUndefined = errors.New("DiffURL is not defined, I cannot fetch and apply patch, reverting to full bin")
 var up = update.New()
@@ -156,16 +150,13 @@ func removeTempSuffixFromPath(path string) string {
 //		go updater.BackgroundRun()
 //	}
 type Updater struct {
-	CurrentVersion string // Currently running version.
-	APIURL         string // Base URL for API requests (json files).
-	CmdName        string // Command name is appended to the ApiURL like http://apiurl/CmdName/. This represents one binary.
-	BinURL         string // Base URL for full binary downloads.
-	DiffURL        string // Base URL for diff downloads.
-	Dir            string // Directory to store selfupdate state.
-	Info           struct {
-		Version string
-		Sha256  []byte
-	}
+	CurrentVersion string               // Currently running version.
+	APIURL         string               // Base URL for API requests (json files).
+	CmdName        string               // Command name is appended to the ApiURL like http://apiurl/CmdName/. This represents one binary.
+	BinURL         string               // Base URL for full binary downloads.
+	DiffURL        string               // Base URL for diff downloads.
+	Dir            string               // Directory to store selfupdate state.
+	Info           *availableUpdateInfo // Information about the available update.
 }
 
 // BackgroundRun starts the update check and apply cycle.
@@ -187,18 +178,6 @@ func (u *Updater) BackgroundRun() error {
 	return nil
 }
 
-func fetch(url string) (io.ReadCloser, error) {
-	resp, err := http.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != 200 {
-		log.Errorf("bad http status from %s: %v", url, resp.Status)
-		return nil, fmt.Errorf("bad http status from %s: %v", url, resp.Status)
-	}
-	return resp.Body, nil
-}
-
 func verifySha(bin []byte, sha []byte) bool {
 	h := sha256.New()
 	h.Write(bin)
@@ -261,18 +240,11 @@ func (u *Updater) fetchBin() ([]byte, error) {
 }
 
 func (u *Updater) fetchInfo() error {
-	r, err := fetch(u.APIURL + u.CmdName + "/" + plat + ".json")
+	info, err := fetchInfo(u.APIURL, u.CmdName)
 	if err != nil {
 		return err
 	}
-	defer r.Close()
-	err = json.NewDecoder(r).Decode(&u.Info)
-	if err != nil {
-		return err
-	}
-	if len(u.Info.Sha256) != sha256.Size {
-		return errors.New("bad cmd hash in info")
-	}
+	u.Info = info
 	return nil
 }