Skip to content

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

feat: Add workspace proxy enterprise cli commands #7123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7271e8f
feat: Add workspace proxy enterprise cli commands
Emyrk Apr 13, 2023
0a1af72
chore: Handle custom workspace proxy options. Remove excess
Emyrk Apr 13, 2023
9fc8078
Add primary access url
Emyrk Apr 13, 2023
56d0ad7
Include app security key
Emyrk Apr 13, 2023
4d7daed
Add output formats for registering a proxy
Emyrk Apr 13, 2023
62f676b
Fix formats
Emyrk Apr 13, 2023
913aef1
Add cli cmd to get app security key
Emyrk Apr 13, 2023
9c37e16
Add deleting proxies
Emyrk Apr 13, 2023
9d4591c
feat: Allow workspace proxy spawn in develop.sh
Emyrk Apr 14, 2023
cc29ffc
Make gen
Emyrk Apr 14, 2023
54a6fc5
Import ordeR
Emyrk Apr 14, 2023
139c309
Quote shell var
Emyrk Apr 14, 2023
6ce0dec
Imports
Emyrk Apr 14, 2023
ffc3877
Fix lint
Emyrk Apr 14, 2023
db78701
Tabs vs spaces
Emyrk Apr 14, 2023
e49f96c
remove unused command
Emyrk Apr 17, 2023
5f05cbf
Fix compile and make gen
Emyrk Apr 17, 2023
0d9da63
Fix slim cmd to include extra proxy cmds
Emyrk Apr 17, 2023
60fb59e
Import order
Emyrk Apr 17, 2023
b9283d8
Import order
Emyrk Apr 17, 2023
dab84e3
Fix comment
Emyrk Apr 17, 2023
ea3593d
Fix compile with name
Emyrk Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix lint
  • Loading branch information
@Emyrk
Emyrk committed Apr 17, 2023
commit ffc3877fdd3f91a8df1ad9090f5701fa808d82f0
2 changes: 1 addition & 1 deletion enterprise/cli/workspaceproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func (r *RootCmd) proxyServer() *clibase.Cmd {
),
Handler: func(inv *clibase.Invocation) error {
if !(primaryAccessURL.Scheme == "http" || primaryAccessURL.Scheme == "https") {
return xerrors.Errorf("primary access URL must be http or https: url=%s", primaryAccessURL)
return xerrors.Errorf("primary access URL must be http or https: url=%s", primaryAccessURL.String())
}

secKey, err := workspaceapps.KeyFromString(appSecuritYKey.Value())
Expand Down
2 changes: 1 addition & 1 deletion scripts/develop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ fatal() {
log "Using external workspace proxy"
(
# Attempt to delete the proxy first, in case it already exists.
"${CODER_DEV_SHIM}" proxy delete name=local-proxy
"${CODER_DEV_SHIM}" proxy delete name=local-proxy || true
# Create the proxy
proxy_session_token=$("${CODER_DEV_SHIM}" proxy register --name=local-proxy --display-name="Local Proxy" --icon="/emojis/1f4bb.png" --access-url=http://localhost:3010 --only-token)
# Start the proxy
Expand Down