lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: resources: Handle recurse field more appropriately

Browse Source 
This smoothes out some edge cases. We should add comprehensive tests in
the future.
This commit is contained in:
James Shubin
2023-11-20 17:23:00 -05:00
parent fd4d32351b
commit 3f42f785ac
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/resources/file.go
View File

@@ -174,7 +174,9 @@ type FileRes struct {
// Recurse specifies if you want to work recursively on the resource. It // Recurse specifies if you want to work recursively on the resource. It
// is used when copying a source directory, or to determine if a watch // is used when copying a source directory, or to determine if a watch
// should be recursive or not. // should be recursive or not. When making a directory, this is required
// if you'd need the parent directories to be made as well. (Analogous
// to the `mkdir -p` option.)
// FIXME: There are some unimplemented cases where we should look at it. // FIXME: There are some unimplemented cases where we should look at it.
Recurse bool `lang:"recurse" yaml:"recurse"` Recurse bool `lang:"recurse" yaml:"recurse"`
@@ -709,8 +711,7 @@ func (obj *FileRes) dirCheckApply(ctx context.Context, apply bool) (bool, error)
} }
} }
if obj.Force { if obj.Recurse {
// FIXME: respect obj.Recurse here...
// TODO: add recurse limit here // TODO: add recurse limit here
return false, os.MkdirAll(obj.getPath(), mode) return false, os.MkdirAll(obj.getPath(), mode)
} }
@@ -941,10 +942,11 @@ func (obj *FileRes) stateCheckApply(ctx context.Context, apply bool) (bool, erro
return false, fmt.Errorf("don't want to remove root") // safety return false, fmt.Errorf("don't want to remove root") // safety
} }
obj.init.Logf("stateCheckApply: removing: %s", p) obj.init.Logf("stateCheckApply: removing: %s", p)
// FIXME: respect obj.Recurse here...
// TODO: add recurse limit here // TODO: add recurse limit here
err := os.RemoveAll(p) // dangerous ;) if obj.Recurse {
return false, err // either nil or not return false, os.RemoveAll(p) // dangerous ;)
}
return false, os.Remove(p)
} }
// we need to make a file or a directory now // we need to make a file or a directory now