Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions cmd/oneauth/commands/cmd_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,21 @@ var updateCmd = &cli.Command{
return fmt.Errorf("update version mismatch: %s != %s", versionManifest.Version, manifest.Version)
}

fmt.Printf(
"New version available: (current: %s; channel: %s) %s\n",
buildinfo.Version, updates.GetChannelName(buildinfo.Version), manifest.Version,
)
newVersion, err := updates.CheckNewVersion(buildinfo.Version, manifest.Version)
if err != nil {
return fmt.Errorf("failed to check new version: %w", err)
}

if newVersion {
fmt.Printf(
"New version available: (current: %s; channel: %s) %s\n",
buildinfo.Version,
updates.GetChannelName(buildinfo.Version),
manifest.Version,
)
} else {
fmt.Println("No update available")
}

return nil
},
Expand Down
22 changes: 22 additions & 0 deletions internal/updates/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,25 @@ func checkVersion(version string) (*semver.Constraints, error) {

return semver.NewConstraint(fmt.Sprintf(">=%s", version))
}

func CheckNewVersion(currentVersion, newVersion string) (bool, error) {
if _, err := checkVersion(currentVersion); err != nil {
return false, fmt.Errorf("failed to check current version: %w", err)
}

if _, err := checkVersion(newVersion); err != nil {
return false, fmt.Errorf("failed to check new version: %w", err)
}

c, err := semver.NewConstraint(fmt.Sprintf(">%s", currentVersion))
if err != nil {
return false, fmt.Errorf("failed to create constraint: %w", err)
}

v, err := semver.NewVersion(newVersion)
if err != nil {
return false, fmt.Errorf("failed to create version: %w", err)
}

return c.Check(v), nil
}
80 changes: 79 additions & 1 deletion internal/updates/version_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package updates

import "testing"
import (
"testing"

"github.com/stretchr/testify/assert"
)

func TestCheckVersion(t *testing.T) {
tests := []struct {
Expand Down Expand Up @@ -35,3 +39,77 @@ func TestCheckVersion(t *testing.T) {
})
}
}

func TestCheckNewVersion(t *testing.T) {
tests := []struct {
name string
currentVersion string
newVersion string
expectedResult bool
expectError bool
}{
{
name: "New version is greater",
currentVersion: "v1.0.0",
newVersion: "v1.1.0",
expectedResult: true,
expectError: false,
},
{
name: "New version is equal",
currentVersion: "v1.0.0",
newVersion: "v1.0.0",
expectedResult: false,
expectError: false,
},
{
name: "New version is lower",
currentVersion: "v1.1.0",
newVersion: "v1.0.0",
expectedResult: false,
expectError: false,
},
{
name: "Invalid current version",
currentVersion: "invalid",
newVersion: "v1.1.0",
expectedResult: false,
expectError: true,
},
{
name: "Invalid new version",
currentVersion: "v1.0.0",
newVersion: "invalid",
expectedResult: false,
expectError: true,
},
{
name: "Empty current version",
currentVersion: "",
newVersion: "v1.1.0",
expectedResult: false,
expectError: true,
},
{
name: "Empty new version",
currentVersion: "v1.0.0",
newVersion: "",
expectedResult: false,
expectError: true,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result, err := CheckNewVersion(tt.currentVersion, tt.newVersion)

if tt.expectError {
assert.Error(t, err)
} else {
assert.NoError(t, err)
}

assert.Equal(t, tt.expectedResult, result)
})
}
}