From a73820b4a8a545a4dc454408d8d932219947d07f 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.MarkS3ObjectAsPublic() 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      | 18 ------------------
 internal/cloud/awscloud/awscloud_test.go |  6 ------
 2 files changed, 24 deletions(-)

diff --git a/internal/cloud/awscloud/awscloud.go b/internal/cloud/awscloud/awscloud.go
index d80acc20f..fcbd63414 100644
--- a/internal/cloud/awscloud/awscloud.go
+++ b/internal/cloud/awscloud/awscloud.go
@@ -17,7 +17,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
-	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	images_awscloud "github.com/osbuild/images/pkg/cloud/awscloud"
 	"github.com/sirupsen/logrus"
 )
@@ -559,23 +558,6 @@ func (a *AWS) S3ObjectPresignedURL(bucket, objectKey string) (string, error) {
 	return req.URL, nil
 }
 
-func (a *AWS) MarkS3ObjectAsPublic(bucket, objectKey string) error {
-	logrus.Infof("[AWS] 👐 Making S3 object public %s/%s", bucket, objectKey)
-	_, err := a.s3.PutObjectAcl(
-		context.Background(),
-		&s3.PutObjectAclInput{
-			Bucket: aws.String(bucket),
-			Key:    aws.String(objectKey),
-			ACL:    s3types.ObjectCannedACL(s3types.ObjectCannedACLPublicRead),
-		},
-	)
-	if err != nil {
-		return err
-	}
-	logrus.Info("[AWS] ✔️ Making S3 object public successful")
-	return nil
-}
-
 func (a *AWS) Regions() ([]string, error) {
 	out, err := a.ec2.DescribeRegions(context.Background(), &ec2.DescribeRegionsInput{})
 	if err != nil {
diff --git a/internal/cloud/awscloud/awscloud_test.go b/internal/cloud/awscloud/awscloud_test.go
index 7d8bbce7d..8e4b35e85 100644
--- a/internal/cloud/awscloud/awscloud_test.go
+++ b/internal/cloud/awscloud/awscloud_test.go
@@ -9,12 +9,6 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/common"
 )
 
-func TestS3MarkObjectAsPublic(t *testing.T) {
-	aws := awscloud.NewForTest(nil, nil, &s3mock{t, "bucket", "object-key"}, nil, nil)
-	require.NotNil(t, aws)
-	require.NoError(t, aws.MarkS3ObjectAsPublic("bucket", "object-key"))
-}
-
 func TestS3ObjectPresignedURL(t *testing.T) {
 	aws := awscloud.NewForTest(nil, nil, nil, nil, &s3signmock{t, "bucket", "object-key"})
 	require.NotNil(t, aws)