Merge branch 'main' into export-https

internal/release/check.go

@@ -16,16 +16,20 @@ type Info struct {
 	UpdateAvailable  bool
 }
 
-type releaseChecker interface {
+type githubReleaseChecker interface {
 	getLatestRelease(ctx context.Context) (*github.RepositoryRelease, error)
 }
 
-type githubReleaseChecker struct {
-	client *github.Client
+type repositoryService interface {
+	GetLatestRelease(ctx context.Context, owner, repo string) (*github.RepositoryRelease, *github.Response, error)
 }
 
-func (c *githubReleaseChecker) getLatestRelease(ctx context.Context) (*github.RepositoryRelease, error) {
-	release, _, err := c.client.Repositories.GetLatestRelease(ctx, "flipt-io", "flipt")
+type githubReleaseCheckerImpl struct {
+	client repositoryService
+}
+
+func (c *githubReleaseCheckerImpl) getLatestRelease(ctx context.Context) (*github.RepositoryRelease, error) {
+	release, _, err := c.client.GetLatestRelease(ctx, "flipt-io", "flipt")
 	if err != nil {
 		return nil, fmt.Errorf("checking for latest version: %w", err)
 	}
@@ -40,8 +44,8 @@ var (
 
 	// defaultReleaseChecker checks for the latest release
 	// can be overridden for testing
-	defaultReleaseChecker releaseChecker = &githubReleaseChecker{
-		client: github.NewClient(nil),
+	defaultReleaseChecker githubReleaseChecker = &githubReleaseCheckerImpl{
+		client: github.NewClient(nil).Repositories,
 	}
 )
 
@@ -53,7 +57,7 @@ func Check(ctx context.Context, version string) (Info, error) {
 }
 
 // visible for testing
-func check(ctx context.Context, rc releaseChecker, version string) (Info, error) {
+func check(ctx context.Context, rc githubReleaseChecker, version string) (Info, error) {
 	i := Info{
 		CurrentVersion: version,
 	}

internal/release/check_test.go

@@ -2,12 +2,82 @@ package release
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/google/go-github/v32/github"
 	"github.com/stretchr/testify/assert"
 )
 
+func strPtr(s string) *string {
+	return &s
+}
+
+type mockGithubReleaseService struct {
+	release  *github.RepositoryRelease
+	response *github.Response
+	err      error
+}
+
+func (m *mockGithubReleaseService) GetLatestRelease(ctx context.Context, owner, repo string) (*github.RepositoryRelease, *github.Response, error) {
+	return m.release, m.response, m.err
+}
+
+func TestGetLatestRelease(t *testing.T) {
+	var (
+		tests = []struct {
+			name    string
+			tagName string
+			htmlURL string
+			err     error
+			want    *github.RepositoryRelease
+		}{
+			{
+				name:    "success",
+				tagName: "0.17.1",
+				htmlURL: "https://github.com/flipt-io/flipt/releases/tag/0.17.2",
+				err:     nil,
+				want: &github.RepositoryRelease{
+					TagName: strPtr("0.17.1"),
+					HTMLURL: strPtr("https://github.com/flipt-io/flipt/releases/tag/0.17.2"),
+				},
+			},
+			{
+				name: "error",
+				err:  fmt.Errorf("error getting release"),
+			},
+		}
+	)
+
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+
+			srv := &mockGithubReleaseService{
+				release: &github.RepositoryRelease{
+					TagName: strPtr(tt.tagName),
+					HTMLURL: strPtr(tt.htmlURL),
+				},
+				err: tt.err,
+			}
+
+			rc := githubReleaseCheckerImpl{
+				client: srv,
+			}
+
+			got, err := rc.getLatestRelease(context.Background())
+			if tt.err != nil {
+				assert.Equal(t, fmt.Sprintf("checking for latest version: %s", tt.err.Error()), err.Error())
+				return
+			}
+
+			assert.NoError(t, err)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+
+}
+
 type mockReleaseChecker struct {
 	tagName string
 	htmlURL string