From 2e3dd16220c8858b1767c0d3c0150e8bd24213a4 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Mon, 16 Jan 2023 15:38:34 +0100
Subject: [PATCH] osbuild-service-maintenance: clean up all regions

Since we started cloning images to different regions, the maintenance
script should clean up all of these regions.
---
 cmd/osbuild-service-maintenance/aws.go  | 92 ++++++++++++++-----------
 cmd/osbuild-service-maintenance/main.go |  2 +-
 internal/cloud/awscloud/awscloud.go     | 13 ++++
 3 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/cmd/osbuild-service-maintenance/aws.go b/cmd/osbuild-service-maintenance/aws.go
index 31231609b..a73807ffb 100644
--- a/cmd/osbuild-service-maintenance/aws.go
+++ b/cmd/osbuild-service-maintenance/aws.go
@@ -11,62 +11,76 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/cloud/awscloud"
 )
 
-func AWSCleanup(maxConcurrentRequests int, dryRun bool, accessKeyID, accessKey, region string, cutoff time.Time) error {
-	a, err := awscloud.New(region, accessKeyID, accessKey, "")
+func AWSCleanup(maxConcurrentRequests int, dryRun bool, accessKeyID, accessKey string, cutoff time.Time) error {
+	a, err := awscloud.New("us-east-1", accessKeyID, accessKey, "")
 	if err != nil {
 		return err
 	}
 
-	var wg sync.WaitGroup
-	sem := semaphore.NewWeighted(int64(maxConcurrentRequests))
-	images, err := a.DescribeImagesByTag("Name", "composer-api-*")
+	regions, err := a.Regions()
 	if err != nil {
 		return err
 	}
 
-	for index, image := range images {
-		// TODO are these actual concerns?
-		if image.ImageId == nil {
-			logrus.Infof("ImageId is nil %v", image)
-			continue
-		}
-		if image.CreationDate == nil {
-			logrus.Infof("Image %v has nil creationdate", *image.ImageId)
-			continue
-		}
-
-		created, err := time.Parse(time.RFC3339, *image.CreationDate)
+	for _, region := range regions {
+		a, err := awscloud.New(region, accessKeyID, accessKey, "")
 		if err != nil {
-			logrus.Infof("Unable to parse date %s for image %s", *image.CreationDate, *image.ImageId)
+			logrus.Errorf("Unable to create new aws session for region %s: %v", region, err)
 			continue
 		}
 
-		if !created.Before(cutoff) {
+		var wg sync.WaitGroup
+		sem := semaphore.NewWeighted(int64(maxConcurrentRequests))
+		images, err := a.DescribeImagesByTag("Name", "composer-api-*")
+		if err != nil {
+			logrus.Errorf("Unable to describe images for region %s: %v", region, err)
 			continue
 		}
 
-		if dryRun {
-			logrus.Infof("Dry run, aws image %s in region %s, with creation date %s would be removed", *image.ImageId, region, *image.CreationDate)
-			continue
-		}
-
-		if err = sem.Acquire(context.Background(), 1); err != nil {
-			logrus.Errorf("Error acquiring semaphore: %v", err)
-			continue
-		}
-		wg.Add(1)
-
-		go func(i int) {
-			defer sem.Release(1)
-			defer wg.Done()
-
-			err := a.RemoveSnapshotAndDeregisterImage(images[i])
-			if err != nil {
-				logrus.Errorf("Cleanup for image %s in region %s failed: %v", *images[i].ImageId, region, err)
+		for index, image := range images {
+			// TODO are these actual concerns?
+			if image.ImageId == nil {
+				logrus.Infof("ImageId is nil %v", image)
+				continue
 			}
-		}(index)
+			if image.CreationDate == nil {
+				logrus.Infof("Image %v has nil creationdate", *image.ImageId)
+				continue
+			}
+
+			created, err := time.Parse(time.RFC3339, *image.CreationDate)
+			if err != nil {
+				logrus.Infof("Unable to parse date %s for image %s", *image.CreationDate, *image.ImageId)
+				continue
+			}
+
+			if !created.Before(cutoff) {
+				continue
+			}
+
+			if dryRun {
+				logrus.Infof("Dry run, aws image %s in region %s, with creation date %s would be removed", *image.ImageId, region, *image.CreationDate)
+				continue
+			}
+
+			if err = sem.Acquire(context.Background(), 1); err != nil {
+				logrus.Errorf("Error acquiring semaphore: %v", err)
+				continue
+			}
+			wg.Add(1)
+
+			go func(i int) {
+				defer sem.Release(1)
+				defer wg.Done()
+
+				err := a.RemoveSnapshotAndDeregisterImage(images[i])
+				if err != nil {
+					logrus.Errorf("Cleanup for image %s in region %s failed: %v", *images[i].ImageId, region, err)
+				}
+			}(index)
+		}
+		wg.Wait()
 	}
 
-	wg.Wait()
 	return nil
 }
diff --git a/cmd/osbuild-service-maintenance/main.go b/cmd/osbuild-service-maintenance/main.go
index c16fd08e2..9d2e3ef28 100644
--- a/cmd/osbuild-service-maintenance/main.go
+++ b/cmd/osbuild-service-maintenance/main.go
@@ -40,7 +40,7 @@ func main() {
 		}
 
 		logrus.Info("Cleaning up AWS")
-		err := AWSCleanup(conf.MaxConcurrentRequests, conf.DryRun, conf.AWSAccessKeyID, conf.AWSSecretAccessKey, "us-east-1", cutoff)
+		err := AWSCleanup(conf.MaxConcurrentRequests, conf.DryRun, conf.AWSAccessKeyID, conf.AWSSecretAccessKey, cutoff)
 		if err != nil {
 			logrus.Errorf("AWS cleanup failed: %v", err)
 		}
diff --git a/internal/cloud/awscloud/awscloud.go b/internal/cloud/awscloud/awscloud.go
index a58a85da2..812756d51 100644
--- a/internal/cloud/awscloud/awscloud.go
+++ b/internal/cloud/awscloud/awscloud.go
@@ -596,3 +596,16 @@ func (a *AWS) MarkS3ObjectAsPublic(bucket, objectKey string) error {
 
 	return nil
 }
+
+func (a *AWS) Regions() ([]string, error) {
+	out, err := a.ec2.DescribeRegions(&ec2.DescribeRegionsInput{})
+	if err != nil {
+		return nil, err
+	}
+
+	result := []string{}
+	for _, r := range out.Regions {
+		result = append(result, aws.StringValue(r.RegionName))
+	}
+	return result, nil
+}