Skip to content

Return cli List error closer to where was returned #4822

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
thardeck merged 1 commit into from
Mar 18, 2026
Merged

Return cli List error closer to where was returned #4822

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
9 changes: 5 additions & 4 deletions internal/cmd/cli/apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,9 @@ func pruneBundlesNotFoundInRepo(
) error {
filter := labels.SelectorFromSet(labels.Set{fleet.RepoLabel: repoName})
bundleList := &fleet.BundleList{}
err := c.List(ctx, bundleList, &client.ListOptions{LabelSelector: filter, Namespace: ns})
if err := c.List(ctx, bundleList, &client.ListOptions{LabelSelector: filter, Namespace: ns}); err != nil {
return err
}
Comment thread
0xavi0 marked this conversation as resolved.

for _, bundle := range bundleList.Items {
if _, ok := gitRepoBundlesMap[bundle.Name]; !ok {
Expand Down Expand Up @@ -404,13 +406,12 @@ func pruneBundlesNotFoundInRepo(
}
}
}
err = c.Delete(ctx, &bundle)
if err != nil {
if err := c.Delete(ctx, &bundle); err != nil {
return err
}
}
}
return err
return nil
}

// newBundle reads bundle data from a source and returns a bundle with the
Expand Down
Loading