Skip to content

Commit 5068d88

Browse files
aslilacaslilac
committed
Merge branch 'main' into optional-external-auth
2 parents 751400b + ec25fb8 commit 5068d88

File tree

47 files changed

+653
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+653
-295
lines changed

‎.github/pr-deployments/template/main.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,9 @@ provider "kubernetes" {
8888
data "coder_workspace" "me" {}
8989

9090
resource "coder_agent" "main" {
91-
os = "linux"
92-
arch = "amd64"
93-
startup_script_timeout = 180
94-
startup_script = <<-EOT
91+
os = "linux"
92+
arch = "amd64"
93+
startup_script = <<-EOT
9594
set -e
9695
9796
# install and start code-server

‎agent/agenttest/client.go

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,10 @@ type FakeAgentAPI struct {
197197
t testing.TB
198198
logger slog.Logger
199199

200-
manifest *agentproto.Manifest
201-
startupCh chan *agentproto.Startup
202-
statsCh chan *agentproto.Stats
200+
manifest *agentproto.Manifest
201+
startupCh chan *agentproto.Startup
202+
statsCh chan *agentproto.Stats
203+
appHealthCh chan *agentproto.BatchUpdateAppHealthRequest
203204

204205
getServiceBannerFunc func() (codersdk.ServiceBannerConfig, error)
205206
}
@@ -244,9 +245,14 @@ func (*FakeAgentAPI) UpdateLifecycle(context.Context, *agentproto.UpdateLifecycl
244245

245246
func (f *FakeAgentAPI) BatchUpdateAppHealths(ctx context.Context, req *agentproto.BatchUpdateAppHealthRequest) (*agentproto.BatchUpdateAppHealthResponse, error) {
246247
f.logger.Debug(ctx, "batch update app health", slog.F("req", req))
248+
f.appHealthCh <- req
247249
return &agentproto.BatchUpdateAppHealthResponse{}, nil
248250
}
249251

252+
func (f *FakeAgentAPI) AppHealthCh() <-chan *agentproto.BatchUpdateAppHealthRequest {
253+
return f.appHealthCh
254+
}
255+
250256
func (f *FakeAgentAPI) UpdateStartup(_ context.Context, req *agentproto.UpdateStartupRequest) (*agentproto.Startup, error) {
251257
f.startupCh <- req.GetStartup()
252258
return req.GetStartup(), nil
@@ -264,10 +270,11 @@ func (*FakeAgentAPI) BatchCreateLogs(context.Context, *agentproto.BatchCreateLog
264270

265271
func NewFakeAgentAPI(t testing.TB, logger slog.Logger, manifest *agentproto.Manifest, statsCh chan *agentproto.Stats) *FakeAgentAPI {
266272
return &FakeAgentAPI{
267-
t: t,
268-
logger: logger.Named("FakeAgentAPI"),
269-
manifest: manifest,
270-
statsCh: statsCh,
271-
startupCh: make(chan *agentproto.Startup, 100),
273+
t: t,
274+
logger: logger.Named("FakeAgentAPI"),
275+
manifest: manifest,
276+
statsCh: statsCh,
277+
startupCh: make(chan *agentproto.Startup, 100),
278+
appHealthCh: make(chan *agentproto.BatchUpdateAppHealthRequest, 100),
272279
}
273280
}

‎agent/apphealth_test.go

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,21 @@ import (
44
"context"
55
"net/http"
66
"net/http/httptest"
7+
"strings"
78
"sync"
89
"sync/atomic"
910
"testing"
1011
"time"
1112

13+
"github.com/google/uuid"
14+
"github.com/stretchr/testify/assert"
1215
"github.com/stretchr/testify/require"
1316

1417
"cdr.dev/slog"
1518
"cdr.dev/slog/sloggers/slogtest"
1619
"github.com/coder/coder/v2/agent"
20+
"github.com/coder/coder/v2/agent/agenttest"
21+
"github.com/coder/coder/v2/agent/proto"
1722
"github.com/coder/coder/v2/coderd/httpapi"
1823
"github.com/coder/coder/v2/codersdk"
1924
"github.com/coder/coder/v2/codersdk/agentsdk"
@@ -40,12 +45,23 @@ func TestAppHealth_Healthy(t *testing.T) {
4045
},
4146
Health: codersdk.WorkspaceAppHealthInitializing,
4247
},
48+
{
49+
Slug: "app3",
50+
Healthcheck: codersdk.Healthcheck{
51+
Interval: 2,
52+
Threshold: 1,
53+
},
54+
Health: codersdk.WorkspaceAppHealthInitializing,
55+
},
4356
}
4457
handlers := []http.Handler{
4558
nil,
4659
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
4760
httpapi.Write(r.Context(), w, http.StatusOK, nil)
4861
}),
62+
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
63+
httpapi.Write(r.Context(), w, http.StatusOK, nil)
64+
}),
4965
}
5066
getApps, closeFn := setupAppReporter(ctx, t, apps, handlers)
5167
defer closeFn()
@@ -58,7 +74,7 @@ func TestAppHealth_Healthy(t *testing.T) {
5874
return false
5975
}
6076

