Skip to content

refactor(workspace): name delete lifecycle stages #1601

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
skevetter merged 1 commit into from
Oct 20, 2026
Merged

refactor(workspace): name delete lifecycle stages #1601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
107 changes: 69 additions & 38 deletions pkg/workspace/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,11 @@ type DeleteOptions struct {
func Delete(ctx context.Context, opts DeleteOptions) (string, error) {
client := opts.Client
if client == nil {
err := progress.RunStep(
ctx,
progress.PhaseDeletingWorkspace,
"Loading workspace",
func(ctx context.Context) error {
var err error
client, err = Get(
ctx,
GetOptions{DevsyConfig: opts.DevsyConfig, Args: opts.Args, Owner: opts.Owner},
)
return err
},
)
loaded, err := loadDeleteClient(ctx, opts)
if err != nil {
return handleDeleteLoadError(ctx, opts, err)
}
client = loaded
}

defer opener.KillBrowserTunnel(client.Context(), client.Workspace())
Expand All @@ -64,18 +53,7 @@ func Delete(ctx context.Context, opts DeleteOptions) (string, error) {
}

if !opts.Force && client.WorkspaceConfig().Imported {
var id string
err := progress.RunStep(
ctx,
progress.PhaseDeletingWorkspace,
"Removing local workspace",
func(context.Context) error {
var err error
id, _, err = deleteImportedWorkspace(client, opts)
return err
},
)
return id, err
return removeImportedLocalWorkspace(ctx, client, opts)
}

unlock, status, err := checkBeforeDelete(ctx, client, opts)
Expand All @@ -92,8 +70,60 @@ func Delete(ctx context.Context, opts DeleteOptions) (string, error) {

stopIfRunning(ctx, client, status)

id, err := removeWorkspaceResources(ctx, client, opts)
if err != nil {
return id, err
}
return id, cleanupDeletedWorkspaceFiles(ctx, opts)
}

func loadDeleteClient(
ctx context.Context,
opts DeleteOptions,
) (client2.BaseWorkspaceClient, error) {
var client client2.BaseWorkspaceClient
err := progress.RunStep(
ctx,
progress.PhaseDeletingWorkspace,
"Loading workspace",
func(ctx context.Context) error {
var err error
client, err = Get(
ctx,
GetOptions{DevsyConfig: opts.DevsyConfig, Args: opts.Args, Owner: opts.Owner},
)
return err
},
)
return client, err
}

func removeImportedLocalWorkspace(
ctx context.Context,
client client2.BaseWorkspaceClient,
opts DeleteOptions,
) (string, error) {
var id string
err := progress.RunStep(
ctx,
progress.PhaseDeletingWorkspace,
"Removing local workspace",
func(context.Context) error {
var err error
id, _, err = deleteImportedWorkspace(client, opts)
return err
},
)
return id, err
}

func removeWorkspaceResources(
ctx context.Context,
client client2.BaseWorkspaceClient,
opts DeleteOptions,
) (string, error) {
var id string
err = progress.RunStep(
err := progress.RunStep(
ctx,
progress.PhaseDeletingWorkspace,
"Removing workspace resources",
Expand All @@ -103,21 +133,22 @@ func Delete(ctx context.Context, opts DeleteOptions) (string, error) {
return err
},
)
if err == nil {
err = progress.RunStep(
ctx,
progress.PhaseDeletingWorkspace,
"Cleaning local files",
func(context.Context) error {
SweepOrphanWorkspaceDirs(opts.DevsyConfig.DefaultContext)
SweepOrphanContentDirs(opts.DevsyConfig.DefaultContext)
return nil
},
)
}
return id, err
}

func cleanupDeletedWorkspaceFiles(ctx context.Context, opts DeleteOptions) error {
return progress.RunStep(
ctx,
progress.PhaseDeletingWorkspace,
"Cleaning local files",
func(context.Context) error {
SweepOrphanWorkspaceDirs(opts.DevsyConfig.DefaultContext)
SweepOrphanContentDirs(opts.DevsyConfig.DefaultContext)
return nil
},
)
}

// stopIfRunning stops the workspace before deletion when it is currently
// running so the lifecycle ordering (running -> stopped -> deleted) is
// predictable for both CLI and programmatic callers. The stop is
Expand Down
Loading