clean up

peterrsongg · peterrsongg · commit c8be7ef46bfc · 2025-03-20T22:41:52.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,6 @@
 **/Temp/
 **/buildlogs/
 **/.vs/
-sdk/test/UnitTests/Custom/Util/get_credentials.bat
 
 **/*project.lock.json
 **/project.lock.json
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/ProcessAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/ProcessAWSCredentials.cs
@@ -54,7 +54,13 @@ public class ProcessAWSCredentials : RefreshingAWSCredentials
 
         #region Public constructors
         [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public ProcessAWSCredentials(string processCredentialInfo, string accountId)
+        public ProcessAWSCredentials(string processCredentialInfo)
+        {
+
+        }
+
+
+        public ProcessAWSCredentials(string processCredentialInfo, string accountId) : this(processCredentialInfo, null)
         {
             processCredentialInfo = processCredentialInfo.Trim();
 
@@ -80,18 +86,12 @@ public ProcessAWSCredentials(string processCredentialInfo, string accountId)
                 RedirectStandardOutput = true,
                 CreateNoWindow = true
             };
-            
+
             // Make sure to fetch new credentials well before the current credentials expire to avoid
             // any request being made with expired credentials.
             PreemptExpiryTime = TimeSpan.FromMinutes(15);
         }
 
-
-        public ProcessAWSCredentials(string processCredentialInfo) : this(processCredentialInfo, null)
-        {
-
-        }
-
         #endregion
 
         #region Protected overridden methods
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/ProcessCredentialVersion1.cs b/sdk/src/Core/Amazon.Runtime/Credentials/ProcessCredentialVersion1.cs
@@ -57,7 +57,7 @@ public class ProcessCredentialVersion1
         public DateTime Expiration { get; set; } = DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);
 
         /// <summary>
-        /// The AccountId used for accountId based endpoints
+        /// The AccountId used for AccountId based endpoints.
         /// </summary>
         public string AccountId { get; set; }
     }
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs
@@ -20,7 +20,6 @@
 using System.Globalization;
 using System.Text.Json;
 