61-
return apps[1].Health == codersdk.WorkspaceAppHealthHealthy
77+
return apps[1].Health == codersdk.WorkspaceAppHealthHealthy && apps[2].Health == codersdk.WorkspaceAppHealthHealthy
6278
}, testutil.WaitLong, testutil.IntervalSlow)
6379
}
6480

@@ -163,6 +179,12 @@ func TestAppHealth_NotSpamming(t *testing.T) {
163179

164180
func setupAppReporter(ctx context.Context, t *testing.T, apps []codersdk.WorkspaceApp, handlers []http.Handler) (agent.WorkspaceAgentApps, func()) {
165181
closers := []func(){}
182+
for i, app := range apps {
183+
if app.ID == uuid.Nil {
184+
app.ID = uuid.New()
185+
apps[i] = app
186+
}
187+
}
166188
for i, handler := range handlers {
167189
if handler == nil {
168190
continue
@@ -181,23 +203,43 @@ func setupAppReporter(ctx context.Context, t *testing.T, apps []codersdk.Workspa
181203
var newApps []codersdk.WorkspaceApp
182204
return append(newApps, apps...), nil
183205
}
184-
postWorkspaceAgentAppHealth := func(_ context.Context, req agentsdk.PostAppHealthsRequest) error {
185-
mu.Lock()
186-
for id, health := range req.Healths {
187-
for i, app := range apps {
188-
if app.ID != id {
189-
continue
206+
207+
// We don't care about manifest or stats in this test since it's not using
208+
// a full agent and these RPCs won't get called.
209+
//
210+
// We use a proper fake agent API so we can test the conversion code and the
211+
// request code as well. Before we were bypassing these by using a custom
212+
// post function.
213+
fakeAAPI := agenttest.NewFakeAgentAPI(t, slogtest.Make(t, nil), nil, nil)
214+
215+
// Process events from the channel and update the health of the apps.
216+
go func() {
217+
appHealthCh := fakeAAPI.AppHealthCh()
218+
for {
219+
select {
220+
case <-ctx.Done():
221+
return
222+
case req := <-appHealthCh:
223+
mu.Lock()
224+
for _, update := range req.Updates {
225+
updateID, err := uuid.FromBytes(update.Id)
226+
assert.NoError(t, err)
227+
updateHealth := codersdk.WorkspaceAppHealth(strings.ToLower(proto.AppHealth_name[int32(update.Health)]))
228+
229+
for i, app := range apps {
230+
if app.ID != updateID {
231+
continue
232+
}
233+
app.Health = updateHealth
234+
apps[i] = app
235+
}
190236
}
191-
app.Health = health
192-
apps[i] = app
237+
mu.Unlock()
193238
}
194239
}
195-
mu.Unlock()
196-
197-
return nil
198-
}
240+
}()
199241

200-
go agent.NewWorkspaceAppHealthReporter(slogtest.Make(t, nil).Leveled(slog.LevelDebug), apps, postWorkspaceAgentAppHealth)(ctx)
242+
go agent.NewWorkspaceAppHealthReporter(slogtest.Make(t, nil).Leveled(slog.LevelDebug), apps, agentsdk.AppHealthPoster(fakeAAPI))(ctx)
201243

202244
return workspaceAgentApps, func() {
203245
for _, closeFn := range closers {

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/json"
66
"fmt"
77
"net/url"
8+
"sort"
89
"strconv"
910
"strings"
1011
"time"
@@ -414,6 +415,16 @@ func AppSubdomain(dbApp database.WorkspaceApp, agentName, workspaceName, ownerNa
414415
}
415416

416417
func Apps(dbApps []database.WorkspaceApp, agent database.WorkspaceAgent, ownerName string, workspace database.Workspace) []codersdk.WorkspaceApp {
418+
sort.Slice(dbApps, func(i, j int) bool {
419+
if dbApps[i].DisplayOrder != dbApps[j].DisplayOrder {
420+
return dbApps[i].DisplayOrder < dbApps[j].DisplayOrder
421+
}
422+
if dbApps[i].DisplayName != dbApps[j].DisplayName {
423+
return dbApps[i].DisplayName < dbApps[j].DisplayName
424+
}
425+
return dbApps[i].Slug < dbApps[j].Slug
426+
})
427+
417428
apps := make([]codersdk.WorkspaceApp, 0)
418429
for _, dbApp := range dbApps {
419430
apps = append(apps, codersdk.WorkspaceApp{

‎coderd/database/dbgen/dbgen.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@ func WorkspaceApp(t testing.TB, db database.Store, orig database.WorkspaceApp) d
465465
HealthcheckInterval: takeFirst(orig.HealthcheckInterval, 60),
466466
HealthcheckThreshold: takeFirst(orig.HealthcheckThreshold, 60),
467467
Health: takeFirst(orig.Health, database.WorkspaceAppHealthHealthy),
468+
DisplayOrder: takeFirst(orig.DisplayOrder, 1),
468469
})
469470
require.NoError(t, err, "insert app")
470471
return resource

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5826,6 +5826,7 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
58265826
HealthcheckInterval: arg.HealthcheckInterval,
58275827
HealthcheckThreshold: arg.HealthcheckThreshold,
58285828
Health: arg.Health,
5829+
DisplayOrder: arg.DisplayOrder,
58295830
}
58305831
q.workspaceApps = append(q.workspaceApps, workspaceApp)
58315832
return workspaceApp, nil

‎coderd/database/dump.sql

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000189_workspace_app_order.down.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE workspace_apps DROP COLUMN display_order;

‎coderd/database/migrations/000189_workspace_app_order.up.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ALTER TABLE workspace_apps ADD COLUMN display_order integer NOT NULL DEFAULT 0;
2+
3+
COMMENT ON COLUMN workspace_apps.display_order
4+
IS 'Specifies the order in which to display agent app in user interfaces.';

‎coderd/database/migrations/000189_external_auth_providers_jsonb.down.sql renamed to ‎coderd/database/migrations/000190_external_auth_providers_jsonb.down.sql

File renamed without changes.

‎coderd/database/migrations/000189_external_auth_providers_jsonb.up.sql renamed to ‎coderd/database/migrations/000190_external_auth_providers_jsonb.up.sql

File renamed without changes.

‎coderd/database/models.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 14 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceapps.sql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ INSERT INTO
2727
healthcheck_url,
2828
healthcheck_interval,
2929
healthcheck_threshold,
30-
health
30+
health,
31+
display_order
3132
)
3233
VALUES
33-
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15) RETURNING *;
34+
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16) RETURNING *;
3435

3536
-- name: UpdateWorkspaceAppHealthByID :exec
3637
UPDATE

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,6 +1673,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
16731673
HealthcheckInterval: app.Healthcheck.Interval,
16741674
HealthcheckThreshold: app.Healthcheck.Threshold,
16751675
Health: health,
1676+
DisplayOrder: int32(app.Order),
16761677
})
16771678
if err != nil {
16781679
return xerrors.Errorf("insert app: %w", err)

0 commit comments

Comments
 (0)