Adopt in stop.go

This commit is contained in:
JP Ungaretti 2023-02-09 23:13:44 +00:00
parent bc789b2787
commit a848cd1bd0

View file

@ -42,9 +42,11 @@ func (a *App) StopCodespace(ctx context.Context, opts *stopOptions) error {
ownerName := opts.userName
if codespaceName == "" {
a.StartProgressIndicatorWithLabel("Fetching codespaces")
codespaces, err := a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: ownerName})
a.StopProgressIndicator()
var codespaces []*api.Codespace
err := a.RunWithProgress("Fetching codespaces", func() (err error) {
codespaces, err = a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: ownerName})
return
})
if err != nil {
return fmt.Errorf("failed to list codespaces: %w", err)
}
@ -68,29 +70,30 @@ func (a *App) StopCodespace(ctx context.Context, opts *stopOptions) error {
codespaceName = codespace.Name
ownerName = codespace.Owner.Login
} else {
a.StartProgressIndicatorWithLabel("Fetching codespace")
var c *api.Codespace
var err error
if opts.orgName == "" {
c, err = a.apiClient.GetCodespace(ctx, codespaceName, false)
} else {
c, err = a.apiClient.GetOrgMemberCodespace(ctx, opts.orgName, ownerName, codespaceName)
}
a.StopProgressIndicator()
err := a.RunWithProgress("Fetching codespace", func() (err error) {
if opts.orgName == "" {
c, err = a.apiClient.GetCodespace(ctx, codespaceName, false)
} else {
c, err = a.apiClient.GetOrgMemberCodespace(ctx, opts.orgName, ownerName, codespaceName)
}
return
})
if err != nil {
return fmt.Errorf("failed to get codespace: %q: %w", codespaceName, err)
}
cs := codespace{c}
if !cs.running() {
return fmt.Errorf("codespace %q is not running", codespaceName)
}
}
a.StartProgressIndicatorWithLabel("Stopping codespace")
defer a.StopProgressIndicator()
if err := a.apiClient.StopCodespace(ctx, codespaceName, opts.orgName, ownerName); err != nil {
err := a.RunWithProgress("Stoppping codespace", func() (err error) {
err = a.apiClient.StopCodespace(ctx, codespaceName, opts.orgName, ownerName)
return
})
if err != nil {
return fmt.Errorf("failed to stop codespace: %w", err)
}