Move substituteUVMPath to test specific go files

This function is now only used by tests, and having it in non _test files
causses unused function lints.

Signed-off-by: Tingmao Wang <[email protected]>

Author: micromaomao

pkg/securitypolicy/regopolicy_linux_test.go

@@ -17,6 +17,8 @@ import (
 	"testing"
 	"testing/quick"
 
+	specInternal "github.com/Microsoft/hcsshim/internal/guest/spec"
+	"github.com/Microsoft/hcsshim/internal/guestpath"
 	rpi "github.com/Microsoft/hcsshim/internal/regopolicyinterpreter"
 	oci "github.com/opencontainers/runtime-spec/specs-go"
 )
@@ -6324,3 +6326,15 @@ func testGetUserInfo(t *testing.T, tc getUserInfoTestCase, userStr string, regoE
 		}
 	})
 }
+
+// substituteUVMPath substitutes mount prefix to an appropriate path inside
+// UVM. At policy generation time, it's impossible to tell what the sandboxID
+// will be, so the prefix substitution needs to happen during runtime.
+func substituteUVMPath(sandboxID string, m mountInternal) mountInternal {
+	if strings.HasPrefix(m.Source, guestpath.SandboxMountPrefix) {
+		m.Source = specInternal.SandboxMountSource(sandboxID, m.Source)
+	} else if strings.HasPrefix(m.Source, guestpath.HugePagesMountPrefix) {
+		m.Source = specInternal.HugePagesMountSource(sandboxID, m.Source)
+	}
+	return m
+}

pkg/securitypolicy/regopolicy_windows_test.go

@@ -1329,3 +1329,13 @@ func Test_Rego_DumpStacksPolicy_Off(t *testing.T) {
 		t.Errorf("Test_Rego_DumpStacksPolicy_Off: %v", err)
 	}
 }
+
+// This is a no-op for windows.
+// substituteUVMPath substitutes mount prefix to an appropriate path inside
+// UVM. At policy generation time, it's impossible to tell what the sandboxID
+// will be, so the prefix substitution needs to happen during runtime.
+func substituteUVMPath(sandboxID string, m mountInternal) mountInternal {
+	//no-op for windows
+	_ = sandboxID
+	return m
+}

pkg/securitypolicy/securitypolicy_linux.go

@@ -8,10 +8,8 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
 
 	specInternal "github.com/Microsoft/hcsshim/internal/guest/spec"
-	"github.com/Microsoft/hcsshim/internal/guestpath"
 	"github.com/moby/sys/user"
 	oci "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
@@ -20,21 +18,6 @@ import (
 //nolint:unused
 const osType = "linux"
 
-// This is being used by StandEnforcer.
-// substituteUVMPath substitutes mount prefix to an appropriate path inside
-// UVM. At policy generation time, it's impossible to tell what the sandboxID
-// will be, so the prefix substitution needs to happen during runtime.
-//
-//nolint:unused // linting is wrong, this is used in rego_utils_test.go
-func substituteUVMPath(sandboxID string, m mountInternal) mountInternal {
-	if strings.HasPrefix(m.Source, guestpath.SandboxMountPrefix) {
-		m.Source = specInternal.SandboxMountSource(sandboxID, m.Source)
-	} else if strings.HasPrefix(m.Source, guestpath.HugePagesMountPrefix) {
-		m.Source = specInternal.HugePagesMountSource(sandboxID, m.Source)
-	}
-	return m
-}
-
 // SandboxMountsDir returns sandbox mounts directory inside UVM/host.
 func SandboxMountsDir(sandboxID string) string {
 	return specInternal.SandboxMountsDir((sandboxID))

pkg/securitypolicy/securitypolicy_windows.go

@@ -8,18 +8,6 @@ import oci "github.com/opencontainers/runtime-spec/specs-go"
 //nolint:unused
 const osType = "windows"
 
-// This is being used by StandEnforcer and is a no-op for windows.
-// substituteUVMPath substitutes mount prefix to an appropriate path inside
-// UVM. At policy generation time, it's impossible to tell what the sandboxID
-// will be, so the prefix substitution needs to happen during runtime.
-//
-//nolint:unused // linting is wrong, this is used in rego_utils_test.go
-func substituteUVMPath(sandboxID string, m mountInternal) mountInternal {
-	//no-op for windows
-	_ = sandboxID
-	return m
-}
-
 // SandboxMountsDir returns sandbox mounts directory inside UVM/host.
 func SandboxMountsDir(sandboxID string) string {
 	return ""