Commit35a5475

authored

chore: addsite flag tobuildinfo (#14868)

1 parent2a3a00c commit35a5475Copy full SHA for 35a5475

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ var (`
`24`	`24`	`// Updated by buildinfo_slim.go on start.`
`25`	`25`	`slimbool`
`26`	`26`
	`27`	`+// Updated by buildinfo_site.go on start.`
	`28`	`+sitebool`
	`29`	`+`
`27`	`30`	`// Injected with ldflags at build, see scripts/build_go.sh`
`28`	`31`	`tagstring`
`29`	`32`	`agplstring// either "true" or "false", ldflags does not support bools`
`@@ -95,6 +98,11 @@ func IsSlim() bool {`
`95`	`98`	`returnslim`
`96`	`99`	`}`
`97`	`100`
	`101`	`+// HasSite returns true if the frontend is embedded in the build.`
	`102`	`+funcHasSite()bool {`
	`103`	`+returnsite`
	`104`	`+}`
	`105`	`+`
`98`	`106`	`// IsAGPL returns true if this is an AGPL build.`
`99`	`107`	`funcIsAGPL()bool {`
`100`	`108`	`returnstrings.Contains(agpl,"t")`

Lines changed: 7 additions & 0 deletions

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ func (r RootCmd) Command(subcommands []serpent.Command) (*serpent.Command, err`
`411`	`411`	`{`
`412`	`412`	`Flag:varNoOpen,`
`413`	`413`	`Env:"CODER_NO_OPEN",`
`414`		`-Description:"Suppress opening the browserafter logging in.",`
	`414`	`+Description:"Suppress opening the browserwhen logging in, or starting the server.",`
`415`	`415`	`Value:serpent.BoolOf(&r.noOpen),`
`416`	`416`	`Hidden:true,`
`417`	`417`	`Group:globalGroup,`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,12 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`492`	`492`	`BorderForeground(lipgloss.Color("12")).`
`493`	`493`	`Render(fmt.Sprintf("View the Web UI:\n%s",`
`494`	`494`	`pretty.Sprint(cliui.DefaultStyles.Hyperlink,accessURL))))`
`495`		`-_=openURL(inv,accessURL)`
	`495`	`+ifbuildinfo.HasSite() {`
	`496`	`+err=openURL(inv,accessURL)`
	`497`	`+iferr==nil {`
	`498`	`+cliui.Infof(inv.Stdout,"Opening local browser... You can disable this by passing --no-open.\n")`
	`499`	`+}`
	`500`	`+}`
`496`	`501`
`497`	`502`	`// Used for zero-trust instance identity with Google Cloud.`
`498`	`503`	`googleTokenValidator,err:=idtoken.NewValidator(ctx,option.WithoutAuthentication())`

Comments

(0)