diff --git a/cmd/flux/resume.go b/cmd/flux/resume.go index 5f3c8b8145..6a622dcb7b 100644 --- a/cmd/flux/resume.go +++ b/cmd/flux/resume.go @@ -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. func (resume *resumeCommand) getPatchedResumables(ctx context.Context, args []string) ([]resumable, error) { if len(args) < 1 { - objs, err := resume.patch(ctx, []client.ListOption{ + objs, err := resume.patch(ctx, args, []client.ListOption{ client.InNamespace(resume.namespace), }) if err != nil { @@ -151,7 +151,7 @@ func (resume *resumeCommand) getPatchedResumables(ctx context.Context, args []st } processed[arg] = struct{}{} - objs, err := resume.patch(ctx, []client.ListOption{ + objs, err := resume.patch(ctx, args, []client.ListOption{ client.InNamespace(resume.namespace), client.MatchingFields{ "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. // 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 { return nil, err } 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 } diff --git a/cmd/flux/testdata/kustomization/resume_kustomization_from_git_multiple_args_wait.golden b/cmd/flux/testdata/kustomization/resume_kustomization_from_git_multiple_args_wait.golden index e07751407b..0cd30e7490 100644 --- a/cmd/flux/testdata/kustomization/resume_kustomization_from_git_multiple_args_wait.golden +++ b/cmd/flux/testdata/kustomization/resume_kustomization_from_git_multiple_args_wait.golden @@ -1,6 +1,6 @@ ► resuming kustomization tkfg in {{ .ns }} namespace ✔ kustomization resumed -✗ no Kustomization objects found in {{ .ns }} namespace +✗ Kustomization object 'tkfg' not found in {{ .ns }} namespace ◎ waiting for Kustomization reconciliation ✔ Kustomization tkfg reconciliation completed ✔ applied revision 6.3.5@sha1:67e2c98a60dc92283531412a9e604dd4bae005a9