From 7645f60f27d011adf175b8bb0916915d0d0b5365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
Date: Wed, 6 Aug 2025 13:46:59 +0200
Subject: [PATCH] internal/awscloud: use AWS.Regions() from osbuild/images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
---
 internal/cloud/awscloud/awscloud.go          | 13 -------------
 internal/cloud/awscloud/awscloud_test.go     | 10 ----------
 internal/cloud/awscloud/client-interfaces.go |  2 --
 internal/cloud/awscloud/mocks_test.go        | 14 --------------
 4 files changed, 39 deletions(-)

diff --git a/internal/cloud/awscloud/awscloud.go b/internal/cloud/awscloud/awscloud.go
index 5b2d4aa32..442351373 100644
--- a/internal/cloud/awscloud/awscloud.go
+++ b/internal/cloud/awscloud/awscloud.go
@@ -298,19 +298,6 @@ func (a *AWS) CopyImage(name, ami, sourceRegion string) (string, error) {
 	return *result.ImageId, nil
 }
 
-func (a *AWS) Regions() ([]string, error) {
-	out, err := a.ec2.DescribeRegions(context.Background(), &ec2.DescribeRegionsInput{})
-	if err != nil {
-		return nil, err
-	}
-
-	result := []string{}
-	for _, r := range out.Regions {
-		result = append(result, *r.RegionName)
-	}
-	return result, nil
-}
-
 func (a *AWS) DescribeImagesByName(name string) (*ec2.DescribeImagesOutput, error) {
 	return a.ec2.DescribeImages(
 		context.Background(),
diff --git a/internal/cloud/awscloud/awscloud_test.go b/internal/cloud/awscloud/awscloud_test.go
index 88adbdf23..98e4d610d 100644
--- a/internal/cloud/awscloud/awscloud_test.go
+++ b/internal/cloud/awscloud/awscloud_test.go
@@ -18,13 +18,3 @@ func TestEC2CopyImage(t *testing.T) {
 	// 1 snapshot, 1 image
 	require.Equal(t, 2, m.calledFn["CreateTags"])
 }
-
-func TestEC2Regions(t *testing.T) {
-	m := newEc2Mock(t)
-	aws := awscloud.NewForTest(m, nil, &s3mock{t, "bucket", "object-key"}, nil, nil)
-	require.NotNil(t, aws)
-	regions, err := aws.Regions()
-	require.NoError(t, err)
-	require.NotEmpty(t, regions)
-	require.Equal(t, 1, m.calledFn["DescribeRegions"])
-}
diff --git a/internal/cloud/awscloud/client-interfaces.go b/internal/cloud/awscloud/client-interfaces.go
index c8680c3f4..ae01b1345 100644
--- a/internal/cloud/awscloud/client-interfaces.go
+++ b/internal/cloud/awscloud/client-interfaces.go
@@ -12,8 +12,6 @@ import (
 )
 
 type EC2 interface {
-	DescribeRegions(context.Context, *ec2.DescribeRegionsInput, ...func(*ec2.Options)) (*ec2.DescribeRegionsOutput, error)
-
 	// Security Groups
 	AuthorizeSecurityGroupIngress(context.Context, *ec2.AuthorizeSecurityGroupIngressInput, ...func(*ec2.Options)) (*ec2.AuthorizeSecurityGroupIngressOutput, error)
 	CreateSecurityGroup(context.Context, *ec2.CreateSecurityGroupInput, ...func(*ec2.Options)) (*ec2.CreateSecurityGroupOutput, error)
diff --git a/internal/cloud/awscloud/mocks_test.go b/internal/cloud/awscloud/mocks_test.go
index 77fcf7553..572231169 100644
--- a/internal/cloud/awscloud/mocks_test.go
+++ b/internal/cloud/awscloud/mocks_test.go
@@ -115,20 +115,6 @@ func newEc2Mock(t *testing.T) *ec2mock {
 	}
 }
 
-func (m *ec2mock) DescribeRegions(ctx context.Context, input *ec2.DescribeRegionsInput, optfns ...func(*ec2.Options)) (*ec2.DescribeRegionsOutput, error) {
-	m.calledFn["DescribeRegions"] += 1
-	return &ec2.DescribeRegionsOutput{
-		Regions: []ec2types.Region{
-			{
-				RegionName: aws.String("region1"),
-			},
-			{
-				RegionName: aws.String("region2"),
-			},
-		},
-	}, nil
-}
-
 func (m *ec2mock) AuthorizeSecurityGroupIngress(ctx context.Context, input *ec2.AuthorizeSecurityGroupIngressInput, optfns ...func(*ec2.Options)) (*ec2.AuthorizeSecurityGroupIngressOutput, error) {
 	m.calledFn["AuthorizeSecurityGroupIngress"] += 1
 	return &ec2.AuthorizeSecurityGroupIngressOutput{