pkg/autostart: Avoid importing code that is not used during runtime.

Signed-off-by: Norio Nomura <[email protected]>

Author: norio-nomura

pkg/autostart/autostart.go

@@ -6,10 +6,8 @@ package autostart
 
 import (
 	"context"
-	"runtime"
 	"sync"
 
-	"github.com/lima-vm/lima/v2/pkg/autostart/systemd"
 	"github.com/lima-vm/lima/v2/pkg/limatype"
 )
 
@@ -59,15 +57,4 @@ type autoStartManager interface {
 	RequestStop(ctx context.Context, inst *limatype.Instance) (bool, error)
 }
 
-var manager = sync.OnceValue(func() autoStartManager {
-	switch runtime.GOOS {
-	case "darwin":
-		return Launchd
-	case "linux":
-		if systemd.IsRunningSystemd() {
-			return Systemd
-		}
-		// TODO: support other init systems
-	}
-	return &notSupportedManager{}
-})
+var manager = sync.OnceValue(Manager)

pkg/autostart/autostart_test.go

@@ -8,6 +8,28 @@ import (
 	"testing"
 
 	"gotest.tools/v3/assert"
+
+	"github.com/lima-vm/lima/v2/pkg/autostart/launchd"
+	"github.com/lima-vm/lima/v2/pkg/autostart/systemd"
+)
+
+var (
+	Launchd = &TemplateFileBasedManager{
+		filePath:              launchd.GetPlistPath,
+		template:              launchd.Template,
+		enabler:               launchd.EnableDisableService,
+		autoStartedIdentifier: launchd.AutoStartedServiceName,
+		requestStart:          launchd.RequestStart,
+		requestStop:           launchd.RequestStop,
+	}
+	Systemd = &TemplateFileBasedManager{
+		filePath:              systemd.GetUnitPath,
+		template:              systemd.Template,
+		enabler:               systemd.EnableDisableUnit,
+		autoStartedIdentifier: systemd.AutoStartedUnitName,
+		requestStart:          systemd.RequestStart,
+		requestStop:           systemd.RequestStop,
+	}
 )
 
 func TestRenderTemplate(t *testing.T) {

pkg/autostart/managers.go

@@ -12,14 +12,14 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/lima-vm/lima/v2/pkg/autostart/launchd"
-	"github.com/lima-vm/lima/v2/pkg/autostart/systemd"
 	"github.com/lima-vm/lima/v2/pkg/limatype"
 	"github.com/lima-vm/lima/v2/pkg/textutil"
 )
 
 type notSupportedManager struct{}
 
+var _ autoStartManager = (*notSupportedManager)(nil)
+
 var ErrNotSupported = fmt.Errorf("autostart is not supported on %s", runtime.GOOS)
 
 func (*notSupportedManager) IsRegistered(_ context.Context, _ *limatype.Instance) (bool, error) {
@@ -46,26 +46,6 @@ func (*notSupportedManager) RequestStop(_ context.Context, _ *limatype.Instance)
 	return false, ErrNotSupported
 }
 
-// Launchd is the autostart manager for macOS.
-var Launchd = &TemplateFileBasedManager{
-	filePath:              launchd.GetPlistPath,
-	template:              launchd.Template,
-	enabler:               launchd.EnableDisableService,
-	autoStartedIdentifier: launchd.AutoStartedServiceName,
-	requestStart:          launchd.RequestStart,
-	requestStop:           launchd.RequestStop,
-}
-
-// Systemd is the autostart manager for Linux.
-var Systemd = &TemplateFileBasedManager{
-	filePath:              systemd.GetUnitPath,
-	template:              systemd.Template,
-	enabler:               systemd.EnableDisableUnit,
-	autoStartedIdentifier: systemd.AutoStartedUnitName,
-	requestStart:          systemd.RequestStart,
-	requestStop:           systemd.RequestStop,
-}
-
 // TemplateFileBasedManager is an autostart manager that uses a template file to create the autostart entry.
 type TemplateFileBasedManager struct {
 	enabler               func(ctx context.Context, enable bool, instName string) error
@@ -76,6 +56,8 @@ type TemplateFileBasedManager struct {
 	requestStop           func(ctx context.Context, inst *limatype.Instance) (bool, error)
 }
 
+var _ autoStartManager = (*TemplateFileBasedManager)(nil)
+
 func (t *TemplateFileBasedManager) IsRegistered(_ context.Context, inst *limatype.Instance) (bool, error) {
 	if t.filePath == nil {
 		return false, errors.New("no filePath function available")

pkg/autostart/managers_darwin.go

@@ -0,0 +1,18 @@
+// SPDX-FileCopyrightText: Copyright The Lima Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package autostart
+
+import "github.com/lima-vm/lima/v2/pkg/autostart/launchd"
+
+// Manager returns the autostart manager for Darwin.
+func Manager() autoStartManager {
+	return &TemplateFileBasedManager{
+		filePath:              launchd.GetPlistPath,
+		template:              launchd.Template,
+		enabler:               launchd.EnableDisableService,
+		autoStartedIdentifier: launchd.AutoStartedServiceName,
+		requestStart:          launchd.RequestStart,
+		requestStop:           launchd.RequestStop,
+	}
+}

pkg/autostart/managers_linux.go

@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: Copyright The Lima Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package autostart
+
+import "github.com/lima-vm/lima/v2/pkg/autostart/systemd"
+
+// Manager returns the autostart manager for Linux.
+func Manager() autoStartManager {
+	if systemd.IsRunningSystemd() {
+		return &TemplateFileBasedManager{
+			filePath:              systemd.GetUnitPath,
+			template:              systemd.Template,
+			enabler:               systemd.EnableDisableUnit,
+			autoStartedIdentifier: systemd.AutoStartedUnitName,
+			requestStart:          systemd.RequestStart,
+			requestStop:           systemd.RequestStop,
+		}
+	}
+	// TODO: add support for non-systemd Linux distros
+	return &notSupportedManager{}
+}

pkg/autostart/managers_others.go

@@ -0,0 +1,11 @@
+//go:build !darwin && !linux
+
+// SPDX-FileCopyrightText: Copyright The Lima Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package autostart
+
+// Manager returns a notSupportedManager for unsupported OSes.
+func Manager() autoStartManager {
+	return &notSupportedManager{}
+}