Avoid cloning ImmutableCredentials objects.

teo-tsirpanis · boblodgett · commit b588a9fcb582 · 2025-07-31T10:46:00.000-07:00
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/BasicAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/BasicAWSCredentials.cs
@@ -70,10 +70,7 @@ public BasicAWSCredentials(string accessKey, string secretKey, string accountId)
         /// <returns></returns>
         public override ImmutableCredentials GetCredentials()
         {
-            if (this._credentials == null)
-                return null;
-
-            return _credentials.Copy();
+            return _credentials;
         }
 
         #endregion
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/DefaultInstanceProfileAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/DefaultInstanceProfileAWSCredentials.cs
@@ -122,7 +122,7 @@ public override ImmutableCredentials GetCredentials()
                             _imdsRefreshFailed = false;
                         }
 
-                        return _lastRetrievedCredentials?.Credentials.Copy();
+                        return _lastRetrievedCredentials?.Credentials;
                     }
                 }
                 finally
@@ -161,7 +161,7 @@ public override ImmutableCredentials GetCredentials()
                         _imdsRefreshFailed = false;
                     }
 
-                    credentials = _lastRetrievedCredentials.Credentials?.Copy();
+                    credentials = _lastRetrievedCredentials.Credentials;
                 }
                 finally
                 {
@@ -211,7 +211,7 @@ public override async Task<ImmutableCredentials> GetCredentialsAsync()
                             _imdsRefreshFailed = false;
                         }
 
-                        return _lastRetrievedCredentials?.Credentials.Copy();
+                        return _lastRetrievedCredentials?.Credentials;
                     }
                 }
                 finally
@@ -250,7 +250,7 @@ public override async Task<ImmutableCredentials> GetCredentialsAsync()
                         _imdsRefreshFailed = false;
                     }
 
-                    credentials = _lastRetrievedCredentials.Credentials?.Copy();
+                    credentials = _lastRetrievedCredentials.Credentials;
                 }
                 finally
                 {
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs
@@ -95,7 +95,7 @@ protected override CredentialsRefreshState GenerateNewCredentials()
                     var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(2);
 #pragma warning restore CS0612,CS0618 // Type or member is obsolete
 
-                    _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials.Copy(), newExpiryTime);
+                    _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials, newExpiryTime);
                     return _currentRefreshState;
                 }
             }
@@ -111,7 +111,7 @@ protected override CredentialsRefreshState GenerateNewCredentials()
                 var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));
 #pragma warning restore CS0612, CS0618 // Type or member is obsolete
 
-                _currentRefreshState = new CredentialsRefreshState(newState.Credentials.Copy(), newExpiryTime);
+                _currentRefreshState = new CredentialsRefreshState(newState.Credentials, newExpiryTime);
 
                 return _currentRefreshState;
             }
@@ -176,7 +176,7 @@ protected override async Task<CredentialsRefreshState> GenerateNewCredentialsAsy
                 if (null != _currentRefreshState)
                 {
                     var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(2);
-                    _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials.Copy(), newExpiryTime);
+                    _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials, newExpiryTime);
                     return _currentRefreshState;
                 }
             }
@@ -188,7 +188,7 @@ protected override async Task<CredentialsRefreshState> GenerateNewCredentialsAsy
 
                 // use a custom refresh time
                 var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));
-                _currentRefreshState = new CredentialsRefreshState(newState.Credentials.Copy(), newExpiryTime);
+                _currentRefreshState = new CredentialsRefreshState(newState.Credentials, newExpiryTime);
 
                 return _currentRefreshState;
             }
@@ -402,7 +402,7 @@ private CredentialsRefreshState GetEarlyRefreshState(CredentialsRefreshState sta
             if (newExpiryTime > state.Expiration)
                 newExpiryTime = state.Expiration;
 
-            return new CredentialsRefreshState(state.Credentials.Copy(), newExpiryTime);
+            return new CredentialsRefreshState(state.Credentials, newExpiryTime);
         }
 
         private CredentialsRefreshState GetRefreshState(string token)
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs
@@ -150,7 +150,7 @@ public override sealed ImmutableCredentials GetCredentials()
                 tempState = GenerateCredentialsAndUpdateState();
             }
 
-            return tempState.Credentials.Copy();
+            return tempState.Credentials;
 
             CredentialsRefreshState GenerateCredentialsAndUpdateState()
             {
@@ -202,7 +202,7 @@ public override sealed async System.Threading.Tasks.Task<ImmutableCredentials> G
                 tempState = await GenerateCredentialsAndUpdateStateAsync().ConfigureAwait(false);
             }
 
