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

Rename and refactor overlay constructor functions

Browse Source 
- Reduces redundancy
- Adds clarity

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-12-18 06:56:43 -07:00
committed by Christian Goll
parent 717241aa18
commit ac49ecef70
14 changed files with 93 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,11 +21,11 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
if err != nil {
return fmt.Errorf("could not convert requested mode: %s", err)
}
err = overlay.CreateSiteOverlay(overlayName)
err = overlay.CloneSiteOverlay(overlayName)
if err != nil {
return err
}
overlaySourceDir, _ = overlay.OverlaySourceDir(overlayName)
overlaySourceDir, _ = overlay.GetOverlay(overlayName)
if !util.IsDir(overlaySourceDir) {
return fmt.Errorf("overlay does not exist: %s", overlayName)

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

@@ -34,11 +34,11 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
} else {
gid = -1
}
err = overlay.CreateSiteOverlay(overlayName)
err = overlay.CloneSiteOverlay(overlayName)
if err != nil {
return err
}
overlaySourceDir, _ = overlay.OverlaySourceDir(overlayName)
overlaySourceDir, _ = overlay.GetOverlay(overlayName)
if !util.IsDir(overlaySourceDir) {
return fmt.Errorf("overlay does not exist: %s", overlayName)

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

@@ -6,6 +6,6 @@ import (
)
func CobraRunE(cmd *cobra.Command, args []string) (err error) {
err = overlay.OverlayInit(args[0])
return
_, err = overlay.CreateSiteOverlay(args[0])
return err
}

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

@@ -22,7 +22,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
fileName = args[1]
}
overlayPath, isSite := overlay.OverlaySourceDir(overlayName)
overlayPath, isSite := overlay.GetOverlay(overlayName)
if !isSite {
return fmt.Errorf("distribution overlay can't deleted")

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

@@ -36,9 +36,9 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
overlayName := args[0]
fileName := args[1]
createdSite := false
overlaySourceDir, isSite := overlay.OverlaySourceDir(overlayName)
overlaySourceDir, isSite := overlay.GetOverlay(overlayName)
if !isSite {
err = overlay.CreateSiteOverlay(overlayName)
err = overlay.CloneSiteOverlay(overlayName)
if err != nil {
return err
}

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

@@ -27,7 +27,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
wwlog.Verbose("Copying '%s' into overlay '%s:%s'", source, overlayName, dest)
overlaySource, _ = overlay.OverlaySourceDir(overlayName)
overlaySource, _ = overlay.GetOverlay(overlayName)
if !util.IsDir(overlaySource) {
return fmt.Errorf("overlay does not exist: %s", overlayName)

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

@@ -32,7 +32,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
for o := range overlays {
name := overlays[o]
path, isSite := overlay.OverlaySourceDir(name)
path, isSite := overlay.GetOverlay(name)
if util.IsDir(path) {
files := util.FindFiles(path)

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

@@ -16,11 +16,11 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
overlayName := args[0]
dirName := args[1]
err = overlay.CreateSiteOverlay(overlayName)
err = overlay.CloneSiteOverlay(overlayName)
if err != nil {
return err
}
overlaySourceDir, _ = overlay.OverlaySourceDir(overlayName)
overlaySourceDir, _ = overlay.GetOverlay(overlayName)
if !util.IsDir(overlaySourceDir) {
return fmt.Errorf("overlay does not exist: %s", overlayName)

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

@@ -22,7 +22,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
overlayName := args[0]
fileName := args[1]
overlaySourceDir, _ = overlay.OverlaySourceDir(overlayName)
overlaySourceDir, _ = overlay.GetOverlay(overlayName)
if !util.IsDir(overlaySourceDir) {
return fmt.Errorf("overlay dir: %s does not exist", overlaySourceDir)