fix: replace path.join with filepath.join (#997)

KusionStack · Apr 1, 2024 · 0500969 · 0500969
1 parent c60a904
commit 0500969
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pkg/cmd/mod/mod_init.go b/pkg/cmd/mod/mod_init.go
@@ -3,7 +3,7 @@ package mod
 import (
 	"fmt"
 	"os"
-	"path"
+	"path/filepath"
 
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/pulumi/pulumi/sdk/v3/go/common/util/gitutil"
@@ -90,7 +90,7 @@ func (o *InitOptions) Run() error {
 	}
 
 	// remove existing directory
-	dir := path.Join(o.Path, o.Name)
+	dir := filepath.Join(o.Path, o.Name)
 	if err := os.RemoveAll(dir); err != nil {
 		return fmt.Errorf("failed to remove existing directory: %v", err)
 	}

diff --git a/pkg/modules/generators/workload/workload_generator.go b/pkg/modules/generators/workload/workload_generator.go
@@ -3,7 +3,6 @@ package workload
 import (
 	"fmt"
 	"net/url"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -394,7 +393,7 @@ func handleFileCreation(c container.Container, uniqueAppName, containerName stri
 
 			volumeMounts = append(volumeMounts, corev1.VolumeMount{
 				Name:      sec.Name,
-				MountPath: path.Join("/", k),
+				MountPath: filepath.Join("/", k),
 				SubPath:   sec.Key,
 			})
 		} else if v.Content != "" {
@@ -455,7 +454,7 @@ func handleDirCreation(c container.Container) (volumes []corev1.Volume, volumeMo
 
 		volumeMounts = append(volumeMounts, corev1.VolumeMount{
 			Name:      sec.Name,
-			MountPath: path.Join("/", mountPath),
+			MountPath: filepath.Join("/", mountPath),
 		})
 		return nil
 	})

diff --git a/pkg/modules/plugin.go b/pkg/modules/plugin.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"sync"
@@ -107,7 +107,7 @@ func buildPluginPath(namespace, resourceType, version string) (string, error) {
 	goOs := runtime.GOOS
 	goArch := runtime.GOARCH
 	name := resourceType + "_" + version
-	p := path.Join(prefixPath, namespace, resourceType, version, goOs, goArch, KusionModuleBinaryPrefix+name)
+	p := filepath.Join(prefixPath, namespace, resourceType, version, goOs, goArch, KusionModuleBinaryPrefix+name)
 	_, err = os.Stat(p)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -126,13 +126,13 @@ func newPluginClient(modulePluginPath, moduleName string) (*plugin.Client, error
 	if err != nil {
 		return nil, err
 	}
-	logDir := path.Join(dir, log.Folder, Dir)
+	logDir := filepath.Join(dir, log.Folder, Dir)
 	if _, err := os.Stat(logDir); os.IsNotExist(err) {
 		if err := os.MkdirAll(logDir, os.ModePerm); err != nil {
 			return nil, fmt.Errorf("failed to create module log dir: %w", err)
 		}
 	}
-	logFilePath = path.Join(logDir, moduleName+".log")
+	logFilePath = filepath.Join(logDir, moduleName+".log")
 	logFile, err := os.Create(logFilePath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create module log file: %w", err)
@@ -170,7 +170,7 @@ func PluginDir() (string, error) {
 	if env, found := os.LookupEnv(DefaultModulePathEnv); found {
 		return env, nil
 	} else if dir, err := kfile.KusionDataFolder(); err == nil {
-		return path.Join(dir, Dir), nil
+		return filepath.Join(dir, Dir), nil
 	} else {
 		return "", err
 	}