CORS-4056: migrate AWS SDK to v2 in asset/machines/aws

Part of CORS-3819, this focuses on helper funcs to query instance types
for machines.

The changes also replaced the deprecated use of sets.String with the
generic sets.Set[string] to satisfy golint.

Author: tthvo

pkg/asset/machines/aws/instance_types.go

@@ -2,10 +2,11 @@ package aws
 
 import (
 	"context"
+	"fmt"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"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"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 
@@ -19,12 +20,15 @@ func PreferredInstanceType(ctx context.Context, meta *awsconfig.Metadata, types
 		return "", errors.New("at least one instance type required, empty instance types given")
 	}
 
-	sess, err := meta.Session(ctx)
+	client, err := awsconfig.NewEC2Client(ctx, awsconfig.EndpointOptions{
+		Region:    meta.Region,
+		Endpoints: meta.Services,
+	})
 	if err != nil {
-		return types[0], err
+		return "", fmt.Errorf("failed to create EC2 client: %w", err)
 	}
 
-	found, err := getInstanceTypeZoneInfo(ctx, sess, meta.Region, types, zones)
+	found, err := getInstanceTypeZoneInfo(ctx, client, types, zones)
 	if err != nil {
 		return types[0], err
 	}
@@ -41,49 +45,50 @@ func PreferredInstanceType(ctx context.Context, meta *awsconfig.Metadata, types
 // FilterZonesBasedOnInstanceType return a filtered list of zones where the particular instance type is available. This is mainly necessary for ARM, where the instance type m6g is not
 // available in all availability zones.
 func FilterZonesBasedOnInstanceType(ctx context.Context, meta *awsconfig.Metadata, instanceType string, zones []string) ([]string, error) {
-	sess, err := meta.Session(ctx)
+	client, err := awsconfig.NewEC2Client(ctx, awsconfig.EndpointOptions{
+		Region:    meta.Region,
+		Endpoints: meta.Services,
+	})
 	if err != nil {
-		return zones, err
+		return nil, fmt.Errorf("failed to create EC2 client: %w", err)
 	}
 
 	types := []string{instanceType}
-	found, err := getInstanceTypeZoneInfo(ctx, sess, meta.Region, types, zones)
+	found, err := getInstanceTypeZoneInfo(ctx, client, types, zones)
 	if err != nil {
 		return zones, err
 	}
 
-	return found[instanceType].Intersection(sets.NewString(zones...)).List(), nil
+	return found[instanceType].Intersection(sets.New(zones...)).UnsortedList(), nil
 }
 
-func getInstanceTypeZoneInfo(ctx context.Context, session *session.Session, region string, types []string, zones []string) (map[string]sets.String, error) {
-	found := map[string]sets.String{}
-
-	client := ec2.New(session, aws.NewConfig().WithRegion(region))
-	resp, err := client.DescribeInstanceTypeOfferingsWithContext(ctx, &ec2.DescribeInstanceTypeOfferingsInput{
-		Filters: []*ec2.Filter{
+func getInstanceTypeZoneInfo(ctx context.Context, client *ec2.Client, types []string, zones []string) (map[string]sets.Set[string], error) {
+	found := map[string]sets.Set[string]{}
+	resp, err := client.DescribeInstanceTypeOfferings(ctx, &ec2.DescribeInstanceTypeOfferingsInput{
+		Filters: []ec2types.Filter{
 			{
 				Name:   aws.String("location"),
-				Values: aws.StringSlice(zones),
+				Values: zones,
 			},
 			{
 				Name:   aws.String("instance-type"),
-				Values: aws.StringSlice(types),
+				Values: types,
 			},
 		},
-		LocationType: aws.String("availability-zone"),
+		LocationType: ec2types.LocationTypeAvailabilityZone,
 	})
 	if err != nil {
 		return found, err
 	}
 
 	// iterate through the offerings and create a map of instance type keys to location values
 	for _, offering := range resp.InstanceTypeOfferings {
-		f, ok := found[aws.StringValue(offering.InstanceType)]
+		f, ok := found[string(offering.InstanceType)]
 		if !ok {
-			f = sets.NewString()
-			found[aws.StringValue(offering.InstanceType)] = f
+			f = sets.New[string]()
+			found[string(offering.InstanceType)] = f
 		}
-		f.Insert(aws.StringValue(offering.Location))
+		f.Insert(aws.ToString(offering.Location))
 	}
 	return found, nil
 }