Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions pkg/desktop/sockets_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,35 @@ import (

func getDockerDesktopPaths() (DockerDesktopPaths, error) {
_, err := os.Stat("/run/host-services/backend.sock")
if err != nil {
if !errors.Is(err, os.ErrNotExist) {
return DockerDesktopPaths{}, err
}
if err == nil {
// Inside LinuxKit
return DockerDesktopPaths{
BackendSocket: "/run/host-services/backend.sock",
}, nil
}

home, err := os.UserHomeDir()
if err != nil {
return DockerDesktopPaths{}, err
}
if !errors.Is(err, os.ErrNotExist) {
return DockerDesktopPaths{}, err
}

// On Linux
if _, err = os.Stat("/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock"); err == nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Variable Shadowing: The WSL2 check uses if _, err = os.Stat(...) which shadows the outer err variable. While this works correctly, it might be clearer to use a new variable name or be explicit:

_, wslErr := os.Stat("/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock")
if wslErr == nil {
    // Inside WSL2
    return DockerDesktopPaths{...}, nil
}
if !errors.Is(wslErr, os.ErrNotExist) {
    return DockerDesktopPaths{}, wslErr
}

This makes it clearer that we're checking a different filesystem operation.

// Inside WSL2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DRY Violation: This error check pattern if !errors.Is(err, os.ErrNotExist) is repeated twice (lines 18-20 and 29-31). Consider extracting it:

if err := checkNotExist(err); err != nil {
    return DockerDesktopPaths{}, err
}

func checkNotExist(err error) error {
    if err != nil && !errors.Is(err, os.ErrNotExist) {
        return err
    }
    return nil
}

Or simply reuse the err variable:

_, err = os.Stat("/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock")
if err == nil {
    return DockerDesktopPaths{...}, nil
}
if !errors.Is(err, os.ErrNotExist) {
    return DockerDesktopPaths{}, err
}

return DockerDesktopPaths{
BackendSocket: filepath.Join(home, ".docker", "desktop", "backend.sock"),
BackendSocket: "/mnt/wsl/docker-desktop/shared-sockets/host-services/backend.sock",
}, nil
}

// Inside LinuxKit
if !errors.Is(err, os.ErrNotExist) {
return DockerDesktopPaths{}, err
}

home, err := os.UserHomeDir()
if err != nil {
return DockerDesktopPaths{}, err
}

// On Linux
return DockerDesktopPaths{
BackendSocket: "/run/host-services/backend.sock",
BackendSocket: filepath.Join(home, ".docker", "desktop", "backend.sock"),
}, nil
}