Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions pkg/agent/delivery/capture.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package delivery

import (
"context"
"fmt"
"os"
"os/exec"

Expand All @@ -23,3 +24,24 @@ func runCaptured(ctx context.Context, cmd *exec.Cmd) (subprocess.Result, error)
func capturedOutput(result subprocess.Result) string {
return result.DiagnosticOutput()
}

// dockerCLI builds a docker/podman invocation. A non-nil env is appended to
// the parent environment.
func dockerCLI(ctx context.Context, command string, env []string, args ...string) *exec.Cmd {
// #nosec G204 -- args are constructed internally, not from user input
cmd := exec.CommandContext(ctx, command, args...)
if env != nil {
cmd.Env = append(os.Environ(), env...)
}
return cmd
}

// runDockerCLI runs a docker/podman command and wraps a failure with its
// captured output.
func runDockerCLI(ctx context.Context, cmd *exec.Cmd) error {
result, err := runCaptured(ctx, cmd)
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
}
25 changes: 4 additions & 21 deletions pkg/agent/delivery/local_docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,7 @@ func (d *LocalDockerDelivery) createVolume(
) error {
args := append([]string{"volume", "create"}, pkgconfig.LabelArgs(labels)...)
args = append(args, name)
result, err := runCaptured(ctx, d.cmd(ctx, args...))
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
return runDockerCLI(ctx, d.cmd(ctx, args...))
}

func (d *LocalDockerDelivery) helperImageName() string {
Expand Down Expand Up @@ -310,11 +306,7 @@ func (d *LocalDockerDelivery) populateVolumeWithHelper(
cmd := d.cmd(ctx, args...)
cmd.Stdin = binary

result, err := runCaptured(ctx, cmd)
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
return runDockerCLI(ctx, cmd)
}

// populateVolumeDirectCopy writes the agent binary to a volume mountpoint the
Expand Down Expand Up @@ -391,11 +383,7 @@ func (d *LocalDockerDelivery) volumeMountpoint(
// removeVolume force-removes a single named volume. It is safe to call for a
// non-existent volume since removal is forced.
func (d *LocalDockerDelivery) removeVolume(ctx context.Context, name string) error {
result, err := runCaptured(ctx, d.cmd(ctx, "volume", "rm", "-f", name))
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
return runDockerCLI(ctx, d.cmd(ctx, "volume", "rm", "-f", name))
}

// listManagedVolumes returns the names of devsy-managed volumes owned by the
Expand Down Expand Up @@ -423,12 +411,7 @@ func (d *LocalDockerDelivery) listManagedVolumes(
}

func (d *LocalDockerDelivery) cmd(ctx context.Context, args ...string) *exec.Cmd {
// #nosec G204 -- args are constructed internally, not from user input
cmd := exec.CommandContext(ctx, d.dockerCommand(), args...)
if d.Environment != nil {
cmd.Env = append(os.Environ(), d.Environment...)
}
return cmd
return dockerCLI(ctx, d.dockerCommand(), d.Environment, args...)
}

func (d *LocalDockerDelivery) dockerCommand() string {
Expand Down
25 changes: 4 additions & 21 deletions pkg/agent/delivery/remote_docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,37 +88,20 @@ func (d *RemoteDockerDelivery) copyBinaryFromSource(
}

dest := fmt.Sprintf("%s:%s", d.ContainerID, destPath)
result, err := runCaptured(ctx, d.cmd(ctx, "cp", tmpPath, dest))
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
return runDockerCLI(ctx, d.cmd(ctx, "cp", tmpPath, dest))
}

func (d *RemoteDockerDelivery) chmodBinary(ctx context.Context, destPath string) error {
result, err := runCaptured(ctx, d.cmd(ctx, "exec", d.ContainerID, "chmod", "755", destPath))
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
return runDockerCLI(ctx, d.cmd(ctx, "exec", d.ContainerID, "chmod", "755", destPath))
}

func (d *RemoteDockerDelivery) ensureDir(ctx context.Context, filePath string) error {
dir := path.Dir(filePath)
result, err := runCaptured(ctx, d.cmd(ctx, "exec", d.ContainerID, "mkdir", "-p", dir))
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
return runDockerCLI(ctx, d.cmd(ctx, "exec", d.ContainerID, "mkdir", "-p", dir))
}

func (d *RemoteDockerDelivery) cmd(ctx context.Context, args ...string) *exec.Cmd {
// #nosec G204 -- args are constructed internally, not from user input
cmd := exec.CommandContext(ctx, d.dockerCommand(), args...)
if d.Environment != nil {
cmd.Env = append(os.Environ(), d.Environment...)
}
return cmd
return dockerCLI(ctx, d.dockerCommand(), d.Environment, args...)
}

func (d *RemoteDockerDelivery) dockerCommand() string {
Expand Down
6 changes: 1 addition & 5 deletions pkg/agent/delivery/workspace_seed.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,5 @@ func (d *LocalDockerDelivery) copyDirIntoVolume(
d.helperImageName(),
"sh", "-c", script.String(),
}
result, err := runCaptured(ctx, d.cmd(ctx, args...))
if err != nil {
return fmt.Errorf("%s: %w", capturedOutput(result), err)
}
return nil
return runDockerCLI(ctx, d.cmd(ctx, args...))
}
Loading