Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: remove ubuntu 22.04 image #29255

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

Draft
aslilac wants to merge 5 commits into
base: main
Choose a base branch
from
+10 −634
Draft

chore: remove ubuntu 22.04 image #29255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdf2a98
chore: remove stale TODO shims and dead code
aslilac Sep 11, 2026
b25dd38
chore: keep nil uuid default org behavior and wintun uninstall
aslilac Sep 11, 2026
d99c163
Update coderd/httpmw/organizationparam.go
aslilac Sep 11, 2026
2cf09ae
more
aslilac Sep 11, 2026
fb601a1
remove ubuntu 22.04
aslilac Sep 11, 2026
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
chore: keep nil uuid default org behavior and wintun uninstall
  • Loading branch information
@aslilac
aslilac committed Sep 11, 2026
commit b25dd386fb965e953b260e413e8aeb6f9514a134
9 changes: 5 additions & 4 deletions coderd/httpmw/organizationparam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ func ExtractOrganizationParam(db database.Store) func(http.Handler) http.Handler
var organization database.Organization
var dbErr error

// If the name is exactly "default", then we fetch the default
// organization. This is a special case to make it easier
// for single org deployments.
if arg == codersdk.DefaultOrganization {
// If the name is exactly "default" or the nil UUID, then we fetch
// the default organization. This is a special case to make it
// easier for single org deployments, and external callers depend
// on the nil UUID resolving to the default org.
if arg == codersdk.DefaultOrganization || arg == uuid.Nil.String() {
organization, dbErr = db.GetDefaultOrganization(ctx)
} else {
// Try by name or uuid.
Expand Down
8 changes: 8 additions & 0 deletions coderd/httpmw/organizationparam_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,5 +227,13 @@ func TestOrganizationParam(t *testing.T) {
res = rw.Result()
defer res.Body.Close()
require.Equal(t, http.StatusOK, res.StatusCode, "by default keyword")

// Try by nil uuid, which resolves to the default org.
chi.RouteContext(r.Context()).URLParams.Add("organization", uuid.Nil.String())
chi.RouteContext(r.Context()).URLParams.Add("user", user.ID.String())
rtr.ServeHTTP(rw, r)
res = rw.Result()
defer res.Body.Close()
require.Equal(t, http.StatusOK, res.StatusCode, "by nil uuid (legacy)")
})
}
20 changes: 20 additions & 0 deletions vpn/tun_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,23 @@ func windowsUptime() time.Duration {
r, _, _ := getTickCount64Proc.Call()
return time.Duration(int64(r)) * time.Millisecond
}

// TODO(@dean): implement a way to install/uninstall the wintun driver, most
// likely as a CLI command
//
// This is taken from Tailscale:
// https://github.com/tailscale/tailscale/blob/3abfbf50aebbe3ba57dc749165edb56be6715c0a/cmd/tailscaled/tailscaled_windows.go#L543
func uninstallWinTun(logf logger.Logf) {
dll := windows.NewLazyDLL("wintun.dll")
if err := dll.Load(); err != nil {
logf("Cannot load wintun.dll for uninstall: %v", err)
return
}

logf("Removing wintun driver...")
err := wintun.Uninstall()
logf("Uninstall: %v", err)
}

// TODO(@dean): remove
var _ = uninstallWinTun
Loading