Skip to content

feat(coderd): add support for external agents to API's and provisioner #19286

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 14 commits into from
Aug 19, 2025
Merged

feat(coderd): add support for external agents to API's and provisioner #19286

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
60dc330
feat: add support for external agents to API's and provisioner
kacpersaw Aug 11, 2025
10fc9fe
generate api model
kacpersaw Aug 11, 2025
5f344a1
move /external-agent/{agent}/credentials endpoint to enterprise
kacpersaw Aug 11, 2025
28243e3
add Content-Digest header to init script response
kacpersaw Aug 11, 2025
d560e5c
implement license checks for external agents in workspace builds and …
kacpersaw Aug 12, 2025
732bc1d
Update license_test.go
kacpersaw Aug 12, 2025
5ca172e
Apply review suggestions
kacpersaw Aug 13, 2025
10e6853
Add HasExternalAgent to TemplateVersion response
kacpersaw Aug 13, 2025
760de9a
Update tests
kacpersaw Aug 13, 2025
3e2288b
add HasLicense field to Options and update UsageChecker
kacpersaw Aug 13, 2025
ee58237
remove HasLicense field from Options and implement HasLicense method …
kacpersaw Aug 13, 2025
b91397d
return 404 if external_agent is not associated with agent
kacpersaw Aug 13, 2025
fb7bc71
update external agent handling in workspace agents and adjust Terrafo…
kacpersaw Aug 13, 2025
0baf2b3
Remove test
kacpersaw Aug 13, 2025
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
remove HasLicense field from Options and implement HasLicense method … 
…in Entitlements
  • Loading branch information
@kacpersaw
kacpersaw committed Aug 19, 2025
commit ee58237e909c3914f60b38d82c798d3f0adf2188
2 changes: 0 additions & 2 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,6 @@ type Options struct {
// Entitlements can come from the enterprise caller if enterprise code is
// included.
Entitlements *entitlements.Set
// HasLicense indicates if a license is installed.
HasLicense bool
// PostAuthAdditionalHeadersFunc is used to add additional headers to the response
// after a successful authentication.
// This is somewhat janky, but seemingly the only reasonable way to add a header
Expand Down
6 changes: 6 additions & 0 deletions coderd/entitlements/entitlements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,9 @@ func (l *Set) Errors() []string {
defer l.entitlementsMu.RUnlock()
return slices.Clone(l.entitlements.Errors)
}

func (l *Set) HasLicense() bool {
l.entitlementsMu.RLock()
defer l.entitlementsMu.RUnlock()
return l.entitlements.HasLicense
}
4 changes: 1 addition & 3 deletions enterprise/coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,8 +739,6 @@ func (api *API) updateEntitlements(ctx context.Context) error {
return codersdk.Entitlements{}, err
}

api.HasLicense = reloadedEntitlements.HasLicense

if reloadedEntitlements.RequireTelemetry && !api.DeploymentValues.Telemetry.Enable.Value() {
api.Logger.Error(ctx, "license requires telemetry enabled")
return codersdk.Entitlements{}, entitlements.ErrLicenseRequiresTelemetry
Expand Down Expand Up @@ -965,7 +963,7 @@ func (api *API) CheckBuildUsage(ctx context.Context, store database.Store, templ
// When unlicensed, we need to check that we haven't breached the managed agent
// limit.
// Unlicensed deployments are allowed to use unlimited managed agents.
if api.HasLicense {
if api.Entitlements.HasLicense() {
managedAgentLimit, ok := api.Entitlements.Feature(codersdk.FeatureManagedAgentLimit)
if !ok || !managedAgentLimit.Enabled || managedAgentLimit.Limit == nil || managedAgentLimit.UsagePeriod == nil {
return wsbuilder.UsageCheckResponse{
Expand Down