Compare commits
1 commit
dev
...
ax/review-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
644986b8bb |
14 changed files with 630 additions and 263 deletions
11
cmd.go
11
cmd.go
|
|
@ -2,7 +2,6 @@ package updater
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
|
@ -28,7 +27,9 @@ func init() {
|
||||||
cli.RegisterCommands(AddUpdateCommands)
|
cli.RegisterCommands(AddUpdateCommands)
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddUpdateCommands registers the update command and subcommands.
|
// AddUpdateCommands registers the update command and its subcommands with the root command.
|
||||||
|
//
|
||||||
|
// cli.RegisterCommands(updater.AddUpdateCommands)
|
||||||
func AddUpdateCommands(root *cobra.Command) {
|
func AddUpdateCommands(root *cobra.Command) {
|
||||||
updateCmd := &cobra.Command{
|
updateCmd := &cobra.Command{
|
||||||
Use: "update",
|
Use: "update",
|
||||||
|
|
@ -186,10 +187,8 @@ func handleDevUpdate(currentVersion string) error {
|
||||||
// handleDevTagUpdate fetches the dev release using the direct tag
|
// handleDevTagUpdate fetches the dev release using the direct tag
|
||||||
func handleDevTagUpdate(currentVersion string) error {
|
func handleDevTagUpdate(currentVersion string) error {
|
||||||
// Construct download URL directly for dev release
|
// Construct download URL directly for dev release
|
||||||
downloadURL := fmt.Sprintf(
|
downloadURL := "https://github.com/" + repoOwner + "/" + repoName +
|
||||||
"https://github.com/%s/%s/releases/download/dev/core-%s-%s",
|
"/releases/download/dev/core-" + runtime.GOOS + "-" + runtime.GOARCH
|
||||||
repoOwner, repoName, runtime.GOOS, runtime.GOARCH,
|
|
||||||
)
|
|
||||||
|
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
downloadURL += ".exe"
|
downloadURL += ".exe"
|
||||||
|
|
|
||||||
13
cmd_unix.go
13
cmd_unix.go
|
|
@ -10,8 +10,9 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// spawnWatcher spawns a background process that watches for the current process
|
// spawnWatcher spawns a detached background process that restarts the binary after the current process exits.
|
||||||
// to exit, then restarts the binary with --version to confirm the update.
|
//
|
||||||
|
// if err := spawnWatcher(); err != nil { /* non-fatal: update proceeds anyway */ }
|
||||||
func spawnWatcher() error {
|
func spawnWatcher() error {
|
||||||
executable, err := os.Executable()
|
executable, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -33,7 +34,9 @@ func spawnWatcher() error {
|
||||||
return cmd.Start()
|
return cmd.Start()
|
||||||
}
|
}
|
||||||
|
|
||||||
// watchAndRestart waits for the given PID to exit, then restarts the binary.
|
// watchAndRestart polls until the given PID exits, then exec-replaces itself with --version.
|
||||||
|
//
|
||||||
|
// return watchAndRestart(os.Getppid())
|
||||||
func watchAndRestart(pid int) error {
|
func watchAndRestart(pid int) error {
|
||||||
// Wait for the parent process to die
|
// Wait for the parent process to die
|
||||||
for isProcessRunning(pid) {
|
for isProcessRunning(pid) {
|
||||||
|
|
@ -54,7 +57,9 @@ func watchAndRestart(pid int) error {
|
||||||
return syscall.Exec(executable, []string{executable, "--version"}, os.Environ())
|
return syscall.Exec(executable, []string{executable, "--version"}, os.Environ())
|
||||||
}
|
}
|
||||||
|
|
||||||
// isProcessRunning checks if a process with the given PID is still running.
|
// isProcessRunning returns true if a process with the given PID is still running.
|
||||||
|
//
|
||||||
|
// for isProcessRunning(parentPID) { time.Sleep(100 * time.Millisecond) }
|
||||||
func isProcessRunning(pid int) bool {
|
func isProcessRunning(pid int) bool {
|
||||||
process, err := os.FindProcess(pid)
|
process, err := os.FindProcess(pid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,9 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// spawnWatcher spawns a background process that watches for the current process
|
// spawnWatcher spawns a detached background process that restarts the binary after the current process exits.
|
||||||
// to exit, then restarts the binary with --version to confirm the update.
|
//
|
||||||
|
// if err := spawnWatcher(); err != nil { /* non-fatal: update proceeds anyway */ }
|
||||||
func spawnWatcher() error {
|
func spawnWatcher() error {
|
||||||
executable, err := os.Executable()
|
executable, err := os.Executable()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -33,7 +34,9 @@ func spawnWatcher() error {
|
||||||
return cmd.Start()
|
return cmd.Start()
|
||||||
}
|
}
|
||||||
|
|
||||||
// watchAndRestart waits for the given PID to exit, then restarts the binary.
|
// watchAndRestart polls until the given PID exits, then spawns --version and exits.
|
||||||
|
//
|
||||||
|
// return watchAndRestart(os.Getppid())
|
||||||
func watchAndRestart(pid int) error {
|
func watchAndRestart(pid int) error {
|
||||||
// Wait for the parent process to die
|
// Wait for the parent process to die
|
||||||
for {
|
for {
|
||||||
|
|
@ -64,7 +67,9 @@ func watchAndRestart(pid int) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// isProcessRunning checks if a process with the given PID is still running.
|
// isProcessRunning returns true if a process with the given PID is still running.
|
||||||
|
//
|
||||||
|
// for isProcessRunning(parentPID) { time.Sleep(100 * time.Millisecond) }
|
||||||
func isProcessRunning(pid int) bool {
|
func isProcessRunning(pid int) bool {
|
||||||
// On Windows, try to open the process with query rights
|
// On Windows, try to open the process with query rights
|
||||||
handle, err := syscall.OpenProcess(syscall.PROCESS_QUERY_INFORMATION, false, uint32(pid))
|
handle, err := syscall.OpenProcess(syscall.PROCESS_QUERY_INFORMATION, false, uint32(pid))
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package updater
|
package updater
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
coreerr "forge.lthn.ai/core/go-log"
|
coreerr "forge.lthn.ai/core/go-log"
|
||||||
|
|
@ -19,15 +19,9 @@ type GenericUpdateInfo struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetLatestUpdateFromURL fetches and parses a latest.json file from a base URL.
|
// GetLatestUpdateFromURL fetches and parses a latest.json file from a base URL.
|
||||||
// The server at the baseURL should host a 'latest.json' file that contains
|
|
||||||
// the version and download URL for the latest update.
|
|
||||||
//
|
//
|
||||||
// Example of latest.json:
|
// info, err := updater.GetLatestUpdateFromURL("https://my-server.com/updates")
|
||||||
//
|
// // info.Version == "1.2.3", info.URL == "https://..."
|
||||||
// {
|
|
||||||
// "version": "1.2.3",
|
|
||||||
// "url": "https://your-server.com/path/to/release-asset"
|
|
||||||
// }
|
|
||||||
func GetLatestUpdateFromURL(baseURL string) (*GenericUpdateInfo, error) {
|
func GetLatestUpdateFromURL(baseURL string) (*GenericUpdateInfo, error) {
|
||||||
u, err := url.Parse(baseURL)
|
u, err := url.Parse(baseURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -49,7 +43,7 @@ func GetLatestUpdateFromURL(baseURL string) (*GenericUpdateInfo, error) {
|
||||||
defer func() { _ = resp.Body.Close() }()
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, coreerr.E("GetLatestUpdateFromURL", fmt.Sprintf("failed to fetch latest.json: status code %d", resp.StatusCode), nil)
|
return nil, coreerr.E("GetLatestUpdateFromURL", "failed to fetch latest.json: status "+strconv.Itoa(resp.StatusCode), nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
var info GenericUpdateInfo
|
var info GenericUpdateInfo
|
||||||
|
|
|
||||||
|
|
@ -7,49 +7,52 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGetLatestUpdateFromURL(t *testing.T) {
|
func TestGenericHttp_GetLatestUpdateFromURL_Good(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
_, _ = fmt.Fprintln(w, `{"version": "v1.1.0", "url": "http://example.com/release.zip"}`)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
info, err := GetLatestUpdateFromURL(server.URL)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if info.Version != "v1.1.0" {
|
||||||
|
t.Errorf("expected version v1.1.0, got %q", info.Version)
|
||||||
|
}
|
||||||
|
if info.URL != "http://example.com/release.zip" {
|
||||||
|
t.Errorf("expected URL http://example.com/release.zip, got %q", info.URL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGenericHttp_GetLatestUpdateFromURL_Bad(t *testing.T) {
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
name string
|
name string
|
||||||
handler http.HandlerFunc
|
handler http.HandlerFunc
|
||||||
expectError bool
|
|
||||||
expectedVersion string
|
|
||||||
expectedURL string
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "Valid latest.json",
|
name: "invalid JSON",
|
||||||
handler: func(w http.ResponseWriter, r *http.Request) {
|
handler: func(w http.ResponseWriter, r *http.Request) {
|
||||||
_, _ = fmt.Fprintln(w, `{"version": "v1.1.0", "url": "http://example.com/release.zip"}`)
|
_, _ = fmt.Fprintln(w, `{"version": "v1.1.0", "url": "http://example.com/release.zip"`) // missing closing brace
|
||||||
},
|
},
|
||||||
expectedVersion: "v1.1.0",
|
|
||||||
expectedURL: "http://example.com/release.zip",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Invalid JSON",
|
name: "missing version field",
|
||||||
handler: func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
_, _ = fmt.Fprintln(w, `{"version": "v1.1.0", "url": "http://example.com/release.zip"`) // Missing closing brace
|
|
||||||
},
|
|
||||||
expectError: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Missing version",
|
|
||||||
handler: func(w http.ResponseWriter, r *http.Request) {
|
handler: func(w http.ResponseWriter, r *http.Request) {
|
||||||
_, _ = fmt.Fprintln(w, `{"url": "http://example.com/release.zip"}`)
|
_, _ = fmt.Fprintln(w, `{"url": "http://example.com/release.zip"}`)
|
||||||
},
|
},
|
||||||
expectError: true,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Missing URL",
|
name: "missing url field",
|
||||||
handler: func(w http.ResponseWriter, r *http.Request) {
|
handler: func(w http.ResponseWriter, r *http.Request) {
|
||||||
_, _ = fmt.Fprintln(w, `{"version": "v1.1.0"}`)
|
_, _ = fmt.Fprintln(w, `{"version": "v1.1.0"}`)
|
||||||
},
|
},
|
||||||
expectError: true,
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Server error",
|
name: "server error",
|
||||||
handler: func(w http.ResponseWriter, r *http.Request) {
|
handler: func(w http.ResponseWriter, r *http.Request) {
|
||||||
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
|
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
|
||||||
},
|
},
|
||||||
expectError: true,
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -58,20 +61,29 @@ func TestGetLatestUpdateFromURL(t *testing.T) {
|
||||||
server := httptest.NewServer(tc.handler)
|
server := httptest.NewServer(tc.handler)
|
||||||
defer server.Close()
|
defer server.Close()
|
||||||
|
|
||||||
info, err := GetLatestUpdateFromURL(server.URL)
|
_, err := GetLatestUpdateFromURL(server.URL)
|
||||||
|
if err == nil {
|
||||||
if (err != nil) != tc.expectError {
|
t.Errorf("expected error for case %q, got nil", tc.name)
|
||||||
t.Errorf("Expected error: %v, got: %v", tc.expectError, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !tc.expectError {
|
|
||||||
if info.Version != tc.expectedVersion {
|
|
||||||
t.Errorf("Expected version: %s, got: %s", tc.expectedVersion, info.Version)
|
|
||||||
}
|
|
||||||
if info.URL != tc.expectedURL {
|
|
||||||
t.Errorf("Expected URL: %s, got: %s", tc.expectedURL, info.URL)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGenericHttp_GetLatestUpdateFromURL_Ugly(t *testing.T) {
|
||||||
|
// Invalid base URL
|
||||||
|
_, err := GetLatestUpdateFromURL("://invalid-url")
|
||||||
|
if err == nil {
|
||||||
|
t.Error("expected error for invalid URL, got nil")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Server returns empty body
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
_, err = GetLatestUpdateFromURL(server.URL)
|
||||||
|
if err == nil {
|
||||||
|
t.Error("expected error for empty response body, got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
43
github.go
43
github.go
|
|
@ -3,10 +3,10 @@ package updater
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
coreerr "forge.lthn.ai/core/go-log"
|
coreerr "forge.lthn.ai/core/go-log"
|
||||||
|
|
@ -44,9 +44,9 @@ type GithubClient interface {
|
||||||
|
|
||||||
type githubClient struct{}
|
type githubClient struct{}
|
||||||
|
|
||||||
// NewAuthenticatedClient creates a new HTTP client that authenticates with the GitHub API.
|
// NewAuthenticatedClient returns an HTTP client using GITHUB_TOKEN if set, or the default client.
|
||||||
// It uses the GITHUB_TOKEN environment variable for authentication.
|
//
|
||||||
// If the token is not set, it returns the default HTTP client.
|
// client := updater.NewAuthenticatedClient(ctx)
|
||||||
var NewAuthenticatedClient = func(ctx context.Context) *http.Client {
|
var NewAuthenticatedClient = func(ctx context.Context) *http.Client {
|
||||||
token := os.Getenv("GITHUB_TOKEN")
|
token := os.Getenv("GITHUB_TOKEN")
|
||||||
if token == "" {
|
if token == "" {
|
||||||
|
|
@ -68,7 +68,7 @@ func (g *githubClient) GetPublicRepos(ctx context.Context, userOrOrg string) ([]
|
||||||
func (g *githubClient) getPublicReposWithAPIURL(ctx context.Context, apiURL, userOrOrg string) ([]string, error) {
|
func (g *githubClient) getPublicReposWithAPIURL(ctx context.Context, apiURL, userOrOrg string) ([]string, error) {
|
||||||
client := NewAuthenticatedClient(ctx)
|
client := NewAuthenticatedClient(ctx)
|
||||||
var allCloneURLs []string
|
var allCloneURLs []string
|
||||||
url := fmt.Sprintf("%s/users/%s/repos", apiURL, userOrOrg)
|
url := apiURL + "/users/" + userOrOrg + "/repos"
|
||||||
|
|
||||||
for {
|
for {
|
||||||
if err := ctx.Err(); err != nil {
|
if err := ctx.Err(); err != nil {
|
||||||
|
|
@ -85,8 +85,8 @@ func (g *githubClient) getPublicReposWithAPIURL(ctx context.Context, apiURL, use
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
_ = resp.Body.Close()
|
_ = resp.Body.Close()
|
||||||
// Try organization endpoint
|
// Try organisation endpoint
|
||||||
url = fmt.Sprintf("%s/orgs/%s/repos", apiURL, userOrOrg)
|
url = apiURL + "/orgs/" + userOrOrg + "/repos"
|
||||||
req, err = newAgentRequest(ctx, "GET", url)
|
req, err = newAgentRequest(ctx, "GET", url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
@ -99,7 +99,7 @@ func (g *githubClient) getPublicReposWithAPIURL(ctx context.Context, apiURL, use
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
_ = resp.Body.Close()
|
_ = resp.Body.Close()
|
||||||
return nil, coreerr.E("github.getPublicReposWithAPIURL", fmt.Sprintf("failed to fetch repos: %s", resp.Status), nil)
|
return nil, coreerr.E("github.getPublicReposWithAPIURL", "failed to fetch repos: "+resp.Status, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
var repos []Repo
|
var repos []Repo
|
||||||
|
|
@ -138,13 +138,14 @@ func (g *githubClient) findNextURL(linkHeader string) string {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetLatestRelease fetches the latest release for a given repository and channel.
|
// GetLatestRelease fetches the first release matching the given channel ("stable", "beta", or "alpha").
|
||||||
// The channel can be "stable", "beta", or "alpha".
|
//
|
||||||
|
// release, err := client.GetLatestRelease(ctx, "myorg", "myrepo", "stable")
|
||||||
func (g *githubClient) GetLatestRelease(ctx context.Context, owner, repo, channel string) (*Release, error) {
|
func (g *githubClient) GetLatestRelease(ctx context.Context, owner, repo, channel string) (*Release, error) {
|
||||||
client := NewAuthenticatedClient(ctx)
|
client := NewAuthenticatedClient(ctx)
|
||||||
url := fmt.Sprintf("https://api.github.com/repos/%s/%s/releases", owner, repo)
|
releaseURL := "https://api.github.com/repos/" + owner + "/" + repo + "/releases"
|
||||||
|
|
||||||
req, err := newAgentRequest(ctx, "GET", url)
|
req, err := newAgentRequest(ctx, "GET", releaseURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
@ -156,7 +157,7 @@ func (g *githubClient) GetLatestRelease(ctx context.Context, owner, repo, channe
|
||||||
defer func() { _ = resp.Body.Close() }()
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, coreerr.E("github.GetLatestRelease", fmt.Sprintf("failed to fetch releases: %s", resp.Status), nil)
|
return nil, coreerr.E("github.GetLatestRelease", "failed to fetch releases: "+resp.Status, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
var releases []Release
|
var releases []Release
|
||||||
|
|
@ -193,12 +194,14 @@ func determineChannel(tagName string, isPreRelease bool) string {
|
||||||
return "stable"
|
return "stable"
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetReleaseByPullRequest fetches a release associated with a specific pull request number.
|
// GetReleaseByPullRequest fetches the release whose tag contains .pr.<prNumber>.
|
||||||
|
//
|
||||||
|
// release, err := client.GetReleaseByPullRequest(ctx, "myorg", "myrepo", 42)
|
||||||
func (g *githubClient) GetReleaseByPullRequest(ctx context.Context, owner, repo string, prNumber int) (*Release, error) {
|
func (g *githubClient) GetReleaseByPullRequest(ctx context.Context, owner, repo string, prNumber int) (*Release, error) {
|
||||||
client := NewAuthenticatedClient(ctx)
|
client := NewAuthenticatedClient(ctx)
|
||||||
url := fmt.Sprintf("https://api.github.com/repos/%s/%s/releases", owner, repo)
|
releaseURL := "https://api.github.com/repos/" + owner + "/" + repo + "/releases"
|
||||||
|
|
||||||
req, err := newAgentRequest(ctx, "GET", url)
|
req, err := newAgentRequest(ctx, "GET", releaseURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
@ -210,7 +213,7 @@ func (g *githubClient) GetReleaseByPullRequest(ctx context.Context, owner, repo
|
||||||
defer func() { _ = resp.Body.Close() }()
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, coreerr.E("github.GetReleaseByPullRequest", fmt.Sprintf("failed to fetch releases: %s", resp.Status), nil)
|
return nil, coreerr.E("github.GetReleaseByPullRequest", "failed to fetch releases: "+resp.Status, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
var releases []Release
|
var releases []Release
|
||||||
|
|
@ -218,8 +221,8 @@ func (g *githubClient) GetReleaseByPullRequest(ctx context.Context, owner, repo
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// The pr number is included in the tag name with the format `vX.Y.Z-alpha.pr.123` or `vX.Y.Z-beta.pr.123`
|
// The PR number is included in the tag name: vX.Y.Z-alpha.pr.123 or vX.Y.Z-beta.pr.123
|
||||||
prTagSuffix := fmt.Sprintf(".pr.%d", prNumber)
|
prTagSuffix := ".pr." + strconv.Itoa(prNumber)
|
||||||
for _, release := range releases {
|
for _, release := range releases {
|
||||||
if strings.Contains(release.TagName, prTagSuffix) {
|
if strings.Contains(release.TagName, prTagSuffix) {
|
||||||
return &release, nil
|
return &release, nil
|
||||||
|
|
@ -298,5 +301,5 @@ func GetDownloadURL(release *Release, releaseURLFormat string) (string, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return "", coreerr.E("GetDownloadURL", fmt.Sprintf("no suitable download asset found for %s/%s", osName, archName), nil)
|
return "", coreerr.E("GetDownloadURL", "no suitable download asset found for "+osName+"/"+archName, nil)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFilterReleases_Good(t *testing.T) {
|
func TestGithubInternal_FilterReleases_Good(t *testing.T) {
|
||||||
releases := []Release{
|
releases := []Release{
|
||||||
{TagName: "v1.0.0-alpha.1", PreRelease: true},
|
{TagName: "v1.0.0-alpha.1", PreRelease: true},
|
||||||
{TagName: "v1.0.0-beta.1", PreRelease: true},
|
{TagName: "v1.0.0-beta.1", PreRelease: true},
|
||||||
|
|
@ -34,7 +34,7 @@ func TestFilterReleases_Good(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFilterReleases_Bad(t *testing.T) {
|
func TestGithubInternal_FilterReleases_Bad(t *testing.T) {
|
||||||
releases := []Release{
|
releases := []Release{
|
||||||
{TagName: "v1.0.0", PreRelease: false},
|
{TagName: "v1.0.0", PreRelease: false},
|
||||||
}
|
}
|
||||||
|
|
@ -44,11 +44,16 @@ func TestFilterReleases_Bad(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFilterReleases_PreReleaseWithoutLabel(t *testing.T) {
|
func TestGithubInternal_FilterReleases_Ugly(t *testing.T) {
|
||||||
releases := []Release{
|
// Empty releases slice
|
||||||
{TagName: "v2.0.0-rc.1", PreRelease: true},
|
got := filterReleases([]Release{}, "stable")
|
||||||
|
if got != nil {
|
||||||
|
t.Errorf("expected nil for empty releases, got %v", got)
|
||||||
}
|
}
|
||||||
got := filterReleases(releases, "beta")
|
|
||||||
|
// Pre-release without alpha/beta label maps to beta channel
|
||||||
|
releases := []Release{{TagName: "v2.0.0-rc.1", PreRelease: true}}
|
||||||
|
got = filterReleases(releases, "beta")
|
||||||
if got == nil {
|
if got == nil {
|
||||||
t.Fatal("expected pre-release without alpha/beta label to match beta channel")
|
t.Fatal("expected pre-release without alpha/beta label to match beta channel")
|
||||||
}
|
}
|
||||||
|
|
@ -57,7 +62,7 @@ func TestFilterReleases_PreReleaseWithoutLabel(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDetermineChannel_Good(t *testing.T) {
|
func TestGithubInternal_DetermineChannel_Good(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
tag string
|
tag string
|
||||||
isPreRelease bool
|
isPreRelease bool
|
||||||
|
|
@ -69,7 +74,6 @@ func TestDetermineChannel_Good(t *testing.T) {
|
||||||
{"v1.0.0-beta.1", false, "beta"},
|
{"v1.0.0-beta.1", false, "beta"},
|
||||||
{"v1.0.0-BETA.1", false, "beta"},
|
{"v1.0.0-BETA.1", false, "beta"},
|
||||||
{"v1.0.0-rc.1", true, "beta"},
|
{"v1.0.0-rc.1", true, "beta"},
|
||||||
{"v1.0.0-rc.1", false, "stable"},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|
@ -82,7 +86,28 @@ func TestDetermineChannel_Good(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetDownloadURL_Good(t *testing.T) {
|
func TestGithubInternal_DetermineChannel_Bad(t *testing.T) {
|
||||||
|
// rc tag without prerelease flag resolves to stable (not beta)
|
||||||
|
got := determineChannel("v1.0.0-rc.1", false)
|
||||||
|
if got != "stable" {
|
||||||
|
t.Errorf("expected stable for rc tag without prerelease flag, got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithubInternal_DetermineChannel_Ugly(t *testing.T) {
|
||||||
|
// Empty tag with prerelease=true — maps to beta
|
||||||
|
got := determineChannel("", true)
|
||||||
|
if got != "beta" {
|
||||||
|
t.Errorf("expected beta for empty tag with prerelease=true, got %q", got)
|
||||||
|
}
|
||||||
|
// Empty tag with prerelease=false — maps to stable
|
||||||
|
got = determineChannel("", false)
|
||||||
|
if got != "stable" {
|
||||||
|
t.Errorf("expected stable for empty tag with prerelease=false, got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithubInternal_GetDownloadURL_Good(t *testing.T) {
|
||||||
osName := runtime.GOOS
|
osName := runtime.GOOS
|
||||||
archName := runtime.GOARCH
|
archName := runtime.GOARCH
|
||||||
|
|
||||||
|
|
@ -94,50 +119,16 @@ func TestGetDownloadURL_Good(t *testing.T) {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
url, err := GetDownloadURL(release, "")
|
downloadURL, err := GetDownloadURL(release, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
if url != "https://example.com/full-match" {
|
if downloadURL != "https://example.com/full-match" {
|
||||||
t.Errorf("expected full match URL, got %q", url)
|
t.Errorf("expected full match URL, got %q", downloadURL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetDownloadURL_OSOnlyFallback(t *testing.T) {
|
func TestGithubInternal_GetDownloadURL_Bad(t *testing.T) {
|
||||||
osName := runtime.GOOS
|
|
||||||
|
|
||||||
release := &Release{
|
|
||||||
TagName: "v1.2.3",
|
|
||||||
Assets: []ReleaseAsset{
|
|
||||||
{Name: "app-other-other", DownloadURL: "https://example.com/other"},
|
|
||||||
{Name: "app-" + osName + "-other", DownloadURL: "https://example.com/os-only"},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
url, err := GetDownloadURL(release, "")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if url != "https://example.com/os-only" {
|
|
||||||
t.Errorf("expected OS-only fallback URL, got %q", url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetDownloadURL_WithFormat(t *testing.T) {
|
|
||||||
release := &Release{TagName: "v1.2.3"}
|
|
||||||
|
|
||||||
url, err := GetDownloadURL(release, "https://example.com/{tag}/{os}/{arch}")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
expected := "https://example.com/v1.2.3/" + runtime.GOOS + "/" + runtime.GOARCH
|
|
||||||
if url != expected {
|
|
||||||
t.Errorf("expected %q, got %q", expected, url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetDownloadURL_Bad(t *testing.T) {
|
|
||||||
// nil release
|
// nil release
|
||||||
_, err := GetDownloadURL(nil, "")
|
_, err := GetDownloadURL(nil, "")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
|
@ -157,14 +148,44 @@ func TestGetDownloadURL_Bad(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFormatVersionForComparison(t *testing.T) {
|
func TestGithubInternal_GetDownloadURL_Ugly(t *testing.T) {
|
||||||
|
osName := runtime.GOOS
|
||||||
|
|
||||||
|
// OS-only fallback when arch does not match
|
||||||
|
release := &Release{
|
||||||
|
TagName: "v1.2.3",
|
||||||
|
Assets: []ReleaseAsset{
|
||||||
|
{Name: "app-other-other", DownloadURL: "https://example.com/other"},
|
||||||
|
{Name: "app-" + osName + "-other", DownloadURL: "https://example.com/os-only"},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
downloadURL, err := GetDownloadURL(release, "")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error for OS-only fallback: %v", err)
|
||||||
|
}
|
||||||
|
if downloadURL != "https://example.com/os-only" {
|
||||||
|
t.Errorf("expected OS-only fallback URL, got %q", downloadURL)
|
||||||
|
}
|
||||||
|
|
||||||
|
// URL format template with placeholders
|
||||||
|
release = &Release{TagName: "v1.2.3"}
|
||||||
|
downloadURL, err = GetDownloadURL(release, "https://example.com/{tag}/{os}/{arch}")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error for URL format: %v", err)
|
||||||
|
}
|
||||||
|
expected := "https://example.com/v1.2.3/" + runtime.GOOS + "/" + runtime.GOARCH
|
||||||
|
if downloadURL != expected {
|
||||||
|
t.Errorf("expected %q, got %q", expected, downloadURL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithubInternal_FormatVersionForComparison_Good(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
input string
|
input string
|
||||||
want string
|
want string
|
||||||
}{
|
}{
|
||||||
{"1.0.0", "v1.0.0"},
|
{"1.0.0", "v1.0.0"},
|
||||||
{"v1.0.0", "v1.0.0"},
|
{"v1.0.0", "v1.0.0"},
|
||||||
{"", ""},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
|
|
@ -177,7 +198,22 @@ func TestFormatVersionForComparison(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFormatVersionForDisplay(t *testing.T) {
|
func TestGithubInternal_FormatVersionForComparison_Bad(t *testing.T) {
|
||||||
|
// Non-semver string still gets v prefix
|
||||||
|
got := formatVersionForComparison("not-a-version")
|
||||||
|
if got != "vnot-a-version" {
|
||||||
|
t.Errorf("expected vnot-a-version, got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithubInternal_FormatVersionForComparison_Ugly(t *testing.T) {
|
||||||
|
// Empty string returns empty (no v prefix added)
|
||||||
|
if got := formatVersionForComparison(""); got != "" {
|
||||||
|
t.Errorf("expected empty string, got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithubInternal_FormatVersionForDisplay_Good(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
version string
|
version string
|
||||||
force bool
|
force bool
|
||||||
|
|
@ -199,14 +235,23 @@ func TestFormatVersionForDisplay(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func boolStr(b bool) string {
|
func TestGithubInternal_FormatVersionForDisplay_Bad(t *testing.T) {
|
||||||
if b {
|
// force=true on already-prefixed version should not double-prefix
|
||||||
return "true"
|
got := formatVersionForDisplay("vv1.0.0", true)
|
||||||
|
if got != "vv1.0.0" {
|
||||||
|
t.Errorf("expected vv1.0.0 unchanged, got %q", got)
|
||||||
}
|
}
|
||||||
return "false"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestStartGitHubCheck_UnknownMode(t *testing.T) {
|
func TestGithubInternal_FormatVersionForDisplay_Ugly(t *testing.T) {
|
||||||
|
// Empty version with force=true — results in "v"
|
||||||
|
got := formatVersionForDisplay("", true)
|
||||||
|
if got != "v" {
|
||||||
|
t.Errorf("expected \"v\" for empty version with force=true, got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithubInternal_StartGitHubCheck_Ugly(t *testing.T) {
|
||||||
s := &UpdateService{
|
s := &UpdateService{
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
CheckOnStartup: StartupCheckMode(99),
|
CheckOnStartup: StartupCheckMode(99),
|
||||||
|
|
@ -215,13 +260,12 @@ func TestStartGitHubCheck_UnknownMode(t *testing.T) {
|
||||||
owner: "owner",
|
owner: "owner",
|
||||||
repo: "repo",
|
repo: "repo",
|
||||||
}
|
}
|
||||||
err := s.Start()
|
if err := s.Start(); err == nil {
|
||||||
if err == nil {
|
|
||||||
t.Error("expected error for unknown startup check mode")
|
t.Error("expected error for unknown startup check mode")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestStartHTTPCheck_UnknownMode(t *testing.T) {
|
func TestGithubInternal_StartHTTPCheck_Ugly(t *testing.T) {
|
||||||
s := &UpdateService{
|
s := &UpdateService{
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: "https://example.com/updates",
|
RepoURL: "https://example.com/updates",
|
||||||
|
|
@ -229,8 +273,14 @@ func TestStartHTTPCheck_UnknownMode(t *testing.T) {
|
||||||
},
|
},
|
||||||
isGitHub: false,
|
isGitHub: false,
|
||||||
}
|
}
|
||||||
err := s.Start()
|
if err := s.Start(); err == nil {
|
||||||
if err == nil {
|
|
||||||
t.Error("expected error for unknown startup check mode")
|
t.Error("expected error for unknown startup check mode")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func boolStr(b bool) string {
|
||||||
|
if b {
|
||||||
|
return "true"
|
||||||
|
}
|
||||||
|
return "false"
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ import (
|
||||||
"github.com/Snider/Borg/pkg/mocks"
|
"github.com/Snider/Borg/pkg/mocks"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGetPublicRepos(t *testing.T) {
|
func TestGithub_GetPublicRepos_Good(t *testing.T) {
|
||||||
mockClient := mocks.NewMockClient(map[string]*http.Response{
|
mockClient := mocks.NewMockClient(map[string]*http.Response{
|
||||||
"https://api.github.com/users/testuser/repos": {
|
"https://api.github.com/users/testuser/repos": {
|
||||||
StatusCode: http.StatusOK,
|
StatusCode: http.StatusOK,
|
||||||
|
|
@ -31,13 +31,11 @@ func TestGetPublicRepos(t *testing.T) {
|
||||||
})
|
})
|
||||||
|
|
||||||
client := &githubClient{}
|
client := &githubClient{}
|
||||||
oldClient := NewAuthenticatedClient
|
originalNewAuthenticatedClient := NewAuthenticatedClient
|
||||||
NewAuthenticatedClient = func(ctx context.Context) *http.Client {
|
NewAuthenticatedClient = func(ctx context.Context) *http.Client {
|
||||||
return mockClient
|
return mockClient
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() { NewAuthenticatedClient = originalNewAuthenticatedClient }()
|
||||||
NewAuthenticatedClient = oldClient
|
|
||||||
}()
|
|
||||||
|
|
||||||
// Test user repos
|
// Test user repos
|
||||||
repos, err := client.getPublicReposWithAPIURL(context.Background(), "https://api.github.com", "testuser")
|
repos, err := client.getPublicReposWithAPIURL(context.Background(), "https://api.github.com", "testuser")
|
||||||
|
|
@ -57,7 +55,8 @@ func TestGetPublicRepos(t *testing.T) {
|
||||||
t.Errorf("unexpected org repos: %v", repos)
|
t.Errorf("unexpected org repos: %v", repos)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
func TestGetPublicRepos_Error(t *testing.T) {
|
|
||||||
|
func TestGithub_GetPublicRepos_Bad(t *testing.T) {
|
||||||
u, _ := url.Parse("https://api.github.com/users/testuser/repos")
|
u, _ := url.Parse("https://api.github.com/users/testuser/repos")
|
||||||
mockClient := mocks.NewMockClient(map[string]*http.Response{
|
mockClient := mocks.NewMockClient(map[string]*http.Response{
|
||||||
"https://api.github.com/users/testuser/repos": {
|
"https://api.github.com/users/testuser/repos": {
|
||||||
|
|
@ -78,47 +77,89 @@ func TestGetPublicRepos_Error(t *testing.T) {
|
||||||
expectedErr := "github.getPublicReposWithAPIURL: failed to fetch repos: 404 Not Found"
|
expectedErr := "github.getPublicReposWithAPIURL: failed to fetch repos: 404 Not Found"
|
||||||
|
|
||||||
client := &githubClient{}
|
client := &githubClient{}
|
||||||
oldClient := NewAuthenticatedClient
|
originalNewAuthenticatedClient := NewAuthenticatedClient
|
||||||
NewAuthenticatedClient = func(ctx context.Context) *http.Client {
|
NewAuthenticatedClient = func(ctx context.Context) *http.Client {
|
||||||
return mockClient
|
return mockClient
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() { NewAuthenticatedClient = originalNewAuthenticatedClient }()
|
||||||
NewAuthenticatedClient = oldClient
|
|
||||||
}()
|
|
||||||
|
|
||||||
// Test user repos
|
|
||||||
_, err := client.getPublicReposWithAPIURL(context.Background(), "https://api.github.com", "testuser")
|
_, err := client.getPublicReposWithAPIURL(context.Background(), "https://api.github.com", "testuser")
|
||||||
if err.Error() != expectedErr {
|
if err == nil || err.Error() != expectedErr {
|
||||||
t.Fatalf("getPublicReposWithAPIURL for user failed: expected %q, got %q", expectedErr, err.Error())
|
t.Fatalf("expected %q, got %q", expectedErr, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFindNextURL(t *testing.T) {
|
func TestGithub_GetPublicRepos_Ugly(t *testing.T) {
|
||||||
|
// Context already cancelled — loop should terminate immediately
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
cancel()
|
||||||
|
|
||||||
|
mockClient := mocks.NewMockClient(map[string]*http.Response{})
|
||||||
|
client := &githubClient{}
|
||||||
|
originalNewAuthenticatedClient := NewAuthenticatedClient
|
||||||
|
NewAuthenticatedClient = func(ctx context.Context) *http.Client { return mockClient }
|
||||||
|
defer func() { NewAuthenticatedClient = originalNewAuthenticatedClient }()
|
||||||
|
|
||||||
|
_, err := client.getPublicReposWithAPIURL(ctx, "https://api.github.com", "testuser")
|
||||||
|
if err == nil {
|
||||||
|
t.Error("expected error from cancelled context, got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithub_FindNextURL_Good(t *testing.T) {
|
||||||
client := &githubClient{}
|
client := &githubClient{}
|
||||||
linkHeader := `<https://api.github.com/organizations/123/repos?page=2>; rel="next", <https://api.github.com/organizations/123/repos?page=1>; rel="prev"`
|
linkHeader := `<https://api.github.com/organizations/123/repos?page=2>; rel="next", <https://api.github.com/organizations/123/repos?page=1>; rel="prev"`
|
||||||
nextURL := client.findNextURL(linkHeader)
|
nextURL := client.findNextURL(linkHeader)
|
||||||
if nextURL != "https://api.github.com/organizations/123/repos?page=2" {
|
if nextURL != "https://api.github.com/organizations/123/repos?page=2" {
|
||||||
t.Errorf("unexpected next URL: %s", nextURL)
|
t.Errorf("unexpected next URL: %s", nextURL)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
linkHeader = `<https://api.github.com/organizations/123/repos?page=1>; rel="prev"`
|
func TestGithub_FindNextURL_Bad(t *testing.T) {
|
||||||
nextURL = client.findNextURL(linkHeader)
|
client := &githubClient{}
|
||||||
|
linkHeader := `<https://api.github.com/organizations/123/repos?page=1>; rel="prev"`
|
||||||
|
nextURL := client.findNextURL(linkHeader)
|
||||||
if nextURL != "" {
|
if nextURL != "" {
|
||||||
t.Errorf("unexpected next URL: %s", nextURL)
|
t.Errorf("expected empty string for no next link, got %q", nextURL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestNewAuthenticatedClient(t *testing.T) {
|
func TestGithub_FindNextURL_Ugly(t *testing.T) {
|
||||||
// Test with no token
|
client := &githubClient{}
|
||||||
client := NewAuthenticatedClient(context.Background())
|
// Empty header
|
||||||
if client != http.DefaultClient {
|
if got := client.findNextURL(""); got != "" {
|
||||||
t.Errorf("expected http.DefaultClient, but got something else")
|
t.Errorf("expected empty string for empty header, got %q", got)
|
||||||
}
|
}
|
||||||
|
// Malformed header — no rel attribute
|
||||||
|
if got := client.findNextURL(`<https://example.com/page=2>`); got != "" {
|
||||||
|
t.Errorf("expected empty string for malformed header, got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Test with token
|
func TestGithub_NewAuthenticatedClient_Good(t *testing.T) {
|
||||||
|
// With token set — should return an authenticated (non-default) client
|
||||||
t.Setenv("GITHUB_TOKEN", "test-token")
|
t.Setenv("GITHUB_TOKEN", "test-token")
|
||||||
client = NewAuthenticatedClient(context.Background())
|
client := NewAuthenticatedClient(context.Background())
|
||||||
if client == http.DefaultClient {
|
if client == http.DefaultClient {
|
||||||
t.Errorf("expected an authenticated client, but got http.DefaultClient")
|
t.Error("expected authenticated client, got http.DefaultClient")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithub_NewAuthenticatedClient_Bad(t *testing.T) {
|
||||||
|
// Without token — should return a plain (unauthenticated) HTTP client, not http.DefaultClient
|
||||||
|
t.Setenv("GITHUB_TOKEN", "")
|
||||||
|
client := NewAuthenticatedClient(context.Background())
|
||||||
|
if client == nil {
|
||||||
|
t.Error("expected non-nil client when no token set")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGithub_NewAuthenticatedClient_Ugly(t *testing.T) {
|
||||||
|
// Cancelled context still returns a client (client creation does not fail on cancelled context)
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
cancel()
|
||||||
|
client := NewAuthenticatedClient(ctx)
|
||||||
|
if client == nil {
|
||||||
|
t.Error("expected non-nil client even with cancelled context")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ package updater
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
@ -28,5 +27,5 @@ func updaterUserAgent() string {
|
||||||
if version == "" {
|
if version == "" {
|
||||||
version = "unknown"
|
version = "unknown"
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("agent-go-update/%s", version)
|
return "agent-go-update/" + version
|
||||||
}
|
}
|
||||||
|
|
|
||||||
81
service.go
81
service.go
|
|
@ -5,9 +5,7 @@
|
||||||
package updater
|
package updater
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
|
||||||
|
|
||||||
coreerr "forge.lthn.ai/core/go-log"
|
coreerr "forge.lthn.ai/core/go-log"
|
||||||
)
|
)
|
||||||
|
|
@ -55,10 +53,14 @@ type UpdateService struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewUpdateService creates and configures a new UpdateService.
|
// NewUpdateService creates and configures a new UpdateService.
|
||||||
// It parses the repository URL to determine if it's a GitHub repository
|
//
|
||||||
// and extracts the owner and repo name.
|
// svc, err := updater.NewUpdateService(updater.UpdateServiceConfig{
|
||||||
|
// RepoURL: "https://github.com/owner/repo",
|
||||||
|
// Channel: "stable",
|
||||||
|
// CheckOnStartup: updater.CheckAndUpdateOnStartup,
|
||||||
|
// })
|
||||||
func NewUpdateService(config UpdateServiceConfig) (*UpdateService, error) {
|
func NewUpdateService(config UpdateServiceConfig) (*UpdateService, error) {
|
||||||
isGitHub := strings.Contains(config.RepoURL, "github.com")
|
isGitHub := containsStr(config.RepoURL, "github.com")
|
||||||
var owner, repo string
|
var owner, repo string
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
|
@ -78,9 +80,10 @@ func NewUpdateService(config UpdateServiceConfig) (*UpdateService, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start initiates the update check based on the service configuration.
|
// Start initiates the update check based on the service configuration.
|
||||||
// It determines whether to perform a GitHub or HTTP-based update check
|
//
|
||||||
// based on the RepoURL. The behavior of the check is controlled by the
|
// if err := svc.Start(); err != nil {
|
||||||
// CheckOnStartup setting in the configuration.
|
// log.Printf("update check failed: %v", err)
|
||||||
|
// }
|
||||||
func (s *UpdateService) Start() error {
|
func (s *UpdateService) Start() error {
|
||||||
if s.isGitHub {
|
if s.isGitHub {
|
||||||
return s.startGitHubCheck()
|
return s.startGitHubCheck()
|
||||||
|
|
@ -97,7 +100,7 @@ func (s *UpdateService) startGitHubCheck() error {
|
||||||
case CheckAndUpdateOnStartup:
|
case CheckAndUpdateOnStartup:
|
||||||
return CheckForUpdates(s.owner, s.repo, s.config.Channel, s.config.ForceSemVerPrefix, s.config.ReleaseURLFormat)
|
return CheckForUpdates(s.owner, s.repo, s.config.Channel, s.config.ForceSemVerPrefix, s.config.ReleaseURLFormat)
|
||||||
default:
|
default:
|
||||||
return coreerr.E("startGitHubCheck", fmt.Sprintf("unknown startup check mode: %d", s.config.CheckOnStartup), nil)
|
return coreerr.E("startGitHubCheck", "unknown startup check mode", nil)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -110,20 +113,72 @@ func (s *UpdateService) startHTTPCheck() error {
|
||||||
case CheckAndUpdateOnStartup:
|
case CheckAndUpdateOnStartup:
|
||||||
return CheckForUpdatesHTTP(s.config.RepoURL)
|
return CheckForUpdatesHTTP(s.config.RepoURL)
|
||||||
default:
|
default:
|
||||||
return coreerr.E("startHTTPCheck", fmt.Sprintf("unknown startup check mode: %d", s.config.CheckOnStartup), nil)
|
return coreerr.E("startHTTPCheck", "unknown startup check mode", nil)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// containsStr reports whether substr appears within s.
|
||||||
|
func containsStr(s, substr string) bool {
|
||||||
|
if substr == "" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for i := 0; i <= len(s)-len(substr); i++ {
|
||||||
|
if s[i:i+len(substr)] == substr {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// trimChars removes all leading and trailing occurrences of any rune in cutset from s.
|
||||||
|
func trimChars(s, cutset string) string {
|
||||||
|
start, end := 0, len(s)
|
||||||
|
for start < end && containsStr(cutset, s[start:start+1]) {
|
||||||
|
start++
|
||||||
|
}
|
||||||
|
for end > start && containsStr(cutset, s[end-1:end]) {
|
||||||
|
end--
|
||||||
|
}
|
||||||
|
return s[start:end]
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitStr splits s by sep and returns a slice of substrings.
|
||||||
|
func splitStr(s, sep string) []string {
|
||||||
|
if sep == "" || s == "" {
|
||||||
|
return []string{s}
|
||||||
|
}
|
||||||
|
var parts []string
|
||||||
|
for {
|
||||||
|
idx := -1
|
||||||
|
for i := 0; i <= len(s)-len(sep); i++ {
|
||||||
|
if s[i:i+len(sep)] == sep {
|
||||||
|
idx = i
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if idx < 0 {
|
||||||
|
parts = append(parts, s)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
parts = append(parts, s[:idx])
|
||||||
|
s = s[idx+len(sep):]
|
||||||
|
}
|
||||||
|
return parts
|
||||||
|
}
|
||||||
|
|
||||||
// ParseRepoURL extracts the owner and repository name from a GitHub URL.
|
// ParseRepoURL extracts the owner and repository name from a GitHub URL.
|
||||||
// It handles standard GitHub URL formats.
|
//
|
||||||
|
// owner, repo, err := updater.ParseRepoURL("https://github.com/myorg/myrepo")
|
||||||
|
// // owner == "myorg", repo == "myrepo"
|
||||||
func ParseRepoURL(repoURL string) (owner string, repo string, err error) {
|
func ParseRepoURL(repoURL string) (owner string, repo string, err error) {
|
||||||
u, err := url.Parse(repoURL)
|
u, err := url.Parse(repoURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", "", err
|
return "", "", err
|
||||||
}
|
}
|
||||||
parts := strings.Split(strings.Trim(u.Path, "/"), "/")
|
path := trimChars(u.Path, "/")
|
||||||
|
parts := splitStr(path, "/")
|
||||||
if len(parts) < 2 {
|
if len(parts) < 2 {
|
||||||
return "", "", coreerr.E("ParseRepoURL", fmt.Sprintf("invalid repo URL path: %s", u.Path), nil)
|
return "", "", coreerr.E("ParseRepoURL", "invalid repo URL path: "+u.Path, nil)
|
||||||
}
|
}
|
||||||
return parts[0], parts[1], nil
|
return parts[0], parts[1], nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,13 @@ import (
|
||||||
|
|
||||||
func ExampleNewUpdateService() {
|
func ExampleNewUpdateService() {
|
||||||
// Mock the update check functions to prevent actual updates during tests
|
// Mock the update check functions to prevent actual updates during tests
|
||||||
|
originalCheckForUpdates := updater.CheckForUpdates
|
||||||
updater.CheckForUpdates = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
updater.CheckForUpdates = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
||||||
fmt.Println("CheckForUpdates called")
|
fmt.Println("CheckForUpdates called")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
defer func() {
|
defer func() {
|
||||||
updater.CheckForUpdates = nil // Restore original function
|
updater.CheckForUpdates = originalCheckForUpdates
|
||||||
}()
|
}()
|
||||||
|
|
||||||
config := updater.UpdateServiceConfig{
|
config := updater.UpdateServiceConfig{
|
||||||
|
|
|
||||||
111
service_test.go
111
service_test.go
|
|
@ -6,51 +6,62 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNewUpdateService(t *testing.T) {
|
func TestService_NewUpdateService_Good(t *testing.T) {
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
name string
|
name string
|
||||||
config UpdateServiceConfig
|
config UpdateServiceConfig
|
||||||
expectError bool
|
isGitHub bool
|
||||||
isGitHub bool
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "Valid GitHub URL",
|
name: "github URL detected as GitHub",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: "https://github.com/owner/repo",
|
RepoURL: "https://github.com/owner/repo",
|
||||||
},
|
},
|
||||||
isGitHub: true,
|
isGitHub: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Valid non-GitHub URL",
|
name: "non-GitHub URL not detected as GitHub",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: "https://example.com/updates",
|
RepoURL: "https://example.com/updates",
|
||||||
},
|
},
|
||||||
isGitHub: false,
|
isGitHub: false,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "Invalid GitHub URL",
|
|
||||||
config: UpdateServiceConfig{
|
|
||||||
RepoURL: "https://github.com/owner",
|
|
||||||
},
|
|
||||||
expectError: true,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range testCases {
|
for _, tc := range testCases {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
service, err := NewUpdateService(tc.config)
|
service, err := NewUpdateService(tc.config)
|
||||||
if (err != nil) != tc.expectError {
|
if err != nil {
|
||||||
t.Errorf("Expected error: %v, got: %v", tc.expectError, err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
if err == nil && service.isGitHub != tc.isGitHub {
|
if service.isGitHub != tc.isGitHub {
|
||||||
t.Errorf("Expected isGitHub: %v, got: %v", tc.isGitHub, service.isGitHub)
|
t.Errorf("expected isGitHub=%v, got %v", tc.isGitHub, service.isGitHub)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUpdateService_Start(t *testing.T) {
|
func TestService_NewUpdateService_Bad(t *testing.T) {
|
||||||
// Setup a mock server for HTTP tests
|
_, err := NewUpdateService(UpdateServiceConfig{
|
||||||
|
RepoURL: "https://github.com/owner", // missing repo segment
|
||||||
|
})
|
||||||
|
if err == nil {
|
||||||
|
t.Error("expected error for invalid GitHub URL, got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestService_NewUpdateService_Ugly(t *testing.T) {
|
||||||
|
// Empty RepoURL — treated as non-GitHub, no parse error
|
||||||
|
service, err := NewUpdateService(UpdateServiceConfig{RepoURL: ""})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error for empty URL: %v", err)
|
||||||
|
}
|
||||||
|
if service.isGitHub {
|
||||||
|
t.Error("expected isGitHub=false for empty URL")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestService_Start_Good(t *testing.T) {
|
||||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
_, _ = w.Write([]byte(`{"version": "v1.1.0", "url": "http://example.com/release.zip"}`))
|
_, _ = w.Write([]byte(`{"version": "v1.1.0", "url": "http://example.com/release.zip"}`))
|
||||||
}))
|
}))
|
||||||
|
|
@ -63,17 +74,16 @@ func TestUpdateService_Start(t *testing.T) {
|
||||||
checkAndDoGitHub int
|
checkAndDoGitHub int
|
||||||
checkOnlyHTTPCalls int
|
checkOnlyHTTPCalls int
|
||||||
checkAndDoHTTPCalls int
|
checkAndDoHTTPCalls int
|
||||||
expectError bool
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "GitHub: NoCheck",
|
name: "GitHub NoCheck skips all checks",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: "https://github.com/owner/repo",
|
RepoURL: "https://github.com/owner/repo",
|
||||||
CheckOnStartup: NoCheck,
|
CheckOnStartup: NoCheck,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "GitHub: CheckOnStartup",
|
name: "GitHub CheckOnStartup calls CheckOnly",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: "https://github.com/owner/repo",
|
RepoURL: "https://github.com/owner/repo",
|
||||||
CheckOnStartup: CheckOnStartup,
|
CheckOnStartup: CheckOnStartup,
|
||||||
|
|
@ -81,7 +91,7 @@ func TestUpdateService_Start(t *testing.T) {
|
||||||
checkOnlyGitHub: 1,
|
checkOnlyGitHub: 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "GitHub: CheckAndUpdateOnStartup",
|
name: "GitHub CheckAndUpdateOnStartup calls CheckForUpdates",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: "https://github.com/owner/repo",
|
RepoURL: "https://github.com/owner/repo",
|
||||||
CheckOnStartup: CheckAndUpdateOnStartup,
|
CheckOnStartup: CheckAndUpdateOnStartup,
|
||||||
|
|
@ -89,14 +99,14 @@ func TestUpdateService_Start(t *testing.T) {
|
||||||
checkAndDoGitHub: 1,
|
checkAndDoGitHub: 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "HTTP: NoCheck",
|
name: "HTTP NoCheck skips all checks",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: server.URL,
|
RepoURL: server.URL,
|
||||||
CheckOnStartup: NoCheck,
|
CheckOnStartup: NoCheck,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "HTTP: CheckOnStartup",
|
name: "HTTP CheckOnStartup calls CheckOnlyHTTP",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: server.URL,
|
RepoURL: server.URL,
|
||||||
CheckOnStartup: CheckOnStartup,
|
CheckOnStartup: CheckOnStartup,
|
||||||
|
|
@ -104,7 +114,7 @@ func TestUpdateService_Start(t *testing.T) {
|
||||||
checkOnlyHTTPCalls: 1,
|
checkOnlyHTTPCalls: 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "HTTP: CheckAndUpdateOnStartup",
|
name: "HTTP CheckAndUpdateOnStartup calls CheckForUpdatesHTTP",
|
||||||
config: UpdateServiceConfig{
|
config: UpdateServiceConfig{
|
||||||
RepoURL: server.URL,
|
RepoURL: server.URL,
|
||||||
CheckOnStartup: CheckAndUpdateOnStartup,
|
CheckOnStartup: CheckAndUpdateOnStartup,
|
||||||
|
|
@ -117,7 +127,6 @@ func TestUpdateService_Start(t *testing.T) {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
var checkOnlyGitHub, checkAndDoGitHub, checkOnlyHTTP, checkAndDoHTTP int
|
var checkOnlyGitHub, checkAndDoGitHub, checkOnlyHTTP, checkAndDoHTTP int
|
||||||
|
|
||||||
// Mock GitHub functions
|
|
||||||
originalCheckOnly := CheckOnly
|
originalCheckOnly := CheckOnly
|
||||||
CheckOnly = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
CheckOnly = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
||||||
checkOnlyGitHub++
|
checkOnlyGitHub++
|
||||||
|
|
@ -132,7 +141,6 @@ func TestUpdateService_Start(t *testing.T) {
|
||||||
}
|
}
|
||||||
defer func() { CheckForUpdates = originalCheckForUpdates }()
|
defer func() { CheckForUpdates = originalCheckForUpdates }()
|
||||||
|
|
||||||
// Mock HTTP functions
|
|
||||||
originalCheckOnlyHTTP := CheckOnlyHTTP
|
originalCheckOnlyHTTP := CheckOnlyHTTP
|
||||||
CheckOnlyHTTP = func(baseURL string) error {
|
CheckOnlyHTTP = func(baseURL string) error {
|
||||||
checkOnlyHTTP++
|
checkOnlyHTTP++
|
||||||
|
|
@ -148,23 +156,52 @@ func TestUpdateService_Start(t *testing.T) {
|
||||||
defer func() { CheckForUpdatesHTTP = originalCheckForUpdatesHTTP }()
|
defer func() { CheckForUpdatesHTTP = originalCheckForUpdatesHTTP }()
|
||||||
|
|
||||||
service, _ := NewUpdateService(tc.config)
|
service, _ := NewUpdateService(tc.config)
|
||||||
err := service.Start()
|
if err := service.Start(); err != nil {
|
||||||
|
t.Errorf("unexpected error: %v", err)
|
||||||
if (err != nil) != tc.expectError {
|
|
||||||
t.Errorf("Expected error: %v, got: %v", tc.expectError, err)
|
|
||||||
}
|
}
|
||||||
if checkOnlyGitHub != tc.checkOnlyGitHub {
|
if checkOnlyGitHub != tc.checkOnlyGitHub {
|
||||||
t.Errorf("Expected GitHub CheckOnly calls: %d, got: %d", tc.checkOnlyGitHub, checkOnlyGitHub)
|
t.Errorf("GitHub CheckOnly calls: want %d, got %d", tc.checkOnlyGitHub, checkOnlyGitHub)
|
||||||
}
|
}
|
||||||
if checkAndDoGitHub != tc.checkAndDoGitHub {
|
if checkAndDoGitHub != tc.checkAndDoGitHub {
|
||||||
t.Errorf("Expected GitHub CheckForUpdates calls: %d, got: %d", tc.checkAndDoGitHub, checkAndDoGitHub)
|
t.Errorf("GitHub CheckForUpdates calls: want %d, got %d", tc.checkAndDoGitHub, checkAndDoGitHub)
|
||||||
}
|
}
|
||||||
if checkOnlyHTTP != tc.checkOnlyHTTPCalls {
|
if checkOnlyHTTP != tc.checkOnlyHTTPCalls {
|
||||||
t.Errorf("Expected HTTP CheckOnly calls: %d, got: %d", tc.checkOnlyHTTPCalls, checkOnlyHTTP)
|
t.Errorf("HTTP CheckOnly calls: want %d, got %d", tc.checkOnlyHTTPCalls, checkOnlyHTTP)
|
||||||
}
|
}
|
||||||
if checkAndDoHTTP != tc.checkAndDoHTTPCalls {
|
if checkAndDoHTTP != tc.checkAndDoHTTPCalls {
|
||||||
t.Errorf("Expected HTTP CheckForUpdates calls: %d, got: %d", tc.checkAndDoHTTPCalls, checkAndDoHTTP)
|
t.Errorf("HTTP CheckForUpdates calls: want %d, got %d", tc.checkAndDoHTTPCalls, checkAndDoHTTP)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestService_Start_Bad(t *testing.T) {
|
||||||
|
// GitHub unknown mode returns an error
|
||||||
|
service := &UpdateService{
|
||||||
|
config: UpdateServiceConfig{CheckOnStartup: StartupCheckMode(99)},
|
||||||
|
isGitHub: true,
|
||||||
|
owner: "owner",
|
||||||
|
repo: "repo",
|
||||||
|
}
|
||||||
|
if err := service.Start(); err == nil {
|
||||||
|
t.Error("expected error for unknown GitHub startup check mode")
|
||||||
|
}
|
||||||
|
|
||||||
|
// HTTP unknown mode returns an error
|
||||||
|
service = &UpdateService{
|
||||||
|
config: UpdateServiceConfig{RepoURL: "https://example.com", CheckOnStartup: StartupCheckMode(99)},
|
||||||
|
isGitHub: false,
|
||||||
|
}
|
||||||
|
if err := service.Start(); err == nil {
|
||||||
|
t.Error("expected error for unknown HTTP startup check mode")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestService_Start_Ugly(t *testing.T) {
|
||||||
|
// Start on a zero-value service (no config, no RepoURL) should not panic
|
||||||
|
service := &UpdateService{}
|
||||||
|
// NoCheck mode — returns nil without any action
|
||||||
|
if err := service.Start(); err != nil {
|
||||||
|
t.Errorf("unexpected error from zero-value service with NoCheck: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
80
updater.go
80
updater.go
|
|
@ -2,11 +2,10 @@ package updater
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
|
||||||
|
|
||||||
|
"forge.lthn.ai/core/cli/pkg/cli"
|
||||||
coreerr "forge.lthn.ai/core/go-log"
|
coreerr "forge.lthn.ai/core/go-log"
|
||||||
"github.com/minio/selfupdate"
|
"github.com/minio/selfupdate"
|
||||||
"golang.org/x/mod/semver"
|
"golang.org/x/mod/semver"
|
||||||
|
|
@ -28,8 +27,9 @@ var NewGithubClient = func() GithubClient {
|
||||||
return &githubClient{}
|
return &githubClient{}
|
||||||
}
|
}
|
||||||
|
|
||||||
// DoUpdate is a variable that holds the function to perform the actual update.
|
// DoUpdate performs the actual binary self-update from the given URL.
|
||||||
// This can be replaced in tests to prevent actual updates.
|
//
|
||||||
|
// updater.DoUpdate = func(url string) error { return nil } // stub in tests
|
||||||
var DoUpdate = func(url string) error {
|
var DoUpdate = func(url string) error {
|
||||||
client := NewHTTPClient()
|
client := NewHTTPClient()
|
||||||
req, err := newAgentRequest(context.Background(), "GET", url)
|
req, err := newAgentRequest(context.Background(), "GET", url)
|
||||||
|
|
@ -46,7 +46,7 @@ var DoUpdate = func(url string) error {
|
||||||
}(resp.Body)
|
}(resp.Body)
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return coreerr.E("DoUpdate", fmt.Sprintf("failed to download update: %s", resp.Status), nil)
|
return coreerr.E("DoUpdate", "failed to download update: "+resp.Status, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = selfupdate.Apply(resp.Body, selfupdate.Options{})
|
err = selfupdate.Apply(resp.Body, selfupdate.Options{})
|
||||||
|
|
@ -59,9 +59,10 @@ var DoUpdate = func(url string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckForNewerVersion checks if a newer version of the application is available on GitHub.
|
// CheckForNewerVersion checks GitHub for a newer release and returns whether one is available.
|
||||||
// It fetches the latest release for the given owner, repository, and channel, and compares its tag
|
//
|
||||||
// with the current application version.
|
// release, available, err := updater.CheckForNewerVersion("myorg", "myrepo", "stable", true)
|
||||||
|
// if available { fmt.Println("update:", release.TagName) }
|
||||||
var CheckForNewerVersion = func(owner, repo, channel string, forceSemVerPrefix bool) (*Release, bool, error) {
|
var CheckForNewerVersion = func(owner, repo, channel string, forceSemVerPrefix bool) (*Release, bool, error) {
|
||||||
client := NewGithubClient()
|
client := NewGithubClient()
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
@ -86,8 +87,9 @@ var CheckForNewerVersion = func(owner, repo, channel string, forceSemVerPrefix b
|
||||||
return release, true, nil // A newer version is available
|
return release, true, nil // A newer version is available
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckForUpdates checks for new updates on GitHub and applies them if a newer version is found.
|
// CheckForUpdates checks for and applies a GitHub update if a newer version is available.
|
||||||
// It uses the provided owner, repository, and channel to find the latest release.
|
//
|
||||||
|
// err := updater.CheckForUpdates("myorg", "myrepo", "stable", true, "")
|
||||||
var CheckForUpdates = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
var CheckForUpdates = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
||||||
release, updateAvailable, err := CheckForNewerVersion(owner, repo, channel, forceSemVerPrefix)
|
release, updateAvailable, err := CheckForNewerVersion(owner, repo, channel, forceSemVerPrefix)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -96,16 +98,16 @@ var CheckForUpdates = func(owner, repo, channel string, forceSemVerPrefix bool,
|
||||||
|
|
||||||
if !updateAvailable {
|
if !updateAvailable {
|
||||||
if release != nil {
|
if release != nil {
|
||||||
fmt.Printf("Current version %s is up-to-date with latest release %s.\n",
|
cli.Print("Current version %s is up-to-date with latest release %s.\n",
|
||||||
formatVersionForDisplay(Version, forceSemVerPrefix),
|
formatVersionForDisplay(Version, forceSemVerPrefix),
|
||||||
formatVersionForDisplay(release.TagName, forceSemVerPrefix))
|
formatVersionForDisplay(release.TagName, forceSemVerPrefix))
|
||||||
} else {
|
} else {
|
||||||
fmt.Println("No releases found.")
|
cli.Print("No releases found.\n")
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("Newer version %s found (current: %s). Applying update...\n",
|
cli.Print("Newer version %s found (current: %s). Applying update...\n",
|
||||||
formatVersionForDisplay(release.TagName, forceSemVerPrefix),
|
formatVersionForDisplay(release.TagName, forceSemVerPrefix),
|
||||||
formatVersionForDisplay(Version, forceSemVerPrefix))
|
formatVersionForDisplay(Version, forceSemVerPrefix))
|
||||||
|
|
||||||
|
|
@ -117,8 +119,9 @@ var CheckForUpdates = func(owner, repo, channel string, forceSemVerPrefix bool,
|
||||||
return DoUpdate(downloadURL)
|
return DoUpdate(downloadURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckOnly checks for new updates on GitHub without applying them.
|
// CheckOnly checks for a newer GitHub release and prints the result without applying any update.
|
||||||
// It prints a message indicating if a new release is available.
|
//
|
||||||
|
// err := updater.CheckOnly("myorg", "myrepo", "stable", true, "")
|
||||||
var CheckOnly = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
var CheckOnly = func(owner, repo, channel string, forceSemVerPrefix bool, releaseURLFormat string) error {
|
||||||
release, updateAvailable, err := CheckForNewerVersion(owner, repo, channel, forceSemVerPrefix)
|
release, updateAvailable, err := CheckForNewerVersion(owner, repo, channel, forceSemVerPrefix)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -127,37 +130,40 @@ var CheckOnly = func(owner, repo, channel string, forceSemVerPrefix bool, releas
|
||||||
|
|
||||||
if !updateAvailable {
|
if !updateAvailable {
|
||||||
if release != nil {
|
if release != nil {
|
||||||
fmt.Printf("Current version %s is up-to-date with latest release %s.\n",
|
cli.Print("Current version %s is up-to-date with latest release %s.\n",
|
||||||
formatVersionForDisplay(Version, forceSemVerPrefix),
|
formatVersionForDisplay(Version, forceSemVerPrefix),
|
||||||
formatVersionForDisplay(release.TagName, forceSemVerPrefix))
|
formatVersionForDisplay(release.TagName, forceSemVerPrefix))
|
||||||
} else {
|
} else {
|
||||||
fmt.Println("No new release found.")
|
cli.Print("No new release found.\n")
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("New release found: %s (current version: %s)\n",
|
cli.Print("New release found: %s (current version: %s)\n",
|
||||||
formatVersionForDisplay(release.TagName, forceSemVerPrefix),
|
formatVersionForDisplay(release.TagName, forceSemVerPrefix),
|
||||||
formatVersionForDisplay(Version, forceSemVerPrefix))
|
formatVersionForDisplay(Version, forceSemVerPrefix))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckForUpdatesByTag checks for and applies updates from GitHub based on the channel
|
// CheckForUpdatesByTag updates from GitHub using the channel inferred from the current version tag.
|
||||||
// determined by the current application's version tag (e.g., 'stable' or 'prerelease').
|
//
|
||||||
|
// err := updater.CheckForUpdatesByTag("myorg", "myrepo")
|
||||||
var CheckForUpdatesByTag = func(owner, repo string) error {
|
var CheckForUpdatesByTag = func(owner, repo string) error {
|
||||||
channel := determineChannel(Version, false) // isPreRelease is false for current version
|
channel := determineChannel(Version, false) // isPreRelease is false for current version
|
||||||
return CheckForUpdates(owner, repo, channel, true, "")
|
return CheckForUpdates(owner, repo, channel, true, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckOnlyByTag checks for updates from GitHub based on the channel determined by the
|
// CheckOnlyByTag checks for a newer release using the channel inferred from the current version tag.
|
||||||
// current version tag, without applying them.
|
//
|
||||||
|
// err := updater.CheckOnlyByTag("myorg", "myrepo")
|
||||||
var CheckOnlyByTag = func(owner, repo string) error {
|
var CheckOnlyByTag = func(owner, repo string) error {
|
||||||
channel := determineChannel(Version, false) // isPreRelease is false for current version
|
channel := determineChannel(Version, false) // isPreRelease is false for current version
|
||||||
return CheckOnly(owner, repo, channel, true, "")
|
return CheckOnly(owner, repo, channel, true, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckForUpdatesByPullRequest finds a release associated with a specific pull request number
|
// CheckForUpdatesByPullRequest finds and applies the GitHub release associated with a specific PR.
|
||||||
// on GitHub and applies the update.
|
//
|
||||||
|
// err := updater.CheckForUpdatesByPullRequest("myorg", "myrepo", 42, "")
|
||||||
var CheckForUpdatesByPullRequest = func(owner, repo string, prNumber int, releaseURLFormat string) error {
|
var CheckForUpdatesByPullRequest = func(owner, repo string, prNumber int, releaseURLFormat string) error {
|
||||||
client := NewGithubClient()
|
client := NewGithubClient()
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
@ -168,11 +174,11 @@ var CheckForUpdatesByPullRequest = func(owner, repo string, prNumber int, releas
|
||||||
}
|
}
|
||||||
|
|
||||||
if release == nil {
|
if release == nil {
|
||||||
fmt.Printf("No release found for PR #%d.\n", prNumber)
|
cli.Print("No release found for PR #%d.\n", prNumber)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("Release %s found for PR #%d. Applying update...\n", release.TagName, prNumber)
|
cli.Print("Release %s found for PR #%d. Applying update...\n", release.TagName, prNumber)
|
||||||
|
|
||||||
downloadURL, err := GetDownloadURL(release, releaseURLFormat)
|
downloadURL, err := GetDownloadURL(release, releaseURLFormat)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -182,8 +188,9 @@ var CheckForUpdatesByPullRequest = func(owner, repo string, prNumber int, releas
|
||||||
return DoUpdate(downloadURL)
|
return DoUpdate(downloadURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckForUpdatesHTTP checks for and applies updates from a generic HTTP endpoint.
|
// CheckForUpdatesHTTP checks for and applies updates from a generic HTTP endpoint serving latest.json.
|
||||||
// The endpoint is expected to provide update information in a structured format.
|
//
|
||||||
|
// err := updater.CheckForUpdatesHTTP("https://my-server.com/updates")
|
||||||
var CheckForUpdatesHTTP = func(baseURL string) error {
|
var CheckForUpdatesHTTP = func(baseURL string) error {
|
||||||
info, err := GetLatestUpdateFromURL(baseURL)
|
info, err := GetLatestUpdateFromURL(baseURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -194,16 +201,17 @@ var CheckForUpdatesHTTP = func(baseURL string) error {
|
||||||
vLatest := formatVersionForComparison(info.Version)
|
vLatest := formatVersionForComparison(info.Version)
|
||||||
|
|
||||||
if semver.Compare(vCurrent, vLatest) >= 0 {
|
if semver.Compare(vCurrent, vLatest) >= 0 {
|
||||||
fmt.Printf("Current version %s is up-to-date with latest release %s.\n", Version, info.Version)
|
cli.Print("Current version %s is up-to-date with latest release %s.\n", Version, info.Version)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("Newer version %s found (current: %s). Applying update...\n", info.Version, Version)
|
cli.Print("Newer version %s found (current: %s). Applying update...\n", info.Version, Version)
|
||||||
return DoUpdate(info.URL)
|
return DoUpdate(info.URL)
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckOnlyHTTP checks for updates from a generic HTTP endpoint without applying them.
|
// CheckOnlyHTTP checks for updates from a generic HTTP endpoint without applying them.
|
||||||
// It prints a message if a new version is available.
|
//
|
||||||
|
// err := updater.CheckOnlyHTTP("https://my-server.com/updates")
|
||||||
var CheckOnlyHTTP = func(baseURL string) error {
|
var CheckOnlyHTTP = func(baseURL string) error {
|
||||||
info, err := GetLatestUpdateFromURL(baseURL)
|
info, err := GetLatestUpdateFromURL(baseURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -214,17 +222,17 @@ var CheckOnlyHTTP = func(baseURL string) error {
|
||||||
vLatest := formatVersionForComparison(info.Version)
|
vLatest := formatVersionForComparison(info.Version)
|
||||||
|
|
||||||
if semver.Compare(vCurrent, vLatest) >= 0 {
|
if semver.Compare(vCurrent, vLatest) >= 0 {
|
||||||
fmt.Printf("Current version %s is up-to-date with latest release %s.\n", Version, info.Version)
|
cli.Print("Current version %s is up-to-date with latest release %s.\n", Version, info.Version)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("New release found: %s (current version: %s)\n", info.Version, Version)
|
cli.Print("New release found: %s (current version: %s)\n", info.Version, Version)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// formatVersionForComparison ensures the version string has a 'v' prefix for semver comparison.
|
// formatVersionForComparison ensures the version string has a 'v' prefix for semver comparison.
|
||||||
func formatVersionForComparison(version string) string {
|
func formatVersionForComparison(version string) string {
|
||||||
if version != "" && !strings.HasPrefix(version, "v") {
|
if version != "" && version[0] != 'v' {
|
||||||
return "v" + version
|
return "v" + version
|
||||||
}
|
}
|
||||||
return version
|
return version
|
||||||
|
|
@ -232,12 +240,12 @@ func formatVersionForComparison(version string) string {
|
||||||
|
|
||||||
// formatVersionForDisplay ensures the version string has the correct 'v' prefix based on the forceSemVerPrefix flag.
|
// formatVersionForDisplay ensures the version string has the correct 'v' prefix based on the forceSemVerPrefix flag.
|
||||||
func formatVersionForDisplay(version string, forceSemVerPrefix bool) string {
|
func formatVersionForDisplay(version string, forceSemVerPrefix bool) string {
|
||||||
hasV := strings.HasPrefix(version, "v")
|
hasV := len(version) > 0 && version[0] == 'v'
|
||||||
if forceSemVerPrefix && !hasV {
|
if forceSemVerPrefix && !hasV {
|
||||||
return "v" + version
|
return "v" + version
|
||||||
}
|
}
|
||||||
if !forceSemVerPrefix && hasV {
|
if !forceSemVerPrefix && hasV {
|
||||||
return strings.TrimPrefix(version, "v")
|
return version[1:]
|
||||||
}
|
}
|
||||||
return version
|
return version
|
||||||
}
|
}
|
||||||
|
|
|
||||||
174
updater_test.go
174
updater_test.go
|
|
@ -7,6 +7,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"testing"
|
||||||
|
|
||||||
coreerr "forge.lthn.ai/core/go-log"
|
coreerr "forge.lthn.ai/core/go-log"
|
||||||
)
|
)
|
||||||
|
|
@ -39,6 +40,169 @@ func (m *mockGithubClient) GetPublicRepos(ctx context.Context, userOrOrg string)
|
||||||
return nil, coreerr.E("mockGithubClient.GetPublicRepos", "not implemented", nil)
|
return nil, coreerr.E("mockGithubClient.GetPublicRepos", "not implemented", nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestUpdater_CheckForNewerVersion_Good verifies that a newer version is detected correctly.
|
||||||
|
func TestUpdater_CheckForNewerVersion_Good(t *testing.T) {
|
||||||
|
originalNewGithubClient := NewGithubClient
|
||||||
|
defer func() { NewGithubClient = originalNewGithubClient }()
|
||||||
|
|
||||||
|
NewGithubClient = func() GithubClient {
|
||||||
|
return &mockGithubClient{
|
||||||
|
getLatestRelease: func(ctx context.Context, owner, repo, channel string) (*Release, error) {
|
||||||
|
return &Release{TagName: "v1.1.0"}, nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Version = "1.0.0"
|
||||||
|
release, available, err := CheckForNewerVersion("owner", "repo", "stable", true)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if !available {
|
||||||
|
t.Error("expected update to be available")
|
||||||
|
}
|
||||||
|
if release == nil || release.TagName != "v1.1.0" {
|
||||||
|
t.Errorf("expected release v1.1.0, got %v", release)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUpdater_CheckForNewerVersion_Bad verifies that a GitHub client error is propagated.
|
||||||
|
func TestUpdater_CheckForNewerVersion_Bad(t *testing.T) {
|
||||||
|
originalNewGithubClient := NewGithubClient
|
||||||
|
defer func() { NewGithubClient = originalNewGithubClient }()
|
||||||
|
|
||||||
|
NewGithubClient = func() GithubClient {
|
||||||
|
return &mockGithubClient{
|
||||||
|
getLatestRelease: func(ctx context.Context, owner, repo, channel string) (*Release, error) {
|
||||||
|
return nil, coreerr.E("test", "simulated network error", nil)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_, _, err := CheckForNewerVersion("owner", "repo", "stable", true)
|
||||||
|
if err == nil {
|
||||||
|
t.Error("expected error from failing client, got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUpdater_CheckForNewerVersion_Ugly verifies no-release and already-up-to-date paths.
|
||||||
|
func TestUpdater_CheckForNewerVersion_Ugly(t *testing.T) {
|
||||||
|
originalNewGithubClient := NewGithubClient
|
||||||
|
defer func() { NewGithubClient = originalNewGithubClient }()
|
||||||
|
|
||||||
|
// No release found
|
||||||
|
NewGithubClient = func() GithubClient {
|
||||||
|
return &mockGithubClient{
|
||||||
|
getLatestRelease: func(ctx context.Context, owner, repo, channel string) (*Release, error) {
|
||||||
|
return nil, nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
release, available, err := CheckForNewerVersion("owner", "repo", "stable", true)
|
||||||
|
if err != nil || release != nil || available {
|
||||||
|
t.Errorf("expected nil/nil/false for no release; got release=%v available=%v err=%v", release, available, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Already on latest version
|
||||||
|
NewGithubClient = func() GithubClient {
|
||||||
|
return &mockGithubClient{
|
||||||
|
getLatestRelease: func(ctx context.Context, owner, repo, channel string) (*Release, error) {
|
||||||
|
return &Release{TagName: "v1.0.0"}, nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Version = "1.0.0"
|
||||||
|
_, available, err = CheckForNewerVersion("owner", "repo", "stable", true)
|
||||||
|
if err != nil || available {
|
||||||
|
t.Errorf("expected available=false when already on latest; err=%v available=%v", err, available)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUpdater_DoUpdate_Good verifies successful binary replacement.
|
||||||
|
func TestUpdater_DoUpdate_Good(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Return minimal valid binary content (selfupdate will fail but we test the HTTP path)
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
_, _ = w.Write([]byte("binary-content"))
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
originalDoUpdate := DoUpdate
|
||||||
|
defer func() { DoUpdate = originalDoUpdate }()
|
||||||
|
|
||||||
|
called := false
|
||||||
|
DoUpdate = func(url string) error {
|
||||||
|
called = true
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := DoUpdate(server.URL); err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if !called {
|
||||||
|
t.Error("expected DoUpdate to be called")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUpdater_DoUpdate_Bad verifies that HTTP errors are propagated.
|
||||||
|
func TestUpdater_DoUpdate_Bad(t *testing.T) {
|
||||||
|
// Restore original DoUpdate for this test
|
||||||
|
originalDoUpdate := DoUpdate
|
||||||
|
defer func() { DoUpdate = originalDoUpdate }()
|
||||||
|
|
||||||
|
// Reset to real implementation
|
||||||
|
DoUpdate = func(downloadURL string) error {
|
||||||
|
client := NewHTTPClient()
|
||||||
|
req, err := newAgentRequest(context.Background(), "GET", downloadURL)
|
||||||
|
if err != nil {
|
||||||
|
return coreerr.E("DoUpdate", "failed to create update request", err)
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return coreerr.E("DoUpdate", "failed to download update", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return coreerr.E("DoUpdate", "failed to download update: "+resp.Status, nil)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.Error(w, "not found", http.StatusNotFound)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
if err := DoUpdate(server.URL); err == nil {
|
||||||
|
t.Error("expected error for 404 response, got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUpdater_DoUpdate_Ugly verifies that an invalid URL returns an error.
|
||||||
|
func TestUpdater_DoUpdate_Ugly(t *testing.T) {
|
||||||
|
originalDoUpdate := DoUpdate
|
||||||
|
defer func() { DoUpdate = originalDoUpdate }()
|
||||||
|
|
||||||
|
// Reset to real implementation
|
||||||
|
DoUpdate = func(downloadURL string) error {
|
||||||
|
client := NewHTTPClient()
|
||||||
|
req, err := newAgentRequest(context.Background(), "GET", downloadURL)
|
||||||
|
if err != nil {
|
||||||
|
return coreerr.E("DoUpdate", "failed to create update request", err)
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return coreerr.E("DoUpdate", "failed to download update", err)
|
||||||
|
}
|
||||||
|
defer func() { _ = resp.Body.Close() }()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := DoUpdate("http://127.0.0.1:0/invalid"); err == nil {
|
||||||
|
t.Error("expected error for unreachable URL, got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func ExampleCheckForNewerVersion() {
|
func ExampleCheckForNewerVersion() {
|
||||||
originalNewGithubClient := NewGithubClient
|
originalNewGithubClient := NewGithubClient
|
||||||
defer func() { NewGithubClient = originalNewGithubClient }()
|
defer func() { NewGithubClient = originalNewGithubClient }()
|
||||||
|
|
@ -66,7 +230,6 @@ func ExampleCheckForNewerVersion() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleCheckForUpdates() {
|
func ExampleCheckForUpdates() {
|
||||||
// Mock the functions to prevent actual updates and network calls
|
|
||||||
originalDoUpdate := DoUpdate
|
originalDoUpdate := DoUpdate
|
||||||
originalNewGithubClient := NewGithubClient
|
originalNewGithubClient := NewGithubClient
|
||||||
defer func() {
|
defer func() {
|
||||||
|
|
@ -121,7 +284,6 @@ func ExampleCheckOnly() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleCheckForUpdatesByTag() {
|
func ExampleCheckForUpdatesByTag() {
|
||||||
// Mock the functions to prevent actual updates and network calls
|
|
||||||
originalDoUpdate := DoUpdate
|
originalDoUpdate := DoUpdate
|
||||||
originalNewGithubClient := NewGithubClient
|
originalNewGithubClient := NewGithubClient
|
||||||
defer func() {
|
defer func() {
|
||||||
|
|
@ -148,7 +310,7 @@ func ExampleCheckForUpdatesByTag() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
Version = "1.0.0" // A version that resolves to the "stable" channel
|
Version = "1.0.0"
|
||||||
err := CheckForUpdatesByTag("owner", "repo")
|
err := CheckForUpdatesByTag("owner", "repo")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("CheckForUpdatesByTag failed: %v", err)
|
log.Fatalf("CheckForUpdatesByTag failed: %v", err)
|
||||||
|
|
@ -173,7 +335,7 @@ func ExampleCheckOnlyByTag() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Version = "1.0.0" // A version that resolves to the "stable" channel
|
Version = "1.0.0"
|
||||||
err := CheckOnlyByTag("owner", "repo")
|
err := CheckOnlyByTag("owner", "repo")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("CheckOnlyByTag failed: %v", err)
|
log.Fatalf("CheckOnlyByTag failed: %v", err)
|
||||||
|
|
@ -182,7 +344,6 @@ func ExampleCheckOnlyByTag() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleCheckForUpdatesByPullRequest() {
|
func ExampleCheckForUpdatesByPullRequest() {
|
||||||
// Mock the functions to prevent actual updates and network calls
|
|
||||||
originalDoUpdate := DoUpdate
|
originalDoUpdate := DoUpdate
|
||||||
originalNewGithubClient := NewGithubClient
|
originalNewGithubClient := NewGithubClient
|
||||||
defer func() {
|
defer func() {
|
||||||
|
|
@ -219,7 +380,6 @@ func ExampleCheckForUpdatesByPullRequest() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleCheckForUpdatesHTTP() {
|
func ExampleCheckForUpdatesHTTP() {
|
||||||
// Create a mock HTTP server
|
|
||||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.URL.Path == "/latest.json" {
|
if r.URL.Path == "/latest.json" {
|
||||||
_, _ = fmt.Fprintln(w, `{"version": "1.1.0", "url": "http://example.com/update"}`)
|
_, _ = fmt.Fprintln(w, `{"version": "1.1.0", "url": "http://example.com/update"}`)
|
||||||
|
|
@ -227,7 +387,6 @@ func ExampleCheckForUpdatesHTTP() {
|
||||||
}))
|
}))
|
||||||
defer server.Close()
|
defer server.Close()
|
||||||
|
|
||||||
// Mock the doUpdateFunc to prevent actual updates
|
|
||||||
originalDoUpdate := DoUpdate
|
originalDoUpdate := DoUpdate
|
||||||
defer func() { DoUpdate = originalDoUpdate }()
|
defer func() { DoUpdate = originalDoUpdate }()
|
||||||
DoUpdate = func(url string) error {
|
DoUpdate = func(url string) error {
|
||||||
|
|
@ -246,7 +405,6 @@ func ExampleCheckForUpdatesHTTP() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func ExampleCheckOnlyHTTP() {
|
func ExampleCheckOnlyHTTP() {
|
||||||
// Create a mock HTTP server
|
|
||||||
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.URL.Path == "/latest.json" {
|
if r.URL.Path == "/latest.json" {
|
||||||
_, _ = fmt.Fprintln(w, `{"version": "1.1.0", "url": "http://example.com/update"}`)
|
_, _ = fmt.Fprintln(w, `{"version": "1.1.0", "url": "http://example.com/update"}`)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue