Skip to content

Commit 5ece4cb

Browse files
kacpersawkacpersaw
committed
Add HasExternalAgent to TemplateVersion response
1 parent b288b91 commit 5ece4cb

File tree

10 files changed

+59
-3
lines changed

10 files changed

+59
-3
lines changed

‎coderd/apidoc/docs.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/templateversions.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,6 +1963,7 @@ func convertTemplateVersion(version database.TemplateVersion, job codersdk.Provi
19631963
Archived: version.Archived,
19641964
Warnings: warnings,
19651965
MatchedProvisioners: matchedProvisioners,
1966+
HasExternalAgent: version.HasExternalAgent.Bool,
19661967
}
19671968
}
19681969

‎coderd/templateversions_test.go

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2221,3 +2221,36 @@ func TestTemplateArchiveVersions(t *testing.T) {
22212221
require.NoError(t, err, "fetch all versions")
22222222
require.Len(t, remaining, totalVersions-len(expArchived)-len(allFailed)+1, "remaining versions")
22232223
}
2224+
2225+
func TestTemplateVersionHasExternalAgent(t *testing.T) {
2226+
t.Parallel()
2227+
2228+
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
2229+
user := coderdtest.CreateFirstUser(t, client)
2230+
2231+
ctx := testutil.Context(t, testutil.WaitMedium)
2232+
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
2233+
Parse: echo.ParseComplete,
2234+
ProvisionPlan: []*proto.Response{
2235+
{
2236+
Type: &proto.Response_Plan{
2237+
Plan: &proto.PlanComplete{
2238+
Resources: []*proto.Resource{
2239+
{
2240+
Name: "example",
2241+
Type: "coder_external_agent",
2242+
},
2243+
},
2244+
HasExternalAgents: true,
2245+
},
2246+
},
2247+
},
2248+
},
2249+
ProvisionApply: echo.ApplyComplete,
2250+
})
2251+
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
2252+
2253+
version, err := client.TemplateVersion(ctx, version.ID)
2254+
require.NoError(t, err)
2255+
require.True(t, version.HasExternalAgent)
2256+
}

‎codersdk/templateversions.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ type TemplateVersion struct {
3333

3434
Warnings []TemplateVersionWarning `json:"warnings,omitempty" enums:"DEPRECATED_PARAMETERS"`
3535
MatchedProvisioners *MatchedProvisioners `json:"matched_provisioners,omitempty"`
36+
37+
HasExternalAgent bool `json:"has_external_agent"`
3638
}
3739

3840
type TemplateVersionExternalAuth struct {

‎docs/reference/api/schemas.md

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

‎docs/reference/api/templates.md

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

‎docs/reference/api/workspaces.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/testHelpers/entities.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,7 @@ You can add instructions here
732732
[Some link info](https://coder.com)`,
733733
created_by: MockUserOwner,
734734
archived: false,
735+
has_external_agent: false,
735736
};
736737

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

756758
export const MockTemplateVersionWithMarkdownMessage: TypesGen.TemplateVersion =

0 commit comments

Comments
 (0)