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

Make naming consistent with regexp.MatchString

Browse Source
This commit is contained in:
Sujeev-Uthayakumar
2026-01-30 18:06:06 -05:00
parent 31bcefea11
commit 0f3f0c3ccf
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/pkg/image/util.go
View File

@@ -12,7 +12,7 @@ import (
) )
func ValidName(name string) bool { func ValidName(name string) bool {
if !util.ValidString(name, "^[\\w\\-\\.\\:]+$") { if !util.ValidString("^[\\w\\-\\.\\:]+$", name) {
wwlog.Warn("Image name has illegal characters: %s", name) wwlog.Warn("Image name has illegal characters: %s", name)
return false return false
} }

2
internal/pkg/overlay/overlay.go
View File

@@ -961,7 +961,7 @@ func BuildOverlayIndir(nodeData node.Node, allNodes []node.Node, overlayNames []
return fmt.Errorf("output must a be a directory: %s", outputDir) return fmt.Errorf("output must a be a directory: %s", outputDir)
} }
if !util.ValidString(strings.Join(overlayNames, ""), "^[a-zA-Z0-9-._:]+$") { if !util.ValidString("^[a-zA-Z0-9-._:]+$", strings.Join(overlayNames, "")) {
return fmt.Errorf("overlay names contains illegal characters: %v", overlayNames) return fmt.Errorf("overlay names contains illegal characters: %v", overlayNames)
} }

2
internal/pkg/upgrade/util.go
View File

@@ -27,7 +27,7 @@ func legacyKernelVersionFile(kernelName string) string {
return "" return ""
} }
if !util.ValidString(kernelName, "^[a-zA-Z0-9-._]+$") { if !util.ValidString("^[a-zA-Z0-9-._]+$", kernelName) {
return "" return ""
} }

4
internal/pkg/util/util.go
View File

@@ -129,8 +129,8 @@ func ReadFile(path string) ([]string, error) {
return lines, nil return lines, nil
} }
func ValidString(pattern string, expr string) bool { func ValidString(pattern string, s string) bool {
if b, _ := regexp.MatchString(expr, pattern); b { if b, _ := regexp.MatchString(pattern, s); b {
return true return true
} }
return false return false