Add AttachNetworkInterfaceWithQueues to EC2API interface

Author: EricMountain

pkg/aws/ec2/mock/mock.go

@@ -369,6 +369,10 @@ func (e *API) DeleteNetworkInterface(ctx context.Context, eniID string) error {
 }
 
 func (e *API) AttachNetworkInterface(ctx context.Context, index int32, instanceID, eniID string) (string, error) {
+	return e.AttachNetworkInterfaceWithQueues(ctx, index, instanceID, eniID, nil)
+}
+
+func (e *API) AttachNetworkInterfaceWithQueues(ctx context.Context, index int32, instanceID, eniID string, enaQueueCount *int32) (string, error) {
 	e.rateLimit()
 	e.delaySim.Delay(AttachNetworkInterface)
 

pkg/aws/eni/instances.go

@@ -35,6 +35,7 @@ type EC2API interface {
 	GetDetachedNetworkInterfaces(ctx context.Context, tags ipamTypes.Tags, maxResults int32) ([]string, error)
 	CreateNetworkInterface(ctx context.Context, toAllocate int32, subnetID, desc string, groups []string, allocatePrefixes bool) (string, *eniTypes.ENI, error)
 	AttachNetworkInterface(ctx context.Context, index int32, instanceID, eniID string) (string, error)
+	AttachNetworkInterfaceWithQueues(ctx context.Context, index int32, instanceID, eniID string, enaQueueCount *int32) (string, error)
 	DeleteNetworkInterface(ctx context.Context, eniID string) error
 	ModifyNetworkInterface(ctx context.Context, eniID, attachmentID string, deleteOnTermination bool) error
 	AssignPrivateIpAddresses(ctx context.Context, eniID string, addresses int32) ([]string, error)

pkg/aws/eni/node.go

@@ -536,9 +536,9 @@ func (n *Node) CreateInterface(ctx context.Context, allocation *ipam.AllocationA
 
 	var attachmentID string
 	for range maxAttachRetries {
-		// Check if the EC2 API client supports ENA queue configuration
-		if ec2APIWithQueues, ok := n.manager.api.(*ec2.Client); ok && enaQueueCount != nil {
-			attachmentID, err = ec2APIWithQueues.AttachNetworkInterfaceWithQueues(ctx, index, n.node.InstanceID(), eniID, enaQueueCount)
+		// TODO fold this into a single interface method
+		if enaQueueCount != nil {
+			attachmentID, err = n.manager.api.AttachNetworkInterfaceWithQueues(ctx, index, n.node.InstanceID(), eniID, enaQueueCount)
 		} else {
 			attachmentID, err = n.manager.api.AttachNetworkInterface(ctx, index, n.node.InstanceID(), eniID)
 		}