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

Commiteeb9500

Browse files
committed
576 problems remaining...
All useclients
1 parent6fb72b5 commiteeb9500

20 files changed

+120
-136
lines changed

‎cli/delete.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@ import (
1212
// nolint
1313
func (r*RootCmd)deleteWorkspace()*clibase.Cmd {
1414
varorphanbool
15+
varclient*codersdk.Client
1516
cmd:=&clibase.Cmd{
1617
Annotations:workspaceCommand,
1718
Use:"delete <workspace>",
1819
Short:"Delete a workspace",
1920
Aliases: []string{"rm"},
20-
Middleware:clibase.RequireNArgs(1),
21+
Middleware:clibase.Chain(
22+
clibase.RequireNArgs(1),
23+
r.useClient(client),
24+
),
2125
Handler:func(inv*clibase.Invokation)error {
2226
_,err:=cliui.Prompt(inv, cliui.PromptOptions{
2327
Text:"Confirm delete workspace?",
@@ -28,10 +32,6 @@ func (r *RootCmd) deleteWorkspace() *clibase.Cmd {
2832
returnerr
2933
}
3034

31-
client,err:=useClient(cmd)
32-
iferr!=nil {
33-
returnerr
34-
}
3535
workspace,err:=namedWorkspace(inv.Context(),client,inv.Args[0])
3636
iferr!=nil {
3737
returnerr

‎cli/login.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414

1515
"github.com/go-playground/validator/v10"
1616
"github.com/pkg/browser"
17-
"github.com/spf13/cobra"
1817
"golang.org/x/xerrors"
1918

2019
"github.com/coder/coder/cli/clibase"
@@ -51,7 +50,7 @@ func (r *RootCmd) login() *clibase.Cmd {
5150
cmd:=&clibase.Cmd{
5251
Use:"login <url>",
5352
Short:"Authenticate with Coder deployment",
54-
Args:cobra.MaximumNArgs(1),
53+
Args:clibase.RequireRangeArgs(0,1),
5554
Handler:func(inv*clibase.Invokation)error {
5655
rawURL:=""
5756
iflen(inv.Args)==0 {

‎cli/parameterslist.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ func (r *RootCmd) parameterList() *clibase.Cmd {
1717
cliui.JSONFormat(),
1818
)
1919

20+
varclient*codersdk.Client
21+
2022
cmd:=&clibase.Cmd{
21-
Use:"list",
22-
Aliases: []string{"ls"},
23-
Middleware:clibase.RequireNArgs(2),
23+
Use:"list",
24+
Aliases: []string{"ls"},
25+
Middleware:clibase.Chain(
26+
clibase.RequireNArgs(2),
27+
r.useClient(client),
28+
),
2429
Handler:func(inv*clibase.Invokation)error {
2530
scope,name:=inv.Args[0],inv.Args[1]
2631

27-
client,err:=useClient(cmd)
28-
iferr!=nil {
29-
returnerr
30-
}
31-
3232
organization,err:=CurrentOrganization(inv,client)
3333
iferr!=nil {
3434
returnxerrors.Errorf("get current organization: %w",err)

‎cli/ping.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ func (r *RootCmd) ping() *clibase.Cmd {
2222
pingWait time.Duration
2323
verbosebool
2424
)
25+
26+
varclient*codersdk.Client
2527
cmd:=&clibase.Cmd{
2628
Annotations:workspaceCommand,
2729
Use:"ping <workspace>",
2830
Short:"Ping a workspace",
29-
Middleware:clibase.RequireNArgs(1),
31+
Middleware:clibase.Chain(
32+
clibase.RequireNArgs(1),
33+
r.useClient(client),
34+
),
3035
Handler:func(inv*clibase.Invokation)error {
3136
ctx,cancel:=context.WithCancel(inv.Context())
3237
defercancel()
3338

34-
client,err:=useClient(cmd)
35-
iferr!=nil {
36-
returnerr
37-
}
38-
3939
workspaceName:=inv.Args[0]
4040
_,workspaceAgent,err:=getWorkspaceAndAgent(ctx,cmd,client,codersdk.Me,workspaceName,false)
4141
iferr!=nil {

‎cli/portforward.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ func (r *RootCmd) portForward() *clibase.Cmd {
2626
tcpForwards []string// <port>:<port>
2727
udpForwards []string// <port>:<port>
2828
)
29+
varclient*codersdk.Client
2930
cmd:=&clibase.Cmd{
30-
Use:"port-forward <workspace>",
31-
Short:"Forward ports from machine to a workspace",
32-
Aliases: []string{"tunnel"},
33-
Middleware:clibase.RequireNArgs(1),
31+
Use:"port-forward <workspace>",
32+
Short:"Forward ports from machine to a workspace",
33+
Aliases: []string{"tunnel"},
3434
Long:formatExamples(
3535
example{
3636
Description:"Port forward a single TCP port from 1234 in the workspace to port 5678 on your local machine",
@@ -49,6 +49,10 @@ func (r *RootCmd) portForward() *clibase.Cmd {
4949
Command:"coder port-forward <workspace> --tcp 8080,9000:3000,9090-9092,10000-10002:10010-10012",
5050
},
5151
),
52+
Middleware:clibase.Chain(
53+
clibase.RequireNArgs(1),
54+
r.useClient(client),
55+
),
5256
Handler:func(inv*clibase.Invokation)error {
5357
ctx,cancel:=context.WithCancel(inv.Context())
5458
defercancel()
@@ -65,11 +69,6 @@ func (r *RootCmd) portForward() *clibase.Cmd {
6569
returnxerrors.New("no port-forwards requested")
6670
}
6771

68-
client,err:=useClient(cmd)
69-
iferr!=nil {
70-
returnerr
71-
}
72-
7372
workspace,workspaceAgent,err:=getWorkspaceAndAgent(ctx,cmd,client,codersdk.Me,inv.Args[0],false)
7473
iferr!=nil {
7574
returnerr

‎cli/publickey.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@ import (
1212

1313
func (r*RootCmd)publickey()*clibase.Cmd {
1414
varresetbool
15-
15+
varclient*codersdk.Client
1616
cmd:=&clibase.Cmd{
17-
Use:"publickey",
18-
Aliases: []string{"pubkey"},
19-
Short:"Output your Coder public key used for Git operations",
17+
Use:"publickey",
18+
Aliases: []string{"pubkey"},
19+
Short:"Output your Coder public key used for Git operations",
20+
Middleware:r.useClient(client),
2021
Handler:func(inv*clibase.Invokation)error {
21-
client,err:=useClient(cmd)
22-
iferr!=nil {
23-
returnxerrors.Errorf("create codersdk client: %w",err)
24-
}
25-
2622
ifreset {
2723
// Confirm prompt if using --reset. We don't want to accidentally
2824
// reset our public key.

‎cli/restart.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ import (
1010
)
1111

1212
func (r*RootCmd)restart()*clibase.Cmd {
13+
varclient*codersdk.Client
1314
cmd:=&clibase.Cmd{
1415
Annotations:workspaceCommand,
1516
Use:"restart <workspace>",
1617
Short:"Restart a workspace",
17-
Middleware:clibase.RequireNArgs(1),
18+
Middleware:clibase.Chain(
19+
clibase.RequireNArgs(1),
20+
r.useClient(client),
21+
),
1822
Handler:func(inv*clibase.Invokation)error {
1923
ctx:=inv.Context()
2024
out:=inv.Stdout
@@ -27,10 +31,6 @@ func (r *RootCmd) restart() *clibase.Cmd {
2731
returnerr
2832
}
2933

30-
client,err:=useClient(cmd)
31-
iferr!=nil {
32-
returnerr
33-
}
3434
workspace,err:=namedWorkspace(inv.Context(),client,inv.Args[0])
3535
iferr!=nil {
3636
returnerr

‎cli/scaletest.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -310,19 +310,19 @@ func (r *userCleanupRunner) Run(ctx context.Context, _ string, _ io.Writer) erro
310310

311311
func (r*RootCmd)scaletestCleanup()*clibase.Cmd {
312312
cleanupStrategy:=&scaletestStrategyFlags{cleanup:true}
313+
varclient*codersdk.Client
313314

314315
cmd:=&clibase.Cmd{
315316
Use:"cleanup",
316317
Short:"Cleanup any orphaned scaletest resources",
317318
Long:"Cleanup scaletest workspaces, then cleanup scaletest users. The strategy flags will apply to each stage of the cleanup process.",
319+
Middleware:clibase.Chain(
320+
r.useClient(client),
321+
),
318322
Handler:func(inv*clibase.Invokation)error {
319323
ctx:=inv.Context()
320-
client,err:=useClient(cmd)
321-
iferr!=nil {
322-
returnerr
323-
}
324324

325-
_,err=requireAdmin(ctx,client)
325+
_,err:=requireAdmin(ctx,client)
326326
iferr!=nil {
327327
returnerr
328328
}
@@ -494,18 +494,17 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd {
494494
output=&scaletestOutputFlags{}
495495
)
496496

497+
varclient*codersdk.Client
498+
497499
cmd:=&clibase.Cmd{
498500
Use:"create-workspaces",
499501
Short:"Creates many workspaces and waits for them to be ready",
500502
Long:`Creates many users, then creates a workspace for each user and waits for them finish building and fully come online. Optionally runs a command inside each workspace, and connects to the workspace over WireGuard.
501503
502504
It is recommended that all rate limits are disabled on the server before running this scaletest. This test generates many login events which will be rate limited against the (most likely single) IP.`,
505+
Middleware:r.useClient(client),
503506
Handler:func(inv*clibase.Invokation)error {
504507
ctx:=inv.Context()
505-
client,err:=useClient(cmd)
506-
iferr!=nil {
507-
returnerr
508-
}
509508

510509
me,err:=requireAdmin(ctx,client)
511510
iferr!=nil {

‎cli/schedule.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -185,27 +185,25 @@ func (r *RootCmd) scheduleStop() *clibase.Cmd {
185185
}
186186

187187
func (r*RootCmd)scheduleOverride()*clibase.Cmd {
188+
varclient*codersdk.Client
188189
overrideCmd:=&clibase.Cmd{
189-
Middleware:clibase.RequireNArgs(2),
190-
Use:"override-stop<workspace-name> <duration from now>",
191-
Long:formatExamples(
190+
Use:"override-stop <workspace-name> <duration from now>",
191+
Short:"Editstoptime of active workspace",
192+
Long:scheduleOverrideDescriptionLong+"\n"+formatExamples(
192193
example{
193194
Command:"coder schedule override-stop my-workspace 90m",
194195
},
195196
),
196-
Short:"Edit stop time of active workspace",
197-
Long:scheduleOverrideDescriptionLong,
197+
Middleware:clibase.Chain(
198+
clibase.RequireNArgs(2),
199+
r.useClient(client),
200+
),
198201
Handler:func(inv*clibase.Invokation)error {
199202
overrideDuration,err:=parseDuration(inv.Args[1])
200203
iferr!=nil {
201204
returnerr
202205
}
203206

204-
client,err:=useClient(cmd)
205-
iferr!=nil {
206-
returnxerrors.Errorf("create client: %w",err)
207-
}
208-
209207
workspace,err:=namedWorkspace(inv.Context(),client,inv.Args[0])
210208
iferr!=nil {
211209
returnxerrors.Errorf("get workspace: %w",err)

‎cli/speedtest.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,19 @@ func (r *RootCmd) speedtest() *clibase.Cmd {
2323
duration time.Duration
2424
directionstring
2525
)
26+
varclient*codersdk.Client
2627
cmd:=&clibase.Cmd{
2728
Annotations:workspaceCommand,
2829
Use:"speedtest <workspace>",
29-
Middleware:clibase.RequireNArgs(1),
3030
Short:"Run upload and download tests from your machine to a workspace",
31+
Middleware:clibase.Chain(
32+
clibase.RequireNArgs(1),
33+
r.useClient(client),
34+
),
3135
Handler:func(inv*clibase.Invokation)error {
3236
ctx,cancel:=context.WithCancel(inv.Context())
3337
defercancel()
3438

35-
client,err:=useClient(cmd)
36-
iferr!=nil {
37-
returnxerrors.Errorf("create codersdk client: %w",err)
38-
}
39-
4039
workspace,workspaceAgent,err:=getWorkspaceAndAgent(ctx,cmd,client,codersdk.Me,inv.Args[0],false)
4140
iferr!=nil {
4241
returnerr

‎cli/ssh.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,18 @@ func (r *RootCmd) ssh() *clibase.Cmd {
4949
wsPollInterval time.Duration
5050
noWaitbool
5151
)
52+
varclient*codersdk.Client
5253
cmd:=&clibase.Cmd{
5354
Annotations:workspaceCommand,
5455
Use:"ssh <workspace>",
5556
Short:"Start a shell into a workspace",
56-
Args:cobra.ArbitraryArgs,
57+
Middleware:clibase.Chain(
58+
r.useClient(client),
59+
),
5760
Handler:func(inv*clibase.Invokation)error {
5861
ctx,cancel:=context.WithCancel(inv.Context())
5962
defercancel()
6063

61-
client,err:=useClient(cmd)
62-
iferr!=nil {
63-
returnerr
64-
}
65-
6664
ifshuffle {
6765
err:=cobra.ExactArgs(0)(cmd,args)
6866
iferr!=nil {

‎cli/stop.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ import (
1010
)
1111

1212
func (r*RootCmd)stop()*clibase.Cmd {
13+
varclient*codersdk.Client
1314
cmd:=&clibase.Cmd{
1415
Annotations:workspaceCommand,
1516
Use:"stop <workspace>",
1617
Short:"Stop a workspace",
17-
Middleware:clibase.RequireNArgs(1),
18+
Middleware:clibase.Chain(
19+
clibase.RequireNArgs(1),
20+
r.useClient(client),
21+
),
1822
Handler:func(inv*clibase.Invokation)error {
1923
_,err:=cliui.Prompt(inv, cliui.PromptOptions{
2024
Text:"Confirm stop workspace?",
@@ -24,10 +28,6 @@ func (r *RootCmd) stop() *clibase.Cmd {
2428
returnerr
2529
}
2630

27-
client,err:=useClient(cmd)
28-
iferr!=nil {
29-
returnerr
30-
}
3131
workspace,err:=namedWorkspace(inv.Context(),client,inv.Args[0])
3232
iferr!=nil {
3333
returnerr

‎cli/templatecreate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
3535
cmd:=&clibase.Cmd{
3636
Use:"create [name]",
3737
Short:"Create a template from the current directory or as specified by flag",
38-
Args:cobra.MaximumNArgs(1),
38+
Args:clibase.RequireRangeArgs(0,1),
3939
Middleware:clibase.Chain(r.useClient(client)),
4040
Handler:func(inv*clibase.Invokation)error {
4141

‎cli/templatedelete.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ import (
1313
)
1414

1515
func (r*RootCmd)templateDelete()*clibase.Cmd {
16+
varclient*codersdk.Client
1617
cmd:=&clibase.Cmd{
1718
Use:"delete [name...]",
1819
Short:"Delete templates",
20+
Middleware:clibase.Chain(
21+
r.useClient(client),
22+
),
1923
Handler:func(inv*clibase.Invokation)error {
2024
var (
2125
ctx=inv.Context()
2226
templateNames= []string{}
2327
templates= []codersdk.Template{}
2428
)
2529

26-
client,err:=useClient(cmd)
27-
iferr!=nil {
28-
returnerr
29-
}
3030
organization,err:=CurrentOrganization(inv,client)
3131
iferr!=nil {
3232
returnerr

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp