contrib: buildable on other platforms (darwin/wins) (#155)

Just make it buildable on other platforms.

Signed-off-by: Wei Fu <[email protected]>

Author: fuweid

contrib/internal/mountns/ns.go renamed to contrib/internal/mountns/ns_linux.go

@@ -1,3 +1,5 @@
+//go:build linux
+
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 

contrib/internal/mountns/ns_other.go

@@ -0,0 +1,12 @@
+//go:build !linux
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+package mountns
+
+import "fmt"
+
+func Executes(run func() error) error {
+	return fmt.Errorf("not supported")
+}

contrib/utils/kubectl_cmd.go

@@ -9,11 +9,6 @@ import (
 	"net/url"
 	"strings"
 	"time"
-
-	"github.com/Azure/kperf/contrib/internal/mountns"
-	"golang.org/x/sys/unix"
-
-	"k8s.io/klog/v2"
 )
 
 // KubectlRunner is the wrapper of exec.Command to execute kubectl command.
@@ -57,43 +52,6 @@ func (kr *KubectlRunner) FQDN(ctx context.Context, timeout time.Duration) (strin
 	return strings.ToLower(host), nil
 }
 
-// Metrics returns the metrics for a specific kube-apiserver.
-func (kr *KubectlRunner) Metrics(ctx context.Context, timeout time.Duration, fqdn, ip string) ([]byte, error) {
-	args := []string{}
-	if kr.kubeCfgPath != "" {
-		args = append(args, "--kubeconfig", kr.kubeCfgPath)
-	}
-	args = append(args, "get", "--raw", "/metrics")
-
-	var result []byte
-
-	merr := mountns.Executes(func() error {
-		newETCHostFile, cleanup, err := CreateTempFileWithContent([]byte(fmt.Sprintf("%s %s\n", ip, fqdn)))
-		if err != nil {
-			return err
-		}
-		defer func() { _ = cleanup() }()
-
-		target := "/etc/hosts"
-
-		err = unix.Mount(newETCHostFile, target, "none", unix.MS_BIND, "")
-		if err != nil {
-			return fmt.Errorf("failed to mount %s on %s: %w",
-				newETCHostFile, target, err)
-		}
-		defer func() {
-			derr := unix.Unmount(target, 0)
-			if derr != nil {
-				klog.Warningf("failed umount %s", target)
-			}
-		}()
-
-		result, err = runCommand(ctx, timeout, "kubectl", args)
-		return err
-	})
-	return result, merr
-}
-
 // Wait runs wait subcommand.
 func (kr *KubectlRunner) Wait(ctx context.Context, timeout time.Duration, condition, waitTimeout, target string) error {
 	if condition == "" {

contrib/utils/kubectl_cmd_linux.go

@@ -0,0 +1,54 @@
+//go:build linux
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+package utils
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/Azure/kperf/contrib/internal/mountns"
+
+	"golang.org/x/sys/unix"
+	"k8s.io/klog/v2"
+)
+
+// Metrics returns the metrics for a specific kube-apiserver.
+func (kr *KubectlRunner) Metrics(ctx context.Context, timeout time.Duration, fqdn, ip string) ([]byte, error) {
+	args := []string{}
+	if kr.kubeCfgPath != "" {
+		args = append(args, "--kubeconfig", kr.kubeCfgPath)
+	}
+	args = append(args, "get", "--raw", "/metrics")
+
+	var result []byte
+
+	merr := mountns.Executes(func() error {
+		newETCHostFile, cleanup, err := CreateTempFileWithContent([]byte(fmt.Sprintf("%s %s\n", ip, fqdn)))
+		if err != nil {
+			return err
+		}
+		defer func() { _ = cleanup() }()
+
+		target := "/etc/hosts"
+
+		err = unix.Mount(newETCHostFile, target, "none", unix.MS_BIND, "")
+		if err != nil {
+			return fmt.Errorf("failed to mount %s on %s: %w",
+				newETCHostFile, target, err)
+		}
+		defer func() {
+			derr := unix.Unmount(target, 0)
+			if derr != nil {
+				klog.Warningf("failed umount %s", target)
+			}
+		}()
+
+		result, err = runCommand(ctx, timeout, "kubectl", args)
+		return err
+	})
+	return result, merr
+}

contrib/utils/kubectl_cmd_other.go

@@ -0,0 +1,17 @@
+//go:build !linux
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+package utils
+
+import (
+	"context"
+	"fmt"
+	"time"
+)
+
+// Metrics returns the metrics for a specific kube-apiserver.
+func (kr *KubectlRunner) Metrics(ctx context.Context, timeout time.Duration, fqdn, ip string) ([]byte, error) {
+	return nil, fmt.Errorf("not supported")
+}

contrib/utils/utils.go

@@ -10,11 +10,9 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"os/exec"
 	"sort"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/Azure/kperf/api/types"
@@ -426,8 +424,7 @@ func runCommand(ctx context.Context, timeout time.Duration, cmd string, args []s
 		defer cancel()
 	}
 
-	c := exec.CommandContext(ctx, cmd, args...)
-	c.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGKILL}
+	c := newExecCommand(ctx, cmd, args...)
 
 	logger.WithKeyValues("level", "info").LogKV("msg", "start command", "cmd", c.String())
 	output, err := c.CombinedOutput()
@@ -448,8 +445,7 @@ func runCommandWithInput(ctx context.Context, timeout time.Duration, cmd string,
 		defer cancel()
 	}
 
-	c := exec.CommandContext(ctx, cmd, args...)
-	c.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGKILL}
+	c := newExecCommand(ctx, cmd, args...)
 	c.Stdin = strings.NewReader(input)
 
 	logger.WithKeyValues("level", "info").LogKV("msg", "start command", "cmd", c.String())

contrib/utils/utils_linux.go

@@ -0,0 +1,18 @@
+//go:build linux
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+package utils
+
+import (
+	"context"
+	"os/exec"
+	"syscall"
+)
+
+func newExecCommand(ctx context.Context, name string, args ...string) *exec.Cmd {
+	c := exec.CommandContext(ctx, name, args...)
+	c.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGKILL}
+	return c
+}

contrib/utils/utils_other.go

@@ -0,0 +1,15 @@
+//go:build !linux
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+package utils
+
+import (
+	"context"
+	"os/exec"
+)
+
+func newExecCommand(ctx context.Context, name string, args ...string) *exec.Cmd {
+	return exec.CommandContext(ctx, name, args...)
+}