Skip to content

Commit 4ffad06

Browse files
committed
Apply review suggestions
1 parent c614690 commit 4ffad06

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

enterprise/cli/externalworkspaces.go

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,11 @@ func (r *RootCmd) externalWorkspaces() *serpent.Command {
4747
func (r *RootCmd) externalWorkspaceCreate() *serpent.Command {
4848
opts := agpl.CreateOptions{
4949
BeforeCreate: func(ctx context.Context, client *codersdk.Client, _ codersdk.Template, templateVersionID uuid.UUID) error {
50-
resources, err := client.TemplateVersionResources(ctx, templateVersionID)
50+
version, err := client.TemplateVersion(ctx, templateVersionID)
5151
if err != nil {
52-
return xerrors.Errorf("get template version resources: %w", err)
52+
return xerrors.Errorf("get template version: %w", err)
5353
}
54-
if len(resources) == 0 {
55-
return xerrors.Errorf("no resources found for template version %q", templateVersionID)
56-
}
57-
58-
var hasExternalAgent bool
59-
for _, resource := range resources {
60-
if resource.Type == "coder_external_agent" {
61-
hasExternalAgent = true
62-
break
63-
}
64-
}
65-
66-
if !hasExternalAgent {
54+
if !version.HasExternalAgent {
6755
return xerrors.Errorf("template version %q does not have an external agent. Only templates with external agents can be used for external workspace creation", templateVersionID)
6856
}
6957

@@ -190,9 +178,9 @@ func (r *RootCmd) externalWorkspaceList() *serpent.Command {
190178
baseFilter := filter.Filter()
191179

192180
if baseFilter.FilterQuery == "" {
193-
baseFilter.FilterQuery = "has-external-agent:true"
181+
baseFilter.FilterQuery = "has_external_agent:true"
194182
} else {
195-
baseFilter.FilterQuery += " has-external-agent:true"
183+
baseFilter.FilterQuery += " has_external_agent:true"
196184
}
197185

198186
res, err := agpl.QueryConvertWorkspaces(inv.Context(), client, baseFilter, agpl.WorkspaceListRowFromWorkspace)

enterprise/cli/externalworkspaces_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func completeWithExternalAgent() *echo.Responses {
4141
},
4242
},
4343
},
44+
HasExternalAgents: true,
4445
},
4546
},
4647
},

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy