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

Commit274c84d

Browse files
committed
Assorted changes
1 parentc8c9e51 commit274c84d

File tree

73 files changed

+250
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+250
-299
lines changed

‎cli/agent.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ import (
2828
"github.com/coder/coder/codersdk/agentsdk"
2929
)
3030

31-
funcworkspaceAgent()*clibase.Command {
31+
funcworkspaceAgent()*clibase.Cmd {
3232
var (
3333
authstring
3434
logDirstring
3535
pprofAddressstring
3636
noReapbool
3737
)
38-
cmd:=&clibase.Command{
38+
cmd:=&clibase.Cmd{
3939
Use:"agent",
4040
// This command isn't useful to manually execute.
4141
Hidden:true,

‎cli/clibase/clibasetest/invokation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func FakeIO(i *clibase.Invokation) *IO {
2727
}
2828

2929
// Invoke creates a fake invokation and IO.
30-
funcInvoke(cmd*clibase.Command,args...string) (*clibase.Invokation,*IO) {
30+
funcInvoke(cmd*clibase.Cmd,args...string) (*clibase.Invokation,*IO) {
3131
i:= clibase.Invokation{
3232
Args:args,
3333
}

‎cli/clitest/clitest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (l *logWriter) Write(p []byte) (n int, err error) {
4747
}
4848

4949
funcNewWithSubcommands(
50-
t*testing.T,subcommands []*clibase.Command,args...string,
50+
t*testing.T,subcommands []*clibase.Cmd,args...string,
5151
) (*clibase.Invokation, config.Root) {
5252
varroot cli.RootCmd
5353
cmd:=root.Command(subcommands)

‎cli/cliui/agent_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestAgent(t *testing.T) {
2424

2525
vardisconnected atomic.Bool
2626
ptty:=ptytest.New(t)
27-
cmd:=&clibase.Command{
27+
cmd:=&clibase.Cmd{
2828
Handler:func(inv*clibase.Invokation)error {
2929
err:=cliui.Agent(inv.Context(),inv.Stdout, cliui.AgentOptions{
3030
WorkspaceName:"example",
@@ -70,7 +70,7 @@ func TestAgent_TimeoutWithTroubleshootingURL(t *testing.T) {
7070
wantURL:="https://coder.com/troubleshoot"
7171

7272
varconnected,timeout atomic.Bool
73-
cmd:=&clibase.Command{
73+
cmd:=&clibase.Cmd{
7474
Handler:func(inv*clibase.Invokation)error {
7575
err:=cliui.Agent(inv.Context(),inv.Stdout, cliui.AgentOptions{
7676
WorkspaceName:"example",
@@ -124,7 +124,7 @@ func TestAgent_StartupTimeout(t *testing.T) {
124124
setStatus:=func(s codersdk.WorkspaceAgentStatus) {status.Store(string(s)) }
125125
setState:=func(s codersdk.WorkspaceAgentLifecycle) {state.Store(string(s)) }
126126

127-
cmd:=&clibase.Command{
127+
cmd:=&clibase.Cmd{
128128
Handler:func(inv*clibase.Invokation)error {
129129
err:=cliui.Agent(inv.Context(),inv.Stdout, cliui.AgentOptions{
130130
WorkspaceName:"example",
@@ -186,7 +186,7 @@ func TestAgent_StartErrorExit(t *testing.T) {
186186
varstatus,state atomic.String
187187
setStatus:=func(s codersdk.WorkspaceAgentStatus) {status.Store(string(s)) }
188188
setState:=func(s codersdk.WorkspaceAgentLifecycle) {state.Store(string(s)) }
189-
cmd:=&clibase.Command{
189+
cmd:=&clibase.Cmd{
190190
Handler:func(inv*clibase.Invokation)error {
191191
err:=cliui.Agent(inv.Context(),inv.Stdout, cliui.AgentOptions{
192192
WorkspaceName:"example",
@@ -245,7 +245,7 @@ func TestAgent_NoWait(t *testing.T) {
245245
varstatus,state atomic.String
246246
setStatus:=func(s codersdk.WorkspaceAgentStatus) {status.Store(string(s)) }
247247
setState:=func(s codersdk.WorkspaceAgentLifecycle) {state.Store(string(s)) }
248-
cmd:=&clibase.Command{
248+
cmd:=&clibase.Cmd{
249249
Handler:func(inv*clibase.Invokation)error {
250250
err:=cliui.Agent(inv.Context(),inv.Stdout, cliui.AgentOptions{
251251
WorkspaceName:"example",
@@ -318,7 +318,7 @@ func TestAgent_LoginBeforeReadyEnabled(t *testing.T) {
318318
varstatus,state atomic.String
319319
setStatus:=func(s codersdk.WorkspaceAgentStatus) {status.Store(string(s)) }
320320
setState:=func(s codersdk.WorkspaceAgentLifecycle) {state.Store(string(s)) }
321-
cmd:=&clibase.Command{
321+
cmd:=&clibase.Cmd{
322322
Handler:func(inv*clibase.Invokation)error {
323323
err:=cliui.Agent(inv.Context(),inv.Stdout, cliui.AgentOptions{
324324
WorkspaceName:"example",

‎cli/cliui/gitauth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestGitAuth(t *testing.T) {
2323
defercancel()
2424

2525
ptty:=ptytest.New(t)
26-
cmd:=&clibase.Command{
26+
cmd:=&clibase.Cmd{
2727
Handler:func(inv*clibase.Invokation)error {
2828
varfetched atomic.Bool
2929
returncliui.GitAuth(inv.Context(),inv.Stdout, cliui.GitAuthOptions{

‎cli/cliui/output.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func NewOutputFormatter(formats ...OutputFormat) *OutputFormatter {
4949

5050
// AttachFlags attaches the --output flag to the given command, and any
5151
// additional flags required by the output formatters.
52-
func (f*OutputFormatter)AttachFlags(cmd*clibase.Command)*pflag.FlagSet {
52+
func (f*OutputFormatter)AttachFlags(cmd*clibase.Cmd)*pflag.FlagSet {
5353
fs:=cmd.Options.FlagSet()
5454
for_,format:=rangef.formats {
5555
format.AttachFlags(fs)

‎cli/cliui/output_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func Test_OutputFormatter(t *testing.T) {
9393
},
9494
)
9595

96-
cmd:=&clibase.Command{}
96+
cmd:=&clibase.Cmd{}
9797
fs:=f.AttachFlags(cmd)
9898

9999
selected,err:=fs.GetString("output")

‎cli/cliui/prompt_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestPrompt(t *testing.T) {
148148

149149
funcnewPrompt(ptty*ptytest.PTY,opts cliui.PromptOptions,invOptfunc(inv*clibase.Invokation)) (string,error) {
150150
value:=""
151-
cmd:=&clibase.Command{
151+
cmd:=&clibase.Cmd{
152152
Handler:func(inv*clibase.Invokation)error {
153153
varerrerror
154154
value,err=cliui.Prompt(inv,opts)
@@ -213,7 +213,7 @@ func TestPasswordTerminalState(t *testing.T) {
213213

214214
// nolint:unused
215215
funcpasswordHelper() {
216-
cmd:=&clibase.Command{
216+
cmd:=&clibase.Cmd{
217217
Handler:func(inv*clibase.Invokation)error {
218218
cliui.Prompt(inv, cliui.PromptOptions{
219219
Text:"Password:",

‎cli/cliui/provisionerjob_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func newProvisionerJob(t *testing.T) provisionerJobTest {
125125
}
126126
jobLock:= sync.Mutex{}
127127
logs:=make(chan codersdk.ProvisionerJobLog,1)
128-
cmd:=&clibase.Command{
128+
cmd:=&clibase.Cmd{
129129
Handler:func(inv*clibase.Invokation)error {
130130
returncliui.ProvisionerJob(inv.Context(),inv.Stdout, cliui.ProvisionerJobOptions{
131131
FetchInterval:time.Millisecond,

‎cli/cliui/select_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestSelect(t *testing.T) {
3333

3434
funcnewSelect(ptty*ptytest.PTY,opts cliui.SelectOptions) (string,error) {
3535
value:=""
36-
cmd:=&clibase.Command{
36+
cmd:=&clibase.Cmd{
3737
Handler:func(inv*clibase.Invokation)error {
3838
varerrerror
3939
value,err=cliui.Select(inv,opts)
@@ -75,7 +75,7 @@ func TestRichSelect(t *testing.T) {
7575

7676
funcnewRichSelect(ptty*ptytest.PTY,opts cliui.RichSelectOptions) (string,error) {
7777
value:=""
78-
cmd:=&clibase.Command{
78+
cmd:=&clibase.Cmd{
7979
Handler:func(inv*clibase.Invokation)error {
8080
richOption,err:=cliui.RichSelect(inv,opts)
8181
iferr==nil {

‎cli/configssh.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ func sshPrepareWorkspaceConfigs(ctx context.Context, client *codersdk.Client) (r
132132
}
133133
}
134134

135-
funcconfigSSH()*clibase.Command {
135+
funcconfigSSH()*clibase.Cmd {
136136
var (
137137
sshConfigFilestring
138138
sshConfigOptssshConfigOptions
139139
usePreviousOptsbool
140140
dryRunbool
141141
skipProxyCommandbool
142142
)
143-
cmd:=&clibase.Command{
143+
cmd:=&clibase.Cmd{
144144
Annotations:workspaceCommand,
145145
Use:"config-ssh",
146146
Short:"Add an SSH Host entry for your workspaces\"ssh coder.workspace\"",

‎cli/create.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/coder/coder/codersdk"
1717
)
1818

19-
funccreate()*clibase.Command {
19+
funccreate()*clibase.Cmd {
2020
var (
2121
parameterFilestring
2222
richParameterFilestring
@@ -25,7 +25,7 @@ func create() *clibase.Command {
2525
stopAfter time.Duration
2626
workspaceNamestring
2727
)
28-
cmd:=&clibase.Command{
28+
cmd:=&clibase.Cmd{
2929
Annotations:workspaceCommand,
3030
Use:"create [name]",
3131
Short:"Create a workspace",
@@ -193,7 +193,7 @@ type buildParameters struct {
193193

194194
// prepWorkspaceBuild will ensure a workspace build will succeed on the latest template version.
195195
// Any missing params will be prompted to the user. It supports legacy and rich parameters.
196-
funcprepWorkspaceBuild(cmd*clibase.Command,client*codersdk.Client, inv.ArgsprepWorkspaceBuildArgs) (*buildParameters,error) {
196+
funcprepWorkspaceBuild(cmd*clibase.Cmd,client*codersdk.Client, inv.ArgsprepWorkspaceBuildArgs) (*buildParameters,error) {
197197
ctx:=inv.Context()
198198

199199
varuseRichParametersbool

‎cli/delete.go

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

1212
// nolint
13-
funcdeleteWorkspace()*clibase.Command {
13+
funcdeleteWorkspace()*clibase.Cmd {
1414
varorphanbool
15-
cmd:=&clibase.Command{
15+
cmd:=&clibase.Cmd{
1616
Annotations:workspaceCommand,
1717
Use:"delete <workspace>",
1818
Short:"Delete a workspace",

‎cli/dotfiles.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"github.com/coder/coder/cli/cliui"
1818
)
1919

20-
funcdotfiles()*clibase.Command {
20+
funcdotfiles()*clibase.Cmd {
2121
varsymlinkDirstring
22-
cmd:=&clibase.Command{
22+
cmd:=&clibase.Cmd{
2323
Use:"dotfiles [git_repo_url]",
2424
Middleware:clibase.RequireNArgs(1),
2525
Short:"Checkout and install a dotfiles repository from a Git URL",

‎cli/gitaskpass.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818

1919
// gitAskpass is used by the Coder agent to automatically authenticate
2020
// with Git providers based on a hostname.
21-
funcgitAskpass()*clibase.Command {
22-
return&clibase.Command{
21+
funcgitAskpass()*clibase.Cmd {
22+
return&clibase.Cmd{
2323
Use:"gitaskpass",
2424
Hidden:true,
2525
Middleware:clibase.Chain(

‎cli/gitssh.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/coder/coder/cli/cliui"
1919
)
2020

21-
funcgitssh()*clibase.Command {
22-
cmd:=&clibase.Command{
21+
funcgitssh()*clibase.Cmd {
22+
cmd:=&clibase.Cmd{
2323
Use:"gitssh",
2424
Hidden:true,
2525
Short:`Wraps the "ssh" command and uses the coder gitssh key for authentication`,

‎cli/list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func workspaceListRowFromWorkspace(now time.Time, usersByID map[uuid.UUID]coders
6464
}
6565
}
6666

67-
funclist()*clibase.Command {
67+
funclist()*clibase.Cmd {
6868
var (
6969
allbool
7070
defaultQuery="owner:me"
@@ -75,7 +75,7 @@ func list() *clibase.Command {
7575
cliui.JSONFormat(),
7676
)
7777
)
78-
cmd:=&clibase.Command{
78+
cmd:=&clibase.Cmd{
7979
Annotations:workspaceCommand,
8080
Use:"list",
8181
Short:"List workspaces",

‎cli/login.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func init() {
3939
browser.Stdout=io.Discard
4040
}
4141

42-
funclogin()*clibase.Command {
42+
funclogin()*clibase.Cmd {
4343
constfirstUserTrialEnv="CODER_FIRST_USER_TRIAL"
4444

4545
var (
@@ -48,7 +48,7 @@ func login() *clibase.Command {
4848
passwordstring
4949
trialbool
5050
)
51-
cmd:=&clibase.Command{
51+
cmd:=&clibase.Cmd{
5252
Use:"login <url>",
5353
Short:"Authenticate with Coder deployment",
5454
Args:cobra.MaximumNArgs(1),
@@ -294,7 +294,7 @@ func isWSL() (bool, error) {
294294
}
295295

296296
// openURL opens the provided URL via user's default browser
297-
funcopenURL(cmd*clibase.Command,urlToOpenstring)error {
297+
funcopenURL(cmd*clibase.Cmd,urlToOpenstring)error {
298298
noOpen,err:=inv.ParsedFlags().GetBool(varNoOpen)
299299
iferr!=nil {
300300
panic(err)

‎cli/logout.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/coder/coder/cli/cliui"
1212
)
1313

14-
funclogout()*clibase.Command {
15-
cmd:=&clibase.Command{
14+
funclogout()*clibase.Cmd {
15+
cmd:=&clibase.Cmd{
1616
Use:"logout",
1717
Short:"Unauthenticate your local session",
1818
Handler:func(inv*clibase.Invokation)error {

‎cli/parameter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func createParameterMapFromFile(parameterFile string) (map[string]string, error)
3636

3737
// Returns a parameter value from a given map, if the map does not exist or does not contain the item, it takes input from the user.
3838
// Throws an error if there are any errors with the users input.
39-
funcgetParameterValueFromMapOrInput(cmd*clibase.Command,parameterMapmap[string]string,parameterSchema codersdk.ParameterSchema) (string,error) {
39+
funcgetParameterValueFromMapOrInput(cmd*clibase.Cmd,parameterMapmap[string]string,parameterSchema codersdk.ParameterSchema) (string,error) {
4040
varparameterValuestring
4141
varerrerror
4242
ifparameterMap!=nil {
@@ -57,7 +57,7 @@ func getParameterValueFromMapOrInput(cmd *clibase.Command, parameterMap map[stri
5757
returnparameterValue,nil
5858
}
5959

60-
funcgetWorkspaceBuildParameterValueFromMapOrInput(cmd*clibase.Command,parameterMapmap[string]string,templateVersionParameter codersdk.TemplateVersionParameter) (*codersdk.WorkspaceBuildParameter,error) {
60+
funcgetWorkspaceBuildParameterValueFromMapOrInput(cmd*clibase.Cmd,parameterMapmap[string]string,templateVersionParameter codersdk.TemplateVersionParameter) (*codersdk.WorkspaceBuildParameter,error) {
6161
varparameterValuestring
6262
varerrerror
6363
ifparameterMap!=nil {

‎cli/parameters.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"gvisor.dev/gvisor/runsc/cmd"
66
)
77

8-
funcparameters()*clibase.Command {
9-
cmd:=&clibase.Command{
8+
funcparameters()*clibase.Cmd {
9+
cmd:=&clibase.Cmd{
1010
Short:"List parameters for a given scope",
1111
Example:formatExamples(
1212
example{

‎cli/parameterslist.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111
"github.com/coder/coder/codersdk"
1212
)
1313

14-
funcparameterList()*clibase.Command {
14+
funcparameterList()*clibase.Cmd {
1515
formatter:=cliui.NewOutputFormatter(
1616
cliui.TableFormat([]codersdk.Parameter{}, []string{"name","scope","destination scheme"}),
1717
cliui.JSONFormat(),
1818
)
1919

20-
cmd:=&clibase.Command{
20+
cmd:=&clibase.Cmd{
2121
Use:"list",
2222
Aliases: []string{"ls"},
2323
Middleware:clibase.RequireNArgs(2),

‎cli/ping.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import (
1515
"github.com/coder/coder/codersdk"
1616
)
1717

18-
funcping()*clibase.Command {
18+
funcping()*clibase.Cmd {
1919
var (
2020
pingNumint
2121
pingTimeout time.Duration
2222
pingWait time.Duration
2323
verbosebool
2424
)
25-
cmd:=&clibase.Command{
25+
cmd:=&clibase.Cmd{
2626
Annotations:workspaceCommand,
2727
Use:"ping <workspace>",
2828
Short:"Ping a workspace",

‎cli/portforward.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121
"github.com/coder/coder/codersdk"
2222
)
2323

24-
funcportForward()*clibase.Command {
24+
funcportForward()*clibase.Cmd {
2525
var (
2626
tcpForwards []string// <port>:<port>
2727
udpForwards []string// <port>:<port>
2828
)
29-
cmd:=&clibase.Command{
29+
cmd:=&clibase.Cmd{
3030
Use:"port-forward <workspace>",
3131
Short:"Forward ports from machine to a workspace",
3232
Aliases: []string{"tunnel"},
@@ -156,7 +156,7 @@ func portForward() *clibase.Command {
156156
returncmd
157157
}
158158

159-
funclistenAndPortForward(ctx context.Context,cmd*clibase.Command,conn*codersdk.WorkspaceAgentConn,wg*sync.WaitGroup,specportForwardSpec) (net.Listener,error) {
159+
funclistenAndPortForward(ctx context.Context,cmd*clibase.Cmd,conn*codersdk.WorkspaceAgentConn,wg*sync.WaitGroup,specportForwardSpec) (net.Listener,error) {
160160
_,_=fmt.Fprintf(cmd.OutOrStderr(),"Forwarding '%v://%v' locally to '%v://%v' in the workspace\n",spec.listenNetwork,spec.listenAddress,spec.dialNetwork,spec.dialAddress)
161161

162162
var (

0 commit comments

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