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
13 changes: 9 additions & 4 deletions cmd/workspace/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,10 +411,15 @@ func resultEnvelopeFrom(state *task.State) config2.ResultEnvelope {
if state.Result == nil {
return config2.ResultEnvelope{}
}
var workspaceFolder string
if state.Result.SubstitutionContext != nil {
workspaceFolder = state.Result.SubstitutionContext.ContainerWorkspaceFolder
}
return config2.ResultEnvelope{
ContainerID: config2.GetContainerID(state.Result),
RemoteUser: config2.GetRemoteUser(state.Result),
Warnings: state.Result.HostWarnings,
Recovery: state.Result.RecoveryContainer,
ContainerID: config2.GetContainerID(state.Result),
RemoteUser: config2.GetRemoteUser(state.Result),
RemoteWorkspaceFolder: workspaceFolder,
Warnings: state.Result.HostWarnings,
Recovery: state.Result.RecoveryContainer,
}
}
69 changes: 53 additions & 16 deletions cmd/workspace/task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (

const (
testResultContainerID = "abc123"
testResultSuccess = "success"
testBuild = "build"
testPhase = "building_image"
testOp = "op-1"
Expand Down Expand Up @@ -183,26 +184,62 @@ func checkTaskTransitionJSON(t *testing.T, output string, expected config.Status
require.ErrorIs(t, decoder.Decode(&extra), io.EOF)
}

func TestResultEnvelopeFrom_PopulatedResult(t *testing.T) {
state := &task.State{
Result: &config.Result{
HostWarnings: []string{"warn"},
RecoveryContainer: true,
ContainerDetails: &config.ContainerDetails{
ID: testResultContainerID,
func TestReportTaskStateJSON_SucceededResult(t *testing.T) {
tests := []struct {
name string
result *config.Result
want config.ResultEnvelope
}{
{
name: "resolved workspace folder and metadata",
result: &config.Result{
HostWarnings: []string{"warn"},
RecoveryContainer: true,
SubstitutionContext: &config.SubstitutionContext{
ContainerWorkspaceFolder: "/workspaces/python/app",
},
MergedConfig: &config.MergedDevContainerConfig{
DevContainerConfigBase: config.DevContainerConfigBase{
RemoteUser: "workspace-user",
},
},
ContainerDetails: &config.ContainerDetails{ID: testResultContainerID},
},
want: config.ResultEnvelope{
Kind: config.KindResult, Outcome: testResultSuccess,
ContainerID: testResultContainerID, RemoteUser: "workspace-user",
RemoteWorkspaceFolder: "/workspaces/python/app",
Warnings: []string{"warn"}, Recovery: true,
},
},
{
name: "nil substitution context",
result: &config.Result{},
want: config.ResultEnvelope{
Kind: config.KindResult, Outcome: testResultSuccess, RemoteUser: "root",
},
},
{
name: "nil result",
want: config.ResultEnvelope{Kind: config.KindResult, Outcome: testResultSuccess},
},
}

got := resultEnvelopeFrom(state)
if got.ContainerID != testResultContainerID {
t.Errorf("ContainerID = %q, want %q", got.ContainerID, testResultContainerID)
}
if !got.Recovery {
t.Error("expected Recovery = true")
}
if len(got.Warnings) != 1 || got.Warnings[0] != "warn" {
t.Errorf("Warnings = %v", got.Warnings)
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
state := &task.State{Status: task.StatusSucceeded, Result: tt.result}
output := captureTaskTransitionStdout(t, func() {
require.NoError(t, reportTaskStateJSON(state))
})
require.Equal(t, 1, strings.Count(output, "\n"))

decoder := json.NewDecoder(strings.NewReader(output))
var got config.ResultEnvelope
require.NoError(t, decoder.Decode(&got))
require.Equal(t, tt.want, got)
var extra any
require.ErrorIs(t, decoder.Decode(&extra), io.EOF)
})
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/delivery/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (d *KubernetesDelivery) DeliverPostStart(ctx context.Context, opts PostStar
err,
)
} else {
log.Debugf("delivered agent binary to pod via in-container download")
log.Debugf("delivered agent binary to container via in-container download")
return nil
}
}
Expand All @@ -110,7 +110,7 @@ func (d *KubernetesDelivery) DeliverPostStart(ctx context.Context, opts PostStar
return deliveryFailure(downloadErr, err)
}

log.Debugf("delivered agent binary to pod via kubernetes exec-stream")
log.Debugf("delivered agent binary to container via exec-stream")
return nil
}

Expand Down
Loading