Skip to content

Commit c6d7575

Browse files
EdwardAngertEdwardAngert
committed
Merge branch 'main' into setup-ext-auth
2 parents 383770b + 1314dbd commit c6d7575

File tree

142 files changed

+4275
-1503
lines changed

Some content is hidden

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

142 files changed

+4275
-1503
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ jobs:
336336
# a separate repository to allow its use before actions/checkout.
337337
- name: Setup RAM Disks
338338
if: runner.os == 'Windows'
339-
uses: coder/setup-ramdisk-action@79dacfe70c47ad6d6c0dd7f45412368802641439
339+
uses: coder/setup-ramdisk-action@81c5c441bda00c6c3d6bcee2e5a33ed4aadbbcc1
340340

341341
- name: Checkout
342342
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/release.yaml

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -924,55 +924,3 @@ jobs:
924924
continue-on-error: true
925925
run: |
926926
make sqlc-push
927-
928-
update-calendar:
929-
name: "Update release calendar in docs"
930-
runs-on: "ubuntu-latest"
931-
needs: [release, publish-homebrew, publish-winget, publish-sqlc]
932-
if: ${{ !inputs.dry_run }}
933-
permissions:
934-
contents: write
935-
pull-requests: write
936-
steps:
937-
- name: Harden Runner
938-
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
939-
with:
940-
egress-policy: audit
941-
942-
- name: Checkout repository
943-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
944-
with:
945-
fetch-depth: 0 # Needed to get all tags for version calculation
946-
947-
- name: Set up Git
948-
run: |
949-
git config user.name "Coder CI"
950-
git config user.email "cdrci@coder.com"
951-
952-
- name: Run update script
953-
run: |
954-
./scripts/update-release-calendar.sh
955-
make fmt/markdown
956-
957-
- name: Check for changes
958-
id: check_changes
959-
run: |
960-
if git diff --quiet docs/install/releases/index.md; then
961-
echo "No changes detected in release calendar."
962-
echo "changes=false" >> $GITHUB_OUTPUT
963-
else
964-
echo "Changes detected in release calendar."
965-
echo "changes=true" >> $GITHUB_OUTPUT
966-
fi
967-
968-
- name: Create Pull Request
969-
if: steps.check_changes.outputs.changes == 'true'
970-
uses: peter-evans/create-pull-request@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3.0.0
971-
with:
972-
commit-message: "docs: update release calendar"
973-
title: "docs: update release calendar"
974-
body: |
975-
This PR automatically updates the release calendar in the docs.
976-
branch: bot/update-release-calendar
977-
delete-branch: true
978-
labels: docs

‎.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: "Upload to code-scanning"
50-
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
50+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
5151
with:
5252
sarif_file: results.sarif

‎.github/workflows/security.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: ./.github/actions/setup-go
3939

4040
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
41+
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
4242
with:
4343
languages: go, javascript
4444

@@ -48,7 +48,7 @@ jobs:
4848
rm Makefile
4949
5050
- name: Perform CodeQL Analysis
51-
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
51+
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
5252

5353
- name: Send Slack notification on failure
5454
if: ${{ failure() }}
@@ -150,7 +150,7 @@ jobs:
150150
severity: "CRITICAL,HIGH"
151151

152152
- name: Upload Trivy scan results to GitHub Security tab
153-
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
153+
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
154154
with:
155155
sarif_file: trivy-results.sarif
156156
category: "Trivy"

‎agent/agent.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,14 @@ type Options struct {
8989
ServiceBannerRefreshInterval time.Duration
9090
BlockFileTransfer bool
9191
Execer agentexec.Execer
92-
SubAgent bool
9392

9493
ExperimentalDevcontainersEnabled bool
9594
ContainerAPIOptions []agentcontainers.Option // Enable ExperimentalDevcontainersEnabled for these to be effective.
9695
}
9796

