consolidate unwanted dirs provisionenr into dir provisioner

base/fup.go

@@ -27,7 +27,7 @@ type Config struct {
 	Binaries        []entity.Binary    `yaml:"binary"`
 	Cargo           []CargoPkg         `yaml:"rust"`
 	DnfRepos        []entity.DnfRepo   `yaml:"dnf_repo"`
-	EnsureDirs      []string           `yaml:"dir"`
+	EnsureDirs      []entity.Dir       `yaml:"dir"`
 	EnsureLines     []LineInFile       `yaml:"line"`
 	Flatpak         entity.Flatpak     `yaml:"flatpak"`
 	GithubUserKey   UserKey            `yaml:"github_key"`
@@ -44,7 +44,6 @@ type Config struct {
 	Tasks           []Task             `yaml:"task"`
 	Templates       []Template         `yaml:"template"`
 	UserInGroup     UserInGroupSpec    `yaml:"user_group"`
-	UnwantedDirs    []string           `yaml:"rmdir"`
 }
 
 func (c Config) IsRemote() bool {

common/ensure.go

@@ -15,7 +15,7 @@ func EnsureLinesInFile(file string, lines []string) error {
 
 	file = internal.ExpandUser(file)
 	dir, _ := path.Split(file)
-	if err := internal.EnsureDir(dir); err != nil {
+	if err := internal.EnsureDirExists(dir); err != nil {
 		return err
 	}
 

entity/aptrepo.go

@@ -118,7 +118,7 @@ func (AptRepo) ensureKeyFile(keyUrl, keyRingFile string) error {
 }
 
 func (a AptRepo) Install() error {
-	err := internal.EnsureDir(keyRingsDir)
+	err := internal.EnsureDirExists(keyRingsDir)
 	if err != nil {
 		return err
 	}

entity/dir.go

@@ -0,0 +1,6 @@
+package entity
+
+type Dir struct {
+	Absent bool   `yaml:"absent"`
+	Name   string `yaml:"name"`
+}

internal/dir.go

@@ -2,7 +2,17 @@ package internal
 
 import "os"
 
-func EnsureDir(dir string) error {
+func EnsureDirAbsent(dir string) error {
+	_, err := os.Stat(dir)
+	if os.IsNotExist(err) {
+		return nil
+	} else if err != nil {
+		return err
+	}
+	return os.RemoveAll(dir)
+}
+
+func EnsureDirExists(dir string) error {
 	_, err := os.Stat(dir)
 	if os.IsNotExist(err) {
 		err = os.MkdirAll(dir, 0744)

provision/ensuredirs.go

@@ -1,21 +1,46 @@
 package provision
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/femnad/fup/base"
+	"github.com/femnad/fup/entity"
 	"github.com/femnad/fup/internal"
 )
 
-func doEnsureDirs(dirs []string) error {
+func ensureDirAbsent(dir entity.Dir) error {
+	dirName := internal.ExpandUser(dir.Name)
+	if err := internal.EnsureDirAbsent(dirName); err != nil {
+		return fmt.Errorf("error removing directory %s: %v", dirName, err)
+	}
+
+	return nil
+}
+
+func ensureDirExist(dir entity.Dir) error {
+	dirName := internal.ExpandUser(dir.Name)
+	if err := internal.EnsureDirExists(dirName); err != nil {
+		return fmt.Errorf("error creating directory %s: %v", dirName, err)
+	}
+
+	return nil
+}
+
+func doEnsureDirs(dirs []entity.Dir) error {
+	var errs []error
+
 	for _, dir := range dirs {
-		dir = internal.ExpandUser(dir)
-		if err := internal.EnsureDir(dir); err != nil {
-			return fmt.Errorf("error ensuring directory %s: %v", dir, err)
+		var err error
+		if dir.Absent {
+			err = ensureDirAbsent(dir)
+		} else {
+			err = ensureDirExist(dir)
 		}
+		errs = append(errs, err)
 	}
 
-	return nil
+	return errors.Join(errs...)
 }
 
 func ensureDirs(config base.Config) error {

provision/provision.go

@@ -106,7 +106,6 @@ func NewProvisioner(cfg base.Config, filter []string) (Provisioner, error) {
 		{"line", p.ensureLines},
 		{"flatpak", p.flatpakInstall},
 		{"snap", p.snapInstall},
-		{"rmdir", p.unwantedDirs},
 		{"group", p.userInGroup},
 		{"post", p.runPostFlightTasks},
 	}
@@ -242,12 +241,6 @@ func (p Provisioner) sshClone() error {
 	return sshClone(p.Config)
 }
 
-func (p Provisioner) unwantedDirs() error {
-	internal.Log.Noticef("Removing unwanted dirs")
-
-	return removeUnwantedDirs(p.Config)
-}
-
 func (p Provisioner) userInGroup() error {
 	internal.Log.Noticef("Ensuring user is in desired groups")
 

provision/service.go

@@ -163,7 +163,7 @@ func persist(s base.Service) error {
 	serviceFilePath := getServiceFilePath(s)
 	if !s.System {
 		dir, _ := path.Split(serviceFilePath)
-		if err := internal.EnsureDir(dir); err != nil {
+		if err := internal.EnsureDirExists(dir); err != nil {
 			return err
 		}
 	}

provision/userkey.go

@@ -35,7 +35,7 @@ func ensureUserKeys(user string) error {
 
 	keyFile := internal.ExpandUser(authorizedKeysFile)
 	dir, _ := path.Split(keyFile)
-	if err = internal.EnsureDir(dir); err != nil {
+	if err = internal.EnsureDirExists(dir); err != nil {
 		return err
 	}
 

remote/http.go

@@ -100,7 +100,7 @@ func Download(url, target string) error {
 	}
 
 	dir, _ := path.Split(target)
-	if err = internal.EnsureDir(dir); err != nil {
+	if err = internal.EnsureDirExists(dir); err != nil {
 		return err
 	}