57c73e8239
* Add --repo flag to commands * Example of using common args * Add -r to stop * Add validation to the add helper * Skip prompt for single option * Migrate (mostly) everything to addGetOrChooseCodespaceCommandArgs * Fix typo in logsCmd * Use R instead of r * Update a couple -r usages * Refactor to codespace_selector * Clean up selector, apply it in a couple examples * Use apiClient instead in constructor * Restore addDeprecatedRepoShorthand * Finish implementing the commands * Update existing tests to use the selector * Add tests for selector * linter * Catch case where there's no conflict * Make the flag persistent for ports * Add support to stop
105 lines
2.4 KiB
Go
105 lines
2.4 KiB
Go
package codespace
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/cli/cli/v2/internal/codespaces"
|
|
"github.com/cli/cli/v2/internal/codespaces/rpc"
|
|
"github.com/cli/cli/v2/pkg/liveshare"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
func newLogsCmd(app *App) *cobra.Command {
|
|
var (
|
|
selector *CodespaceSelector
|
|
follow bool
|
|
)
|
|
|
|
logsCmd := &cobra.Command{
|
|
Use: "logs",
|
|
Short: "Access codespace logs",
|
|
Args: noArgsConstraint,
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return app.Logs(cmd.Context(), selector, follow)
|
|
},
|
|
}
|
|
|
|
selector = AddCodespaceSelector(logsCmd, app.apiClient)
|
|
|
|
logsCmd.Flags().BoolVarP(&follow, "follow", "f", false, "Tail and follow the logs")
|
|
|
|
return logsCmd
|
|
}
|
|
|
|
func (a *App) Logs(ctx context.Context, selector *CodespaceSelector, follow bool) (err error) {
|
|
// Ensure all child tasks (port forwarding, remote exec) terminate before return.
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
|
|
codespace, err := selector.Select(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
session, err := startLiveShareSession(ctx, codespace, a, false, "")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer safeClose(session, &err)
|
|
|
|
// Ensure local port is listening before client (getPostCreateOutput) connects.
|
|
listen, localPort, err := codespaces.ListenTCP(0)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer listen.Close()
|
|
|
|
a.StartProgressIndicatorWithLabel("Fetching SSH Details")
|
|
invoker, err := rpc.CreateInvoker(ctx, session)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer safeClose(invoker, &err)
|
|
|
|
remoteSSHServerPort, sshUser, err := invoker.StartSSHServer(ctx)
|
|
a.StopProgressIndicator()
|
|
if err != nil {
|
|
return fmt.Errorf("error getting ssh server details: %w", err)
|
|
}
|
|
|
|
cmdType := "cat"
|
|
if follow {
|
|
cmdType = "tail -f"
|
|
}
|
|
|
|
dst := fmt.Sprintf("%s@localhost", sshUser)
|
|
cmd, err := codespaces.NewRemoteCommand(
|
|
ctx, localPort, dst, fmt.Sprintf("%s /workspaces/.codespaces/.persistedshare/creation.log", cmdType),
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("remote command: %w", err)
|
|
}
|
|
|
|
tunnelClosed := make(chan error, 1)
|
|
go func() {
|
|
fwd := liveshare.NewPortForwarder(session, "sshd", remoteSSHServerPort, false)
|
|
tunnelClosed <- fwd.ForwardToListener(ctx, listen) // error is non-nil
|
|
}()
|
|
|
|
cmdDone := make(chan error, 1)
|
|
go func() {
|
|
cmdDone <- cmd.Run()
|
|
}()
|
|
|
|
select {
|
|
case err := <-tunnelClosed:
|
|
return fmt.Errorf("connection closed: %w", err)
|
|
case err := <-cmdDone:
|
|
if err != nil {
|
|
return fmt.Errorf("error retrieving logs: %w", err)
|
|
}
|
|
|
|
return nil // success
|
|
}
|
|
}
|