Skip to content

Commit 0ac0d41

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #1990 from aws/staging/d5832522-25df-4b0c-a4eb-75bfc0bdb526
Pull request: release <- staging/d5832522-25df-4b0c-a4eb-75bfc0bdb526
2 parents 7b16061 + d8439d2 commit 0ac0d41

File tree

375 files changed

+794
-463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

375 files changed

+794
-463
lines changed

‎.changes/2.17.171.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2.17.171",
3+
"date": "2022-04-14",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS Batch",
8+
"contributor": "",
9+
"description": "Enables configuration updates for compute environments with BEST_FIT_PROGRESSIVE and SPOT_CAPACITY_OPTIMIZED allocation strategies."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Glue",
14+
"contributor": "",
15+
"description": "Auto Scaling for Glue version 3.0 and later jobs to dynamically scale compute resources. This SDK change provides customers with the auto-scaled DPU usage"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon AppStream",
20+
"contributor": "",
21+
"description": "Includes updates for create and update fleet APIs to manage the session scripts locations for Elastic fleets."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Appflow",
26+
"contributor": "",
27+
"description": "Enables users to pass custom token URL parameters for Oauth2 authentication during create connector profile"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "Automatically refresh credentials in the background when async credential refreshes are enabled, even if traffic is low."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS SDK for Java v2",
38+
"contributor": "",
39+
"description": "Updated service endpoint metadata."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon CloudWatch",
44+
"contributor": "",
45+
"description": "Updates documentation for additional statistics in CloudWatch Metric Streams."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Elastic Compute Cloud",
50+
"contributor": "",
51+
"description": "Documentation updates for Amazon EC2."
52+
}
53+
]
54+
}

