Refactor to use filepath.Join instead of path.Join (#2199)

Author: alexandear

cmd/importer/util/util_test.go

@@ -18,7 +18,7 @@ package util
 
 import (
 	"os"
-	"path"
+	"path/filepath"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -76,7 +76,7 @@ var testMappingRules = MappingRules{
 
 func TestMappingFromFile(t *testing.T) {
 	tdir := t.TempDir()
-	fPath := path.Join(tdir, "mapping.yaml")
+	fPath := filepath.Join(tdir, "mapping.yaml")
 	err := os.WriteFile(fPath, []byte(testContent), os.FileMode(0600))
 	if err != nil {
 		t.Fatalf("unable to create the test file: %s", err)

pkg/controller/admissionchecks/multikueue/fswatch_test.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 	"os"
-	"path"
+	"path/filepath"
 	"runtime"
 	"sync"
 	"testing"
@@ -43,13 +43,13 @@ func TestFSWatch(t *testing.T) {
 		"empty": {},
 		"single cluster existing file": {
 			prepareFnc: func(basePath string) error {
-				return os.WriteFile(path.Join(basePath, "c1.kubeconfig"), []byte("123"), 0666)
+				return os.WriteFile(filepath.Join(basePath, "c1.kubeconfig"), []byte("123"), 0666)
 			},
 			clusters: map[string]string{
 				"c1": "c1.kubeconfig",
 			},
 			opFnc: func(basePath string) error {
-				return os.WriteFile(path.Join(basePath, "c1.kubeconfig"), []byte("123456"), 0666)
+				return os.WriteFile(filepath.Join(basePath, "c1.kubeconfig"), []byte("123456"), 0666)
 			},
 			wantEventsForClusters: set.New("c1"),
 		},
@@ -58,55 +58,55 @@ func TestFSWatch(t *testing.T) {
 				"c1": "c1.kubeconfig",
 			},
 			opFnc: func(basePath string) error {
-				return os.WriteFile(path.Join(basePath, "c1.kubeconfig"), []byte("123456"), 0666)
+				return os.WriteFile(filepath.Join(basePath, "c1.kubeconfig"), []byte("123456"), 0666)
 			},
 			wantEventsForClusters: set.New("c1"),
 		},
 		"single existing file deleted": {
 			prepareFnc: func(basePath string) error {
-				return os.WriteFile(path.Join(basePath, "c1.kubeconfig"), []byte("123"), 0666)
+				return os.WriteFile(filepath.Join(basePath, "c1.kubeconfig"), []byte("123"), 0666)
 			},
 			clusters: map[string]string{
 				"c1": "c1.kubeconfig",
 			},
 			opFnc: func(basePath string) error {
-				return os.Remove(path.Join(basePath, "c1.kubeconfig"))
+				return os.Remove(filepath.Join(basePath, "c1.kubeconfig"))
 			},
 			wantEventsForClusters: set.New("c1"),
 		},
 		"single cluster file rename to": {
 			prepareFnc: func(basePath string) error {
-				return os.WriteFile(path.Join(basePath, "c1.kubeconfig.old"), []byte("123"), 0666)
+				return os.WriteFile(filepath.Join(basePath, "c1.kubeconfig.old"), []byte("123"), 0666)
 			},
 			clusters: map[string]string{
 				"c1": "c1.kubeconfig",
 			},
 			opFnc: func(basePath string) error {
-				return os.Rename(path.Join(basePath, "c1.kubeconfig.old"), path.Join(basePath, "c1.kubeconfig"))
+				return os.Rename(filepath.Join(basePath, "c1.kubeconfig.old"), filepath.Join(basePath, "c1.kubeconfig"))
 			},
 			wantEventsForClusters: set.New("c1"),
 		},
 		"single cluster file rename from": {
 			prepareFnc: func(basePath string) error {
-				return os.WriteFile(path.Join(basePath, "c1.kubeconfig"), []byte("123"), 0666)
+				return os.WriteFile(filepath.Join(basePath, "c1.kubeconfig"), []byte("123"), 0666)
 			},
 			clusters: map[string]string{
 				"c1": "c1.kubeconfig",
 			},
 			opFnc: func(basePath string) error {
-				return os.Rename(path.Join(basePath, "c1.kubeconfig"), path.Join(basePath, "c1.kubeconfig.new"))
+				return os.Rename(filepath.Join(basePath, "c1.kubeconfig"), filepath.Join(basePath, "c1.kubeconfig.new"))
 			},
 			wantEventsForClusters: set.New("c1"),
 		},
 		"single create link": {
 			prepareFnc: func(basePath string) error {
-				return os.WriteFile(path.Join(basePath, "c1.kubeconfig.src"), []byte("123"), 0666)
+				return os.WriteFile(filepath.Join(basePath, "c1.kubeconfig.src"), []byte("123"), 0666)
 			},
 			clusters: map[string]string{
 				"c1": "c1.kubeconfig",
 			},
 			opFnc: func(basePath string) error {
-				return os.Symlink(path.Join(basePath, "c1.kubeconfig.src"), path.Join(basePath, "c1.kubeconfig"))
+				return os.Symlink(filepath.Join(basePath, "c1.kubeconfig.src"), filepath.Join(basePath, "c1.kubeconfig"))
 			},
 			wantEventsForClusters: set.New("c1"),
 		},
@@ -116,16 +116,16 @@ func TestFSWatch(t *testing.T) {
 			// fixed https://github.com/fsnotify/fsnotify/issues/636.
 			skipOnDarwin: true,
 			prepareFnc: func(basePath string) error {
-				if err := os.WriteFile(path.Join(basePath, "c1.kubeconfig.src"), []byte("123"), 0666); err != nil {
+				if err := os.WriteFile(filepath.Join(basePath, "c1.kubeconfig.src"), []byte("123"), 0666); err != nil {
 					return err
 				}
-				return os.Symlink(path.Join(basePath, "c1.kubeconfig.src"), path.Join(basePath, "c1.kubeconfig"))
+				return os.Symlink(filepath.Join(basePath, "c1.kubeconfig.src"), filepath.Join(basePath, "c1.kubeconfig"))
 			},
 			clusters: map[string]string{
 				"c1": "c1.kubeconfig",
 			},
 			opFnc: func(basePath string) error {
-				return os.Remove(path.Join(basePath, "c1.kubeconfig"))
+				return os.Remove(filepath.Join(basePath, "c1.kubeconfig"))
 			},
 			wantEventsForClusters: set.New("c1"),
 		},
@@ -168,7 +168,7 @@ func TestFSWatch(t *testing.T) {
 
 			gotAddErrors := map[string]error{}
 			for c, p := range tc.clusters {
-				if err := watcher.AddOrUpdate(c, path.Join(basePath, p)); err != nil {
+				if err := watcher.AddOrUpdate(c, filepath.Join(basePath, p)); err != nil {
 					gotAddErrors[c] = err
 				}
 			}
@@ -196,10 +196,10 @@ func TestFSWatchAddRm(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	basePath := t.TempDir()
-	f1Path := path.Join(basePath, "file.one")
-	f2Path := path.Join(basePath, "file.two")
-	f3Dir := path.Join(basePath, "d1")
-	f3Path := path.Join(f3Dir, "file.three")
+	f1Path := filepath.Join(basePath, "file.one")
+	f2Path := filepath.Join(basePath, "file.two")
+	f3Dir := filepath.Join(basePath, "d1")
+	f3Path := filepath.Join(f3Dir, "file.three")
 	steps := []struct {
 		name               string
 		skipOnDarwin       bool

test/integration/multikueue/multikueue_test.go

@@ -19,7 +19,7 @@ package multikueue
 import (
 	"fmt"
 	"os"
-	"path"
+	"path/filepath"
 	"time"
 
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -358,7 +358,7 @@ var _ = ginkgo.Describe("Multikueue", func() {
 		})
 
 		tempDir := ginkgo.GinkgoT().TempDir()
-		fsKubeConfig := path.Join(tempDir, "testing.kubeconfig")
+		fsKubeConfig := filepath.Join(tempDir, "testing.kubeconfig")
 
 		config := utiltesting.MakeMultiKueueConfig("testing-config").Clusters("testing-cluster").Obj()
 		ginkgo.By("creating the config, the admission check's state is updated", func() {

test/performance/scheduler/runner/generator/generator_test.go

@@ -18,7 +18,7 @@ package generator
 
 import (
 	"os"
-	"path"
+	"path/filepath"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -120,7 +120,7 @@ func TestLoadConfig(t *testing.T) {
         request: 20
 `
 	tempDir := t.TempDir()
-	fPath := path.Join(tempDir, "config.yaml")
+	fPath := filepath.Join(tempDir, "config.yaml")
 	err := os.WriteFile(fPath, []byte(testContent), os.FileMode(0600))
 	if err != nil {
 		t.Fatalf("unable to create the test file: %s", err)

test/performance/scheduler/runner/main.go

@@ -24,6 +24,7 @@ import (
 	"os/exec"
 	"os/signal"
 	"path"
+	"path/filepath"
 	"strconv"
 	"sync"
 	"syscall"
@@ -131,7 +132,7 @@ func main() {
 			os.Exit(1)
 		}
 
-		kubeconfigPath := path.Join(*outputDir, "kubeconfig")
+		kubeconfigPath := filepath.Join(*outputDir, "kubeconfig")
 		err = os.WriteFile(kubeconfigPath, kubeconfig, 00660)
 		if err != nil {
 			log.Error(err, "Write kubeconfig")
@@ -184,7 +185,7 @@ func main() {
 	}
 
 	if *metricsScrapeInterval != 0 && *metricsScrapeURL != "" {
-		dumpTar := path.Join(*outputDir, "metricsDump.tgz")
+		dumpTar := filepath.Join(*outputDir, "metricsDump.tgz")
 		err := runScraper(ctx, *metricsScrapeInterval, dumpTar, *metricsScrapeURL, errCh, wg)
 		if err != nil {
 			log.Error(err, "Scraper start")
@@ -217,17 +218,17 @@ func main() {
 		os.Exit(1)
 	}
 
-	err = recorder.WriteSummary(path.Join(*outputDir, "summary.yaml"))
+	err = recorder.WriteSummary(filepath.Join(*outputDir, "summary.yaml"))
 	if err != nil {
 		log.Error(err, "Writing summary")
 		os.Exit(1)
 	}
-	err = recorder.WriteCQCsv(path.Join(*outputDir, "cqStates.csv"))
+	err = recorder.WriteCQCsv(filepath.Join(*outputDir, "cqStates.csv"))
 	if err != nil {
 		log.Error(err, "Writing cq csv")
 		os.Exit(1)
 	}
-	err = recorder.WriteWLCsv(path.Join(*outputDir, "wlStates.csv"))
+	err = recorder.WriteWLCsv(filepath.Join(*outputDir, "wlStates.csv"))
 	if err != nil {
 		log.Error(err, "Writing wl csv")
 		os.Exit(1)
@@ -246,7 +247,7 @@ func main() {
 func runCommand(ctx context.Context, workDir, cmdPath, kubeconfig string, withCPUProf, withLogs, logToFile bool, logLevel int, errCh chan<- error, wg *sync.WaitGroup, metricsPort int) error {
 	log := ctrl.LoggerFrom(ctx).WithName("Run command")
 
-	cmd := exec.CommandContext(ctx, cmdPath, "--kubeconfig", path.Join(workDir, kubeconfig))
+	cmd := exec.CommandContext(ctx, cmdPath, "--kubeconfig", filepath.Join(workDir, kubeconfig))
 	cmd.Cancel = func() error {
 		log.Info("Stop the command")
 		return cmd.Process.Signal(syscall.SIGINT)
@@ -255,7 +256,7 @@ func runCommand(ctx context.Context, workDir, cmdPath, kubeconfig string, withCP
 	exe := path.Base(cmdPath)
 
 	if withCPUProf {
-		cmd.Args = append(cmd.Args, "--cpuprofile", path.Join(workDir, fmt.Sprintf("%s.cpu.prof", exe)))
+		cmd.Args = append(cmd.Args, "--cpuprofile", filepath.Join(workDir, fmt.Sprintf("%s.cpu.prof", exe)))
 	}
 
 	if withLogs {
@@ -264,13 +265,13 @@ func runCommand(ctx context.Context, workDir, cmdPath, kubeconfig string, withCP
 		errWriter := os.Stderr
 		if logToFile {
 			var err error
-			outWriter, err = os.Create(path.Join(workDir, fmt.Sprintf("%s.out.log", exe)))
+			outWriter, err = os.Create(filepath.Join(workDir, fmt.Sprintf("%s.out.log", exe)))
 			if err != nil {
 				return err
 			}
 			defer outWriter.Close()
 
-			errWriter, err = os.Create(path.Join(workDir, fmt.Sprintf("%s.err.log", exe)))
+			errWriter, err = os.Create(filepath.Join(workDir, fmt.Sprintf("%s.err.log", exe)))
 			if err != nil {
 				return err
 			}
@@ -320,7 +321,7 @@ func runCommand(ctx context.Context, workDir, cmdPath, kubeconfig string, withCP
 			return
 		}
 
-		err = os.WriteFile(path.Join(workDir, fmt.Sprintf("%s.stats.yaml", exe)), csBytes, 0666)
+		err = os.WriteFile(filepath.Join(workDir, fmt.Sprintf("%s.stats.yaml", exe)), csBytes, 0666)
 		if err != nil {
 			log.Error(err, "Writing cmd stats")
 		}