Skip to content

Add template tooltips/kira pilot #2308

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

Merged
merged 17 commits into from
Jun 14, 2022
Merged

Add template tooltips/kira pilot #2308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b2833c6
feat: update build url to @username/workspace/builds/buildnumber (#2234)
AbhineetJain Jun 10, 2022
fcc5284
fix: update icon (#2216)
jsjoeio Jun 10, 2022
1a9e572
feat: Show template description in `coder template init` (#2238)
mafredri Jun 10, 2022
928958c
fix: workspace schedule time displays (#2249)
greyscaled Jun 10, 2022
f79ab7f
fix: Remove easter egg mentioning competitor (#2250)
kylecarbs Jun 10, 2022
71fd196
feat: Warn on coderd startup if access URL is localhost (#2248)
dwahler Jun 10, 2022
f562b74
feat: use custom wireguard reverse proxy for dev tunnel (#1975)
coadler Jun 10, 2022
46da59a
fix: use correct link in create from template button (#2253)
f0ssel Jun 10, 2022
02d2aea
feat: store and display template creator (#2228)
AbhineetJain Jun 10, 2022
ec0bb7b
feat: update language on workspace page (#2220)
Kira-Pilot Jun 10, 2022
de6f86b
fix: ensure config dir exists before reading tunnel config (#2259)
coadler Jun 10, 2022
8415022
fix(devtunnel): close `http.Server` before wireguard interface (#2263)
coadler Jun 10, 2022
e3a1cd3
fix: ensure `agentResource` is non-nil (#2261)
coadler Jun 11, 2022
cbde8e8
chore: add hero image to OSS docs homepage (#2241)
Jun 13, 2022
49f8578
fix: Do not write 2 errors to api on template fetch error (#2285)
Emyrk Jun 13, 2022
e207286
Merge remote-tracking branch 'origin/main' into add-template-tooltips…
Kira-Pilot Jun 13, 2022
fe20e25
feat: add tooltips to templates page
Kira-Pilot Jun 13, 2022
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
feat: use custom wireguard reverse proxy for dev tunnel (#1975)
  • Loading branch information
@coadler
coadler authored Jun 10, 2022
commit f562b74fa153c0be3d8e96ce9867844c3c284320
33 changes: 28 additions & 5 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"golang.org/x/mod/semver"
"golang.org/x/oauth2"
xgithub "golang.org/x/oauth2/github"
"golang.org/x/sync/errgroup"
"golang.org/x/xerrors"
"google.golang.org/api/idtoken"
"google.golang.org/api/option"
Expand Down Expand Up @@ -169,8 +170,9 @@ func server() *cobra.Command {
}

var (
tunnelErrChan <-chan error
ctxTunnel, closeTunnel = context.WithCancel(cmd.Context())
devTunnel = (*devtunnel.Tunnel)(nil)
devTunnelErrChan = make(<-chan error, 1)
)
defer closeTunnel()

Expand All @@ -195,10 +197,11 @@ func server() *cobra.Command {
}
}
if err == nil {
accessURL, tunnelErrChan, err = devtunnel.New(ctxTunnel, localURL)
devTunnel, devTunnelErrChan, err = devtunnel.New(ctxTunnel, logger.Named("devtunnel"))
if err != nil {
return xerrors.Errorf("create tunnel: %w", err)
}
accessURL = devTunnel.URL
}
_, _ = fmt.Fprintln(cmd.ErrOrStderr())
}
Expand Down Expand Up @@ -349,7 +352,27 @@ func server() *cobra.Command {
return shutdownConnsCtx
},
}
errCh <- server.Serve(listener)

wg := errgroup.Group{}
wg.Go(func() error {
// Make sure to close the tunnel listener if we exit so the
// errgroup doesn't wait forever!
if dev && tunnel {
defer devTunnel.Listener.Close()
}

return server.Serve(listener)
})

if dev && tunnel {
wg.Go(func() error {
defer listener.Close()

return server.Serve(devTunnel.Listener)
})
}

errCh <- wg.Wait()
}()

config := createConfig(cmd)
Expand Down Expand Up @@ -415,7 +438,7 @@ func server() *cobra.Command {
case <-cmd.Context().Done():
coderAPI.Close()
return cmd.Context().Err()
case err := <-tunnelErrChan:
case err := <-devTunnelErrChan:
if err != nil {
return err
}
Expand Down Expand Up @@ -478,7 +501,7 @@ func server() *cobra.Command {
if dev && tunnel {
_, _ = fmt.Fprintf(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"Waiting for dev tunnel to close...\n")
closeTunnel()
<-tunnelErrChan
<-devTunnelErrChan
}

_, _ = fmt.Fprintf(cmd.OutOrStdout(), cliui.Styles.Prompt.String()+"Waiting for WebSocket connections to close...\n")
Expand Down
Loading