Commit96cc93b

committed

Update API request, print mult. envs in tabs, handle non 200 response

1 parentc69c791 commit96cc93bCopy full SHA for 96cc93b

File tree

1 file changed

+25

-11

lines changed

cmd/coder
- url.go

1 file changed

+25

-11

lines changed

`‎cmd/coder/url.go`

Lines changed: 25 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"fmt"`
`6`	`6`	`"net/http"`
	`7`	`+"os"`
	`8`	`+"text/tabwriter"`
`7`	`9`
`8`	`10`	`"github.com/spf13/pflag"`
`9`	`11`
`@@ -14,7 +16,9 @@ import (`
`14`	`16`	`typeurlCmdstruct{}`
`15`	`17`
`16`	`18`	`typeDevURLstruct {`
`17`		-Urlstring`json:"url"`
	`19`	+URLstring`json:"url"`
	`20`	+Portstring`json:"port"`
	`21`	+Accessstring`json:"access"`
`18`	`22`	`}`
`19`	`23`
`20`	`24`	`func (cmdurlCmd)Spec() cli.CommandSpec {`
`@@ -26,34 +30,44 @@ func (cmd urlCmd) Spec() cli.CommandSpec {`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`func (cmdurlCmd)Run(fl*pflag.FlagSet) {`
`29`		`-var (`
`30`		`-envName=fl.Arg(0)`
`31`		`-port=fl.Arg(1)`
`32`		`-)`
`33`		`-ifenvName==""\|\|port=="" {`
	`33`	`+varenvName=fl.Arg(0)`
	`34`	`+`
	`35`	`+ifenvName=="" {`
`34`	`36`	`exitUsage(fl)`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`entClient:=requireAuth()`
`38`	`40`
`39`	`41`	`env:=findEnv(entClient,envName)`
`40`	`42`
`41`		`-reqString:="%s/api/environments/%s/devurl?port=%s&session_token=%s"`
`42`		`-reqUrl:=fmt.Sprintf(reqString,entClient.BaseURL,env.ID,port,entClient.Token)`
	`43`	`+reqString:="%s/api/environments/%s/devurls?session_token=%s"`
	`44`	`+reqUrl:=fmt.Sprintf(reqString,entClient.BaseURL,env.ID,entClient.Token)`
`43`	`45`
`44`	`46`	`resp,err:=http.Get(reqUrl)`
`45`	`47`	`iferr!=nil {`
`46`	`48`	`flog.Fatal("%v",err)`
`47`	`49`	`}`
`48`	`50`	`deferresp.Body.Close()`
`49`	`51`
	`52`	`+ifresp.StatusCode!=200 {`
	`53`	`+flog.Fatal("non-success status code: %d",resp.StatusCode)`
	`54`	`+}`
	`55`	`+`
`50`	`56`	`dec:=json.NewDecoder(resp.Body)`
`51`	`57`
`52`		`-vardevUrlDevURL`
`53`		`-err=dec.Decode(&devUrl)`
	`58`	`+vardevURLs=make([]DevURL,0)`
	`59`	`+err=dec.Decode(&devURLs)`
`54`	`60`	`iferr!=nil {`
`55`	`61`	`flog.Fatal("%v",err)`
`56`	`62`	`}`
`57`	`63`
`58`		`-fmt.Println(devUrl.Url)`
	`64`	`+iflen(devURLs)==0 {`
	`65`	`+fmt.Printf("no dev urls were found for environment: %s\n",envName)`
	`66`	`+}`
	`67`	`+`
	`68`	`+w:=tabwriter.NewWriter(os.Stdout,0,0,1,' ',tabwriter.TabIndent)`
	`69`	`+for_,devURL:=rangedevURLs {`
	`70`	`+fmt.Fprintf(w,"%s\t%s\t%s\n",devURL.URL,devURL.Port,devURL.Access)`
	`71`	`+}`
	`72`	`+w.Flush()`
`59`	`73`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit96cc93b

File tree

1 file changed

1 file changed

`‎cmd/coder/url.go`

0 commit comments