Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-06 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass args to enable more detailed error message

Browse Source 
Signed-off-by: Sjors Holtrop <sjors.holtrop@ritense.com>
This commit is contained in:
Sjors Holtrop
2025-01-14 14:29:04 +01:00
parent 3478fe343d
commit 2e9e8e2690
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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,12 +151,7 @@ func (resume *resumeCommand) getPatchedResumables(ctx context.Context, args []st
} }
processed[arg] = struct{}{} processed[arg] = struct{}{}
if resume.list.len() == 0 { objs, err := resume.patch(ctx, args, []client.ListOption{
logger.Failuref("%s object '%s' not found in %s namespace", resume.kind, arg, resume.namespace)
continue
}
objs, err := resume.patch(ctx, []client.ListOption{
client.InNamespace(resume.namespace), client.InNamespace(resume.namespace),
client.MatchingFields{ client.MatchingFields{
"metadata.name": arg, "metadata.name": arg,
@@ -174,11 +169,16 @@ 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 {
logger.Failuref("%s object '%s' not found in %s namespace", resume.kind, args[0], resume.namespace)
return nil, nil
}
var resumables []resumable var resumables []resumable
for i := 0; i < resume.list.len(); i++ { for i := 0; i < resume.list.len(); i++ {