opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add GET /api/v2/templatebuilder/modules endpoint (#26117)

Browse Source 
Implement `GET /api/v2/templatebuilder/modules`, which returns the
filtered list of modules available for a given base template. Reads from
the bundled catalog via `LoadModules()` and applies OS-compatibility
filtering based on the `base` query param.

Computed variables (e.g. `agent_id`) are excluded from the API response
at the `ToSDK()` conversion boundary since they are wired automatically
by the builder. The `Computed` field is removed from the SDK type. Adds
`CompatibleWithOS()` to `ModuleManifest` for OS filtering.

Returns 400 for unknown base IDs and 404 when the template builder is
disabled.

Depends on #26116

> [!NOTE]
> This PR was authored by Coder Agents on behalf of @jeremyruppel.
This commit is contained in:
Jeremy Ruppel
2026-06-12 17:53:48 -04:00
committed by GitHub
parent 776fbfa748
commit 9a6e348f5d
11 changed files with 664 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/apidoc/docs.go
Generated
+124
View File
@@ -7358,6 +7358,39 @@ const docTemplate = `{
]
}
},
"/api/v2/templatebuilder/modules": {
"get": {
"produces": [
"application/json"
],
"tags": [
"TemplateBuilder"
],
"summary": "List template builder modules",
"operationId": "list-template-builder-modules",
"parameters": [
{
"type": "string",
"description": "Base template example ID for OS-compatibility filtering",
"name": "base",
"in": "query"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/codersdk.TemplateBuilderModulesResponse"
}
}
},
"security": [
{
"CoderSessionToken": []
}
]
}
},
"/api/v2/templates": {
"get": {
"description": "Returns a list of templates.\nBy default, only non-deprecated templates are returned.\nTo include deprecated templates, specify ` + "`" + `deprecated:true` + "`" + ` in the search query.",
@@ -23664,6 +23697,97 @@ const docTemplate = `{
}
}
},
"codersdk.TemplateBuilderModule": {
"type": "object",
"properties": {
"category": {
"type": "string"
},
"compatible_os": {
"type": "array",
"items": {
"type": "string"
}
},
"conflicts_with": {
"type": "array",
"items": {
"type": "string"
}
},
"description": {
"type": "string"
},
"display_name": {
"type": "string"
},
"icon": {
"type": "string"
},
"id": {
"type": "string"
},
"variables": {
"type": "array",
"items": {
"$ref": "#/definitions/codersdk.TemplateBuilderModuleVariable"
}
},
"version": {
"type": "string"
}
}
},
"codersdk.TemplateBuilderModuleVariable": {
"type": "object",
"properties": {
"default": {
"type": "array",
"items": {
"type": "integer"
}
},
"description": {
"type": "string"
},
"name": {
"type": "string"
},
"required": {
"type": "boolean"
},
"sensitive": {
"type": "boolean"
},
"type": {
"$ref": "#/definitions/codersdk.TemplateBuilderVariableType"
}
}
},
"codersdk.TemplateBuilderModulesResponse": {
"type": "object",
"properties": {
"modules": {
"type": "array",
"items": {
"$ref": "#/definitions/codersdk.TemplateBuilderModule"
}
}
}
},
"codersdk.TemplateBuilderVariableType": {
"type": "string",
"enum": [
"string",
"number",
"bool"
],
"x-enum-varnames": [
"TemplateBuilderVariableTypeString",
"TemplateBuilderVariableTypeNumber",
"TemplateBuilderVariableTypeBool"
]
},
"codersdk.TemplateExample": {
"type": "object",
"properties": {
coderd/apidoc/swagger.json
Generated
+116
View File
@@ -6527,6 +6527,35 @@
]
}
},
"/api/v2/templatebuilder/modules": {
"get": {
"produces": ["application/json"],
"tags": ["TemplateBuilder"],
"summary": "List template builder modules",
"operationId": "list-template-builder-modules",
"parameters": [
{
"type": "string",
"description": "Base template example ID for OS-compatibility filtering",
"name": "base",
"in": "query"
}
],
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/codersdk.TemplateBuilderModulesResponse"
}
}
},
"security": [
{
"CoderSessionToken": []
}
]
}
},
"/api/v2/templates": {
"get": {
"description": "Returns a list of templates.\nBy default, only non-deprecated templates are returned.\nTo include deprecated templates, specify `deprecated:true` in the search query.",
@@ -21730,6 +21759,93 @@
}
}
},
"codersdk.TemplateBuilderModule": {
"type": "object",
"properties": {
"category": {
"type": "string"
},
"compatible_os": {
"type": "array",
"items": {
"type": "string"
}
},
"conflicts_with": {
"type": "array",
"items": {
"type": "string"
}
},
"description": {
"type": "string"
},
"display_name": {
"type": "string"
},
"icon": {
"type": "string"
},
"id": {
"type": "string"
},
"variables": {
"type": "array",
"items": {
"$ref": "#/definitions/codersdk.TemplateBuilderModuleVariable"
}
},
"version": {
"type": "string"
}
}
},
"codersdk.TemplateBuilderModuleVariable": {
"type": "object",
"properties": {
"default": {
"type": "array",
"items": {
"type": "integer"
}
},
"description": {
"type": "string"
},
"name": {
"type": "string"
},
"required": {
"type": "boolean"
},
"sensitive": {
"type": "boolean"
},
"type": {
"$ref": "#/definitions/codersdk.TemplateBuilderVariableType"
}
}
},
"codersdk.TemplateBuilderModulesResponse": {
"type": "object",
"properties": {
"modules": {
"type": "array",
"items": {
"$ref": "#/definitions/codersdk.TemplateBuilderModule"
}
}
}
},
"codersdk.TemplateBuilderVariableType": {
"type": "string",
"enum": ["string", "number", "bool"],
"x-enum-varnames": [
"TemplateBuilderVariableTypeString",
"TemplateBuilderVariableTypeNumber",
"TemplateBuilderVariableTypeBool"
]
},
"codersdk.TemplateExample": {
"type": "object",
"properties": {
coderd/coderd.go
+1
View File
@@ -1621,6 +1621,7 @@ func New(options *Options) *API {
apiKeyMiddleware,
)
r.Get("/bases", api.templateBuilderBases)
r.Get("/modules", api.templateBuilderModules)
})
}
coderd/templatebuilder/catalog.go
+20 -1
View File
@@ -137,11 +137,31 @@ func parseModulesFromFS(fsys fs.FS) ([]ModuleManifest, error) {
return modules, nil
}
// CompatibleWithOS reports whether the module is compatible with the given OS.
// Modules with an empty CompatibleOS list are compatible with all platforms.
func (m ModuleManifest) CompatibleWithOS(os string) bool {
if len(m.CompatibleOS) == 0 {
return true
}
for _, supported := range m.CompatibleOS {
if supported == os {
return true
}
}
return false
}
// ToSDK converts a ModuleManifest to the API response type.
// PinnedVersion is mapped to Version; tags are not part of the API surface.
// Computed variables are excluded from the output.
func (m ModuleManifest) ToSDK() codersdk.TemplateBuilderModule {
variables := make([]codersdk.TemplateBuilderModuleVariable, 0, len(m.Variables))
for _, v := range m.Variables {
// Computed variables (e.g. agent_id) are wired by the builder
// automatically and must not be surfaced to the user.
if v.Computed {
continue
}
variables = append(variables, codersdk.TemplateBuilderModuleVariable{
Name: v.Name,
Type: validVariableTypes[v.Type],
@@ -149,7 +169,6 @@ func (m ModuleManifest) ToSDK() codersdk.TemplateBuilderModule {
Default: v.Default,
Required: v.Required,
Sensitive: v.Sensitive,
Computed: v.Computed,
})
}
coderd/templatebuilder/catalog_test.go
+33 -14
View File
@@ -93,18 +93,10 @@ func TestToSDK(t *testing.T) {
t.Run("AllVariableFields", func(t *testing.T) {
t.Parallel()
require.Len(t, sdk.Variables, 3)
// Computed variables (agent_id) are excluded from SDK output.
require.Len(t, sdk.Variables, 2)
agent := sdk.Variables[0]
require.Equal(t, "agent_id", agent.Name)
require.Equal(t, codersdk.TemplateBuilderVariableTypeString, agent.Type)
require.Equal(t, "The Coder agent ID.", agent.Description)
require.Nil(t, agent.Default)
require.True(t, agent.Required)
require.False(t, agent.Sensitive)
require.True(t, agent.Computed)
port := sdk.Variables[1]
port := sdk.Variables[0]
require.Equal(t, "port", port.Name)
require.Equal(t, codersdk.TemplateBuilderVariableTypeNumber, port.Type)
require.Equal(t, "Port to listen on.", port.Description)
@@ -112,16 +104,14 @@ func TestToSDK(t *testing.T) {
require.JSONEq(t, "8080", string(port.Default))
require.False(t, port.Required)
require.False(t, port.Sensitive)
require.False(t, port.Computed)
secret := sdk.Variables[2]
secret := sdk.Variables[1]
require.Equal(t, "secret_key", secret.Name)
require.Equal(t, codersdk.TemplateBuilderVariableTypeString, secret.Type)
require.Equal(t, "A sensitive value.", secret.Description)
require.Nil(t, secret.Default)
require.True(t, secret.Required)
require.True(t, secret.Sensitive)
require.False(t, secret.Computed)
})
t.Run("NilSlicesNormalizedToEmpty", func(t *testing.T) {
@@ -141,3 +131,32 @@ func TestToSDK(t *testing.T) {
require.Empty(t, s.Variables)
})
}
func TestCompatibleWithOS(t *testing.T) {
t.Parallel()
tests := []struct {
name string
compatibleOS []string
os string
want bool
}{
{"EmptyListMatchesAll", nil, "linux", true},
{"ExactMatch", []string{"linux"}, "linux", true},
{"MultipleMatch", []string{"linux", "windows"}, "windows", true},
{"NoMatch", []string{"linux"}, "windows", false},
{"CaseSensitive", []string{"linux"}, "Linux", false},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
m := templatebuilder.ModuleManifest{
ID: "test",
PinnedVersion: "1.0.0",
CompatibleOS: tc.compatibleOS,
}
require.Equal(t, tc.want, m.CompatibleWithOS(tc.os))
})
}
}
coderd/templatebuilder_handler.go
+51
View File
@@ -67,3 +67,54 @@ func (api *API) templateBuilderBases(rw http.ResponseWriter, r *http.Request) {
Bases: bases,
})
}
// @Summary List template builder modules
// @ID list-template-builder-modules
// @Security CoderSessionToken
// @Produce json
// @Tags TemplateBuilder
// @Param base query string false "Base template example ID for OS-compatibility filtering"
// @Success 200 {object} codersdk.TemplateBuilderModulesResponse
// @Router /api/v2/templatebuilder/modules [get]
func (api *API) templateBuilderModules(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context()
if !api.Authorize(r, policy.ActionRead, rbac.ResourceTemplate.AnyOrganization()) {
httpapi.ResourceNotFound(rw)
return
}
manifests, err := templatebuilder.LoadModules()
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error loading module catalog.",
Detail: err.Error(),
})
return
}
// Resolve OS filter from the base query param.
var filterOS templatebuilder.BaseOS
if base := r.URL.Query().Get("base"); base != "" {
filterOS = templatebuilder.BaseTemplateOS(base)
if filterOS == "" {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Unknown base template.",
Detail: "The \"base\" query parameter must be a valid base template ID.",
})
return
}
}
modules := make([]codersdk.TemplateBuilderModule, 0, len(manifests))
for _, m := range manifests {
if filterOS != "" && !m.CompatibleWithOS(string(filterOS)) {
continue
}
modules = append(modules, m.ToSDK())
}
httpapi.Write(ctx, rw, http.StatusOK, codersdk.TemplateBuilderModulesResponse{
Modules: modules,
})
}
coderd/templatebuilder_handler_test.go
+104
View File
@@ -81,3 +81,107 @@ func TestTemplateBuilderBases(t *testing.T) {
require.Equal(t, http.StatusNotFound, sdkErr.StatusCode())
})
}
func TestTemplateBuilderModules(t *testing.T) {
t.Parallel()
t.Run("OK", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
_ = coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
resp, err := client.TemplateBuilderModules(ctx, "")
require.NoError(t, err)
require.NotEmpty(t, resp.Modules)
for _, m := range resp.Modules {
require.NotEmpty(t, m.ID)
require.NotEmpty(t, m.Version)
}
})
t.Run("FilteredByBase", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
_ = coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
resp, err := client.TemplateBuilderModules(ctx, "docker")
require.NoError(t, err)
for _, m := range resp.Modules {
if len(m.CompatibleOS) > 0 {
require.Contains(t, m.CompatibleOS, "linux",
"module %q should be compatible with linux when filtered by docker base", m.ID)
}
}
})
t.Run("ComputedVariablesExcluded", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
_ = coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
resp, err := client.TemplateBuilderModules(ctx, "")
require.NoError(t, err)
// The embedded code-server module has agent_id with computed=true.
// It must not appear in the API response.
var found bool
for _, m := range resp.Modules {
if m.ID == "code-server" {
found = true
for _, v := range m.Variables {
require.NotEqual(t, "agent_id", v.Name,
"computed variable agent_id must not appear in API response")
}
}
}
require.True(t, found, "code-server module must be in the catalog")
})
t.Run("UnknownBaseReturns400", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
_ = coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
_, err := client.TemplateBuilderModules(ctx, "nonexistent")
require.Error(t, err)
var sdkErr *codersdk.Error
require.ErrorAs(t, err, &sdkErr)
require.Equal(t, http.StatusBadRequest, sdkErr.StatusCode())
})
t.Run("DisabledReturns404", func(t *testing.T) {
t.Parallel()
dv := coderdtest.DeploymentValues(t)
dv.TemplateBuilder.Disabled = true
client := coderdtest.New(t, &coderdtest.Options{
DeploymentValues: dv,
})
_ = coderdtest.CreateFirstUser(t, client)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
_, err := client.TemplateBuilderModules(ctx, "")
require.Error(t, err)
var sdkErr *codersdk.Error
require.ErrorAs(t, err, &sdkErr)
require.Equal(t, http.StatusNotFound, sdkErr.StatusCode())
})
}