Adopt in delete.go

This commit is contained in:
JP Ungaretti 2023-02-09 23:21:41 +00:00
parent a388358348
commit 6a150d57e0

View file

@ -83,17 +83,19 @@ func (a *App) Delete(ctx context.Context, opts deleteOptions) (err error) {
var codespaces []*api.Codespace
nameFilter := opts.codespaceName
if nameFilter == "" {
a.StartProgressIndicatorWithLabel("Fetching codespaces")
userName := opts.userName
if userName == "" && opts.orgName != "" {
currentUser, err := a.apiClient.GetUser(ctx)
if err != nil {
return err
var codespaces []*api.Codespace
err = a.RunWithProgress("Fetching codespaces", func() (err error) {
userName := opts.userName
if userName == "" && opts.orgName != "" {
currentUser, err := a.apiClient.GetUser(ctx)
if err != nil {
return err
}
userName = currentUser.Login
}
userName = currentUser.Login
}
codespaces, err = a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: userName})
a.StopProgressIndicator()
codespaces, err = a.apiClient.ListCodespaces(ctx, api.ListCodespacesOptions{OrgName: opts.orgName, UserName: userName})
return
})
if err != nil {
return fmt.Errorf("error getting codespaces: %w", err)
}