kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-09-25 05:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand source error (#293)

Browse Source
This commit is contained in:
Itxaka
2024-04-15 13:24:10 +00:00
committed by GitHub
parent 28e5622d3c
commit d24489e074
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,14 +187,14 @@ type UpgradeSpec struct {
func (u *UpgradeSpec) Sanitize() error {
if u.RecoveryUpgrade {
if u.Recovery.Source.IsEmpty() {
return fmt.Errorf("undefined upgrade source")
return fmt.Errorf(constants.UpgradeNoSourceError)
}
if u.Partitions.Recovery == nil || u.Partitions.Recovery.MountPoint == "" {
return fmt.Errorf("undefined recovery partition")
}
} else {
if u.Active.Source.IsEmpty() {
return fmt.Errorf("undefined upgrade source")
return fmt.Errorf(constants.UpgradeNoSourceError)
}
if u.Partitions.State == nil || u.Partitions.State.MountPoint == "" {
return fmt.Errorf("undefined state partition")

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

@@ -425,7 +425,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("undefined upgrade source"))
Expect(err.Error()).To(ContainSubstring(constants.UpgradeNoSourceError))
})
It("fails with missing state partition", func() {
spec.Active.Source = v1.NewFileSrc("/tmp")
@@ -449,7 +449,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("undefined upgrade source"))
Expect(err.Error()).To(ContainSubstring(constants.UpgradeNoSourceError))
})
It("fails with missing recovery partition", func() {
spec.Recovery.Source = v1.NewFileSrc("/tmp")