kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-10-21 11:29:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong error message when upgrading recovery (#788)

Browse Source 
* Fix wrong error message when upgrading recovery

fix command help text and simplify variables in function

Fixes https://github.com/kairos-io/kairos/issues/3393

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Fix test

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

---------

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
Dimitris Karakasilis
2025-05-19 18:37:25 +03:00
committed by GitHub
parent 2b1e5e66fb
commit 53c1b6c9ea
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/types/v1/config.go
View File

@@ -190,7 +190,7 @@ func (u *UpgradeSpec) RecoveryUpgrade() bool {
func (u *UpgradeSpec) Sanitize() error {
if u.RecoveryUpgrade() {
if u.Recovery.Source.IsEmpty() {
return fmt.Errorf(constants.UpgradeNoSourceError)
return fmt.Errorf(constants.UpgradeRecoveryNoSourceError)
}
if u.Partitions.Recovery == nil || u.Partitions.Recovery.MountPoint == "" {
return fmt.Errorf("undefined recovery partition")

5
pkg/types/v1/config_test.go
View File

@@ -17,9 +17,10 @@ limitations under the License.
package v1_test
import (
sdkTypes "github.com/kairos-io/kairos-sdk/types"
"path/filepath"
sdkTypes "github.com/kairos-io/kairos-sdk/types"
"github.com/kairos-io/kairos-agent/v2/pkg/constants"
v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
. "github.com/onsi/ginkgo/v2"
@@ -451,7 +452,7 @@ var _ = Describe("Types", Label("types", "config"), func() {
It("fails with empty source", func() {
err := spec.Sanitize()
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring(constants.UpgradeNoSourceError))
Expect(err.Error()).To(ContainSubstring(constants.UpgradeRecoveryNoSourceError))
})
It("fails with missing recovery partition", func() {
spec.Recovery.Source = v1.NewFileSrc("/tmp")