Merge branch 'pr-amery-files' into next-amery

Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
2023-10-29 23:32:50 +00:00
2 changed files with 59 additions and 17 deletions
+3 -17
View File
@@ -1,7 +1,6 @@
package cluster
import (
"bytes"
"fmt"
"io"
"os"
@@ -42,16 +41,9 @@ func (m *Machine) openWriter(name string, flags int, args ...any) (io.WriteClose
// RemoveFile deletes a file from the machine's config directory
func (m *Machine) RemoveFile(name string, args ...any) error {
base := m.zone.zones.dir
fullName := m.getFilename(name, args...)
err := fs.Remove(base, fullName)
switch {
case os.IsNotExist(err):
return nil
default:
return err
}
return m.zone.zones.RemoveFile(fullName)
}
// ReadFile reads a file from the machine's config directory
@@ -63,15 +55,9 @@ func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
// WriteStringFile writes the given content to a file on the machine's config directory
func (m *Machine) WriteStringFile(value string, name string, args ...any) error {
f, err := m.CreateTruncFile(name, args...)
if err != nil {
return err
}
defer f.Close()
fullName := m.getFilename(name, args...)
buf := bytes.NewBufferString(value)
_, err = buf.WriteTo(f)
return err
return m.zone.zones.WriteStringFile(value, fullName)
}
// MkdirAll creates directories relative to the machine's config directory