Add aws sdk http timeout

pkg/awsutils/awssession/session.go

@@ -16,6 +16,7 @@ package awssession
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"os"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -35,12 +36,20 @@ import (
 const (
 	httpTimeoutEnv = "HTTP_TIMEOUT"
 	maxRetries     = 10
+
+	// DefaultAWSSDKClientTimeout is the default timeout for individual HTTP requests made by AWS SDK clients.
+	DefaultAWSSDKClientTimeout = 10 * time.Second
 )
 
+// NewAWSSDKHTTPClient returns a new HTTP client with the default AWS SDK timeout.
+func NewAWSSDKHTTPClient() *http.Client {
+	return &http.Client{Timeout: DefaultAWSSDKClientTimeout}
+}
+
 var (
 	log = logger.Get()
 	// HTTP timeout default value in seconds (10 seconds)
-	httpTimeoutValue = 10 * time.Second
+	httpTimeoutValue = DefaultAWSSDKClientTimeout
 )
 
 func getHTTPTimeout() time.Duration {

pkg/awsutils/awssession/session_test.go

@@ -38,3 +38,16 @@ func TestAwsEc2EndpointResolver(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, customEndpoint, resolvedEndpoint.URL)
 }
+
+func TestNew_SetsHTTPClientTimeout(t *testing.T) {
+	t.Setenv("AWS_REGION", "us-west-2")
+	cfg, err := New(context.Background())
+	assert.NoError(t, err)
+	assert.NotNil(t, cfg.HTTPClient)
+}
+
+func TestNewAWSSDKHTTPClient_SetsTimeout(t *testing.T) {
+	client := NewAWSSDKHTTPClient()
+	assert.NotNil(t, client)
+	assert.Equal(t, DefaultAWSSDKClientTimeout, client.Timeout)
+}

pkg/awsutils/awsutils.go

@@ -443,6 +443,7 @@ func New(ctx context.Context, useSubnetDiscovery, useCustomNetworking, disableLe
 	version := utils.GetEnv(envVpcCniVersion, "")
 	awsCfg, err := config.LoadDefaultConfig(context.TODO(),
 		config.WithRegion(region.Region),
+		config.WithHTTPClient(awssession.NewAWSSDKHTTPClient()),
 		config.WithAPIOptions([]func(*smithymiddleware.Stack) error{
 			middleware.AddUserAgentKeyValue("amazon-vpc-cni-k8s", version),
 		}),

pkg/ec2metadatawrapper/ec2metadatawrapper.go

@@ -4,6 +4,7 @@ package ec2metadatawrapper
 import (
 	"context"
 
+	"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils/awssession"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 )
@@ -26,7 +27,9 @@ type ec2MetadataClientImpl struct {
 
 // New creates an ec2metadata client to retrieve metadata
 func New(ctx context.Context) (EC2MetadataClient, error) {
-	cfg, err := config.LoadDefaultConfig(ctx)
+	cfg, err := config.LoadDefaultConfig(ctx,
+		config.WithHTTPClient(awssession.NewAWSSDKHTTPClient()),
+	)
 	if err != nil {
 		return nil, err
 	}

pkg/ec2metadatawrapper/ec2metadatawrapper_test.go

@@ -6,6 +6,7 @@ import (
 
 	mockec2metadatawrapper "github.com/aws/amazon-vpc-cni-k8s/pkg/ec2metadatawrapper/mocks"
 
+	"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils/awssession"
 	ec2metadata "github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 	"github.com/golang/mock/gomock"
 	"github.com/pkg/errors"
@@ -84,3 +85,10 @@ func TestGetRegionErr(t *testing.T) {
 	assert.Error(t, err)
 	assert.Empty(t, region)
 }
+
+func TestNew_SetsHTTPClientTimeout(t *testing.T) {
+	t.Setenv("AWS_REGION", "us-west-2")
+	client := awssession.NewAWSSDKHTTPClient()
+	assert.NotNil(t, client)
+	assert.Equal(t, awssession.DefaultAWSSDKClientTimeout, client.Timeout)
+}

pkg/ec2wrapper/ec2wrapper.go

@@ -4,6 +4,7 @@ package ec2wrapper
 import (
 	"context"
 
+	"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils/awssession"
 	"github.com/aws/amazon-vpc-cni-k8s/pkg/ec2metadatawrapper"
 	"github.com/aws/amazon-vpc-cni-k8s/pkg/utils/logger"
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -42,7 +43,10 @@ func NewMetricsClient() (*EC2Wrapper, error) {
 		return &EC2Wrapper{}, err
 	}
 
-	awsCfg, err := config.LoadDefaultConfig(ctx, config.WithRegion(instanceIdentityDocumentOutput.Region))
+	awsCfg, err := config.LoadDefaultConfig(ctx,
+		config.WithRegion(instanceIdentityDocumentOutput.Region),
+		config.WithHTTPClient(awssession.NewAWSSDKHTTPClient()),
+	)
 	if err != nil {
 		return &EC2Wrapper{}, err
 	}

utils/imds/imds.go

@@ -5,12 +5,16 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils/awssession"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 )
 
 func GetMetaData(key string) (string, error) {
-	cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRetryMaxAttempts(10))
+	cfg, err := config.LoadDefaultConfig(context.TODO(),
+		config.WithHTTPClient(awssession.NewAWSSDKHTTPClient()),
+		config.WithRetryMaxAttempts(10),
+	)
 	if err != nil {
 		return "", fmt.Errorf("unable to load SDK config, %v", err)
 	}

utils/imds/imds_test.go

@@ -0,0 +1,17 @@
+package imds
+
+import (
+	"testing"
+
+	"github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils/awssession"
+)
+
+func TestGetMetaData_ConfigSetsHTTPClientTimeout(t *testing.T) {
+	client := awssession.NewAWSSDKHTTPClient()
+	if client == nil {
+		t.Fatal("NewAWSSDKHTTPClient should not return nil")
+	}
+	if client.Timeout != awssession.DefaultAWSSDKClientTimeout {
+		t.Fatalf("expected timeout %v, got %v", awssession.DefaultAWSSDKClientTimeout, client.Timeout)
+	}
+}