feat: support acct id based endpoints

Author: peterrsongg

sdk/src/Core/Amazon.Runtime/CredentialManagement/AWSCredentialsFactory.cs

@@ -205,12 +205,12 @@ private static AWSCredentials GetAWSCredentialsInternal(
                     case CredentialProfileType.BasicWithServices:
                     case CredentialProfileType.BasicWithGlobalEndpoint:
                     case CredentialProfileType.BasicWithServicesAndGlobalEndpoint:
-                        return new BasicAWSCredentials(options.AccessKey, options.SecretKey);
+                        return string.IsNullOrEmpty(options.AwsAccountId) ? new BasicAWSCredentials(options.AccessKey, options.SecretKey) : new BasicAWSCredentials(options.AccessKey, options.SecretKey, options.AwsAccountId);
                     case CredentialProfileType.Session:
                     case CredentialProfileType.SessionWithServices:
                     case CredentialProfileType.SessionWithGlobalEndpoint:
                     case CredentialProfileType.SessionWithServicesAndGlobalEndpoint:
-                        return new SessionAWSCredentials(options.AccessKey, options.SecretKey, options.Token);
+                        return string.IsNullOrEmpty(options.AwsAccountId) ? new SessionAWSCredentials(options.AccessKey, options.SecretKey, options.Token) : new SessionAWSCredentials(options.AccessKey, options.SecretKey, options.Token, options.AwsAccountId); ; 
                     case CredentialProfileType.AssumeRole:
                     case CredentialProfileType.AssumeRoleWithServices:
                     case CredentialProfileType.AssumeRoleWithGlobalEndpoint:
@@ -353,7 +353,7 @@ private static AWSCredentials GetAWSCredentialsInternal(
                             return ThrowOrReturnNull("Federated credentials are not available on this platform.", null, throwIfInvalid);
                         }
                     case CredentialProfileType.CredentialProcess:
-                        return new ProcessAWSCredentials(options.CredentialProcess);
+                        return new ProcessAWSCredentials(options.CredentialProcess, options.AwsAccountId);
 
                     default:
                         var defaultMessage = profileName == null

sdk/src/Core/Amazon.Runtime/CredentialManagement/CredentialProfile.cs

@@ -161,6 +161,8 @@ internal Dictionary<string, Dictionary<string, string>> NestedProperties
         /// </summary>
         public string ClientAppId { get; set; }
 
+        public string AwsAccountId { get; set; }
+
 
         /// <summary>
         /// Determines the behavior for calculating checksums for request payloads.

sdk/src/Core/Amazon.Runtime/CredentialManagement/CredentialProfileOptions.cs

@@ -139,7 +139,12 @@ public class CredentialProfileOptions
         /// Provided by the SSO service via the web console.
         /// </summary>
         public string SsoStartUrl { get; set; }
-      
+
+        /// <summary>
+        /// The account id to use for account id based endpoint routing
+        /// </summary>
+        public string AwsAccountId { get; set; }
+
         /// <summary>
         /// Return true the properties are all null or empty, false otherwise.
         /// </summary>
@@ -167,7 +172,8 @@ internal bool IsEmpty
                     string.IsNullOrEmpty(SsoRoleName) &&
                     string.IsNullOrEmpty(SsoStartUrl) &&
                     string.IsNullOrEmpty(SsoSession) &&
-                    string.IsNullOrEmpty(WebIdentityTokenFile);
+                    string.IsNullOrEmpty(WebIdentityTokenFile) &&
+                    string.IsNullOrEmpty(AwsAccountId);
             }
         }
         public override string ToString()
@@ -193,6 +199,7 @@ public override string ToString()
                 ", " + "SsoRoleName=" + SsoRoleName +
                 ", " + "SsoStartUrl=" + SsoStartUrl +
                 ", " + "SsoSession=" + SsoSession +
+                ", " + "AwsAccountId=" + AwsAccountId +
                 "]";
         }
 
@@ -206,13 +213,13 @@ public override bool Equals(object obj)
                 return false;
 
             return AWSSDKUtils.AreEqual(
-                new object[] { AccessKey, EndpointName, ExternalID, MfaSerial, RoleArn, RoleSessionName, SecretKey, SourceProfile, Token, UserIdentity, CredentialProcess, WebIdentityTokenFile, SsoAccountId, SsoRegion, SsoRegistrationScopes, SsoRoleName, SsoStartUrl, SsoSession, Services, EndpointUrl },
-                new object[] { po.AccessKey, po.EndpointName, po.ExternalID, po.MfaSerial, po.RoleArn, po.RoleSessionName, po.SecretKey, po.SourceProfile, po.Token, po.UserIdentity, po.CredentialProcess, po.WebIdentityTokenFile, po.SsoAccountId, po.SsoRegion, po.SsoRegistrationScopes, po.SsoRoleName, po.SsoStartUrl, po.SsoSession, po.Services, po.EndpointUrl });
+                new object[] { AccessKey, EndpointName, ExternalID, MfaSerial, RoleArn, RoleSessionName, SecretKey, SourceProfile, Token, UserIdentity, CredentialProcess, WebIdentityTokenFile, SsoAccountId, SsoRegion, SsoRegistrationScopes, SsoRoleName, SsoStartUrl, SsoSession, Services, EndpointUrl, AwsAccountId },
+                new object[] { po.AccessKey, po.EndpointName, po.ExternalID, po.MfaSerial, po.RoleArn, po.RoleSessionName, po.SecretKey, po.SourceProfile, po.Token, po.UserIdentity, po.CredentialProcess, po.WebIdentityTokenFile, po.SsoAccountId, po.SsoRegion, po.SsoRegistrationScopes, po.SsoRoleName, po.SsoStartUrl, po.SsoSession, po.Services, po.EndpointUrl, po.AwsAccountId });
         }
 
         public override int GetHashCode()
         {
-            return Hashing.Hash(AccessKey, EndpointName, ExternalID, MfaSerial, RoleArn, RoleSessionName, SecretKey, SourceProfile, Token, UserIdentity, CredentialProcess, WebIdentityTokenFile, SsoAccountId, SsoRegion, SsoRegistrationScopes, SsoRoleName, SsoStartUrl, SsoSession, Services, EndpointUrl);
+            return Hashing.Hash(AccessKey, EndpointName, ExternalID, MfaSerial, RoleArn, RoleSessionName, SecretKey, SourceProfile, Token, UserIdentity, CredentialProcess, WebIdentityTokenFile, SsoAccountId, SsoRegion, SsoRegistrationScopes, SsoRoleName, SsoStartUrl, SsoSession, Services, EndpointUrl, AwsAccountId);
         }
     }
 }