Filepath join should use separator of the target VM instead of runner

DataDog · Jan 10, 2025 · e889e4f · e889e4f
1 parent 221bbc8
commit e889e4f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/components/command/osCommand.go b/components/command/osCommand.go
@@ -27,6 +27,7 @@ type OSCommand interface {
 		user string) pulumi.StringInput
 
 	IsPathAbsolute(path string) bool
+	PathJoin(parts ...string) string
 
 	NewCopyFile(runner *Runner, name string, localPath, remotePath pulumi.StringInput, opts ...pulumi.ResourceOption) (pulumi.Resource, error)
 }
@@ -64,7 +65,6 @@ func buildCommandString(
 	if command == nil {
 		return nil
 	}
-
 	envVarsStr := envVars.ToStringArrayOutput().ApplyT(func(inputs []string) string {
 		return strings.Join(inputs, " ")
 	}).(pulumi.StringOutput)

diff --git a/components/command/unixOSCommand.go b/components/command/unixOSCommand.go
@@ -68,13 +68,17 @@ func (fs unixOSCommand) BuildCommandString(command pulumi.StringInput, env pulum
 	})
 }
 
+func (fs unixOSCommand) PathJoin(parts ...string) string {
+	return strings.Join(parts, "/")
+}
+
 func (fs unixOSCommand) IsPathAbsolute(path string) bool {
 	return strings.HasPrefix(path, "/")
 }
 
 func (fs unixOSCommand) NewCopyFile(runner *Runner, name string, localPath, remotePath pulumi.StringInput, opts ...pulumi.ResourceOption) (pulumi.Resource, error) {
 	tempRemotePath := localPath.ToStringOutput().ApplyT(func(path string) string {
-		return filepath.Join(runner.osCommand.GetTemporaryDirectory(), filepath.Base(path))
+		return fs.PathJoin(runner.osCommand.GetTemporaryDirectory(), filepath.Base(path))
 	}).(pulumi.StringOutput)
 
 	tempCopyFile, err := remote.NewCopyFile(runner.e.Ctx(), runner.namer.ResourceName("copy", name), &remote.CopyFileArgs{

diff --git a/components/command/windowsOSCommand.go b/components/command/windowsOSCommand.go
@@ -63,6 +63,10 @@ func (fs windowsOSCommand) BuildCommandString(
 	})
 }
 
+func (fs windowsOSCommand) PathJoin(parts ...string) string {
+	return strings.Join(parts, "\\")
+}
+
 func (fs windowsOSCommand) IsPathAbsolute(path string) bool {
 	// valid absolute path prefixes: "x:\", "x:/", "\\", "//" ]
 	if len(path) < 2 {