kairos/provider-kairos
1
0
Fork 0
mirror of https://github.com/kairos-io/provider-kairos.git synced 2025-09-16 15:19:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the "stable" filtering in available_release response

Browse Source 
because all our versions are considered pre-releases in standard
semantic versioning. E.g.

v1.0.0-k3sv1.23.9-k3s1

this also has a "pre-release" part (everything after the `-`).

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
Dimitris Karakasilis
2022-11-07 10:16:37 +02:00
parent 7cc7883ee5
commit f01235ea6a
2 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/provider/upgrade.go
View File

@@ -34,10 +34,6 @@ func ListVersions(e *pluggable.Event) pluggable.EventResponse {
semver.Sort(displayTags) semver.Sort(displayTags)
if e.Data == "stable" {
keepOnlyStable(displayTags)
}
versions, err := json.Marshal(displayTags) versions, err := json.Marshal(displayTags)
resp := &pluggable.EventResponse{ resp := &pluggable.EventResponse{
Data: string(versions), Data: string(versions),
@@ -49,14 +45,3 @@ func ListVersions(e *pluggable.Event) pluggable.EventResponse {
return *resp return *resp
} }
func keepOnlyStable(versions []string) []string {
result := []string{}
for _, v := range versions {
if semver.Prerelease(v) == "" {
result = append(result, v)
}
}
return result
}

23
tests/provider_upgrade_test.go
View File

@@ -23,7 +23,7 @@ var _ = Describe("provider upgrade test", Label("provider-upgrade"), func() {
}) })
Context("agent.available_releases event", func() { Context("agent.available_releases event", func() {
It("returns all the available versions ordered", func() { It("returns the available versions ordered", func() {
resultStr, _ := machine.SSHCommand(`echo '{}' | /system/providers/agent-provider-kairos agent.available_releases`) resultStr, _ := machine.SSHCommand(`echo '{}' | /system/providers/agent-provider-kairos agent.available_releases`)
var result pluggable.EventResponse var result pluggable.EventResponse
@@ -42,27 +42,6 @@ var _ = Describe("provider upgrade test", Label("provider-upgrade"), func() {
semver.Sort(sorted) semver.Sort(sorted)
Expect(sorted).To(Equal(versions)) Expect(sorted).To(Equal(versions))
Expect(versions).To(ContainElement("v1.0.0-rc2-k3sv1.23.9-k3s1"))
})
When("'stable' versions are requested", func() {
It("returns only stable versions", func() {
resultStr, _ := machine.SSHCommand(`echo '{"data": "stable"}' | /system/providers/agent-provider-kairos agent.available_releases`)
var result pluggable.EventResponse
err := json.Unmarshal([]byte(resultStr), &result)
Expect(err).ToNot(HaveOccurred())
Expect(result.Data).ToNot(BeEmpty())
var versions []string
json.Unmarshal([]byte(result.Data), &versions)
Expect(versions).ToNot(BeEmpty())
for _, v := range versions {
Expect(v).ToNot(MatchRegexp(`-rc\d+-`))
}
})
}) })
}) })
}) })