kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

removed wwBool.Parse and use Set

Browse Source
This commit is contained in:
Christian Goll
2025-07-28 11:13:58 +02:00
parent 8a684973d9
commit cc946e0b99
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/pkg/upgrade/node.go
View File

@@ -12,7 +12,6 @@ import (
"github.com/warewulf/warewulf/internal/pkg/node" "github.com/warewulf/warewulf/internal/pkg/node"
"github.com/warewulf/warewulf/internal/pkg/util" "github.com/warewulf/warewulf/internal/pkg/util"
"github.com/warewulf/warewulf/internal/pkg/wwlog" "github.com/warewulf/warewulf/internal/pkg/wwlog"
"github.com/warewulf/warewulf/internal/pkg/wwtype"
) )
var wwinitSplitOverlays = []string{ var wwinitSplitOverlays = []string{
@@ -711,7 +710,10 @@ func (legacy *Disk) Upgrade() (upgraded *node.Disk) {
upgraded.Partitions[name] = partition.Upgrade() upgraded.Partitions[name] = partition.Upgrade()
} }
} }
upgraded.WipeTable = wwtype.Parse(legacy.WipeTable) err := upgraded.WipeTable.Set(legacy.WipeTable)
if err != nil {
wwlog.Warn("error when parsing legacy.WipeTable: %w", err)
}
return return
} }
@@ -730,12 +732,21 @@ func (legacy *Partition) Upgrade() (upgraded *node.Partition) {
upgraded = new(node.Partition) upgraded = new(node.Partition)
upgraded.Guid = legacy.Guid upgraded.Guid = legacy.Guid
upgraded.Number = legacy.Number upgraded.Number = legacy.Number
upgraded.Resize = wwtype.Parse(legacy.Resize) err := upgraded.Resize.Set(legacy.Resize)
upgraded.ShouldExist = wwtype.Parse(legacy.ShouldExist) if err != nil {
wwlog.Warn("error when parsing legacy.Resize: %w", err)
}
err = upgraded.ShouldExist.Set(legacy.ShouldExist)
if err != nil {
wwlog.Warn("error when parsing legacy.ShouldExist: %w", err)
}
upgraded.SizeMiB = legacy.SizeMiB upgraded.SizeMiB = legacy.SizeMiB
upgraded.StartMiB = legacy.StartMiB upgraded.StartMiB = legacy.StartMiB
upgraded.TypeGuid = legacy.TypeGuid upgraded.TypeGuid = legacy.TypeGuid
upgraded.WipePartitionEntry = wwtype.Parse(legacy.WipePartitionEntry) err = upgraded.WipePartitionEntry.Set(legacy.WipePartitionEntry)
if err != nil {
wwlog.Warn("error when parsing legacy.WipePartitionEntry: %w", err)
}
return return
} }
@@ -771,6 +782,9 @@ func (legacy *FileSystem) Upgrade() (upgraded *node.FileSystem) {
upgraded.Options = append(upgraded.Options, legacy.Options...) upgraded.Options = append(upgraded.Options, legacy.Options...)
upgraded.Path = legacy.Path upgraded.Path = legacy.Path
upgraded.Uuid = legacy.Uuid upgraded.Uuid = legacy.Uuid
upgraded.WipeFileSystem = wwtype.Parse(legacy.WipeFileSystem) err := upgraded.WipeFileSystem.Set(legacy.WipeFileSystem)
if err != nil {
wwlog.Warn("error when parsing legacy.WipeFileSystem: %w", err)
}
return return
} }

8
internal/pkg/wwtype/wwbool.go
View File

@@ -97,11 +97,3 @@ var unsetValues = []string{"unset", "delete", "undef", "--", "nil", "0.0.0.0"}
func isUnsetValue(value string) bool { func isUnsetValue(value string) bool {
return util.InSlice(unsetValues, strings.ToLower(value)) return util.InSlice(unsetValues, strings.ToLower(value))
} }
/*
Parse a string to a WWBool
*/
func Parse(in string) (ret WWbool) {
ret.Set(in)
return
}