add tests

cli/cage/commands/upgrade.go

@@ -6,7 +6,7 @@ import (
 )
 
 func (c *CageCommands) Upgrade(
-	currVersion string,
+	upgrader upgrade.Upgrader,
 ) *cli.Command {
 	var preRelease bool
 	return &cli.Command{
@@ -20,9 +20,8 @@ func (c *CageCommands) Upgrade(
 			},
 		},
 		Action: func(ctx *cli.Context) error {
-			return upgrade.Upgrade(&upgrade.Input{
-				CurrentVersion: currVersion,
-				PreRelease:     preRelease,
+			return upgrader.Upgrade(&upgrade.Input{
+				PreRelease: preRelease,
 			})
 		},
 	}

cli/cage/commands/upgrade_test.go

@@ -0,0 +1,43 @@
+package commands_test
+
+import (
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"github.com/loilo-inc/canarycage/cli/cage/commands"
+	"github.com/loilo-inc/canarycage/cli/cage/upgrade"
+	"github.com/loilo-inc/canarycage/mocks/mock_upgrade"
+	"github.com/stretchr/testify/assert"
+	"github.com/urfave/cli/v2"
+)
+
+func TestUpgrade(t *testing.T) {
+	t.Run("Upgrade", func(t *testing.T) {
+		app := cli.NewApp()
+		ctrl := gomock.NewController(t)
+		u := mock_upgrade.NewMockUpgrader(ctrl)
+		u.EXPECT().Upgrade(
+			gomock.Eq(&upgrade.Input{}),
+		).Return(nil)
+		cmds := commands.NewCageCommands(nil, nil)
+		app.Commands = []*cli.Command{
+			cmds.Upgrade(u),
+		}
+		err := app.Run([]string{"cage", "upgrade"})
+		assert.NoError(t, err)
+	})
+	t.Run("Upgrade with pre-release", func(t *testing.T) {
+		app := cli.NewApp()
+		ctrl := gomock.NewController(t)
+		u := mock_upgrade.NewMockUpgrader(ctrl)
+		u.EXPECT().Upgrade(
+			gomock.Eq(&upgrade.Input{PreRelease: true}),
+		).Return(nil)
+		cmds := commands.NewCageCommands(nil, nil)
+		app.Commands = []*cli.Command{
+			cmds.Upgrade(u),
+		}
+		err := app.Run([]string{"cage", "upgrade", "--pre-release"})
+		assert.NoError(t, err)
+	})
+}

cli/cage/main.go

@@ -7,6 +7,7 @@ import (
 
 	cage "github.com/loilo-inc/canarycage"
 	"github.com/loilo-inc/canarycage/cli/cage/commands"
+	"github.com/loilo-inc/canarycage/cli/cage/upgrade"
 	"github.com/urfave/cli/v2"
 )
 
@@ -30,7 +31,7 @@ func main() {
 		cmds.RollOut(&envars),
 		cmds.Run(&envars),
 		cmds.Recreate(&envars),
-		cmds.Upgrade(version),
+		cmds.Upgrade(upgrade.NewUpgrader(version)),
 	}
 	app.Flags = []cli.Flag{
 		&cli.BoolFlag{

cli/cage/upgrade/upgrade.go

@@ -19,15 +19,23 @@ import (
 	"golang.org/x/xerrors"
 )
 
+type Upgrader interface {
+	Upgrade(p *Input) error
+}
+type upgrader struct {
+	currentVersion string
+}
+
 type Input struct {
-	CurrentVersion string
-	PreRelease     bool
-	TargetPath     string
-	Os             string
-	Arch           string
+	PreRelease bool
+	TargetPath string
+}
+
+func NewUpgrader(currentVersion string) Upgrader {
+	return &upgrader{currentVersion: currentVersion}
 }
 
-func Upgrade(p *Input) error {
+func (u *upgrader) Upgrade(p *Input) error {
 	cont := context.Background()
 	client := github.NewClient(nil)
 	log.Infof("checking for updates...")
@@ -53,7 +61,7 @@ func Upgrade(p *Input) error {
 		return xerrors.Errorf("failed to find latest release")
 	}
 	log.Infof("latest release: %s", latestRelease.GetTagName())
-	currVer, currVerErr := semver.NewVersion(p.CurrentVersion)
+	currVer, currVerErr := semver.NewVersion(u.currentVersion)
 	latestVer := semver.MustParse(latestRelease.GetTagName())
 	if currVerErr == nil {
 		if currVer.Equal(latestVer) || currVer.GreaterThan(latestVer) {
@@ -62,7 +70,7 @@ func Upgrade(p *Input) error {
 		}
 	}
 	// ignore current version if it's not a valid semver
-	log.Infof("upgrading from %s to %s", p.CurrentVersion, latestRelease.GetTagName())
+	log.Infof("upgrading from %s to %s", u.currentVersion, latestRelease.GetTagName())
 	var version = latestRelease.GetTagName()
 	var checksumAsset *github.ReleaseAsset
 	var binaryAsset *github.ReleaseAsset

cli/cage/upgrade/upgrade_test.go

@@ -100,10 +100,9 @@ func TestUpgrade(t *testing.T) {
 	t.Run("basic", func(t *testing.T) {
 		registerResponses(t, "0.1.0", "0.2.0", "0.2.1-rc1")
 		tmpDir := setupCurrent(t, "0.1.0")
-
-		err := upgrade.Upgrade(&upgrade.Input{
-			CurrentVersion: "0.1.0",
-			TargetPath:     tmpDir + "/cage"})
+		u := upgrade.NewUpgrader("0.1.0")
+		err := u.Upgrade(&upgrade.Input{
+			TargetPath: tmpDir + "/cage"})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -112,20 +111,20 @@ func TestUpgrade(t *testing.T) {
 	t.Run("no updates", func(t *testing.T) {
 		registerResponses(t, "0.1.0")
 		tmpDir := setupCurrent(t, "0.1.0")
-		err := upgrade.Upgrade(&upgrade.Input{
-			CurrentVersion: "0.1.0",
-			TargetPath:     tmpDir + "/cage",
+		u := upgrade.NewUpgrader("0.1.0")
+		err := u.Upgrade(&upgrade.Input{
+			TargetPath: tmpDir + "/cage",
 		})
 		assert.NoError(t, err)
 		assertUpgraded(t, tmpDir, "0.1.0")
 	})
 	t.Run("pre-release", func(t *testing.T) {
 		registerResponses(t, "0.1.0", "0.2.0", "0.2.1-rc1")
 		tmpDir := setupCurrent(t, "0.1.0")
-		err := upgrade.Upgrade(&upgrade.Input{
-			CurrentVersion: "0.1.0",
-			PreRelease:     true,
-			TargetPath:     tmpDir + "/cage"})
+		u := upgrade.NewUpgrader("0.1.0")
+		err := u.Upgrade(&upgrade.Input{
+			PreRelease: true,
+			TargetPath: tmpDir + "/cage"})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -134,9 +133,9 @@ func TestUpgrade(t *testing.T) {
 	t.Run("should upgrade if current version is not a valid semver", func(t *testing.T) {
 		registerResponses(t, "0.1.0", "0.2.0")
 		tmpDir := setupCurrent(t, "dev")
-		err := upgrade.Upgrade(&upgrade.Input{
-			CurrentVersion: "dev",
-			TargetPath:     tmpDir + "/cage"})
+		u := upgrade.NewUpgrader("dev")
+		err := u.Upgrade(&upgrade.Input{
+			TargetPath: tmpDir + "/cage"})
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -150,8 +149,8 @@ func TestUpgrade(t *testing.T) {
 			httpmock.NewJsonResponderOrPanic(200, makeReleases("0.1.0", "0.2.0")))
 		httpmock.RegisterResponder("GET", "https://localhost/0.2.0/canarycage_0.2.0_checksums.txt",
 			httpmock.NewStringResponder(200, "invalid"))
-		err := upgrade.Upgrade(&upgrade.Input{
-			CurrentVersion: "0.1.0"})
+		u := upgrade.NewUpgrader("0.1.0")
+		err := u.Upgrade(&upgrade.Input{})
 		assert.EqualError(t, err, "invalid checksum line: invalid")
 	})
 }