9897
type Client interface {
99-
ConnectRPC24(ctx context.Context) (
100-
proto.DRPCAgentClient24, tailnetproto.DRPCTailnetClient24, error,
98+
ConnectRPC25(ctx context.Context) (
99+
proto.DRPCAgentClient25, tailnetproto.DRPCTailnetClient25, error,
101100
)
102101
RewriteDERPMap(derpMap *tailcfg.DERPMap)
103102
}
@@ -191,8 +190,6 @@ func New(options Options) Agent {
191190
metrics: newAgentMetrics(prometheusRegistry),
192191
execer: options.Execer,
193192

194-
subAgent: options.SubAgent,
195-
196193
experimentalDevcontainersEnabled: options.ExperimentalDevcontainersEnabled,
197194
containerAPIOptions: options.ContainerAPIOptions,
198195
}
@@ -275,8 +272,6 @@ type agent struct {
275272
metrics *agentMetrics
276273
execer agentexec.Execer
277274

278-
subAgent bool
279-
280275
experimentalDevcontainersEnabled bool
281276
containerAPIOptions []agentcontainers.Option
282277
containerAPI atomic.Pointer[agentcontainers.API] // Set by apiHandler.
@@ -913,7 +908,7 @@ func (a *agent) run() (retErr error) {
913908
a.sessionToken.Store(&sessionToken)
914909

915910
// ConnectRPC returns the dRPC connection we use for the Agent and Tailnet v2+ APIs
916-
aAPI, tAPI, err := a.client.ConnectRPC24(a.hardCtx)
911+
aAPI, tAPI, err := a.client.ConnectRPC25(a.hardCtx)
917912
if err != nil {
918913
return err
919914
}

‎agent/agent_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,10 +1262,6 @@ func TestAgent_SSHConnectionLoginVars(t *testing.T) {
12621262
key: "LOGNAME",
12631263
want: u.Username,
12641264
},
1265-
{
1266-
key: "HOME",
1267-
want: u.HomeDir,
1268-
},
12691265
{
12701266
key: "SHELL",
12711267
want: shell,
@@ -1502,7 +1498,7 @@ func TestAgent_Lifecycle(t *testing.T) {
15021498

15031499
_, client, _, _, _ := setupAgent(t, agentsdk.Manifest{
15041500
Scripts: []codersdk.WorkspaceAgentScript{{
1505-
Script: "true",
1501+
Script: "echo foo",
15061502
Timeout: 30 * time.Second,
15071503
RunOnStart: true,
15081504
}},

‎agent/agentcontainers/acmock/acmock.go

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

‎agent/agentcontainers/acmock/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Package acmock contains a mock implementation of agentcontainers.Lister for use in tests.
22
package acmock
33

4-
//go:generate mockgen -destination ./acmock.go -package acmock .. Lister
4+
//go:generate mockgen -destination ./acmock.go -package acmock .. Lister,DevcontainerCLI

‎agent/agentcontainers/api.go

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,15 @@ func WithClock(clock quartz.Clock) Option {
6969
}
7070
}
7171

72+
// WithCacheDuration sets the cache duration for the API.
73+
// This is used to control how often the API refreshes the list of
74+
// containers. The default is 10 seconds.
75+
func WithCacheDuration(d time.Duration) Option {
76+
return func(api *API) {
77+
api.cacheDuration = d
78+
}
79+
}
80+
7281
// WithExecer sets the agentexec.Execer implementation to use.
7382
func WithExecer(execer agentexec.Execer) Option {
7483
return func(api *API) {
@@ -336,14 +345,29 @@ func (api *API) getContainers(ctx context.Context) (codersdk.WorkspaceAgentListC
336345
}
337346

338347
// Check if the container is running and update the known devcontainers.
339-
for _, container := range updated.Containers {
348+
for i := range updated.Containers {
349+
container := &updated.Containers[i]
340350
workspaceFolder := container.Labels[DevcontainerLocalFolderLabel]
341351
configFile := container.Labels[DevcontainerConfigFileLabel]
342352

343353
if workspaceFolder == "" {
344354
continue
345355
}
346356

357+
container.DevcontainerDirty = dirtyStates[workspaceFolder]
358+
if container.DevcontainerDirty {
359+
lastModified, hasModTime := api.configFileModifiedTimes[configFile]
360+
if hasModTime && container.CreatedAt.After(lastModified) {
361+
api.logger.Info(ctx, "new container created after config modification, not marking as dirty",
362+
slog.F("container", container.ID),
363+
slog.F("created_at", container.CreatedAt),
364+
slog.F("config_modified_at", lastModified),
365+
slog.F("file", configFile),
366+
)
367+
container.DevcontainerDirty = false
368+
}
369+
}
370+
347371
// Check if this is already in our known list.
348372
if knownIndex := slices.IndexFunc(api.knownDevcontainers, func(dc codersdk.WorkspaceAgentDevcontainer) bool {
349373
return dc.WorkspaceFolder == workspaceFolder
@@ -356,7 +380,7 @@ func (api *API) getContainers(ctx context.Context) (codersdk.WorkspaceAgentListC
356380
}
357381
}
358382
api.knownDevcontainers[knownIndex].Running = container.Running
359-
api.knownDevcontainers[knownIndex].Container = &container
383+
api.knownDevcontainers[knownIndex].Container = container
360384

361385
// Check if this container was created after the config
362386
// file was modified.
@@ -395,28 +419,14 @@ func (api *API) getContainers(ctx context.Context) (codersdk.WorkspaceAgentListC
395419
}
396420
}
397421

398-
dirty := dirtyStates[workspaceFolder]
399-
if dirty {
400-
lastModified, hasModTime := api.configFileModifiedTimes[configFile]
401-
if hasModTime && container.CreatedAt.After(lastModified) {
402-
api.logger.Info(ctx, "new container created after config modification, not marking as dirty",
403-
slog.F("container", container.ID),
404-
slog.F("created_at", container.CreatedAt),
405-
slog.F("config_modified_at", lastModified),
406-
slog.F("file", configFile),
407-
)
408-
dirty = false
409-
}
410-
}
411-
412422
api.knownDevcontainers = append(api.knownDevcontainers, codersdk.WorkspaceAgentDevcontainer{
413423
ID: uuid.New(),
414424
Name: name,
415425
WorkspaceFolder: workspaceFolder,
416426
ConfigPath: configFile,
417427
Running: container.Running,
418-
Dirty: dirty,
419-
Container: &container,
428+
Dirty: container.DevcontainerDirty,
429+
Container: container,
420430
})
421431
}
422432

@@ -510,6 +520,13 @@ func (api *API) handleDevcontainerRecreate(w http.ResponseWriter, r *http.Reques
510520
slog.F("name", api.knownDevcontainers[i].Name),
511521
)
512522
api.knownDevcontainers[i].Dirty = false
523+
// TODO(mafredri): This should be handled by a service that
524+
// updates the devcontainer state periodically and on-demand.
525+
api.knownDevcontainers[i].Container = nil
526+
// Set the modified time to the zero value to indicate that
527+
// the containers list must be refreshed. This will see to
528+
// it that the new container is re-assigned.
529+
api.mtime = time.Time{}
513530
}
514531
return
515532
}
@@ -579,6 +596,9 @@ func (api *API) markDevcontainerDirty(configPath string, modifiedAt time.Time) {
579596
slog.F("modified_at", modifiedAt),
580597
)
581598
api.knownDevcontainers[i].Dirty = true
599+
if api.knownDevcontainers[i].Container != nil {
600+
api.knownDevcontainers[i].Container.DevcontainerDirty = true
601+
}
582602
}
583603
}
584604
})

0 commit comments

Comments
 (0)