From 87ef1527fc825dfb0b8493271dd8f6d9e50f6613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Sch=C3=BCller?= Date: Wed, 4 Dec 2024 16:23:56 +0100 Subject: [PATCH] osbuild-service-maintenance/aws: avoid error on empty list Passing an empty list to `TerminateInstances` causes an error message, which is not necessary, as there is nothing to terminate. --- cmd/osbuild-service-maintenance/aws.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/osbuild-service-maintenance/aws.go b/cmd/osbuild-service-maintenance/aws.go index 25d6e4c8f2..348aa3db6f 100644 --- a/cmd/osbuild-service-maintenance/aws.go +++ b/cmd/osbuild-service-maintenance/aws.go @@ -158,9 +158,11 @@ func terminateOrphanedSecureInstances(a *awscloud.AWS, dryRun bool) error { instanceIDs = filterOnTooOld(instanceIDs, reservations) logrus.Infof("Cleaning up executor instances: %v", instanceIDs) if !dryRun { - err = a.TerminateInstances(instanceIDs) - if err != nil { - return fmt.Errorf("Unable to terminate secure instances: %w", err) + if len(instanceIDs) > 0 { + err = a.TerminateInstances(instanceIDs) + if err != nil { + return fmt.Errorf("Unable to terminate secure instances: %w", err) + } } } else { logrus.Info("Dry run, didn't actually terminate any instances")