[refactor-runner-adxt-783] env: Vars are exported and not passed to t…

…he shell anymore
DataDog · Dec 18, 2024 · 36bcf5a · 36bcf5a
1 parent 3656bda
commit 36bcf5a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/components/command/runner.go b/components/command/runner.go
@@ -29,14 +29,13 @@ type Args struct {
 
 func (args *Args) toLocalCommandArgs(config RunnerConfiguration, osCommand OSCommand) (*local.CommandArgs, error) {
 	return &local.CommandArgs{
-		Create:      osCommand.BuildCommandString(args.Create, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
-		Update:      osCommand.BuildCommandString(args.Update, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
-		Delete:      osCommand.BuildCommandString(args.Delete, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
-		Environment: args.Environment,
-		Triggers:    args.Triggers,
-		Stdin:       args.Stdin,
-		AssetPaths:  args.LocalAssetPaths,
-		Dir:         args.LocalDir,
+		Create:     osCommand.BuildCommandString(args.Create, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
+		Update:     osCommand.BuildCommandString(args.Update, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
+		Delete:     osCommand.BuildCommandString(args.Delete, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
+		Triggers:   args.Triggers,
+		Stdin:      args.Stdin,
+		AssetPaths: args.LocalAssetPaths,
+		Dir:        args.LocalDir,
 	}, nil
 }
 
@@ -50,13 +49,12 @@ func (args *Args) toRemoteCommandArgs(config RunnerConfiguration, osCommand OSCo
 	}
 
 	return &remote.CommandArgs{
-		Connection:  config.connection,
-		Create:      osCommand.BuildCommandString(args.Create, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
-		Update:      osCommand.BuildCommandString(args.Update, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
-		Delete:      osCommand.BuildCommandString(args.Delete, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
-		Environment: args.Environment,
-		Triggers:    args.Triggers,
-		Stdin:       args.Stdin,
+		Connection: config.connection,
+		Create:     osCommand.BuildCommandString(args.Create, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
+		Update:     osCommand.BuildCommandString(args.Update, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
+		Delete:     osCommand.BuildCommandString(args.Delete, args.Environment, args.Sudo, args.RequirePasswordFromStdin, config.user),
+		Triggers:   args.Triggers,
+		Stdin:      args.Stdin,
 	}, nil
 }
 

diff --git a/components/command/unixOSCommand.go b/components/command/unixOSCommand.go
@@ -58,7 +58,7 @@ func (fs unixOSCommand) BuildCommandString(command pulumi.StringInput, env pulum
 
 	var envVars pulumi.StringArray
 	for varName, varValue := range env {
-		envVars = append(envVars, pulumi.Sprintf(`%v="%v"`, varName, varValue))
+		envVars = append(envVars, pulumi.Sprintf(`export %v="%v";`, varName, varValue))
 	}
 
 	return buildCommandString(formattedCommand, envVars, func(envVarsStr pulumi.StringOutput) pulumi.StringInput {