8000 feat: add computed workspace and agent health fields to the api by mafredri · Pull Request #8280 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: add computed workspace and agent health fields to the api #8280

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 7 commits into from
Jul 10, 2023
Merged

feat: add computed workspace and agent health fields to the api #8280

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
60489f9
feat: add computed workspace and agent health fields to the api
mafredri Jun 30, 2023
16976c0
update golden files
mafredri Jul 3, 2023
15cfc3f
remove health property from workspace
mafredri Jul 3, 2023
9774488
implement proposal, add tests and examples
mafredri Jul 4, 2023
a62c6ae
Merge branch 'main' into mafredri/feat-add-workspace-and-agent-health
mafredri Jul 4, 2023
fba12e2
more tests
mafredri Jul 4, 2023
f51c061
Merge branch 'main' into mafredri/feat-add-workspace-and-agent-health
mafredri Jul 10, 2023
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
Prev Previous commit
Next Next commit
more tests
  • Loading branch information
@mafredri
mafredri committed Jul 4, 2023
commit fba12e220945c5f78fb024038b4a5837ed49caba
61 changes: 58 additions & 3 deletions coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func TestWorkspace(t *testing.T) {
require.NoError(t, err)
require.Equal(t, user.UserID, ws.LatestBuild.InitiatorID)
require.Equal(t, codersdk.BuildReasonInitiator, ws.LatestBuild.Reason)
require.True(t, ws.Health.Healthy)
})

t.Run("Deleted", func(t *testing.T) {
Expand Down Expand Up @@ -200,8 +199,11 @@ func TestWorkspace(t *testing.T) {

workspace, err := client.Workspace(ctx, workspace.ID)
require.NoError(t, err)

agent := workspace.LatestBuild.Resources[0].Agents[0]

assert.True(t, workspace.Health.Healthy)
assert.Equal(t, []uuid.UUID{}, workspace.Health.FailingAgents)
assert.True(t, agent.Health.Healthy)
assert.Empty(t, agent.Health.Reason)
})
Expand Down Expand Up @@ -239,17 +241,70 @@ func TestWorkspace(t *testing.T) {
var err error
testutil.Eventually(ctx, t, func(ctx context.Context) bool {
workspace, err = client.Workspace(ctx, workspace.ID)
t.Logf("%#v", workspace)
return assert.NoError(t, err) && !workspace.Health.Healthy
}, testutil.IntervalMedium)

agent := workspace.LatestBuild.Resources[0].Agents[0]

assert.False(t, workspace.Health.Healthy)
assert.Len(t, workspace.Health.FailingAgents, 1)
assert.Equal(t, []uuid.UUID{agent.ID}, workspace.Health.FailingAgents)
assert.False(t, agent.Health.Healthy)
assert.NotEmpty(t, agent.Health.Reason)
})

t.Run("Mixed health", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
user := coderdtest.CreateFirstUser(t, client)
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
Parse: echo.ParseComplete,
ProvisionApply: []*proto.Provision_Response{{
Type: &proto.Provision_Response_Complete{
Complete: &proto.Provision_Complete{
Resources: []*proto.Resource{{
Name: "some",
Type: "example",
Agents: []*proto.Agent{{
Id: uuid.NewString(),
Name: "a1",
Auth: &proto.Agent_Token{},
}, {
Id: uuid.NewString(),
Name: "a2",
Auth: &proto.Agent_Token{},
ConnectionTimeoutSeconds: 1,
}},
}},
},
},
}},
})
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

var err error
testutil.Eventually(ctx, t, func(ctx context.Context) bool {
workspace, err = client.Workspace(ctx, workspace.ID)
return assert.NoError(t, err) && !workspace.Health.Healthy
}, testutil.IntervalMedium)

assert.False(t, workspace.Health.Healthy)
assert.Len(t, workspace.Health.FailingAgents, 1)

agent1 := workspace.LatestBuild.Resources[0].Agents[0]
agent2 := workspace.LatestBuild.Resources[0].Agents[1]

assert.Equal(t, []uuid.UUID{agent2.ID}, workspace.Health.FailingAgents)
assert.True(t, agent1.Health.Healthy)
assert.Empty(t, agent1.Health.Reason)
assert.False(t, agent2.Health.Healthy)
assert.NotEmpty(t, agent2.Health.Reason)
})
})
}

Expand Down
0