Browse Source

zones: move Machine.ReadFile to a dedicated machine_file.go

Signed-off-by: Alejandro Mery <amery@jpi.io>
pull/1/head
Alejandro Mery 1 year ago
parent
commit
86075eb47f
  1. 25
      pkg/zones/machine.go
  2. 29
      pkg/zones/machine_file.go

25
pkg/zones/machine.go

@ -1,10 +1,7 @@
package zones
import (
"fmt"
"io/fs"
"net/netip"
"path/filepath"
"strings"
)
@ -36,28 +33,6 @@ func (m *Machine) FullName() string {
return m.Name
}
// ReadFile reads a file from the machine's config directory
func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
base := m.zone.zones.dir
fullName := m.getFilename(name, args...)
return fs.ReadFile(base, fullName)
}
func (m *Machine) getFilename(name string, args ...any) string {
if len(args) > 0 {
name = fmt.Sprintf(name, args...)
}
s := []string{
m.zone.Name,
m.Name,
name,
}
return filepath.Join(s...)
}
// IsGateway tells if the Machine is a ring0 gateway
func (m *Machine) IsGateway() bool {
_, ok := m.getRingInfo(0)

29
pkg/zones/machine_file.go

@ -0,0 +1,29 @@
package zones
import (
"fmt"
"io/fs"
"path/filepath"
)
// ReadFile reads a file from the machine's config directory
func (m *Machine) ReadFile(name string, args ...any) ([]byte, error) {
base := m.zone.zones.dir
fullName := m.getFilename(name, args...)
return fs.ReadFile(base, fullName)
}
func (m *Machine) getFilename(name string, args ...any) string {
if len(args) > 0 {
name = fmt.Sprintf(name, args...)
}
s := []string{
m.zone.Name,
m.Name,
name,
}
return filepath.Join(s...)
}
Loading…
Cancel
Save