diff --git a/generator/.DevConfigs/efb0dd6a-3af3-4c38-a7d1-9188ccd1bf39.json b/generator/.DevConfigs/efb0dd6a-3af3-4c38-a7d1-9188ccd1bf39.json new file mode 100644 index 000000000000..a12f90ac50fb --- /dev/null +++ b/generator/.DevConfigs/efb0dd6a-3af3-4c38-a7d1-9188ccd1bf39.json @@ -0,0 +1,32 @@ +{ + "core": { + "updateMinimum": false, + "type": "patch", + "changeLogMessages": [ + "Avoid cloning \u0060ImmutableCredentials\u0060 objects." + ] + }, + "services": [ + { + "serviceName": "GameLift", + "type": "patch", + "changeLogMessages": [ + "Avoid cloning \u0060ImmutableCredentials\u0060 objects." + ] + }, + { + "serviceName": "SecurityToken", + "type": "patch", + "changeLogMessages": [ + "Avoid cloning \u0060ImmutableCredentials\u0060 objects." + ] + }, + { + "serviceName": "CognitoIdentity", + "type": "patch", + "changeLogMessages": [ + "Avoid cloning \u0060ImmutableCredentials\u0060 objects." + ] + } + ] +} \ No newline at end of file diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/BasicAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/BasicAWSCredentials.cs index e1c516f69cbc..5261c92a209f 100644 --- 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) /// 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 index af7743925ee8..1490d56f224c 100644 --- 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 GetCredentialsAsync() _imdsRefreshFailed = false; } - return _lastRetrievedCredentials?.Credentials.Copy(); + return _lastRetrievedCredentials?.Credentials; } } finally @@ -250,7 +250,7 @@ public override async Task 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 index 81b527abfcff..fbdb0b85f813 100644 --- 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 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 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 index e68627c2f0cb..de6e50d627dd 100644 --- 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 G tempState = await GenerateCredentialsAndUpdateStateAsync().ConfigureAwait(false); } - return tempState.Credentials.Copy(); + return tempState.Credentials; async System.Threading.Tasks.Task GenerateCredentialsAndUpdateStateAsync() { diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/SessionAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/SessionAWSCredentials.cs index e938990d2d8a..1975d5959116 100644 --- 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 /// 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 index 7ab1dabdffa2..0737acb1c1d9 100644 --- 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 index dd251a01d14b..855bec10b129 100644 --- 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; } } } \ No newline at end of file diff --git a/sdk/src/Services/SecurityToken/Custom/Model/Credentials.Extensions.cs b/sdk/src/Services/SecurityToken/Custom/Model/Credentials.Extensions.cs index 1be4bbdd707b..429bb7b64954 100644 --- 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; } } }