diff --git a/pkg/agent/delivery/capture.go b/pkg/agent/delivery/capture.go index 4c1e1229e9..11953ae659 100644 --- a/pkg/agent/delivery/capture.go +++ b/pkg/agent/delivery/capture.go @@ -2,6 +2,7 @@ package delivery import ( "context" + "fmt" "os" "os/exec" @@ -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 +} diff --git a/pkg/agent/delivery/local_docker.go b/pkg/agent/delivery/local_docker.go index a67f869a27..96620c1df2 100644 --- a/pkg/agent/delivery/local_docker.go +++ b/pkg/agent/delivery/local_docker.go @@ -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 { @@ -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 @@ -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 @@ -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 { diff --git a/pkg/agent/delivery/remote_docker.go b/pkg/agent/delivery/remote_docker.go index 8fc7f19fa2..d7be5bd6a7 100644 --- a/pkg/agent/delivery/remote_docker.go +++ b/pkg/agent/delivery/remote_docker.go @@ -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 { diff --git a/pkg/agent/delivery/workspace_seed.go b/pkg/agent/delivery/workspace_seed.go index dd53a167cf..07cea14484 100644 --- a/pkg/agent/delivery/workspace_seed.go +++ b/pkg/agent/delivery/workspace_seed.go @@ -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...)) }