From 3f834004a82e0bc48c83f93a8f1b9dcbbd3890f1 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Sat, 18 Oct 2025 00:34:18 +0200 Subject: [PATCH] Rename NewInstance to New --- pkg/instance/instance.go | 6 +++--- pkg/instance/instance_test.go | 14 +++++++------- pkg/instance/timeout_test.go | 12 ++++++------ pkg/manager/manager.go | 2 +- pkg/manager/operations.go | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index 1407eba..5b29737 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -27,7 +27,7 @@ type Instance struct { // Global configuration (read-only, no lock needed) globalInstanceSettings *config.InstancesConfig globalBackendSettings *config.BackendConfig - localNodeName string `json:"-"` // Name of the local node for remote detection + localNodeName string `json:"-"` // Name of the local node for remote detection // Components (can be nil for remote instances or when stopped) logger *logger `json:"-"` // nil for remote instances @@ -47,8 +47,8 @@ type Instance struct { monitorDone chan struct{} `json:"-"` // Channel to signal monitor goroutine completion } -// NewInstance creates a new instance with the given name, log path, and options -func NewInstance(name string, globalBackendSettings *config.BackendConfig, globalInstanceSettings *config.InstancesConfig, opts *Options, localNodeName string, onStatusChange func(oldStatus, newStatus Status)) *Instance { +// New creates a new instance with the given name, log path, and options +func New(name string, globalBackendSettings *config.BackendConfig, globalInstanceSettings *config.InstancesConfig, opts *Options, localNodeName string, onStatusChange func(oldStatus, newStatus Status)) *Instance { // Validate and copy options opts.ValidateAndApplyDefaults(name, globalInstanceSettings) diff --git a/pkg/instance/instance_test.go b/pkg/instance/instance_test.go index 5260769..ac9019e 100644 --- a/pkg/instance/instance_test.go +++ b/pkg/instance/instance_test.go @@ -44,7 +44,7 @@ func TestNewInstance(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) if inst.Name != "test-instance" { t.Errorf("Expected name 'test-instance', got %q", inst.Name) @@ -115,7 +115,7 @@ func TestNewInstance_WithRestartOptions(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - instance := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + instance := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) opts := instance.GetOptions() // Check that explicit values override defaults @@ -164,7 +164,7 @@ func TestSetOptions(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, initialOptions, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, initialOptions, "main", mockOnStatusChange) // Update options newOptions := &instance.Options{ @@ -217,7 +217,7 @@ func TestSetOptions_PreservesNodes(t *testing.T) { } mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, initialOptions, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, initialOptions, "main", mockOnStatusChange) // Try to update with different nodes updatedOptions := &instance.Options{ @@ -274,7 +274,7 @@ func TestGetProxy(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) // Get proxy for the first time proxy1, err := inst.GetProxy() @@ -329,7 +329,7 @@ func TestMarshalJSON(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - instance := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + instance := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) data, err := json.Marshal(instance) if err != nil { @@ -498,7 +498,7 @@ func TestCreateOptionsValidation(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - instance := instance.NewInstance("test", backendConfig, globalSettings, options, "main", mockOnStatusChange) + instance := instance.New("test", backendConfig, globalSettings, options, "main", mockOnStatusChange) opts := instance.GetOptions() if opts.MaxRestarts == nil { diff --git a/pkg/instance/timeout_test.go b/pkg/instance/timeout_test.go index d4f5176..e49e893 100644 --- a/pkg/instance/timeout_test.go +++ b/pkg/instance/timeout_test.go @@ -56,7 +56,7 @@ func TestUpdateLastRequestTime(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) // Test that UpdateLastRequestTime doesn't panic inst.UpdateLastRequestTime() @@ -88,7 +88,7 @@ func TestShouldTimeout_NotRunning(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) // Instance is not running, should not timeout regardless of configuration if inst.ShouldTimeout() { @@ -132,7 +132,7 @@ func TestShouldTimeout_NoTimeoutConfigured(t *testing.T) { }, } - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) // Simulate running state inst.SetStatus(instance.Running) @@ -169,7 +169,7 @@ func TestShouldTimeout_WithinTimeLimit(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) inst.SetStatus(instance.Running) // Update last request time to now @@ -207,7 +207,7 @@ func TestShouldTimeout_ExceedsTimeLimit(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) inst.SetStatus(instance.Running) // Use MockTimeProvider to simulate old last request time @@ -263,7 +263,7 @@ func TestTimeoutConfiguration_Validation(t *testing.T) { // Mock onStatusChange function mockOnStatusChange := func(oldStatus, newStatus instance.Status) {} - inst := instance.NewInstance("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) + inst := instance.New("test-instance", backendConfig, globalSettings, options, "main", mockOnStatusChange) opts := inst.GetOptions() if opts.IdleTimeout == nil || *opts.IdleTimeout != tt.expectedTimeout { diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index b4378a7..894b8df 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -298,7 +298,7 @@ func (im *instanceManager) loadInstance(name, path string) error { } // Create new inst using NewInstance (handles validation, defaults, setup) - inst := instance.NewInstance(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, statusCallback) + inst := instance.New(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, statusCallback) // Restore persisted fields that NewInstance doesn't set inst.Created = persistedInstance.Created diff --git a/pkg/manager/operations.go b/pkg/manager/operations.go index 5931cfa..7129794 100644 --- a/pkg/manager/operations.go +++ b/pkg/manager/operations.go @@ -122,7 +122,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.Options // Create a local stub that preserves the Nodes field for tracking // We keep the original options (with Nodes) so IsRemote() works correctly - inst := instance.NewInstance(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, nil) + inst := instance.New(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, nil) // Update the local stub with all remote data (preserving Nodes) im.updateLocalInstanceFromRemote(inst, remoteInst) @@ -155,7 +155,7 @@ func (im *instanceManager) CreateInstance(name string, options *instance.Options im.onStatusChange(name, oldStatus, newStatus) } - inst := instance.NewInstance(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, statusCallback) + inst := instance.New(name, &im.backendsConfig, &im.instancesConfig, options, im.localNodeName, statusCallback) im.instances[inst.Name] = inst if err := im.persistInstance(inst); err != nil {