Skip to content

ssbc: Log final env when resolved #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2021
Merged

ssbc: Log final env when resolved #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions internal/batches/executor/run_steps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ func executeSingleStep(
if err != nil {
return bytes.Buffer{}, bytes.Buffer{}, errors.Wrap(err, "resolving step environment")
}

// Render the step.Env variables as templates.
env, err := template.RenderStepMap(stepEnv, stepContext)
if err != nil {
Expand All @@ -275,7 +274,7 @@ func executeSingleStep(
// ----------
// EXECUTION
// ----------
opts.ui.StepStarted(i+1, runScript)
opts.ui.StepStarted(i+1, runScript, env)

workspaceOpts, err := workspace.DockerRunOpts(ctx, workDir)
if err != nil {
Expand Down
18 changes: 9 additions & 9 deletions internal/batches/executor/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type StepsExecutionUI interface {
StepSkipped(int)

StepPreparing(int)
StepStarted(int, string)
StepStarted(stepIdx int, runScript string, env map[string]string)

StepOutputWriter(context.Context, *Task, int) StepOutputWriter

Expand All @@ -51,14 +51,14 @@ type StepsExecutionUI interface {
// NoopStepsExecUI is an implementation of StepsExecutionUI that does nothing.
type NoopStepsExecUI struct{}

func (noop NoopStepsExecUI) ArchiveDownloadStarted() {}
func (noop NoopStepsExecUI) ArchiveDownloadFinished() {}
func (noop NoopStepsExecUI) WorkspaceInitializationStarted() {}
func (noop NoopStepsExecUI) WorkspaceInitializationFinished() {}
func (noop NoopStepsExecUI) SkippingStepsUpto(startStep int) {}
func (noop NoopStepsExecUI) StepSkipped(step int) {}
func (noop NoopStepsExecUI) StepPreparing(step int) {}
func (noop NoopStepsExecUI) StepStarted(step int, runScript string) {}
func (noop NoopStepsExecUI) ArchiveDownloadStarted() {}
func (noop NoopStepsExecUI) ArchiveDownloadFinished() {}
func (noop NoopStepsExecUI) WorkspaceInitializationStarted() {}
func (noop NoopStepsExecUI) WorkspaceInitializationFinished() {}
func (noop NoopStepsExecUI) SkippingStepsUpto(startStep int) {}
func (noop NoopStepsExecUI) StepSkipped(step int) {}
func (noop NoopStepsExecUI) StepPreparing(step int) {}
func (noop NoopStepsExecUI) StepStarted(step int, runScript string, env map[string]string) {}
func (noop NoopStepsExecUI) StepOutputWriter(ctx context.Context, task *Task, step int) StepOutputWriter {
return NoopStepOutputWriter{}
}
Expand Down
4 changes: 2 additions & 2 deletions internal/batches/ui/json_lines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ func (ui *stepsExecutionJSONLines) StepPreparing(step int) {
logOperationProgress(batcheslib.LogEventOperationTaskPreparingStep, map[string]interface{}{"taskID": ui.linesTask.ID, "step": step})
}

func (ui *stepsExecutionJSONLines) StepStarted(step int, runScript string) {
logOperationStart(batcheslib.LogEventOperationTaskStep, map[string]interface{}{"taskID": ui.linesTask.ID, "step": step, "runScript": runScript})
func (ui *stepsExecutionJSONLines) StepStarted(step int, runScript string, env map[string]string) {
logOperationStart(batcheslib.LogEventOperationTaskStep, map[string]interface{}{"taskID": ui.linesTask.ID, "step": step, "runScript": runScript, "env": env})
}

func (ui *stepsExecutionJSONLines) StepOutputWriter(ctx context.Context, task *executor.Task, step int) executor.StepOutputWriter {
Expand Down
3 changes: 2 additions & 1 deletion internal/batches/ui/task_exec_tui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"github.com/sourcegraph/go-diff/diff"

"github.com/sourcegraph/src-cli/internal/batches/executor"

batcheslib "github.com/sourcegraph/sourcegraph/lib/batches"
Expand Down Expand Up @@ -453,7 +454,7 @@ func (ui stepsExecTUI) StepSkipped(step int) {
func (ui stepsExecTUI) StepPreparing(step int) {
ui.updateStatusBar(fmt.Sprintf("Preparing %d", step))
}
func (ui stepsExecTUI) StepStarted(step int, runScript string) {
func (ui stepsExecTUI) StepStarted(step int, runScript string, _ map[string]string) {
ui.updateStatusBar(runScript)
}

Expand Down