-//Add constructor for account id here?
 namespace Amazon.Runtime
 {
     /// <summary>
@@ -64,7 +63,7 @@ public SAMLImmutableCredentials(string awsAccessKeyId,
         }
 
         /// <summary>
-        /// Constructs an instance with supplied keys and SAML assertion data.
+        /// Constructs an instance with supplied keys SAML assertion data, and an account id
         /// </summary>
         /// <param name="awsAccessKeyId"></param>
         /// <param name="awsSecretAccessKey"></param>
@@ -84,7 +83,7 @@ public SAMLImmutableCredentials(string awsAccessKeyId,
             Subject = subject;
         }
         /// <summary>
-        /// Constructs an instance with supplied keys and SAML assertion data and an accountId.
+        /// Constructs an instance with supplied keys and SAML assertion data and an account id.
         /// </summary>
         /// <param name="credentials"></param>
         /// <param name="expires"></param>
@@ -112,7 +111,6 @@ public SAMLImmutableCredentials(ImmutableCredentials credentials,
         {
         }
 
-
         #endregion
 
         #region Overrides
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/_bcl+netstandard/SSOImmutableCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/_bcl+netstandard/SSOImmutableCredentials.cs
@@ -39,15 +39,22 @@ public class SSOImmutableCredentials : ImmutableCredentials
         /// <param name="expiration">The expiration time for the credentials.</param>
         public SSOImmutableCredentials(
             string awsAccessKeyId, string awsSecretAccessKey,
-            string token, DateTime expiration)
-            : base(awsAccessKeyId, awsSecretAccessKey, token)
+            string token, DateTime expiration) : this(awsAccessKeyId, awsSecretAccessKey, token, expiration, null)
         {
-            if (string.IsNullOrEmpty(token)) throw new ArgumentNullException(nameof(token));
-            Expiration = expiration;
         }
 
-        public SSOImmutableCredentials(string awsAccessKeyId, string awsSecretAccessKey, string token, DateTime expiration, string accountId) : this(awsAccessKeyId, awsSecretAccessKey, token, expiration)
+        /// <summary>
+        /// Constructs an instance with supplied keys, token, expiration, and account id
+        /// </summary>
+        /// <param name="awsAccessKeyId"></param>
+        /// <param name="awsSecretAccessKey"></param>
+        /// <param name="token"></param>
+        /// <param name="expiration"></param>
+        /// <param name="accountId"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public SSOImmutableCredentials(string awsAccessKeyId, string awsSecretAccessKey, string token, DateTime expiration, string accountId) : base(awsAccessKeyId, awsSecretAccessKey, token)
         {
+            if (string.IsNullOrEmpty(token)) throw new ArgumentNullException(nameof(token));
             AccountId = accountId;
         }
 
@@ -57,12 +64,12 @@ public SSOImmutableCredentials(string awsAccessKeyId, string awsSecretAccessKey,
         /// <returns>A copy of this object.</returns>
         public new SSOImmutableCredentials Copy()
         {
-            return new SSOImmutableCredentials(AccessKey, SecretKey, Token, Expiration);
+            return new SSOImmutableCredentials(AccessKey, SecretKey, Token, Expiration, AccountId);
         }
 
         public override int GetHashCode()
         {
-            return Hashing.Hash(AccessKey, SecretKey, Token, Expiration);
+            return Hashing.Hash(AccessKey, SecretKey, Token, Expiration, AccountId);
         }
 
         public override bool Equals(object obj)
diff --git a/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs b/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs
@@ -37,8 +37,6 @@
 using System.Threading;
 using Amazon.Runtime.Endpoints;
 using ThirdParty.RuntimeBackports;
-using System.CodeDom;
-
 
 #if AWS_ASYNC_API
 using System.Threading.Tasks;
@@ -829,30 +827,6 @@ public static void CopyStream(Stream source, Stream destination, int bufferSize)
         {
             source.CopyTo(destination, bufferSize);
         }
-
-        /// <summary>
-        /// Utility method to get an account id from an assume role arn. For example
-        /// arn:aws:sts::account_id:assumed-role/assume-role-integration-test-role
-        /// </summary>
-        /// <param name="assumeRoleArn"></param>
-        /// <returns></returns>
-        public static string GetAccountIdFromAssumeRoleArn(string assumeRoleArn)
-        {
-            if (string.IsNullOrEmpty(assumeRoleArn))
-                throw new ArgumentNullException("assumeRoleArn");
-            
-            // everything between the first :: and the next :
-            int start = assumeRoleArn.IndexOf("::");
-            if (start == 0)
-                throw new InvalidDataException("Arn not in expected format. please pass in a properly formatted arn");
-                
-            //all aws account id's are 12 digits
-            string accountId = assumeRoleArn.Substring(start + 2, 12);
-            //validate
-            if (accountId.Any(x => (int)x < 48 || (int)x > 57 ))
-                throw new InvalidDataException("account id's must only contain integers");
-            return accountId;
-        }
 #endregion
 
 #region Public Methods and Properties
diff --git a/sdk/test/Services/SecurityToken/UnitTests/Custom/StaticCheckTests.cs b/sdk/test/Services/SecurityToken/UnitTests/Custom/StaticCheckTests.cs
@@ -43,7 +43,6 @@ public void LookForAssumeRoleRequestChanges()
         [TestCategory("SecurityToken")]
         public void LookForProfileTypeChanges()
         {
-            //1C76F6CC5D3B18FD76D4A811E5EB2FD96E97F4D4F202F38B5FBE5FAC56BE09FB
             var expectedHash = "1C76F6CC5D3B18FD76D4A811E5EB2FD96E97F4D4F202F38B5FBE5FAC56BE09FB";
             AssertExtensions.AssertEnumUnchanged(
                 typeof(CredentialProfileType),
diff --git a/sdk/test/UnitTests/Custom/Util/AWSSDKUtilsTests.cs b/sdk/test/UnitTests/Custom/Util/AWSSDKUtilsTests.cs
@@ -12,11 +12,9 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-using Amazon.CloudFront.Model;
 using Amazon.Util;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
-using System.CodeDom;
 using System.IO;
 using System.Reflection;
 using System.Text;

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class ProcessCredentialVersion1`
`57`	`57`	`public DateTime Expiration { get; set; } = DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);`
`58`	`58`
`59`	`59`	`/// <summary>`
`60`		`- /// The AccountId used for accountId based endpoints`
	`60`	`+ /// The AccountId used for AccountId based endpoints.`
`61`	`61`	`/// </summary>`
`62`	`62`	`public string AccountId { get; set; }`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`using System.Globalization;`
`21`	`21`	`using System.Text.Json;`
`22`	`22`
`23`		`-//Add constructor for account id here?`
`24`	`23`	`namespace Amazon.Runtime`
`25`	`24`	`{`
`26`	`25`	`/// <summary>`
`@@ -64,7 +63,7 @@ public SAMLImmutableCredentials(string awsAccessKeyId,`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`/// <summary>`
`67`		`- /// Constructs an instance with supplied keys and SAML assertion data.`
	`66`	`+ /// Constructs an instance with supplied keys SAML assertion data, and an account id`
`68`	`67`	`/// </summary>`
`69`	`68`	`/// <param name="awsAccessKeyId"></param>`
`70`	`69`	`/// <param name="awsSecretAccessKey"></param>`
`@@ -84,7 +83,7 @@ public SAMLImmutableCredentials(string awsAccessKeyId,`
`84`	`83`	`Subject = subject;`
`85`	`84`	`}`
`86`	`85`	`/// <summary>`
`87`		`- /// Constructs an instance with supplied keys and SAML assertion data and an accountId.`
	`86`	`+ /// Constructs an instance with supplied keys and SAML assertion data and an account id.`
`88`	`87`	`/// </summary>`
`89`	`88`	`/// <param name="credentials"></param>`
`90`	`89`	`/// <param name="expires"></param>`
`@@ -112,7 +111,6 @@ public SAMLImmutableCredentials(ImmutableCredentials credentials,`
`112`	`111`	`{`
`113`	`112`	`}`
`114`	`113`
`115`		`-`
`116`	`114`	`#endregion`
`117`	`115`
`118`	`116`	`#region Overrides`
Original file line number	Diff line number	Diff line change
`@@ -39,15 +39,22 @@ public class SSOImmutableCredentials : ImmutableCredentials`
`39`	`39`	`/// <param name="expiration">The expiration time for the credentials.</param>`
`40`	`40`	`public SSOImmutableCredentials(`
`41`	`41`	`string awsAccessKeyId, string awsSecretAccessKey,`
`42`		`- string token, DateTime expiration)`
`43`		`- : base(awsAccessKeyId, awsSecretAccessKey, token)`
	`42`	`+ string token, DateTime expiration) : this(awsAccessKeyId, awsSecretAccessKey, token, expiration, null)`
`44`	`43`	`{`
`45`		`- if (string.IsNullOrEmpty(token)) throw new ArgumentNullException(nameof(token));`
`46`		`- Expiration = expiration;`
`47`	`44`	`}`
`48`	`45`
`49`		`- public SSOImmutableCredentials(string awsAccessKeyId, string awsSecretAccessKey, string token, DateTime expiration, string accountId) : this(awsAccessKeyId, awsSecretAccessKey, token, expiration)`
	`46`	`+ /// <summary>`
	`47`	`+ /// Constructs an instance with supplied keys, token, expiration, and account id`
	`48`	`+ /// </summary>`
	`49`	`+ /// <param name="awsAccessKeyId"></param>`
	`50`	`+ /// <param name="awsSecretAccessKey"></param>`
	`51`	`+ /// <param name="token"></param>`
	`52`	`+ /// <param name="expiration"></param>`
	`53`	`+ /// <param name="accountId"></param>`
	`54`	`+ /// <exception cref="ArgumentNullException"></exception>`
	`55`	`+ public SSOImmutableCredentials(string awsAccessKeyId, string awsSecretAccessKey, string token, DateTime expiration, string accountId) : base(awsAccessKeyId, awsSecretAccessKey, token)`
`50`	`56`	`{`
	`57`	`+ if (string.IsNullOrEmpty(token)) throw new ArgumentNullException(nameof(token));`
`51`	`58`	`AccountId = accountId;`
`52`	`59`	`}`
`53`	`60`
`@@ -57,12 +64,12 @@ public SSOImmutableCredentials(string awsAccessKeyId, string awsSecretAccessKey,`
`57`	`64`	`/// <returns>A copy of this object.</returns>`
`58`	`65`	`public new SSOImmutableCredentials Copy()`
`59`	`66`	`{`
`60`		`- return new SSOImmutableCredentials(AccessKey, SecretKey, Token, Expiration);`
	`67`	`+ return new SSOImmutableCredentials(AccessKey, SecretKey, Token, Expiration, AccountId);`
`61`	`68`	`}`
`62`	`69`
`63`	`70`	`public override int GetHashCode()`
`64`	`71`	`{`
`65`		`- return Hashing.Hash(AccessKey, SecretKey, Token, Expiration);`
	`72`	`+ return Hashing.Hash(AccessKey, SecretKey, Token, Expiration, AccountId);`
`66`	`73`	`}`
`67`	`74`
`68`	`75`	`public override bool Equals(object obj)`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ public void LookForAssumeRoleRequestChanges()`
`43`	`43`	`[TestCategory("SecurityToken")]`
`44`	`44`	`public void LookForProfileTypeChanges()`
`45`	`45`	`{`
`46`		`- //1C76F6CC5D3B18FD76D4A811E5EB2FD96E97F4D4F202F38B5FBE5FAC56BE09FB`
`47`	`46`	`var expectedHash = "1C76F6CC5D3B18FD76D4A811E5EB2FD96E97F4D4F202F38B5FBE5FAC56BE09FB";`
`48`	`47`	`AssertExtensions.AssertEnumUnchanged(`
`49`	`48`	`typeof(CredentialProfileType),`