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

internal/awscloud: remove S3 client 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 4f0ae84add
commit caa7816121
7 changed files with 9 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import (
"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"
"github.com/aws/aws-sdk-go-v2/service/s3"
images_awscloud "github.com/osbuild/images/pkg/cloud/awscloud"
)
@ -26,15 +25,13 @@ type AWS struct {
ec2 EC2
ec2imds EC2Imds
s3 S3
asg ASG
}
func newForTest(ec2cli EC2, ec2imds EC2Imds, s3cli S3) *AWS {
func newForTest(ec2cli EC2, ec2imds EC2Imds) *AWS {
return &AWS{
ec2: ec2cli,
ec2imds: ec2imds,
s3: s3cli,
asg: nil,
}
}
@ -42,12 +39,10 @@ func newForTest(ec2cli EC2, ec2imds EC2Imds, s3cli S3) *AWS {
// Create a new session from the credentials and the region and returns an *AWS object initialized with it.
// /creds credentials.StaticCredentialsProvider, region string
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,
asg: autoscaling.NewFromConfig(cfg),
}
}
@ -167,16 +162,10 @@ func newAwsFromCredsWithEndpoint(creds config.LoadOptionsFunc, region, endpoint,
return nil, err
}
s3cli := s3.NewFromConfig(cfg, func(options *s3.Options) {
options.BaseEndpoint = aws.String(endpoint)
options.UsePathStyle = true
})
return &AWS{
AWS: imagesAWS,
ec2: ec2.NewFromConfig(cfg),
ec2imds: imds.NewFromConfig(cfg),
s3: s3cli,
asg: autoscaling.NewFromConfig(cfg),
}, nil
}