STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6551 from jungaretti/jungaretti/incremental-rebuild

Browse source
This commit is contained in:
Caleb Brose 2022-11-01 17:45:31 -05:00 • committed by GitHub
commit 3692defe8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/cmd/codespace/common.go
View file

@ -66,7 +66,7 @@ type liveshareSession interface {
StartSharing(context.Context, string, int) (liveshare.ChannelID, error)
StartSSHServer(context.Context) (int, string, error)
StartSSHServerWithOptions(context.Context, liveshare.StartSSHServerOptions) (int, string, error)
RebuildContainer(context.Context) error
RebuildContainer(context.Context, bool) error
}
// Connects to a codespace using Live Share and returns that session

15
pkg/cmd/codespace/rebuild.go
View file

@ -10,22 +10,27 @@ import (
func newRebuildCmd(app *App) *cobra.Command {
var codespace string
var fullRebuild bool
rebuildCmd := &cobra.Command{
Use: "rebuild",
Short: "Rebuild a codespace",
Args: cobra.NoArgs,
Long: `Rebuilding recreates your codespace. Your code and any current changes will be
preserved. Your codespace will be rebuilt using your working directory's
dev container. A full rebuild also removes cached Docker images.`,
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
return app.Rebuild(cmd.Context(), codespace)
return app.Rebuild(cmd.Context(), codespace, fullRebuild)
},
}
rebuildCmd.Flags().StringVarP(&codespace, "codespace", "c", "", "Name of the codespace")
rebuildCmd.Flags().StringVarP(&codespace, "codespace", "c", "", "name of the codespace")
rebuildCmd.Flags().BoolVar(&fullRebuild, "full", false, "perform a full rebuild")
return rebuildCmd
}
func (a *App) Rebuild(ctx context.Context, codespaceName string) (err error) {
func (a *App) Rebuild(ctx context.Context, codespaceName string, full bool) (err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
@ -46,7 +51,7 @@ func (a *App) Rebuild(ctx context.Context, codespaceName string) (err error) {
}
defer safeClose(session, &err)
err = session.RebuildContainer(ctx)
err = session.RebuildContainer(ctx, full)
if err != nil {
return fmt.Errorf("rebuilding codespace via session: %w", err)
}

2
pkg/cmd/codespace/rebuild_test.go
View file

@ -15,7 +15,7 @@ func TestAlreadyRebuildingCodespace(t *testing.T) {
}
app := testingRebuildApp(*rebuildingCodespace)
err := app.Rebuild(context.Background(), "rebuildingCodespace")
err := app.Rebuild(context.Background(), "rebuildingCodespace", false)
if err != nil {
t.Errorf("rebuilding a codespace that was already rebuilding: %v", err)
}

9
pkg/liveshare/session.go
View file

@ -123,9 +123,14 @@ func (s *Session) StartJupyterServer(ctx context.Context) (int, string, error) {
return port, response.ServerUrl, nil
}
func (s *Session) RebuildContainer(ctx context.Context) error {
func (s *Session) RebuildContainer(ctx context.Context, full bool) error {
rpcMethod := "IEnvironmentConfigurationService.incrementalRebuildContainer"
if full {
rpcMethod = "IEnvironmentConfigurationService.rebuildContainer"
}
var rebuildSuccess bool
err := s.rpc.do(ctx, "IEnvironmentConfigurationService.rebuildContainer", nil, &rebuildSuccess)
err := s.rpc.do(ctx, rpcMethod, nil, &rebuildSuccess)
if err != nil {
return fmt.Errorf("invoking rebuild RPC: %w", err)
}

55
pkg/liveshare/session_test.go
View file

@ -400,26 +400,45 @@ func TestSessionHeartbeat(t *testing.T) {
}
func TestRebuild(t *testing.T) {
requestCount := 0
getSharedServers := func(conn *jsonrpc2.Conn, req *jsonrpc2.Request) (interface{}, error) {
requestCount++
return true, nil
}
testServer, session, err := makeMockSession(
livesharetest.WithService("IEnvironmentConfigurationService.rebuildContainer", getSharedServers),
)
if err != nil {
t.Fatalf("creating mock session: %v", err)
}
defer testServer.Close()
err = session.RebuildContainer(context.Background())
if err != nil {
t.Fatalf("rebuilding codespace via mock session: %v", err)
tests := []struct {
fullRebuild bool
rpcService string
}{
{
fullRebuild: false,
rpcService: "IEnvironmentConfigurationService.incrementalRebuildContainer",
},
{
fullRebuild: true,
rpcService: "IEnvironmentConfigurationService.rebuildContainer",
},
}
if requestCount == 0 {
t.Fatalf("no requests were made")
for _, tt := range tests {
t.Logf("RPC service: %s", tt.rpcService)
t.Logf("full rebuild: %t", tt.fullRebuild)
requestCount := 0
rebuildContainer := func(conn *jsonrpc2.Conn, req *jsonrpc2.Request) (interface{}, error) {
requestCount++
return true, nil
}
testServer, session, err := makeMockSession(
livesharetest.WithService(tt.rpcService, rebuildContainer),
)
if err != nil {
t.Errorf("creating mock session: %v", err)
}
defer testServer.Close()
err = session.RebuildContainer(context.Background(), tt.fullRebuild)
if err != nil {
t.Errorf("rebuilding codespace via mock session: %v", err)
}
if requestCount == 0 {
t.Errorf("no requests were made")
}
}
}