NotificationsYou must be signed in to change notification settings
Fork1.1k
Star11.6k

feat: Add workspace proxy enterprise cli commands#7123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Closed

Emyrk wants to merge22 commits intostevenmasley/external_proxy_2fromdreamteam/external_proxy_cli_cmd

Closed

feat: Add workspace proxy enterprise cli commands#7123

Emyrk wants to merge22 commits intostevenmasley/external_proxy_2fromdreamteam/external_proxy_cli_cmd

Conversation

Copy link

Member

Emyrk commentedApr 13, 2023•
edited
Loading

What this does

Makes a cli command to spin up external workspace proxies!

coder proxy register # ....coder proxy server # ....

Testing/Development

This givesdevelop.sh an option--use-proxy which will spin up the devserver with an external workspace proxy. This should allow easier manual validation.

Features added to make this work

Cli command to delete workspace proxies.
clibase.Optionset filter to filter out options that do not pertain to the workspace proxy.
Ability to hard codeapp-security-key

Logs

Run./develop.sh --use-proxy

======================================================================                                                                ====            Coder is now running in development mode.           ====                  API:    http://localhost:3000                 ====                  API:    http://127.0.0.1:3000                 ====                  API:    http://192.168.1.17:3000              ====                  API:    http://192.168.1.18:3000              ====                  API:    http://172.25.0.1:3000                ====                  Web UI: http://localhost:8080                 ====                  Web UI: http://127.0.0.1:8080                 ====                  Web UI: http://192.168.1.17:8080              ====                  Web UI: http://192.168.1.18:8080              ====                  Web UI: http://172.25.0.1:8080                ====                  Proxy:  http://localhost:3010                 ====                  Proxy:  http://127.0.0.1:3010                 ====                  Proxy:  http://192.168.1.17:3010              ====                  Proxy:  http://192.168.1.18:3010              ====                  Proxy:  http://172.25.0.1:3010                ====                                                                ====      Use ./scripts/coder-dev.sh to talk to this instance!      ====       alias cdr=/home/steven/go/src/github.com/cdr/coder/scripts/coder-dev.sh              ======================================================================

github-actionsbot assignedEmyrk

Apr 13, 2023

Emyrk force-pushed thedreamteam/external_proxy_cli_cmd branch from838e562 to913c547Compare

April 13, 2023 18:08

Emyrk mentioned this pull request

Apr 14, 2023

chore: add workspace proxies to the backend#7032

Merged

deansheather reviewed

Apr 17, 2023

View reviewed changes

cli/appsecuritykey.go OutdatedShow resolvedHide resolved

coderd/httpmw/workspaceproxy.goShow resolvedHide resolved

enterprise/cli/workspaceproxy.go OutdatedShow resolvedHide resolved

enterprise/cli/workspaceproxy.go Outdated

		cli.PrintDeprecatedOptions(),
		clibase.RequireNArgs(0),
		// We need a client to connect with the primary coderd instance.
		r.InitClient(client),

Copy link

Member

deansheatherApr 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Shouldn't this just be a proxysdk client that we construct in the handler?

Copy link

MemberAuthor

EmyrkApr 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I was honestly just using this for the version checking.

enterprise/cli/workspaceproxy_slim.go OutdatedShow resolvedHide resolved

enterprise/coderd/workspaceproxy.go OutdatedShow resolvedHide resolved

enterprise/cli/workspaceproxy.go Outdated

		primaryAccessURL clibase.URL
		appSecuritYKey clibase.String
		)
		opts.Add(

Copy link

Member

deansheatherApr 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Can't these be added to the regular config struct, and then the primary server can filter them out?

Copy link

MemberAuthor

EmyrkApr 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

We talked on discord. I think the best move here is to autogenerate the Deployment struct from the Options. Then we can create all the options in 1 place, and filter them.

I will do this in another branch, this isok for now here just to get a cmd working.

Follow up PRs will make the workspace proxy creation/register experience better.

Emyrk force-pushed thedreamteam/external_proxy_cli_cmd branch 2 times, most recently fromabc7415 to27d1476Compare

April 17, 2023 19:51

Emyrk added22 commits

April 17, 2023 14:51

feat: Add workspace proxy enterprise cli commands

7271e8f

chore: Handle custom workspace proxy options. Remove excess

0a1af72

Add primary access url

9fc8078

Include app security key

56d0ad7

Add output formats for registering a proxy

4d7daed

Fix formats

62f676b

Add cli cmd to get app security key

913aef1

Add deleting proxies

9c37e16

feat: Allow workspace proxy spawn in develop.sh

9d4591c

Make gen

cc29ffc

Import ordeR

54a6fc5

Quote shell var

139c309

Imports

6ce0dec

Fix lint

ffc3877

Tabs vs spaces

db78701

remove unused command

e49f96c

Fix compile and make gen

5f05cbf

Fix slim cmd to include extra proxy cmds

0d9da63

Import order

60fb59e

Import order

b9283d8

Fix comment

dab84e3

Fix compile with name

ea3593d

Emyrk force-pushed thedreamteam/external_proxy_cli_cmd branch from27d1476 toea3593dCompare

April 17, 2023 19:53

Base automatically changed fromdreamteam/external_proxy tomain

April 17, 2023 19:57

Emyrk changed the base branch frommain tostevenmasley/external_proxy_2

April 17, 2023 20:22

Copy link

MemberAuthor

Emyrk commentedApr 17, 2023•
edited
Loading

Rebased to#7176

Emyrk closed this

Apr 17, 2023

github-actionsbot locked and limited conversation to collaborators

Apr 17, 2023

github-actionsbot deleted the dreamteam/external_proxy_cli_cmd branch

October 18, 2023 00:10

Labels

None yet

Movatterモバイル変換

feat: Add workspace proxy enterprise cli commands#7123

feat: Add workspace proxy enterprise cli commands#7123

Uh oh!

Conversation

Emyrk commentedApr 13, 2023• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

What this does

Testing/Development

Features added to make this work

Logs

Uh oh!

Uh oh!

Uh oh!

Uh oh!

deansheatherApr 17, 2023

Choose a reason for hiding this comment

Uh oh!

EmyrkApr 17, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

deansheatherApr 17, 2023

Choose a reason for hiding this comment

Uh oh!

EmyrkApr 17, 2023

Choose a reason for hiding this comment

Uh oh!

Emyrk commentedApr 17, 2023• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Emyrk commentedApr 13, 2023•
edited
Loading

Emyrk commentedApr 17, 2023•
edited
Loading