Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
kacpersaw merged 14 commits intomainfromkacpersaw/feat-coder-attach-api
Aug 19, 2025
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
60dc330
feat: add support for external agents to API's and provisioner
kacpersawAug 11, 2025
10fc9fe
generate api model
kacpersawAug 11, 2025
5f344a1
move /external-agent/{agent}/credentials endpoint to enterprise
kacpersawAug 11, 2025
28243e3
add Content-Digest header to init script response
kacpersawAug 11, 2025
d560e5c
implement license checks for external agents in workspace builds and …
kacpersawAug 12, 2025
732bc1d
Update license_test.go
kacpersawAug 12, 2025
5ca172e
Apply review suggestions
kacpersawAug 13, 2025
10e6853
Add HasExternalAgent to TemplateVersion response
kacpersawAug 13, 2025
760de9a
Update tests
kacpersawAug 13, 2025
3e2288b
add HasLicense field to Options and update UsageChecker
kacpersawAug 13, 2025
ee58237
remove HasLicense field from Options and implement HasLicense method …
kacpersawAug 13, 2025
b91397d
return 404 if external_agent is not associated with agent
kacpersawAug 13, 2025
fb7bc71
update external agent handling in workspace agents and adjust Terrafo…
kacpersawAug 13, 2025
0baf2b3
Remove test
kacpersawAug 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
PrevPrevious commit
NextNext commit
Add HasExternalAgent to TemplateVersion response
  • Loading branch information
@kacpersaw
kacpersaw committedAug 19, 2025
commit10e6853fca643b380793e743c05e92d5fff96ac7
5 changes: 4 additions & 1 deletioncoderd/apidoc/docs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

5 changes: 4 additions & 1 deletioncoderd/apidoc/swagger.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

1 change: 1 addition & 0 deletionscoderd/templateversions.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1963,6 +1963,7 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi
Archived: version.Archived,
Warnings: warnings,
MatchedProvisioners: matchedProvisioners,
HasExternalAgent: version.HasExternalAgent.Bool,
}
}

Expand Down
33 changes: 33 additions & 0 deletionscoderd/templateversions_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2221,3 +2221,36 @@ func TestTemplateArchiveVersions(t *testing.T) {
require.NoError(t, err, "fetch all versions")
require.Len(t, remaining, totalVersions-len(expArchived)-len(allFailed)+1, "remaining versions")
}

func TestTemplateVersionHasExternalAgent(t *testing.T) {
t.Parallel()

client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
user := coderdtest.CreateFirstUser(t, client)

ctx := testutil.Context(t, testutil.WaitMedium)
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
Parse: echo.ParseComplete,
ProvisionPlan: []*proto.Response{
{
Type: &proto.Response_Plan{
Plan: &proto.PlanComplete{
Resources: []*proto.Resource{
{
Name: "example",
Type: "coder_external_agent",
},
},
HasExternalAgents: true,
},
},
},
},
ProvisionApply: echo.ApplyComplete,
})
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)

version, err := client.TemplateVersion(ctx, version.ID)
require.NoError(t, err)
require.True(t, version.HasExternalAgent)
}
2 changes: 2 additions & 0 deletionscodersdk/templateversions.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,8 @@ type TemplateVersion struct {

Warnings []TemplateVersionWarning `json:"warnings,omitempty" enums:"DEPRECATED_PARAMETERS"`
MatchedProvisioners *MatchedProvisioners `json:"matched_provisioners,omitempty"`

HasExternalAgent bool `json:"has_external_agent"`
}

type TemplateVersionExternalAuth struct {
Expand Down
2 changes: 2 additions & 0 deletionsdocs/reference/api/schemas.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

9 changes: 9 additions & 0 deletionsdocs/reference/api/templates.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

2 changes: 1 addition & 1 deletiondocs/reference/api/workspaces.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

1 change: 1 addition & 0 deletionssite/src/api/typesGenerated.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

2 changes: 2 additions & 0 deletionssite/src/testHelpers/entities.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,7 @@ You can add instructions here
[Some link info](https://coder.com)`,
created_by: MockUserOwner,
archived: false,
has_external_agent: false,
};

export const MockTemplateVersion2: TypesGen.TemplateVersion = {
Expand All@@ -751,6 +752,7 @@ You can add instructions here
[Some link info](https://coder.com)`,
created_by: MockUserOwner,
archived: false,
has_external_agent: false,
};

export const MockTemplateVersionWithMarkdownMessage: TypesGen.TemplateVersion =
Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp