Skip to content

CNTRLPLANE-2219: feat(aws): migrate ec2 to AWS SDK v2 #7871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Mar 17, 2026
Merged

CNTRLPLANE-2219: feat(aws): migrate ec2 to AWS SDK v2 #7871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d66de7
build(deps): remove v1 ec2 vendor package
LiangquanLi930 Mar 6, 2026
4708e22
build(aws): add EC2 SDK v2 interface and regenerate delegating client
LiangquanLi930 Mar 8, 2026
2a7fdb5
feat(aws): migrate EC2 client to AWS SDK v2
LiangquanLi930 Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
215 changes: 108 additions & 107 deletions cmd/bastion/aws/create.go
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 16 additions & 14 deletions cmd/bastion/aws/destroy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/openshift/hypershift/cmd/log"
"github.com/openshift/hypershift/cmd/util"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ec2"

"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -111,9 +111,11 @@ func (o *DestroyBastionOpts) Run(ctx context.Context, logger logr.Logger) error
region = o.Region
}

awsSession := awsutil.NewSession("cli-destroy-bastion", o.AWSCredentialsFile, o.AWSKey, o.AWSSecretKey, region)
awsConfig := awsutil.NewConfig()
ec2Client := ec2.New(awsSession, awsConfig)
awsSession := awsutil.NewSessionV2(ctx, "cli-destroy-bastion", o.AWSCredentialsFile, o.AWSKey, o.AWSSecretKey, region)
awsConfig := awsutil.NewConfigV2()
ec2Client := ec2.NewFromConfig(*awsSession, func(o *ec2.Options) {
o.Retryer = awsConfig()
})

return wait.PollUntilContextCancel(ctx, 5*time.Second, true, func(ctx context.Context) (bool, error) {
err := destroyBastion(ctx, logger, ec2Client, infraID)
Expand All @@ -128,7 +130,7 @@ func (o *DestroyBastionOpts) Run(ctx context.Context, logger logr.Logger) error
})
}