-            return tempState.Credentials.Copy();
+            return tempState.Credentials;
 
             async System.Threading.Tasks.Task<CredentialsRefreshState> GenerateCredentialsAndUpdateStateAsync()
             {
diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/SessionAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/SessionAWSCredentials.cs
@@ -72,7 +72,7 @@ public SessionAWSCredentials(string awsAccessKeyId, string awsSecretAccessKey, s
         /// <returns></returns>
         public override ImmutableCredentials GetCredentials()
         {
-            return _lastCredentials.Copy();
+            return _lastCredentials;
         }
 
         #endregion
diff --git a/sdk/src/Services/CognitoIdentity/Custom/Model/Credentials.Extensions.cs b/sdk/src/Services/CognitoIdentity/Custom/Model/Credentials.Extensions.cs
@@ -37,7 +37,7 @@ public override ImmutableCredentials GetCredentials()
         {
             if (_credentials == null)
                 _credentials = new ImmutableCredentials(AccessKeyId, SecretKey, SessionToken);
-            return _credentials.Copy();
+            return _credentials;
         }
     }
 }
diff --git a/sdk/src/Services/GameLift/Custom/Model/Credentials.Extensions.cs b/sdk/src/Services/GameLift/Custom/Model/Credentials.Extensions.cs
@@ -44,7 +44,7 @@ public override ImmutableCredentials GetCredentials()
         {
             if (_credentials == null)
                 _credentials = new ImmutableCredentials(AccessKeyId, SecretAccessKey, SessionToken);
-            return _credentials.Copy();
+            return _credentials;
         }
     }
 }
diff --git a/sdk/src/Services/SecurityToken/Custom/Model/Credentials.Extensions.cs b/sdk/src/Services/SecurityToken/Custom/Model/Credentials.Extensions.cs
@@ -36,7 +36,7 @@ public override ImmutableCredentials GetCredentials()
         {
             if (_credentials == null)
                 _credentials = new ImmutableCredentials(AccessKeyId, SecretAccessKey, SessionToken);
-            return _credentials.Copy();
+            return _credentials;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,7 @@ public BasicAWSCredentials(string accessKey, string secretKey, string accountId)`
`70`	`70`	`/// <returns></returns>`
`71`	`71`	`public override ImmutableCredentials GetCredentials()`
`72`	`72`	`{`
`73`		`- if (this._credentials == null)`
`74`		`- return null;`
`75`		`-`
`76`		`- return _credentials.Copy();`
	`73`	`+ return _credentials;`
`77`	`74`	`}`
`78`	`75`
`79`	`76`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public override ImmutableCredentials GetCredentials()`
`122`	`122`	`_imdsRefreshFailed = false;`
`123`	`123`	`}`
`124`	`124`
`125`		`- return _lastRetrievedCredentials?.Credentials.Copy();`
	`125`	`+ return _lastRetrievedCredentials?.Credentials;`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`finally`
`@@ -161,7 +161,7 @@ public override ImmutableCredentials GetCredentials()`
`161`	`161`	`_imdsRefreshFailed = false;`
`162`	`162`	`}`
`163`	`163`
`164`		`- credentials = _lastRetrievedCredentials.Credentials?.Copy();`
	`164`	`+ credentials = _lastRetrievedCredentials.Credentials;`
`165`	`165`	`}`
`166`	`166`	`finally`
`167`	`167`	`{`
`@@ -211,7 +211,7 @@ public override async Task<ImmutableCredentials> GetCredentialsAsync()`
`211`	`211`	`_imdsRefreshFailed = false;`
`212`	`212`	`}`
`213`	`213`
`214`		`- return _lastRetrievedCredentials?.Credentials.Copy();`
	`214`	`+ return _lastRetrievedCredentials?.Credentials;`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`	`finally`
`@@ -250,7 +250,7 @@ public override async Task<ImmutableCredentials> GetCredentialsAsync()`
`250`	`250`	`_imdsRefreshFailed = false;`
`251`	`251`	`}`
`252`	`252`
`253`		`- credentials = _lastRetrievedCredentials.Credentials?.Copy();`
	`253`	`+ credentials = _lastRetrievedCredentials.Credentials;`
`254`	`254`	`}`
`255`	`255`	`finally`
`256`	`256`	`{`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected override CredentialsRefreshState GenerateNewCredentials()`
`95`	`95`	`var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(2);`
`96`	`96`	`#pragma warning restore CS0612,CS0618 // Type or member is obsolete`
`97`	`97`
`98`		`- _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials.Copy(), newExpiryTime);`
	`98`	`+ _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials, newExpiryTime);`
