fix(portforwarding): Use proper context when runninig command

qdm12 · Aug 10, 2024 · 52ace5f · 52ace5f
1 parent cbaa4f2
commit 52ace5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/portforward/service/command.go b/internal/portforward/service/command.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-func (s *Service) runUpCommand(ports []uint16) (err error) {
+func (s *Service) runUpCommand(ctx context.Context, ports []uint16) (err error) {
 	// run command replacing {{PORTS}} with the ports (space separated)
 	portStrings := make([]string, len(ports))
 	for i, port := range ports {
@@ -20,7 +20,7 @@ func (s *Service) runUpCommand(ports []uint16) (err error) {
 	s.logger.Info("running port forward command " + rawCommand)
 	command := strings.Split(rawCommand, " ")
 	// it is a user input and we trust it so we can ignore the gosec warning
-	cmd := exec.CommandContext(context.Background(), command[0], command[1:]...) // #nosec G204
+	cmd := exec.CommandContext(ctx, command[0], command[1:]...) // #nosec G204
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()

diff --git a/internal/portforward/service/start.go b/internal/portforward/service/start.go
@@ -70,7 +70,7 @@ func (s *Service) Start(ctx context.Context) (runError <-chan error, err error)
 	}
 
 	if s.settings.Command != "" {
-		err = s.runUpCommand(ports)
+		err = s.runUpCommand(ctx, ports)
 		if err != nil {
 			_ = s.cleanup()
 			return nil, fmt.Errorf("running port forward command: %w", err)