func destroyBastion(ctx context.Context, logger logr.Logger, ec2Client *ec2.EC2, infraID string) error {
func destroyBastion(ctx context.Context, logger logr.Logger, ec2Client *ec2.Client, infraID string) error {
if err := destroyEC2Instance(ctx, logger, ec2Client, infraID); err != nil {
return err
}
Expand All @@ -141,7 +143,7 @@ func destroyBastion(ctx context.Context, logger logr.Logger, ec2Client *ec2.EC2,
return nil
}

func destroyEC2Instance(ctx context.Context, logger logr.Logger, ec2Client *ec2.EC2, infraID string) error {
func destroyEC2Instance(ctx context.Context, logger logr.Logger, ec2Client *ec2.Client, infraID string) error {
instanceID, err := existingInstance(ctx, ec2Client, infraID)
if err != nil {
return err
Expand All @@ -151,8 +153,8 @@ func destroyEC2Instance(ctx context.Context, logger logr.Logger, ec2Client *ec2.
}
terminateCtx, cancel := context.WithTimeout(ctx, 2*time.Minute)
defer cancel()
_, err = ec2Client.TerminateInstancesWithContext(terminateCtx, &ec2.TerminateInstancesInput{
InstanceIds: []*string{aws.String(instanceID)},
_, err = ec2Client.TerminateInstances(terminateCtx, &ec2.TerminateInstancesInput{
InstanceIds: []string{instanceID},
})
if err != nil {
return fmt.Errorf("error deleting instance: %w", err)
Expand All @@ -161,7 +163,7 @@ func destroyEC2Instance(ctx context.Context, logger logr.Logger, ec2Client *ec2.
return nil
}

func destroySecurityGroup(ctx context.Context, logger logr.Logger, ec2Client *ec2.EC2, infraID string) error {
func destroySecurityGroup(ctx context.Context, logger logr.Logger, ec2Client *ec2.Client, infraID string) error {
sg, err := existingSecurityGroup(ctx, ec2Client, infraID)
if err != nil {
return err
Expand All @@ -171,17 +173,17 @@ func destroySecurityGroup(ctx context.Context, logger logr.Logger, ec2Client *ec
}
sgCtx, cancel := context.WithTimeout(ctx, 2*time.Minute)
defer cancel()
_, err = ec2Client.DeleteSecurityGroupWithContext(sgCtx, &ec2.DeleteSecurityGroupInput{
_, err = ec2Client.DeleteSecurityGroup(sgCtx, &ec2.DeleteSecurityGroupInput{
GroupId: sg.GroupId,
})
if err != nil {
return fmt.Errorf("error deleting security group: %w", err)
}
logger.Info("Deleted security group", "id", aws.StringValue(sg.GroupId), "name", securityGroupName(infraID))
logger.Info("Deleted security group", "id", aws.ToString(sg.GroupId), "name", securityGroupName(infraID))
return nil
}

func destroyKeyPair(ctx context.Context, logger logr.Logger, ec2Client *ec2.EC2, infraID string) error {
func destroyKeyPair(ctx context.Context, logger logr.Logger, ec2Client *ec2.Client, infraID string) error {
keyPairID, err := existingKeyPair(ctx, ec2Client, infraID)
if err != nil {
return err
Expand All @@ -191,7 +193,7 @@ func destroyKeyPair(ctx context.Context, logger logr.Logger, ec2Client *ec2.EC2,
}
kpCtx, cancel := context.WithTimeout(ctx, 2*time.Minute)
defer cancel()
_, err = ec2Client.DeleteKeyPairWithContext(kpCtx, &ec2.DeleteKeyPairInput{
_, err = ec2Client.DeleteKeyPair(kpCtx, &ec2.DeleteKeyPairInput{
KeyPairId: aws.String(keyPairID),
})
if err != nil {
Expand Down
40 changes: 22 additions & 18 deletions cmd/consolelogs/aws/getlogs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ import (
awsutil "github.com/openshift/hypershift/cmd/infra/aws/util"
"github.com/openshift/hypershift/cmd/log"
"github.com/openshift/hypershift/cmd/util"
"github.com/openshift/hypershift/support/awsapi"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ec2"
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"

"k8s.io/apimachinery/pkg/types"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
Expand Down Expand Up @@ -80,12 +82,14 @@ func (o *ConsoleLogOpts) Run(ctx context.Context) error {
infraID := hostedCluster.Spec.InfraID
region := hostedCluster.Spec.Platform.AWS.Region

awsSession, err := o.AWSCredentialsOpts.GetSession("cli-console-logs", nil, region)
awsSession, err := o.AWSCredentialsOpts.GetSessionV2(ctx, "cli-console-logs", nil, region)
if err != nil {
return err
}
awsConfig := awsutil.NewConfig()
ec2Client := ec2.New(awsSession, awsConfig)
awsConfig := awsutil.NewConfigV2()
ec2Client := ec2.NewFromConfig(*awsSession, func(o *ec2.Options) {
o.Retryer = awsConfig()
})

// Fetch any instances belonging to the cluster
instances, err := getEC2Instances(ctx, ec2Client, infraID)
Expand All @@ -100,16 +104,16 @@ func (o *ConsoleLogOpts) Run(ctx context.Context) error {
return nil
}

func getEC2Instances(ctx context.Context, ec2Client *ec2.EC2, infraID string) (map[string]string, error) {
func getEC2Instances(ctx context.Context, ec2Client awsapi.EC2API, infraID string) (map[string]string, error) {
ctxWithTimeout, cancel := context.WithTimeout(ctx, 2*time.Minute)
defer cancel()
clusterTagFilter := fmt.Sprintf("tag:kubernetes.io/cluster/%s", infraID)
clusterTagValue := "owned"
output, err := ec2Client.DescribeInstancesWithContext(ctxWithTimeout, &ec2.DescribeInstancesInput{
Filters: []*ec2.Filter{
output, err := ec2Client.DescribeInstances(ctxWithTimeout, &ec2.DescribeInstancesInput{
Filters: []ec2types.Filter{
{
Name: &clusterTagFilter,
Values: []*string{&clusterTagValue},
Values: []string{clusterTagValue},
},
},
})
Expand All @@ -119,36 +123,36 @@ func getEC2Instances(ctx context.Context, ec2Client *ec2.EC2, infraID string) (m
instances := map[string]string{}
for _, r := range output.Reservations {
for _, instance := range r.Instances {
if aws.StringValue(instance.State.Name) == "running" {
nameKey := aws.StringValue(instance.InstanceId)
if instance.State.Name == ec2types.InstanceStateNameRunning {
nameKey := aws.ToString(instance.InstanceId)
for _, tag := range instance.Tags {
if aws.StringValue(tag.Key) == "Name" {
nameKey = aws.StringValue(tag.Value)
if aws.ToString(tag.Key) == "Name" {
nameKey = aws.ToString(tag.Value)
}
}
instances[nameKey] = aws.StringValue(instance.InstanceId)
instances[nameKey] = aws.ToString(instance.InstanceId)
}
}
}
return instances, nil
}

func getInstanceConsoleOutput(ctx context.Context, ec2Client *ec2.EC2, instances map[string]string, outputDir string) error {
func getInstanceConsoleOutput(ctx context.Context, ec2Client awsapi.EC2API, instances map[string]string, outputDir string) error {
if err := os.MkdirAll(outputDir, 0755); err != nil {
return err
}
var errs []error
for name, instanceID := range instances {
ctxWithTimeout, cancel := context.WithTimeout(ctx, 2*time.Minute)
defer cancel()
output, err := ec2Client.GetConsoleOutputWithContext(ctxWithTimeout, &ec2.GetConsoleOutputInput{
output, err := ec2Client.GetConsoleOutput(ctxWithTimeout, &ec2.GetConsoleOutputInput{
InstanceId: aws.String(instanceID),
Comment thread
coderabbitai[bot] marked this conversation as resolved.
})
cancel()
if err != nil {
errs = append(errs, err)
continue
}
logOutput, err := base64.StdEncoding.DecodeString(aws.StringValue(output.Output))
logOutput, err := base64.StdEncoding.DecodeString(aws.ToString(output.Output))
if err != nil {
errs = append(errs, err)
continue
Expand Down
Loading