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
This repository was archived by the owner on Aug 30, 2024. It is now read-only.
/coder-v1-cliPublic archive

Commit1dc6c3b

Browse files
author
Russtopia
committed
use requireSuccess(); log.Fatal() where appropriate; change 'del' to 'rm'
1 parentf50cfc0 commit1dc6c3b

File tree

2 files changed

+17
-27
lines changed

2 files changed

+17
-27
lines changed

‎ci/integration/devurls_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ func TestDevURLCLI(t *testing.T) {
8282
// tcli.Success(),
8383
// jsonUnmarshals(&durl))
8484

85-
// // == devurldel should function
86-
// c.Run(ctx, `coder urlsdel env1 3002`).Assert(t,
85+
// // == devurlrm should function
86+
// c.Run(ctx, `coder urlsrm env1 3002`).Assert(t,
8787
// tcli.Success())
8888

8989
// // == removed devurl should no longer be there

‎cmd/coder/urls.go

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,21 @@ func (sub listSubCmd) Run(fl *pflag.FlagSet) {
8888
envName:=fl.Arg(0)
8989
devURLs:=urlList(envName)
9090

91+
iflen(devURLs)==0 {
92+
return
93+
}
94+
9195
switchsub.outputFmt {
9296
case"human":
9397
w:=tabwriter.NewWriter(os.Stdout,0,0,1,' ',tabwriter.TabIndent)
9498
for_,devURL:=rangedevURLs {
9599
fmt.Fprintf(w,"%s\t%d\t%s\n",devURL.URL,devURL.Port,devURL.Access)
96100
}
97101
err:=w.Flush()
98-
iferr!=nil {
99-
flog.Fatal("failed to flush writer: %v",err)
100-
}
102+
requireSuccess(err,"failed to flush writer: %v",err)
101103
case"json":
102104
err:=json.NewEncoder(os.Stdout).Encode(devURLs)
103-
iferr!=nil {
104-
flog.Fatal("failed to encode devurls to json: %v",err)
105-
}
105+
requireSuccess(err,"failed to encode devurls to json: %v",err)
106106
default:
107107
exitUsage(fl)
108108
}
@@ -116,7 +116,7 @@ func (sub *listSubCmd) Spec() cli.CommandSpec {
116116
return cli.CommandSpec{
117117
Name:"ls",
118118
Usage:"<env> <flags>",
119-
Desc:"list all devurls",
119+
Desc:"list all devurls for a given environment",
120120
}
121121
}
122122

@@ -169,7 +169,7 @@ func (sub createSubCmd) Run(fl *pflag.FlagSet) {
169169

170170
name=sub.urlname
171171
ifname!=""&&!devURLNameValidRx.MatchString(name) {
172-
flog.Error("update devurl: name must be < 64 chars in length, begin with a letter and only contain letters or digits.")
172+
flog.Fatal("update devurl: name must be < 64 chars in length, begin with a letter and only contain letters or digits.")
173173
return
174174
}
175175
entClient:=requireAuth()
@@ -180,25 +180,21 @@ func (sub createSubCmd) Run(fl *pflag.FlagSet) {
180180
iffound {
181181
flog.Info("Updating devurl for port %v",port)
182182
err:=entClient.UpdateDevURL(env.ID,urlID,portNum,name,access)
183-
iferr!=nil {
184-
flog.Error("update devurl: %s",err.Error())
185-
}
183+
requireSuccess(err,"update devurl: %s",err)
186184
}else {
187185
flog.Info("Adding devurl for port %v",port)
188186
err:=entClient.InsertDevURL(env.ID,portNum,name,access)
189-
iferr!=nil {
190-
flog.Error("insert devurl: %s",err.Error())
191-
}
187+
requireSuccess(err,"insert devurl: %s",err)
192188
}
193189
}
194190

195191
typedelSubCmdstruct{}
196192

197193
func (subdelSubCmd)Spec() cli.CommandSpec {
198194
return cli.CommandSpec{
199-
Name:"del",
195+
Name:"rm",
200196
Usage:"<env name> <port>",
201-
Desc:"delete a devurl",
197+
Desc:"remove a devurl",
202198
}
203199
}
204200

@@ -239,9 +235,7 @@ func (sub delSubCmd) Run(fl *pflag.FlagSet) {
239235
}
240236

241237
err=entClient.DelDevURL(env.ID,urlID)
242-
iferr!=nil {
243-
flog.Error("delete devurl: %s",err.Error())
244-
}
238+
requireSuccess(err,"delete devurl: %s",err)
245239
}
246240

247241
// urlList returns the list of active devURLs from the cemanager.
@@ -253,9 +247,7 @@ func urlList(envName string) []DevURL {
253247
reqURL:=fmt.Sprintf(reqString,entClient.BaseURL,env.ID,entClient.Token)
254248

255249
resp,err:=http.Get(reqURL)
256-
iferr!=nil {
257-
flog.Fatal("%v",err)
258-
}
250+
requireSuccess(err,"%v",err)
259251
deferresp.Body.Close()
260252

261253
ifresp.StatusCode!=200 {
@@ -266,9 +258,7 @@ func urlList(envName string) []DevURL {
266258

267259
devURLs:=make([]DevURL,0)
268260
err=dec.Decode(&devURLs)
269-
iferr!=nil {
270-
flog.Fatal("%v",err)
271-
}
261+
requireSuccess(err,"%v",err)
272262

273263
returndevURLs
274264
}

0 commit comments

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