actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-21 15:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #5146 from sjorsholtrop-ritense/improve-resume-error-msg

Browse source 
Improve "flux resume" error message on non-existent object
This commit is contained in:
Matheus Pimenta 2025-01-14 15:05:02 +00:00 committed by GitHub
commit e09ba7a8e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/flux/resume.go
View file

@ -133,7 +133,7 @@ func (resume resumeCommand) run(cmd *cobra.Command, args []string) error {
// If the args slice is empty, it patches all resumable objects in the given namespace. // If the args slice is empty, it patches all resumable objects in the given namespace.
func (resume *resumeCommand) getPatchedResumables(ctx context.Context, args []string) ([]resumable, error) { func (resume *resumeCommand) getPatchedResumables(ctx context.Context, args []string) ([]resumable, error) {
if len(args) < 1 { if len(args) < 1 {
objs, err := resume.patch(ctx, []client.ListOption{ objs, err := resume.patch(ctx, args, []client.ListOption{
client.InNamespace(resume.namespace), client.InNamespace(resume.namespace),
}) })
if err != nil { if err != nil {
@ -151,7 +151,7 @@ func (resume *resumeCommand) getPatchedResumables(ctx context.Context, args []st
} }
processed[arg] = struct{}{} processed[arg] = struct{}{}
objs, err := resume.patch(ctx, []client.ListOption{ objs, err := resume.patch(ctx, args, []client.ListOption{
client.InNamespace(resume.namespace), client.InNamespace(resume.namespace),
client.MatchingFields{ client.MatchingFields{
"metadata.name": arg, "metadata.name": arg,
@ -169,13 +169,17 @@ func (resume *resumeCommand) getPatchedResumables(ctx context.Context, args []st
// Patches resumable objects by setting their status to unsuspended. // Patches resumable objects by setting their status to unsuspended.
// Returns a slice of resumables that have been patched and any error encountered during patching. // Returns a slice of resumables that have been patched and any error encountered during patching.
func (resume resumeCommand) patch(ctx context.Context, listOpts []client.ListOption) ([]resumable, error) { func (resume resumeCommand) patch(ctx context.Context, args []string, listOpts []client.ListOption) ([]resumable, error) {
if err := resume.client.List(ctx, resume.list.asClientList(), listOpts...); err != nil { if err := resume.client.List(ctx, resume.list.asClientList(), listOpts...); err != nil {
return nil, err return nil, err
} }
if resume.list.len() == 0 { if resume.list.len() == 0 {
logger.Failuref("no %s objects found in %s namespace", resume.kind, resume.namespace) if len(args) < 1 {
logger.Failuref("no %s objects found in %s namespace", resume.kind, resume.namespace)
} else {
logger.Failuref("%s object '%s' not found in %s namespace", resume.kind, args[0], resume.namespace)
}
return nil, nil return nil, nil
} }

2
cmd/flux/testdata/kustomization/resume_kustomization_from_git_multiple_args_wait.golden vendored
View file

@ -1,6 +1,6 @@
► resuming kustomization tkfg in {{ .ns }} namespace ► resuming kustomization tkfg in {{ .ns }} namespace
✔ kustomization resumed ✔ kustomization resumed
✗ no Kustomization objects found in {{ .ns }} namespace ✗ Kustomization object 'tkfg' not found in {{ .ns }} namespace
◎ waiting for Kustomization reconciliation ◎ waiting for Kustomization reconciliation
✔ Kustomization tkfg reconciliation completed ✔ Kustomization tkfg reconciliation completed
✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9 ✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9