particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

internal/awscloud: remove S3 manager from AWS struct

Browse source 
This functionality is not needed any more, since it is provided by the
osbuild/images version of AWS.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-08-08 13:48:02 +02:00 • committed by Tomáš Hozza
parent 0b5bfa044f
commit 4f0ae84add
7 changed files with 27 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

43
internal/cloud/awscloud/awscloud.go
View file

@ -12,7 +12,6 @@ import (
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/credentials"
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/autoscaling"
"github.com/aws/aws-sdk-go-v2/service/ec2"
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
@ -25,20 +24,18 @@ type AWS struct {
// related to image upload and sharing.
*images_awscloud.AWS
ec2 EC2
ec2imds EC2Imds
s3 S3
s3uploader S3Manager
asg ASG
ec2 EC2
ec2imds EC2Imds
s3 S3
asg ASG
}
func newForTest(ec2cli EC2, ec2imds EC2Imds, s3cli S3, upldr S3Manager) *AWS {
func newForTest(ec2cli EC2, ec2imds EC2Imds, s3cli S3) *AWS {
return &AWS{
ec2: ec2cli,
ec2imds: ec2imds,
s3: s3cli,
s3uploader: upldr,
asg: nil,
ec2: ec2cli,
ec2imds: ec2imds,
s3: s3cli,
asg: nil,
}
}
@ -47,12 +44,11 @@ func newForTest(ec2cli EC2, ec2imds EC2Imds, s3cli S3, upldr S3Manager) *AWS {
func newAwsFromConfig(cfg aws.Config, imagesAWS *images_awscloud.AWS) *AWS {
s3cli := s3.NewFromConfig(cfg)
return &AWS{
AWS: imagesAWS,
ec2: ec2.NewFromConfig(cfg),
ec2imds: imds.NewFromConfig(cfg),
s3: s3cli,
s3uploader: manager.NewUploader(s3cli),
asg: autoscaling.NewFromConfig(cfg),
AWS: imagesAWS,
ec2: ec2.NewFromConfig(cfg),
ec2imds: imds.NewFromConfig(cfg),
s3: s3cli,
asg: autoscaling.NewFromConfig(cfg),
}
}
@ -177,12 +173,11 @@ func newAwsFromCredsWithEndpoint(creds config.LoadOptionsFunc, region, endpoint,
})
return &AWS{
AWS: imagesAWS,
ec2: ec2.NewFromConfig(cfg),
ec2imds: imds.NewFromConfig(cfg),
s3: s3cli,
s3uploader: manager.NewUploader(s3cli),
asg: autoscaling.NewFromConfig(cfg),
AWS: imagesAWS,
ec2: ec2.NewFromConfig(cfg),
ec2imds: imds.NewFromConfig(cfg),
s3: s3cli,
asg: autoscaling.NewFromConfig(cfg),
}, nil
}

2
internal/cloud/awscloud/awscloud_test.go
View file

@ -10,7 +10,7 @@ import (
func TestEC2CopyImage(t *testing.T) {
m := newEc2Mock(t)
aws := awscloud.NewForTest(m, nil, &s3mock{t, "bucket", "object-key"}, nil)
aws := awscloud.NewForTest(m, nil, &s3mock{t, "bucket", "object-key"})
imageId, err := aws.CopyImage("image-name", "image-id", "region")
require.NoError(t, err)
require.Equal(t, "image-id", imageId)

5
internal/cloud/awscloud/client-interfaces.go
View file

@ -4,7 +4,6 @@ import (
"context"
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/autoscaling"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/s3"
@ -65,7 +64,3 @@ type S3 interface {
DeleteObject(context.Context, *s3.DeleteObjectInput, ...func(*s3.Options)) (*s3.DeleteObjectOutput, error)
PutObjectAcl(context.Context, *s3.PutObjectAclInput, ...func(*s3.Options)) (*s3.PutObjectAclOutput, error)
}
type S3Manager interface {
Upload(context.Context, *s3.PutObjectInput, ...func(*manager.Uploader)) (*manager.UploadOutput, error)
}

2
internal/cloud/awscloud/maintenance_test.go
View file

@ -11,7 +11,7 @@ import (
func TestEC2RemoveSnapshotAndDeregisterImage(t *testing.T) {
m := newEc2Mock(t)
aws := awscloud.NewForTest(m, nil, &s3mock{t, "bucket", "object-key"}, nil)
aws := awscloud.NewForTest(m, nil, &s3mock{t, "bucket", "object-key"})
require.NotNil(t, aws)
err := aws.RemoveSnapshotAndDeregisterImage(&ec2types.Image{

19
internal/cloud/awscloud/mocks_test.go
View file

@ -2,12 +2,10 @@ package awscloud_test
import (
"context"
"io"
"testing"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"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"
@ -35,23 +33,6 @@ func (m *s3mock) PutObjectAcl(ctx context.Context, input *s3.PutObjectAclInput,
return nil, nil
}
type s3upldrmock struct {
t *testing.T
contents string
bucket string
key string
}
func (m *s3upldrmock) Upload(ctx context.Context, input *s3.PutObjectInput, optfns ...func(*manager.Uploader)) (*manager.UploadOutput, error) {
body, err := io.ReadAll(input.Body)
require.NoError(m.t, err)
require.Equal(m.t, m.contents, string(body))
require.Equal(m.t, m.bucket, *input.Bucket)
require.Equal(m.t, m.key, *input.Key)
return nil, nil
}
type ec2imdsmock struct {
t *testing.T

10
internal/cloud/awscloud/secure-instance_test.go
View file

@ -75,7 +75,7 @@ write_files:
func TestSIRunSecureInstance(t *testing.T) {
m := newEc2Mock(t)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil, nil)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil)
require.NotNil(t, aws)
si, err := aws.RunSecureInstance("iam-profile", "key-name", "cw-group", "hostname")
@ -88,7 +88,7 @@ func TestSIRunSecureInstance(t *testing.T) {
func TestSITerminateSecureInstance(t *testing.T) {
m := newEc2Mock(t)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil, nil)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil)
require.NotNil(t, aws)
// Small hack, describeinstances returns terminate/running
@ -110,7 +110,7 @@ func TestSITerminateSecureInstance(t *testing.T) {
func TestSICreateSGFailures(t *testing.T) {
m := newEc2Mock(t)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil, nil)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil)
require.NotNil(t, aws)
m.failFn["CreateSecurityGroup"] = fmt.Errorf("some-error")
@ -126,7 +126,7 @@ func TestSICreateSGFailures(t *testing.T) {
func TestSICreateLTFailures(t *testing.T) {
m := newEc2Mock(t)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil, nil)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil)
require.NotNil(t, aws)
m.failFn["CreateLaunchTemplate"] = fmt.Errorf("some-error")
@ -142,7 +142,7 @@ func TestSICreateLTFailures(t *testing.T) {
func TestSICreateFleetFailures(t *testing.T) {
m := newEc2Mock(t)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil, nil)
aws := awscloud.NewForTest(m, &ec2imdsmock{t, "instance-id", "region1"}, nil)
require.NotNil(t, aws)
// create fleet error should call create fleet thrice