Skip to content

Fix expiration in past warning from ProfileFileRefresher. #6157

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
alextwoods merged 7 commits into from
Jun 5, 2025
Merged

Fix expiration in past warning from ProfileFileRefresher. #6157

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51e7014
Fix expiration in past warning from ProfileFileRefresher.
alextwoods Jun 4, 2025
0ceb206
Add changelog
alextwoods Jun 4, 2025
ce1c6e9
Update stale time to 1s to match delay previously added by the Cached…
alextwoods Jun 4, 2025
55ae137
Revert change to test case
alextwoods Jun 4, 2025
e3130b5
Update changelog description
alextwoods Jun 4, 2025
b949120
Merge branch 'master' into alexwoo/fix-profilefilesupplier-warning
alextwoods Jun 5, 2025
4271d5e
Add assertion to test that warning is not logged
alextwoods Jun 5, 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
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AWSSDKforJavav2-8565660.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "AWS SDK for Java v2",
"contributor": "",
"description": "Fix expiration in past warning from ProfileFileRefresher."
Comment thread
alextwoods marked this conversation as resolved.
Outdated
}
3 changes: 2 additions & 1 deletion ...profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileRefresher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public final class ProfileFileRefresher {
private static final ProfileFileRefreshRecord EMPTY_REFRESH_RECORD = ProfileFileRefreshRecord.builder()
.refreshTime(Instant.MIN)
.build();
private static final long STALE_TIME_MS = 1000;
Comment thread
alextwoods marked this conversation as resolved.
private final CachedSupplier<ProfileFileRefreshRecord> profileFileCache;
private volatile ProfileFileRefreshRecord currentRefreshRecord;
private final Supplier<ProfileFile> profileFile;
Expand Down Expand Up @@ -96,7 +97,7 @@ private RefreshResult<ProfileFileRefreshRecord> reloadAsRefreshResultIfStale() {
refreshRecord = currentRefreshRecord;
}

return wrapIntoRefreshResult(refreshRecord, now);
return wrapIntoRefreshResult(refreshRecord, now.plusMillis(STALE_TIME_MS));
}

private <T> RefreshResult<T> wrapIntoRefreshResult(T value, Instant staleTime) {
Expand Down
4 changes: 2 additions & 2 deletions ...iles/src/test/java/software/amazon/awssdk/profiles/internal/ProfileFileRefresherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void refreshIfStale_profileModifiedNoPathSpecified_doesNotReloadProfileFile() {
}

@Test
void refreshIfStale_profileModifiedWithinJitterPeriod_doesNotReloadProfileFile() {
void refreshIfStale_profileModifiedWithinStalePeriod_doesNotReloadProfileFile() {
Path credentialsFilePath = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");

AdjustableClock clock = new AdjustableClock();
Expand All @@ -99,7 +99,7 @@ void refreshIfStale_profileModifiedWithinJitterPeriod_doesNotReloadProfileFile()
}

@Test
void refreshIfStale_profileModifiedOutsideJitterPeriod_reloadsProfileFile() {
void refreshIfStale_profileModifiedOutsideStalePeriod_reloadsProfileFile() {
Path credentialsFilePath = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");

AdjustableClock clock = new AdjustableClock();
Expand Down
Loading