allow user to provide a region. Check profile region first, then provided region, then default to us-east-1

Author: sebsto

Sources/SotoCore/Credential/Login/LoginCredentialProvider.swift

@@ -29,6 +29,7 @@ public struct LoginCredentialProvider: CredentialProvider {
     private let configuration: LoginConfiguration?
     private let profileName: String?
     private let cacheDirectoryOverride: String?
+    private let region: Region?
     private let dpopGenerator = DPoPTokenGenerator()
     private let httpClient: AWSHTTPClient
     private let threadPool: NIOThreadPool
@@ -39,6 +40,7 @@ public struct LoginCredentialProvider: CredentialProvider {
         self.configuration = configuration
         self.profileName = nil
         self.cacheDirectoryOverride = nil
+        self.region = nil
         self.httpClient = httpClient
         self.threadPool = threadPool
     }
@@ -47,15 +49,18 @@ public struct LoginCredentialProvider: CredentialProvider {
     /// - Parameters:
     ///   - profileName: Name of the profile in ~/.aws/config (defaults to "default")
     ///   - cacheDirectoryOverride: Optional override for token cache directory
+    ///   - region: Region to use if not specified in profile (defaults to us-east-1)
     ///   - httpClient: HTTP client for making requests
     public init(
         profileName: String? = nil,
         cacheDirectoryOverride: String? = nil,
+        region: Region? = nil,
         httpClient: AWSHTTPClient
     ) {
         self.configuration = nil
         self.profileName = profileName
         self.cacheDirectoryOverride = cacheDirectoryOverride
+        self.region = region
         self.httpClient = httpClient
         self.threadPool = .singleton
     }
@@ -221,19 +226,22 @@ public struct LoginCredentialProvider: CredentialProvider {
         }
         return try await self.loadConfiguration(
             profileName: profileName,
-            cacheDirectoryOverride: cacheDirectoryOverride
+            cacheDirectoryOverride: cacheDirectoryOverride,
+            region: region
         )
     }
 
     /// Load configuration from profile
     /// - Parameters:
     ///   - profileName: Name of the profile (defaults to "default")
     ///   - cacheDirectoryOverride: Optional override for cache directory
+    ///   - region: Region to use if not specified in profile (defaults to us-east-1)
     ///   - configPath: Optional path to config file (defaults to ~/.aws/config)
     /// - Returns: LoginConfiguration
     private func loadConfiguration(
         profileName: String? = nil,
         cacheDirectoryOverride: String? = nil,
+        region: Region? = nil,
         configPath: String? = nil
     ) async throws -> LoginConfiguration {
         let profile = profileName ?? "default"
@@ -261,25 +269,23 @@ public struct LoginCredentialProvider: CredentialProvider {
             throw AWSLoginCredentialError.loginSessionMissing
         }
 
-        // region is optional - check profile, then AWS_REGION env var, then default to us-east-1
-        let region: Region
+        // region is optional - check profile, then use provided region, then default to us-east-1
+        let resolvedRegion: Region
         if let regionString = profileSection["region"] {
-            region = Region(rawValue: regionString)
-        } else if let envRegion = ProcessInfo.processInfo.environment["AWS_REGION"] {
-            region = Region(rawValue: envRegion)
+            resolvedRegion = Region(rawValue: regionString)
         } else {
-            region = .useast1
+            resolvedRegion = region ?? .useast1
         }
 
         // Check environment for cache directory override
         let cacheDir = cacheDirectoryOverride ?? ProcessInfo.processInfo.environment[LoginConfiguration.cacheEnvVar]
 
-        let endpoint = "\(region.rawValue).\(LoginConfiguration.loginServiceHostPrefix).aws.amazon.com"
+        let endpoint = "\(resolvedRegion.rawValue).\(LoginConfiguration.loginServiceHostPrefix).aws.amazon.com"
 
         return LoginConfiguration(
             endpoint: endpoint,
             loginSession: loginSession,
-            region: region,
+            region: resolvedRegion,
             cacheDirectory: cacheDir
         )
     }
@@ -296,16 +302,19 @@ extension CredentialProviderFactory {
     /// - Parameters:
     ///   - profileName: Name of the profile in ~/.aws/config (defaults to "default")
     ///   - cacheDirectoryOverride: Optional override for token cache directory
+    ///   - region: Region to use if not specified in profile (defaults to us-east-1)
     /// - Returns: A credential provider factory
     @available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
     public static func login(
         profileName: String? = nil,
-        cacheDirectoryOverride: String? = nil
+        cacheDirectoryOverride: String? = nil,
+        region: Region? = nil
     ) -> CredentialProviderFactory {
         .custom { context in
             let provider = LoginCredentialProvider(
                 profileName: profileName,
                 cacheDirectoryOverride: cacheDirectoryOverride,
+                region: region,
                 httpClient: context.httpClient
             )
             // Wrap in RotatingCredentialProvider for automatic credential rotation