Minor changes

Emyrk · Emyrk · commit 5ac70d5dbd8f · 2023-04-18T10:01:25.000-05:00
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -339,7 +339,8 @@ const (
 	flagExternalProxies = "external_workspace_proxies"
 )
 
-func IsExternalProxies(opt clibase.Option) bool {
+// IsWorkspaceProxies returns true if the cli option is used by workspace proxies.
+func IsWorkspaceProxies(opt clibase.Option) bool {
 	// If it is a bool, use the bool value.
 	b, _ := strconv.ParseBool(opt.Annotations[flagExternalProxies])
 	return b
diff --git a/enterprise/cli/proxyserver.go b/enterprise/cli/proxyserver.go
@@ -47,7 +47,7 @@ func (r *RootCmd) proxyServer() *clibase.Cmd {
 	var (
 		cfg = new(codersdk.DeploymentValues)
 		// Filter options for only relevant ones.
-		opts = cfg.Options().Filter(codersdk.IsExternalProxies)
+		opts = cfg.Options().Filter(codersdk.IsWorkspaceProxies)
 
 		externalProxyOptionGroup = clibase.Group{
 			Name: "External Workspace Proxy",
@@ -84,7 +84,7 @@ func (r *RootCmd) proxyServer() *clibase.Cmd {
 			Hidden:      false,
 		},
 
-		// TODO: Make sure this is kept secret. Idk if a flag is the best option
+		// TODO: This will eventually be pulled over an authenticated api endpoint.
 		clibase.Option{
 			Name:        "App Security Key",
 			Description: "App security key used for decrypting/verifying app tokens sent from coderd.",
diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go
@@ -32,7 +32,7 @@ func (r *RootCmd) workspaceProxy() *clibase.Cmd {
 func (r *RootCmd) deleteProxy() *clibase.Cmd {
 	client := new(codersdk.Client)
 	cmd := &clibase.Cmd{
-		Use:   "delete",
+		Use:   "delete <name|id>",
 		Short: "Delete a workspace proxy",
 		Middleware: clibase.Chain(
 			clibase.RequireNArgs(1),
diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go
@@ -220,9 +220,10 @@ func (s *Server) DialWorkspaceAgent(id uuid.UUID) (*codersdk.WorkspaceAgentConn,
 
 func (s *Server) buildInfo(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.BuildInfoResponse{
-		ExternalURL:  buildinfo.ExternalURL(),
-		Version:      buildinfo.Version(),
-		DashboardURL: s.DashboardURL.String(),
+		ExternalURL:    buildinfo.ExternalURL(),
+		Version:        buildinfo.Version(),
+		DashboardURL:   s.DashboardURL.String(),
+		WorkspaceProxy: true,
 	})
 }
 
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -319,6 +319,7 @@ export interface DERPServerConfig {
 export interface DangerousConfig {
   readonly allow_path_app_sharing: boolean
   readonly allow_path_app_site_owner_access: boolean
+  readonly dev_app_security_key: string
 }
 
 // From codersdk/deployment.go

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,8 @@ const (`
`339`	`339`	`flagExternalProxies = "external_workspace_proxies"`
`340`	`340`	`)`
`341`	`341`
`342`		`-func IsExternalProxies(opt clibase.Option) bool {`
	`342`	`+// IsWorkspaceProxies returns true if the cli option is used by workspace proxies.`
	`343`	`+func IsWorkspaceProxies(opt clibase.Option) bool {`
`343`	`344`	`// If it is a bool, use the bool value.`
`344`	`345`	`b, _ := strconv.ParseBool(opt.Annotations[flagExternalProxies])`
`345`	`346`	`return b`
Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,7 @@ export interface DERPServerConfig {`
`319`	`319`	`export interface DangerousConfig {`
`320`	`320`	`readonly allow_path_app_sharing: boolean`
`321`	`321`	`readonly allow_path_app_site_owner_access: boolean`
	`322`	`+ readonly dev_app_security_key: string`
`322`	`323`	`}`
`323`	`324`
`324`	`325`	`// From codersdk/deployment.go`