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

Emyrk · web-flow · commit 2624ee8f1228 · 2023-05-05T13:09:04.000-05:00
* chore: Remove extra opt and fix 'proxy' alias
* proxy -&gt; wsproxy
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1350,7 +1350,7 @@ when required by your organization's security policy.`,
 			Description: "Whether Coder only allows connections to workspaces via the browser.",
 			Flag:        "browser-only",
 			Env:         "CODER_BROWSER_ONLY",
-			Annotations: clibase.Annotations{}.Mark(annotationEnterpriseKey, "true").Mark(annotationExternalProxies, "true"),
+			Annotations: clibase.Annotations{}.Mark(annotationEnterpriseKey, "true"),
 			Value:       &c.BrowserOnly,
 			Group:       &deploymentGroupNetworking,
 			YAML:        "browserOnly",
diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go
@@ -16,7 +16,7 @@ func (r *RootCmd) workspaceProxy() *clibase.Cmd {
 	cmd := &clibase.Cmd{
 		Use:     "workspace-proxy",
 		Short:   "Manage workspace proxies",
-		Aliases: []string{"proxy"},
+		Aliases: []string{"wsproxy"},
 		Hidden:  true,
 		Handler: func(inv *clibase.Invocation) error {
 			return inv.Command.HelpHandler(inv)
diff --git a/enterprise/cli/workspaceproxy_test.go b/enterprise/cli/workspaceproxy_test.go
@@ -45,7 +45,7 @@ func Test_ProxyCRUD(t *testing.T) {
 		ctx := testutil.Context(t, testutil.WaitLong)
 		inv, conf := newCLI(
 			t,
-			"proxy", "create",
+			"wsproxy", "create",
 			"--name", expectedName,
 			"--display-name", "Test Proxy",
 			"--icon", "/emojis/1f4bb.png",
@@ -68,7 +68,7 @@ func Test_ProxyCRUD(t *testing.T) {
 		// Fetch proxies and check output
 		inv, conf = newCLI(
 			t,
-			"proxy", "ls",
+			"wsproxy", "ls",
 		)
 
 		pty = ptytest.New(t)
@@ -118,7 +118,7 @@ func Test_ProxyCRUD(t *testing.T) {
 
 		inv, conf := newCLI(
 			t,
-			"proxy", "delete", expectedName,
+			"wsproxy", "delete", expectedName,
 		)
 
 		pty := ptytest.New(t)
diff --git a/scripts/develop.sh b/scripts/develop.sh
@@ -181,11 +181,11 @@ fatal() {
 		log "Using external workspace proxy"
 		(
 			# Attempt to delete the proxy first, in case it already exists.
-			"${CODER_DEV_SHIM}" proxy delete local-proxy || true
+			"${CODER_DEV_SHIM}" wsproxy delete local-proxy || true
 			# Create the proxy
-			proxy_session_token=$("${CODER_DEV_SHIM}" proxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --only-token)
+			proxy_session_token=$("${CODER_DEV_SHIM}" wsproxy create --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --only-token)
 			# Start the proxy
-			start_cmd PROXY "" "${CODER_DEV_SHIM}" proxy server --http-address=localhost:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000
+			start_cmd PROXY "" "${CODER_DEV_SHIM}" wsproxy server --http-address=localhost:3010 --proxy-session-token="${proxy_session_token}" --primary-access-url=http://localhost:3000
 		) || echo "Failed to create workspace proxy. No workspace proxy created."
 	fi
 
diff --git a/scripts/linux-pkg/coder-workspace-proxy.service b/scripts/linux-pkg/coder-workspace-proxy.service
@@ -22,7 +22,7 @@ CapabilityBoundingSet=CAP_SYSLOG CAP_IPC_LOCK CAP_NET_BIND_SERVICE
 KillSignal=SIGINT
 KillMode=mixed
 NoNewPrivileges=yes
-ExecStart=/usr/bin/coder proxy server
+ExecStart=/usr/bin/coder workspace-proxy server
 Restart=on-failure
 RestartSec=5
 TimeoutStopSec=90
