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

Simpler names for overlay methods

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-08-27 22:21:16 -06:00
parent 6fd858899d
commit 66450a7dcd
20 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/app/wwctl/completions/completions.go
View File

@@ -89,7 +89,7 @@ func OverlayList(cmd *cobra.Command, args []string, toComplete string) ([]string
}
func OverlayFiles(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
myOverlay, _ := overlay.GetOverlay(args[0])
myOverlay, _ := overlay.Get(args[0])
ret, _ := myOverlay.GetFiles()
return ret, cobra.ShellCompDirectiveNoFileComp
}

2
internal/app/wwctl/overlay/chmod/main.go
View File

@@ -9,7 +9,7 @@ import (
)
func CobraRunE(cmd *cobra.Command, args []string) error {
myOverlay, err := overlay.GetOverlay(args[0])
myOverlay, err := overlay.Get(args[0])
if err != nil {
return err
}

2
internal/app/wwctl/overlay/chown/main.go
View File

@@ -37,7 +37,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
}
myOverlay, err := overlay.GetOverlay(args[0])
myOverlay, err := overlay.Get(args[0])
if err != nil {
return err
}

2
internal/app/wwctl/overlay/delete/main.go
View File

@@ -12,7 +12,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
fileName = args[1]
}
myOverlay, err := overlay.GetOverlay(args[0])
myOverlay, err := overlay.Get(args[0])
if err != nil {
return err
}

9
internal/app/wwctl/overlay/edit/main.go
View File

@@ -35,7 +35,7 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
overlayName := args[0]
fileName := args[1]
myOverlay, err := overlay.GetOverlay(overlayName)
myOverlay, err := overlay.Get(overlayName)
if err != nil {
return err
}
@@ -104,14 +104,13 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
}
if !myOverlay.IsSiteOverlay() {
myOverlay, err = myOverlay.CloneSiteOverlay()
myOverlay, err = myOverlay.CloneToSite()
if err != nil {
return err
}
overlayFile = myOverlay.File(fileName)
overlayFileDir = path.Dir(overlayFile)
}
// re-generate because overlay_ may have changed
overlayFile = myOverlay.File(fileName)
overlayFileDir = path.Dir(overlayFile)
if CreateDirs {
if err := os.MkdirAll(overlayFileDir, 0755); err != nil {

4
internal/app/wwctl/overlay/imprt/main.go
View File

@@ -22,12 +22,12 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
} else {
dest = source
}
overlay_, err := overlay.GetOverlay(args[0])
overlay_, err := overlay.Get(args[0])
if err != nil {
return err
}
if !overlay_.IsSiteOverlay() {
overlay_, err = overlay_.CloneSiteOverlay()
overlay_, err = overlay_.CloneToSite()
if err != nil {
return err
}

2
internal/app/wwctl/overlay/list/main.go
View File

@@ -39,7 +39,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) error {
}
for _, name := range overlays {
overlay_, err := overlay.GetOverlay(name)
overlay_, err := overlay.Get(name)
if err != nil {
wwlog.Error("%s:%s", name, err)

2
internal/app/wwctl/overlay/mkdir/main.go
View File

@@ -7,7 +7,7 @@ import (
func CobraRunE(cmd *cobra.Command, args []string) (err error) {
myOverlay, err := overlay.GetOverlay(args[0])
myOverlay, err := overlay.Get(args[0])
if err != nil {
return err
}

2
internal/app/wwctl/overlay/show/main.go
View File

@@ -20,7 +20,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
overlayName := args[0]
fileName := args[1]
overlay_, err := overlay.GetOverlay(overlayName)
overlay_, err := overlay.Get(overlayName)
if err != nil {
return err
}