`99`	`99`	`return _currentRefreshState;`
`100`	`100`	`}`
`101`	`101`	`}`
`@@ -111,7 +111,7 @@ protected override CredentialsRefreshState GenerateNewCredentials()`
`111`	`111`	`var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));`
`112`	`112`	`#pragma warning restore CS0612, CS0618 // Type or member is obsolete`
`113`	`113`
`114`		`- _currentRefreshState = new CredentialsRefreshState(newState.Credentials.Copy(), newExpiryTime);`
	`114`	`+ _currentRefreshState = new CredentialsRefreshState(newState.Credentials, newExpiryTime);`
`115`	`115`
`116`	`116`	`return _currentRefreshState;`
`117`	`117`	`}`
`@@ -176,7 +176,7 @@ protected override async Task<CredentialsRefreshState> GenerateNewCredentialsAsy`
`176`	`176`	`if (null != _currentRefreshState)`
`177`	`177`	`{`
`178`	`178`	`var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(2);`
`179`		`- _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials.Copy(), newExpiryTime);`
	`179`	`+ _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials, newExpiryTime);`
`180`	`180`	`return _currentRefreshState;`
`181`	`181`	`}`
`182`	`182`	`}`
`@@ -188,7 +188,7 @@ protected override async Task<CredentialsRefreshState> GenerateNewCredentialsAsy`
`188`	`188`
`189`	`189`	`// use a custom refresh time`
`190`	`190`	`var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));`
`191`		`- _currentRefreshState = new CredentialsRefreshState(newState.Credentials.Copy(), newExpiryTime);`
	`191`	`+ _currentRefreshState = new CredentialsRefreshState(newState.Credentials, newExpiryTime);`
`192`	`192`
`193`	`193`	`return _currentRefreshState;`
`194`	`194`	`}`
`@@ -402,7 +402,7 @@ private CredentialsRefreshState GetEarlyRefreshState(CredentialsRefreshState sta`
`402`	`402`	`if (newExpiryTime > state.Expiration)`
`403`	`403`	`newExpiryTime = state.Expiration;`
`404`	`404`
`405`		`- return new CredentialsRefreshState(state.Credentials.Copy(), newExpiryTime);`
	`405`	`+ return new CredentialsRefreshState(state.Credentials, newExpiryTime);`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`private CredentialsRefreshState GetRefreshState(string token)`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public override sealed ImmutableCredentials GetCredentials()`
`150`	`150`	`tempState = GenerateCredentialsAndUpdateState();`
`151`	`151`	`}`
`152`	`152`
`153`		`- return tempState.Credentials.Copy();`
	`153`	`+ return tempState.Credentials;`
`154`	`154`
`155`	`155`	`CredentialsRefreshState GenerateCredentialsAndUpdateState()`
`156`	`156`	`{`
`@@ -202,7 +202,7 @@ public override sealed async System.Threading.Tasks.Task<ImmutableCredentials> G`
`202`	`202`	`tempState = await GenerateCredentialsAndUpdateStateAsync().ConfigureAwait(false);`
`203`	`203`	`}`
`204`	`204`
`205`		`- return tempState.Credentials.Copy();`
	`205`	`+ return tempState.Credentials;`
`206`	`206`
`207`	`207`	`async System.Threading.Tasks.Task<CredentialsRefreshState> GenerateCredentialsAndUpdateStateAsync()`
`208`	`208`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public SessionAWSCredentials(string awsAccessKeyId, string awsSecretAccessKey, s`
`72`	`72`	`/// <returns></returns>`
`73`	`73`	`public override ImmutableCredentials GetCredentials()`
`74`	`74`	`{`
`75`		`- return _lastCredentials.Copy();`
	`75`	`+ return _lastCredentials;`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override ImmutableCredentials GetCredentials()`
`37`	`37`	`{`
`38`	`38`	`if (_credentials == null)`
`39`	`39`	`_credentials = new ImmutableCredentials(AccessKeyId, SecretKey, SessionToken);`
`40`		`- return _credentials.Copy();`
	`40`	`+ return _credentials;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public override ImmutableCredentials GetCredentials()`
`44`	`44`	`{`
`45`	`45`	`if (_credentials == null)`
`46`	`46`	`_credentials = new ImmutableCredentials(AccessKeyId, SecretAccessKey, SessionToken);`
`47`		`- return _credentials.Copy();`
	`47`	`+ return _credentials;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public override ImmutableCredentials GetCredentials()`
`36`	`36`	`{`
`37`	`37`	`if (_credentials == null)`
`38`	`38`	`_credentials = new ImmutableCredentials(AccessKeyId, SecretAccessKey, SessionToken);`
`39`		`- return _credentials.Copy();`
	`39`	`+ return _credentials;`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`