From 8ff79d8a2da0b7f2c1f493b08015a1f9523fac45 Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Fri, 9 Sep 2022 12:26:34 -0400
Subject: [PATCH] CI: make `make check` clean on macOS (#14528)

Running `make check` on macOS identifies some dead code because the code is used
only with the Linux build tag. Move this code into appropriately-tagged code
files.
---
 client/fingerprint/cgroup.go           |  3 +--
 client/fingerprint/cgroup_linux.go     |  4 ++++
 client/lib/cgutil/cpuset_manager.go    | 13 -------------
 client/lib/cgutil/cpuset_manager_v2.go | 13 +++++++++++++
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/client/fingerprint/cgroup.go b/client/fingerprint/cgroup.go
index b24c3f0a3..ce88fdc83 100644
--- a/client/fingerprint/cgroup.go
+++ b/client/fingerprint/cgroup.go
@@ -8,8 +8,7 @@ import (
 )
 
 const (
-	cgroupAvailable   = "available"
-	cgroupUnavailable = "unavailable"
+	cgroupUnavailable = "unavailable" // "available" is over in cgroup_linux
 
 	cgroupMountPointAttribute = "unique.cgroup.mountpoint"
 	cgroupVersionAttribute    = "unique.cgroup.version"
diff --git a/client/fingerprint/cgroup_linux.go b/client/fingerprint/cgroup_linux.go
index a951dca65..e4decda8a 100644
--- a/client/fingerprint/cgroup_linux.go
+++ b/client/fingerprint/cgroup_linux.go
@@ -6,6 +6,10 @@ import (
 	"fmt"
 )
 
+const (
+	cgroupAvailable = "available"
+)
+
 // Fingerprint tries to find a valid cgroup mount point and the version of cgroups
 // if a mount-point is present.
 func (f *CGroupFingerprint) Fingerprint(req *FingerprintRequest, resp *FingerprintResponse) error {
diff --git a/client/lib/cgutil/cpuset_manager.go b/client/lib/cgutil/cpuset_manager.go
index b3e56fa60..17530f1be 100644
--- a/client/lib/cgutil/cpuset_manager.go
+++ b/client/lib/cgutil/cpuset_manager.go
@@ -2,7 +2,6 @@ package cgutil
 
 import (
 	"context"
-	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -61,18 +60,6 @@ type TaskCgroupInfo struct {
 	Error              error
 }
 
-// identity is the "<allocID>.<taskName>" string that uniquely identifies an
-// individual instance of a task within the flat cgroup namespace
-type identity string
-
-func makeID(allocID, task string) identity {
-	return identity(fmt.Sprintf("%s.%s", allocID, task))
-}
-
-func makeScope(id identity) string {
-	return string(id) + ".scope"
-}
-
 // SplitPath determines the parent and cgroup from p.
 // p must contain at least 2 elements (parent + cgroup).
 //
diff --git a/client/lib/cgutil/cpuset_manager_v2.go b/client/lib/cgutil/cpuset_manager_v2.go
index 42942308f..355d7e200 100644
--- a/client/lib/cgutil/cpuset_manager_v2.go
+++ b/client/lib/cgutil/cpuset_manager_v2.go
@@ -4,6 +4,7 @@ package cgutil
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -314,3 +315,15 @@ func getCPUsFromCgroupV2(group string) ([]uint16, error) {
 	}
 	return set.ToSlice(), nil
 }
+
+// identity is the "<allocID>.<taskName>" string that uniquely identifies an
+// individual instance of a task within the flat cgroup namespace
+type identity string
+
+func makeID(allocID, task string) identity {
+	return identity(fmt.Sprintf("%s.%s", allocID, task))
+}
+
+func makeScope(id identity) string {
+	return string(id) + ".scope"
+}