Commit2624ee8

authored

chore: Remove extra opt and fix 'proxy' alias (#7413)

* chore: Remove extra opt and fix 'proxy' alias* proxy -> wsproxy

1 parentec11405 commit2624ee8Copy full SHA for 2624ee8

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1350,7 +1350,7 @@ when required by your organization's security policy.`,
`1350`	`1350`	`Description:"Whether Coder only allows connections to workspaces via the browser.",`
`1351`	`1351`	`Flag:"browser-only",`
`1352`	`1352`	`Env:"CODER_BROWSER_ONLY",`
`1353`		`-Annotations: clibase.Annotations{}.Mark(annotationEnterpriseKey,"true").Mark(annotationExternalProxies,"true"),`
	`1353`	`+Annotations: clibase.Annotations{}.Mark(annotationEnterpriseKey,"true"),`
`1354`	`1354`	`Value:&c.BrowserOnly,`
`1355`	`1355`	`Group:&deploymentGroupNetworking,`
`1356`	`1356`	`YAML:"browserOnly",`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func (r RootCmd) workspaceProxy() clibase.Cmd {`
`16`	`16`	`cmd:=&clibase.Cmd{`
`17`	`17`	`Use:"workspace-proxy",`
`18`	`18`	`Short:"Manage workspace proxies",`
`19`		`-Aliases: []string{"proxy"},`
	`19`	`+Aliases: []string{"wsproxy"},`
`20`	`20`	`Hidden:true,`
`21`	`21`	`Handler:func(inv*clibase.Invocation)error {`
`22`	`22`	`returninv.Command.HelpHandler(inv)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func Test_ProxyCRUD(t *testing.T) {`
`45`	`45`	`ctx:=testutil.Context(t,testutil.WaitLong)`
`46`	`46`	`inv,conf:=newCLI(`
`47`	`47`	`t,`
`48`		`-"proxy","create",`
	`48`	`+"wsproxy","create",`
`49`	`49`	`"--name",expectedName,`
`50`	`50`	`"--display-name","Test Proxy",`
`51`	`51`	`"--icon","/emojis/1f4bb.png",`
`@@ -68,7 +68,7 @@ func Test_ProxyCRUD(t *testing.T) {`
`68`	`68`	`// Fetch proxies and check output`
`69`	`69`	`inv,conf=newCLI(`
`70`	`70`	`t,`
`71`		`-"proxy","ls",`
	`71`	`+"wsproxy","ls",`
`72`	`72`	`)`
`73`	`73`
`74`	`74`	`pty=ptytest.New(t)`
`@@ -118,7 +118,7 @@ func Test_ProxyCRUD(t *testing.T) {`
`118`	`118`
`119`	`119`	`inv,conf:=newCLI(`
`120`	`120`	`t,`
`121`		`-"proxy","delete",expectedName,`
	`121`	`+"wsproxy","delete",expectedName,`
`122`	`122`	`)`
`123`	`123`
`124`	`124`	`pty:=ptytest.New(t)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,11 @@ fatal() {`
`181`	`181`	`log"Using external workspace proxy"`
`182`	`182`	`(`
`183`	`183`	`# Attempt to delete the proxy first, in case it already exists.`
`184`		`-"${CODER_DEV_SHIM}"proxy delete local-proxy\|\|true`
	`184`	`+"${CODER_DEV_SHIM}"wsproxy delete local-proxy\|\|true`
`185`	`185`	`# Create the proxy`
`186`		`-proxy_session_token=$("${CODER_DEV_SHIM}"proxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --only-token)`
	`186`	`+proxy_session_token=$("${CODER_DEV_SHIM}"wsproxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --only-token)`
`187`	`187`	`# Start the proxy`
`188`		`-start_cmd PROXY"""${CODER_DEV_SHIM}"proxy server --http-address=localhost:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000`
	`188`	`+start_cmd PROXY"""${CODER_DEV_SHIM}"wsproxy server --http-address=localhost:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000`
`189`	`189`	`)\|\|echo"Failed to create workspace proxy. No workspace proxy created."`
`190`	`190`	`fi`
`191`	`191`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ CapabilityBoundingSet=CAP_SYSLOG CAP_IPC_LOCK CAP_NET_BIND_SERVICE`
`22`	`22`	`KillSignal=SIGINT`
`23`	`23`	`KillMode=mixed`
`24`	`24`	`NoNewPrivileges=yes`
`25`		`-ExecStart=/usr/bin/coder proxy server`
	`25`	`+ExecStart=/usr/bin/coderworkspace-proxy server`
`26`	`26`	`Restart=on-failure`
`27`	`27`	`RestartSec=5`
`28`	`28`	`TimeoutStopSec=90`

Comments

(0)