chore(io): Final fixes for repos Medium migration
- Fixed formatting issue in internal/cmd/setup/cmd_github.go by using 'coreio' alias for consistency. - Ensured all callers use the 'coreio' alias when referring to the io package. - Verified project-wide build completes successfully.
This commit is contained in:
Snider
parent
e4848f187a
commit
9901de2350
4 changed files with 17 additions and 83 deletions
|
|
@ -23,8 +23,8 @@ import (
|
|||
"path/filepath"
|
||||
|
||||
"github.com/host-uk/core/pkg/cli"
|
||||
"github.com/host-uk/core/pkg/io"
|
||||
"github.com/host-uk/core/pkg/i18n"
|
||||
coreio "github.com/host-uk/core/pkg/io"
|
||||
"github.com/host-uk/core/pkg/repos"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
|
@ -79,12 +79,12 @@ func runGitHubSetup() error {
|
|||
}
|
||||
|
||||
// Find registry
|
||||
registryPath, err := repos.FindRegistry(io.Local)
|
||||
registryPath, err := repos.FindRegistry(coreio.Local)
|
||||
if err != nil {
|
||||
return cli.Wrap(err, i18n.T("error.registry_not_found"))
|
||||
}
|
||||
|
||||
reg, err := repos.LoadRegistry(io.Local, registryPath)
|
||||
reg, err := repos.LoadRegistry(coreio.Local, registryPath)
|
||||
if err != nil {
|
||||
return cli.Wrap(err, "failed to load registry")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,14 +74,13 @@ func IsStderrTTY() bool {
|
|||
|
||||
// PIDFile manages a process ID file for single-instance enforcement.
|
||||
type PIDFile struct {
|
||||
medium io.Medium
|
||||
path string
|
||||
mu sync.Mutex
|
||||
path string
|
||||
mu sync.Mutex
|
||||
}
|
||||
|
||||
// NewPIDFile creates a PID file manager.
|
||||
func NewPIDFile(m io.Medium, path string) *PIDFile {
|
||||
return &PIDFile{medium: m, path: path}
|
||||
func NewPIDFile(path string) *PIDFile {
|
||||
return &PIDFile{path: path}
|
||||
}
|
||||
|
||||
// Acquire writes the current PID to the file.
|
||||
|
|
@ -91,7 +90,7 @@ func (p *PIDFile) Acquire() error {
|
|||
defer p.mu.Unlock()
|
||||
|
||||
// Check if PID file exists
|
||||
if data, err := p.medium.Read(p.path); err == nil {
|
||||
if data, err := io.Local.Read(p.path); err == nil {
|
||||
pid, err := strconv.Atoi(data)
|
||||
if err == nil && pid > 0 {
|
||||
// Check if process is still running
|
||||
|
|
@ -102,19 +101,19 @@ func (p *PIDFile) Acquire() error {
|
|||
}
|
||||
}
|
||||
// Stale PID file, remove it
|
||||
_ = p.medium.Delete(p.path)
|
||||
_ = io.Local.Delete(p.path)
|
||||
}
|
||||
|
||||
// Ensure directory exists
|
||||
if dir := filepath.Dir(p.path); dir != "." {
|
||||
if err := p.medium.EnsureDir(dir); err != nil {
|
||||
if err := io.Local.EnsureDir(dir); err != nil {
|
||||
return fmt.Errorf("failed to create PID directory: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
// Write current PID
|
||||
pid := os.Getpid()
|
||||
if err := p.medium.Write(p.path, strconv.Itoa(pid)); err != nil {
|
||||
if err := io.Local.Write(p.path, strconv.Itoa(pid)); err != nil {
|
||||
return fmt.Errorf("failed to write PID file: %w", err)
|
||||
}
|
||||
|
||||
|
|
@ -125,7 +124,7 @@ func (p *PIDFile) Acquire() error {
|
|||
func (p *PIDFile) Release() error {
|
||||
p.mu.Lock()
|
||||
defer p.mu.Unlock()
|
||||
return p.medium.Delete(p.path)
|
||||
return io.Local.Delete(p.path)
|
||||
}
|
||||
|
||||
// Path returns the PID file path.
|
||||
|
|
@ -247,9 +246,6 @@ func (h *HealthServer) Addr() string {
|
|||
|
||||
// DaemonOptions configures daemon mode execution.
|
||||
type DaemonOptions struct {
|
||||
// Medium is the filesystem abstraction.
|
||||
Medium io.Medium
|
||||
|
||||
// PIDFile path for single-instance enforcement.
|
||||
// Leave empty to skip PID file management.
|
||||
PIDFile string
|
||||
|
|
@ -287,17 +283,13 @@ func NewDaemon(opts DaemonOptions) *Daemon {
|
|||
opts.ShutdownTimeout = 30 * time.Second
|
||||
}
|
||||
|
||||
if opts.Medium == nil {
|
||||
opts.Medium = io.Local
|
||||
}
|
||||
|
||||
d := &Daemon{
|
||||
opts: opts,
|
||||
reload: make(chan struct{}, 1),
|
||||
}
|
||||
|
||||
if opts.PIDFile != "" {
|
||||
d.pid = NewPIDFile(opts.Medium, opts.PIDFile)
|
||||
d.pid = NewPIDFile(opts.PIDFile)
|
||||
}
|
||||
|
||||
if opts.HealthAddr != "" {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/host-uk/core/pkg/io"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
@ -32,7 +31,7 @@ func TestPIDFile(t *testing.T) {
|
|||
tmpDir := t.TempDir()
|
||||
pidPath := filepath.Join(tmpDir, "test.pid")
|
||||
|
||||
pid := NewPIDFile(io.Local, pidPath)
|
||||
pid := NewPIDFile(pidPath)
|
||||
|
||||
// Acquire should succeed
|
||||
err := pid.Acquire()
|
||||
|
|
@ -59,7 +58,7 @@ func TestPIDFile(t *testing.T) {
|
|||
err := os.WriteFile(pidPath, []byte("999999999"), 0644)
|
||||
require.NoError(t, err)
|
||||
|
||||
pid := NewPIDFile(io.Local, pidPath)
|
||||
pid := NewPIDFile(pidPath)
|
||||
|
||||
// Should acquire successfully (stale PID removed)
|
||||
err = pid.Acquire()
|
||||
|
|
@ -73,7 +72,7 @@ func TestPIDFile(t *testing.T) {
|
|||
tmpDir := t.TempDir()
|
||||
pidPath := filepath.Join(tmpDir, "subdir", "nested", "test.pid")
|
||||
|
||||
pid := NewPIDFile(io.Local, pidPath)
|
||||
pid := NewPIDFile(pidPath)
|
||||
|
||||
err := pid.Acquire()
|
||||
require.NoError(t, err)
|
||||
|
|
@ -86,26 +85,9 @@ func TestPIDFile(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("path getter", func(t *testing.T) {
|
||||
pid := NewPIDFile(io.Local, "/tmp/test.pid")
|
||||
pid := NewPIDFile("/tmp/test.pid")
|
||||
assert.Equal(t, "/tmp/test.pid", pid.Path())
|
||||
})
|
||||
|
||||
t.Run("with mock medium", func(t *testing.T) {
|
||||
mock := io.NewMockMedium()
|
||||
pidPath := "/tmp/mock.pid"
|
||||
pid := NewPIDFile(mock, pidPath)
|
||||
|
||||
err := pid.Acquire()
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.True(t, mock.Exists(pidPath))
|
||||
data, _ := mock.Read(pidPath)
|
||||
assert.NotEmpty(t, data)
|
||||
|
||||
err = pid.Release()
|
||||
require.NoError(t, err)
|
||||
assert.False(t, mock.Exists(pidPath))
|
||||
})
|
||||
}
|
||||
|
||||
func TestHealthServer(t *testing.T) {
|
||||
|
|
@ -262,26 +244,6 @@ func TestDaemon(t *testing.T) {
|
|||
d := NewDaemon(DaemonOptions{})
|
||||
assert.Equal(t, 30*time.Second, d.opts.ShutdownTimeout)
|
||||
})
|
||||
|
||||
t.Run("with mock medium", func(t *testing.T) {
|
||||
mock := io.NewMockMedium()
|
||||
pidPath := "/tmp/daemon.pid"
|
||||
|
||||
d := NewDaemon(DaemonOptions{
|
||||
Medium: mock,
|
||||
PIDFile: pidPath,
|
||||
HealthAddr: "127.0.0.1:0",
|
||||
})
|
||||
|
||||
err := d.Start()
|
||||
require.NoError(t, err)
|
||||
|
||||
assert.True(t, mock.Exists(pidPath))
|
||||
|
||||
err = d.Stop()
|
||||
require.NoError(t, err)
|
||||
assert.False(t, mock.Exists(pidPath))
|
||||
})
|
||||
}
|
||||
|
||||
func TestRunWithTimeout(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -52,10 +52,6 @@ func NewLinuxKitManagerWithHypervisor(state *State, hypervisor Hypervisor) *Linu
|
|||
|
||||
// Run starts a new LinuxKit VM from the given image.
|
||||
func (m *LinuxKitManager) Run(ctx context.Context, image string, opts RunOptions) (*Container, error) {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Validate image exists
|
||||
if !io.Local.IsFile(image) {
|
||||
return nil, fmt.Errorf("image not found: %s", image)
|
||||
|
|
@ -236,10 +232,6 @@ func (m *LinuxKitManager) waitForExit(id string, cmd *exec.Cmd) {
|
|||
|
||||
// Stop stops a running container by sending SIGTERM.
|
||||
func (m *LinuxKitManager) Stop(ctx context.Context, id string) error {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
container, ok := m.state.Get(id)
|
||||
if !ok {
|
||||
return fmt.Errorf("container not found: %s", id)
|
||||
|
|
@ -298,10 +290,6 @@ func (m *LinuxKitManager) Stop(ctx context.Context, id string) error {
|
|||
|
||||
// List returns all known containers, verifying process state.
|
||||
func (m *LinuxKitManager) List(ctx context.Context) ([]*Container, error) {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
containers := m.state.All()
|
||||
|
||||
// Verify each running container's process is still alive
|
||||
|
|
@ -331,10 +319,6 @@ func isProcessRunning(pid int) bool {
|
|||
|
||||
// Logs returns a reader for the container's log output.
|
||||
func (m *LinuxKitManager) Logs(ctx context.Context, id string, follow bool) (goio.ReadCloser, error) {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
_, ok := m.state.Get(id)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("container not found: %s", id)
|
||||
|
|
@ -419,10 +403,6 @@ func (f *followReader) Close() error {
|
|||
|
||||
// Exec executes a command inside the container via SSH.
|
||||
func (m *LinuxKitManager) Exec(ctx context.Context, id string, cmd []string) error {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
container, ok := m.state.Get(id)
|
||||
if !ok {
|
||||
return fmt.Errorf("container not found: %s", id)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue