From e0ec00d141ee3ca1f75689a6011c90691613aad7 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Thu, 16 Oct 2025 19:40:03 +0200 Subject: [PATCH] Remove rendundant instance prefix from status --- pkg/instance/instance.go | 6 +++--- pkg/instance/instance_test.go | 12 ++++++------ pkg/instance/status.go | 16 ++++++++-------- pkg/instance/timeout_test.go | 12 ++++++------ pkg/manager/manager.go | 6 +++--- pkg/manager/operations.go | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index 605fd59..5123dab 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -22,8 +22,8 @@ type Instance struct { globalBackendSettings *config.BackendConfig // Status - Status InstanceStatus `json:"status"` - onStatusChange func(oldStatus, newStatus InstanceStatus) + Status Status `json:"status"` + onStatusChange func(oldStatus, newStatus Status) // Creation time Created int64 `json:"created,omitempty"` // Unix timestamp when the instance was created @@ -49,7 +49,7 @@ type Instance struct { } // NewInstance creates a new instance with the given name, log path, and options -func NewInstance(name string, globalBackendSettings *config.BackendConfig, globalInstanceSettings *config.InstancesConfig, options *CreateInstanceOptions, onStatusChange func(oldStatus, newStatus InstanceStatus)) *Instance { +func NewInstance(name string, globalBackendSettings *config.BackendConfig, globalInstanceSettings *config.InstancesConfig, options *CreateInstanceOptions, onStatusChange func(oldStatus, newStatus Status)) *Instance { // Validate and copy options options.ValidateAndApplyDefaults(name, globalInstanceSettings) diff --git a/pkg/instance/instance_test.go b/pkg/instance/instance_test.go index f22ee72..9940633 100644 --- a/pkg/instance/instance_test.go +++ b/pkg/instance/instance_test.go @@ -42,7 +42,7 @@ func TestNewInstance(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) @@ -113,7 +113,7 @@ func TestNewInstance_WithRestartOptions(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} instance := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) opts := instance.GetOptions() @@ -162,7 +162,7 @@ func TestSetOptions(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, initialOptions, mockOnStatusChange) @@ -220,7 +220,7 @@ func TestGetProxy(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) @@ -275,7 +275,7 @@ func TestMarshalJSON(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} instance := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) @@ -444,7 +444,7 @@ func TestCreateInstanceOptionsValidation(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} instance := instance.NewInstance("test", backendConfig, globalSettings, options, mockOnStatusChange) opts := instance.GetOptions() diff --git a/pkg/instance/status.go b/pkg/instance/status.go index b06bef0..2c1045e 100644 --- a/pkg/instance/status.go +++ b/pkg/instance/status.go @@ -6,27 +6,27 @@ import ( ) // Enum for instance status -type InstanceStatus int +type Status int const ( - Stopped InstanceStatus = iota + Stopped Status = iota Running Failed ) -var nameToStatus = map[string]InstanceStatus{ +var nameToStatus = map[string]Status{ "stopped": Stopped, "running": Running, "failed": Failed, } -var statusToName = map[InstanceStatus]string{ +var statusToName = map[Status]string{ Stopped: "stopped", Running: "running", Failed: "failed", } -func (p *Instance) SetStatus(status InstanceStatus) { +func (p *Instance) SetStatus(status Status) { oldStatus := p.Status p.Status = status @@ -35,7 +35,7 @@ func (p *Instance) SetStatus(status InstanceStatus) { } } -func (p *Instance) GetStatus() InstanceStatus { +func (p *Instance) GetStatus() Status { return p.Status } @@ -44,7 +44,7 @@ func (p *Instance) IsRunning() bool { return p.Status == Running } -func (s InstanceStatus) MarshalJSON() ([]byte, error) { +func (s Status) MarshalJSON() ([]byte, error) { name, ok := statusToName[s] if !ok { name = "stopped" // Default to "stopped" for unknown status @@ -53,7 +53,7 @@ func (s InstanceStatus) MarshalJSON() ([]byte, error) { } // UnmarshalJSON implements json.Unmarshaler -func (s *InstanceStatus) UnmarshalJSON(data []byte) error { +func (s *Status) UnmarshalJSON(data []byte) error { var str string if err := json.Unmarshal(data, &str); err != nil { return err diff --git a/pkg/instance/timeout_test.go b/pkg/instance/timeout_test.go index 1171c6a..c602131 100644 --- a/pkg/instance/timeout_test.go +++ b/pkg/instance/timeout_test.go @@ -54,7 +54,7 @@ func TestUpdateLastRequestTime(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) @@ -86,7 +86,7 @@ func TestShouldTimeout_NotRunning(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) @@ -122,7 +122,7 @@ func TestShouldTimeout_NoTimeoutConfigured(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} options := &instance.CreateInstanceOptions{ IdleTimeout: tt.idleTimeout, @@ -167,7 +167,7 @@ func TestShouldTimeout_WithinTimeLimit(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) inst.SetStatus(instance.Running) @@ -205,7 +205,7 @@ func TestShouldTimeout_ExceedsTimeLimit(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) inst.SetStatus(instance.Running) @@ -261,7 +261,7 @@ func TestTimeoutConfiguration_Validation(t *testing.T) { } // Mock onStatusChange function - mockOnStatusChange := func(oldStatus, newStatus instance.InstanceStatus) {} + mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, mockOnStatusChange) opts := inst.GetOptions() diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index 258d4b7..12e1a59 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -276,10 +276,10 @@ func (im *instanceManager) loadInstance(name, path string) error { // Check if this is a remote instance isRemote := options != nil && len(options.Nodes) > 0 - var statusCallback func(oldStatus, newStatus instance.InstanceStatus) + var statusCallback func(oldStatus, newStatus instance.Status) if !isRemote { // Only set status callback for local instances - statusCallback = func(oldStatus, newStatus instance.InstanceStatus) { + statusCallback = func(oldStatus, newStatus instance.Status) { im.onStatusChange(persistedInstance.Name, oldStatus, newStatus) } } @@ -361,7 +361,7 @@ func (im *instanceManager) autoStartInstances() { } } -func (im *instanceManager) onStatusChange(name string, oldStatus, newStatus instance.InstanceStatus) { +func (im *instanceManager) onStatusChange(name string, oldStatus, newStatus instance.Status) { im.mu.Lock() defer im.mu.Unlock() diff --git a/pkg/manager/operations.go b/pkg/manager/operations.go index b33c34c..80858d0 100644 --- a/pkg/manager/operations.go +++ b/pkg/manager/operations.go @@ -148,7 +148,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.CreateI return nil, err } - statusCallback := func(oldStatus, newStatus instance.InstanceStatus) { + statusCallback := func(oldStatus, newStatus instance.Status) { im.onStatusChange(name, oldStatus, newStatus) }