Skip to content

[V4] Re-introduce background refresh behavior #4100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 7, 2025
Merged

[V4] Re-introduce background refresh behavior #4100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cefbd6c
Rework the locking in the RefreshingAWSCredentials base class
normj Nov 4, 2025
e3d3022
Add backwardIncompatibilitiesToIgnore to change log
normj Nov 4, 2025
76e64cb
refactor: Re-introduce unit tests for background refresh
dscpinheiro Nov 5, 2025
ab73e3b
refactor: Update logging to remove duplicate messages and use correct…
dscpinheiro Nov 5, 2025
107d154
fix: Mark method as static
dscpinheiro Nov 5, 2025
130b21c
refactor: Address Copilot feedback
dscpinheiro Nov 5, 2025
292a4ae
refactor: More test cases and documentation updates
dscpinheiro Nov 5, 2025
8e951fc
Add locking documentation for RefreshingAWSCredentials
normj Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions generator/.DevConfigs/e11928c9-15fb-4b9e-91d3-91775150d378.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"core": {
"updateMinimum": true,
"type": "minor",
"changeLogMessages": [
"Re-introduce background refresh of credentials during their preempt expiry period (https://github.com/aws/aws-sdk-net/issues/4024)"
],
"backwardIncompatibilitiesToIgnore": [
"Amazon.Runtime.RefreshingAWSCredentials/MethodAdded",
"Amazon.Runtime.RefreshingAWSCredentials/FieldTypeChanged"
]
}
}
16 changes: 5 additions & 11 deletions sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,7 @@ protected override CredentialsRefreshState GenerateNewCredentials()
// but try again to refresh them in 2 minutes.
if (null != _currentRefreshState)
{
#pragma warning disable CS0612, CS0618 // Type or member is obsolete
var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(2);
#pragma warning restore CS0612,CS0618 // Type or member is obsolete

var newExpiryTime = _timeProvider.CorrectedUtcNow + TimeSpan.FromMinutes(2);
_currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials, newExpiryTime);
return _currentRefreshState;
}
Expand All @@ -107,10 +104,7 @@ protected override CredentialsRefreshState GenerateNewCredentials()

// use a custom refresh time

#pragma warning disable CS0612, CS0618 // Type or member is obsolete
var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));
#pragma warning restore CS0612, CS0618 // Type or member is obsolete

var newExpiryTime = _timeProvider.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));
_currentRefreshState = new CredentialsRefreshState(newState.Credentials, newExpiryTime);

return _currentRefreshState;
Expand Down Expand Up @@ -175,7 +169,7 @@ protected override async Task<CredentialsRefreshState> GenerateNewCredentialsAsy
// but try again to refresh them in 2 minutes.
if (null != _currentRefreshState)
{
var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(2);
var newExpiryTime = _timeProvider.CorrectedUtcNow + TimeSpan.FromMinutes(2);
_currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials, newExpiryTime);
return _currentRefreshState;
}
Expand All @@ -187,7 +181,7 @@ protected override async Task<CredentialsRefreshState> GenerateNewCredentialsAsy
_logger.InfoFormat(_receivedExpiredCredentialsFromIMDS);

// use a custom refresh time
var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));
var newExpiryTime = _timeProvider.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11));
_currentRefreshState = new CredentialsRefreshState(newState.Credentials, newExpiryTime);

return _currentRefreshState;
Expand Down Expand Up @@ -396,7 +390,7 @@ private static Uri InfoUri

private CredentialsRefreshState GetEarlyRefreshState(CredentialsRefreshState state)
{
DateTime newExpiryTime = AWSSDKUtils.CorrectedUtcNow + _refreshAttemptPeriod + PreemptExpiryTime;
DateTime newExpiryTime = _timeProvider.CorrectedUtcNow + _refreshAttemptPeriod + PreemptExpiryTime;

// Use this only if the time is earlier than the default expiration time
if (newExpiryTime > state.Expiration)
Expand Down
Loading