fix tests

Author: castlemilk

pkg/cloudprovider/aws/builder.go

@@ -2,6 +2,7 @@ package aws
 
 import (
 	"fmt"
+	"net/http"
 	"time"
 
 	"github.com/atlassian-labs/cyclops/pkg/cloudprovider"
@@ -59,6 +60,10 @@ func NewCloudProviderWithRetryConfig(logger logr.Logger, retryConfig RetryConfig
 	var creds *credentials.Credentials
 
 	// Configure AWS SDK with retry logic and timeouts
+	httpClient := &http.Client{
+		Timeout: 30 * time.Second,
+	}
+
 	config := &aws.Config{
 		Credentials: creds,
 		// Maximum number of retries for API calls
@@ -73,9 +78,7 @@ func NewCloudProviderWithRetryConfig(logger logr.Logger, retryConfig RetryConfig
 			},
 		},
 		// HTTP client timeout (increased from default to handle slow networks)
-		HTTPClient: &aws.HTTPClient{
-			Timeout: 30 * time.Second,
-		},
+		HTTPClient: httpClient,
 	}
 
 	ec2Service := ec2.New(sess, config)

pkg/cloudprovider/aws/errors.go

@@ -160,14 +160,12 @@ func retryOnTransientErrorWithConfig(fn func() error, logger logr.Logger, config
 		lastErr = err
 
 		// Log the transient error and retry attempt
-		if logger != nil {
-			logger.Info("Transient AWS error, retrying",
-				"attempt", attempt+1,
-				"maxRetries", config.MaxRetries,
-				"delayMs", delayMs,
-				"retryEnabled", config.Enabled,
-				"error", err.Error())
-		}
+		logger.Info("Transient AWS error, retrying",
+			"attempt", attempt+1,
+			"maxRetries", config.MaxRetries,
+			"delayMs", delayMs,
+			"retryEnabled", config.Enabled,
+			"error", err.Error())
 
 		// Don't sleep on the last attempt
 		if attempt < config.MaxRetries-1 {