add cross-platform declaration for IsContainerized()

johnstcn · johnstcn · commit 0e1c96af882b · 2023-06-13T17:33:31.000+01:00
diff --git a/cli/clistat/container.go b/cli/clistat/container.go
@@ -0,0 +1,11 @@
+//go:build !linux
+
+package clistat
+
+// IsContainerized returns whether the host is containerized.
+// This is adapted from https://github.com/elastic/go-sysinfo/tree/main/providers/linux/container.go#L31
+// with modifications to support Sysbox containers.
+// On non-Linux platforms, it always returns false.
+func IsContainerized() (bool, error) {
+	return false, nil
+}
diff --git a/cli/clistat/container_linux.go b/cli/clistat/container_linux.go
@@ -0,0 +1,52 @@
+package clistat
+
+import (
+	"bufio"
+	"bytes"
+	"os"
+
+	"golang.org/x/xerrors"
+)
+
+// IsContainerized returns whether the host is containerized.
+// This is adapted from https://github.com/elastic/go-sysinfo/tree/main/providers/linux/container.go#L31
+// with modifications to support Sysbox containers.
+// On non-Linux platforms, it always returns false.
+func IsContainerized() (bool, error) {
+	data, err := os.ReadFile(procOneCgroup)
+	if err != nil {
+		if os.IsNotExist(err) { // how?
+			return false, nil
+		}
+		return false, xerrors.Errorf("read process cgroups: %w", err)
+	}
+
+	s := bufio.NewScanner(bytes.NewReader(data))
+	for s.Scan() {
+		line := s.Bytes()
+		if bytes.Contains(line, []byte("docker")) ||
+			bytes.Contains(line, []byte(".slice")) ||
+			bytes.Contains(line, []byte("lxc")) ||
+			bytes.Contains(line, []byte("kubepods")) {
+			return true, nil
+		}
+	}
+
+	// Last-ditch effort to detect Sysbox containers.
+	// Check if we have anything mounted as type sysboxfs in /proc/mounts
+	data, err = os.ReadFile("/proc/mounts")
+	if err != nil {
+		return false, xerrors.Errorf("read /proc/mounts: %w", err)
+	}
+
+	s = bufio.NewScanner(bytes.NewReader(data))
+	for s.Scan() {
+		line := s.Bytes()
+		if bytes.HasPrefix(line, []byte("sysboxfs")) {
+			return true, nil
+		}
+	}
+
+	// If we get here, we are _probably_ not running in a container.
+	return false, nil
+}
diff --git a/cli/clistat/stat.go b/cli/clistat/stat.go
@@ -1,9 +1,6 @@
 package clistat
 
 import (
-	"bufio"
-	"bytes"
-	"os"
 	"runtime"
 	"strconv"
 	"strings"
@@ -156,45 +153,3 @@ func (s *Statter) ContainerCPU() (*Result, error) {
 func (s *Statter) ContainerMemory() (*Result, error) {
 	return nil, xerrors.Errorf("not implemented")
 }
-
-// IsContainerized returns whether the host is containerized.
-// This is adapted from https://github.com/elastic/go-sysinfo/tree/main/providers/linux/container.go#L31
-// with modifications to support Sysbox containers.
-func IsContainerized() (bool, error) {
-	data, err := os.ReadFile(procOneCgroup)
-	if err != nil {
-		if os.IsNotExist(err) { // how?
-			return false, nil
-		}
-		return false, xerrors.Errorf("read process cgroups: %w", err)
-	}
-
-	s := bufio.NewScanner(bytes.NewReader(data))
-	for s.Scan() {
-		line := s.Bytes()
-		if bytes.Contains(line, []byte("docker")) ||
-			bytes.Contains(line, []byte(".slice")) ||
-			bytes.Contains(line, []byte("lxc")) ||
-			bytes.Contains(line, []byte("kubepods")) {
-			return true, nil
-		}
-	}
-
-	// Last-ditch effort to detect Sysbox containers.
-	// Check if we have anything mounted as type sysboxfs in /proc/mounts
-	data, err = os.ReadFile("/proc/mounts")
-	if err != nil {
-		return false, xerrors.Errorf("read /proc/mounts: %w", err)
-	}
-
-	s = bufio.NewScanner(bytes.NewReader(data))
-	for s.Scan() {
-		line := s.Bytes()
-		if bytes.HasPrefix(line, []byte("sysboxfs")) {
-			return true, nil
-		}
-	}
-
-	// If we get here, we are _probably_ not running in a container.
-	return false, nil
-}