‎CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
# __2.17.171__ __2022-04-14__
2+
## __AWS Batch__
3+
- ### Features
4+
- Enables configuration updates for compute environments with BEST_FIT_PROGRESSIVE and SPOT_CAPACITY_OPTIMIZED allocation strategies.
5+
6+
## __AWS Glue__
7+
- ### Features
8+
- Auto Scaling for Glue version 3.0 and later jobs to dynamically scale compute resources. This SDK change provides customers with the auto-scaled DPU usage
9+
10+
## __AWS SDK for Java v2__
11+
- ### Features
12+
- Automatically refresh credentials in the background when async credential refreshes are enabled, even if traffic is low.
13+
- Updated service endpoint metadata.
14+
15+
## __Amazon AppStream__
16+
- ### Features
17+
- Includes updates for create and update fleet APIs to manage the session scripts locations for Elastic fleets.
18+
19+
## __Amazon Appflow__
20+
- ### Features
21+
- Enables users to pass custom token URL parameters for Oauth2 authentication during create connector profile
22+
23+
## __Amazon CloudWatch__
24+
- ### Features
25+
- Updates documentation for additional statistics in CloudWatch Metric Streams.
26+
27+
## __Amazon Elastic Compute Cloud__
28+
- ### Features
29+
- Documentation updates for Amazon EC2.
30+
131
# __2.17.170__ __2022-04-13__
232
## __Amazon CloudWatch__
333
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
5252
<dependency>
5353
<groupId>software.amazon.awssdk</groupId>
5454
<artifactId>bom</artifactId>
55-
<version>2.17.170</version>
55+
<version>2.17.171</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
8686
<dependency>
8787
<groupId>software.amazon.awssdk</groupId>
8888
<artifactId>ec2</artifactId>
89-
<version>2.17.170</version>
89+
<version>2.17.171</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.17.170</version>
94+
<version>2.17.171</version>
9595
</dependency>
9696
```
9797

@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103103
<dependency>
104104
<groupId>software.amazon.awssdk</groupId>
105105
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.17.170</version>
106+
<version>2.17.171</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/archetype-lambda/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>archetypes</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.17.170</version>
20+
<version>2.17.171</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.17.170</version>
20+
<version>2.17.171</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.17.170</version>
24+
<version>2.17.171</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.17.170</version>
25+
<version>2.17.171</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.17.170</version>
24+
<version>2.17.171</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.17.170</version>
25+
<version>2.17.171</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.17.170</version>
24+
<version>2.17.171</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth-crt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.170</version>
25+
<version>2.17.171</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>

‎core/auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.170</version>
25+
<version>2.17.171</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/auth/src/main/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProvider.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ private RefreshResult<AwsCredentials> refreshCredentials() {
124124
LoadedCredentials credentials;
125125
try {
126126
credentials = httpCredentialsLoader.loadCredentials(createEndpointProvider());
127+
logExpirationTime(credentials);
127128
this.cachedCredentials = credentials;
128129
} catch (RuntimeException | IOException e) {
129130
credentials = this.cachedCredentials;
@@ -151,6 +152,10 @@ private RefreshResult<AwsCredentials> refreshCredentials() {
151152
.build();
152153
}
153154

155+
private void logExpirationTime(LoadedCredentials credentials) {
156+
log.debug(() -> "Loaded credentials from IMDS with expiration time of " + credentials.getExpiration());
157+
}
158+
154159
private boolean isLocalCredentialLoadingDisabled() {
155160
return SdkSystemSetting.AWS_EC2_METADATA_DISABLED.getBooleanValueOrThrow();
156161
}
@@ -163,26 +168,23 @@ private Instant prefetchTime(Instant expiration) {
163168
return now.plus(60, MINUTES);
164169
}
165170

166-
// If expiration time is 60+ minutes from now, refresh in 60 minutes or 60 minutes before expiration, whichever is
167-
// sooner. This is the average case, where customers are using IMDS and there is no IMDS outage.
171+
// If expiration time is 60+ minutes from now, refresh in 30 minutes.
168172
Instant sixtyMinutesBeforeExpiration = expiration.minus(60, MINUTES);
169173
if (now.isBefore(sixtyMinutesBeforeExpiration)) {
170-
return minimum(sixtyMinutesBeforeExpiration, now.plus(60, MINUTES));
174+
return now.plus(30, MINUTES);
171175
}
172176

173-
// If expiration time is 5-60 minutes from now, refresh in 30 minutes or 5 minutes before expiration, whatever is
174-
// sooner. This is an unusual case: IMDS is either having an outage or the customer is using a mock IMDS with shorter
175-
// default session durations.
176-
Instant fiveMinutesBeforeExpiration = expiration.minus(5, MINUTES);
177-
if (now.isBefore(fiveMinutesBeforeExpiration)) {
178-
return minimum(fiveMinutesBeforeExpiration, now.plus(30, MINUTES));
177+
// If expiration time is 15 minutes or more from now, refresh in 10 minutes.
178+
Instant fifteenMinutesBeforeExpiration = expiration.minus(15, MINUTES);
179+
if (now.isBefore(fifteenMinutesBeforeExpiration)) {
180+
return now.plus(10, MINUTES);
179181
}
180182

181-
// If expiration time is 0.25-5 minutes from now, refresh 15 seconds before expiration. This is an unusual case: IMDS is
182-
// either having an outage or the customer is using a mock IMDS with very aggressive session durations.
183+
// If expiration time is 0.25-15 minutes from now, refresh in 5 minutes, or 15 seconds before expiration, whichever is
184+
// sooner.
183185
Instant fifteenSecondsBeforeExpiration = expiration.minus(15, SECONDS);
184186
if (now.isBefore(fifteenSecondsBeforeExpiration)) {
185-
return fifteenSecondsBeforeExpiration;
187+
return minimum(now.plus(5, MINUTES), fifteenSecondsBeforeExpiration);
186188
}
187189

188190
// These credentials are expired. Try refreshing again in 5 minutes. We can't be more aggressive than that, because we

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.170</version>
25+
<version>2.17.171</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/json-utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/metrics-spi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.17.170</version>
8+
<version>2.17.171</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.17.170</version>
24+
<version>2.17.171</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.17.170</version>
25+
<version>2.17.171</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/protocols/aws-cbor-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-json-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-query-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.17.170</version>
23+
<version>2.17.171</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

0 commit comments

Comments
 (0)