Skip to content

Commit cebbc5f

Browse files
committed
Update to AWS SDK 1.11.223 (#27278)
1 parent afab439 commit cebbc5f

File tree

10 files changed

+24
-16
lines changed

10 files changed

+24
-16
lines changed

docs/plugins/repository-s3.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ are marked as `Secure`.
111111

112112
`use_throttle_retries`::
113113

114-
Whether retries should be throttled (ie use backoff). Must be `true` or `false`. Defaults to `false`.
114+
Whether retries should be throttled (ie use backoff). Must be `true` or `false`. Defaults to `true`.
115115

116116
[[repository-s3-repository]]
117117
==== Repository Settings

plugins/repository-s3/build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ esplugin {
2323
}
2424

2525
versions << [
26-
'aws': '1.10.69'
26+
'aws': '1.11.223'
2727
]
2828

2929
dependencies {
@@ -76,6 +76,15 @@ thirdPartyAudit.excludes = [
7676
'org.apache.avalon.framework.logger.Logger',
7777
'org.apache.log.Hierarchy',
7878
'org.apache.log.Logger',
79+
'software.amazon.ion.IonReader',
80+
'software.amazon.ion.IonSystem',
81+
'software.amazon.ion.IonType',
82+
'software.amazon.ion.IonWriter',
83+
'software.amazon.ion.Timestamp',
84+
'software.amazon.ion.system.IonBinaryWriterBuilder',
85+
'software.amazon.ion.system.IonSystemBuilder',
86+
'software.amazon.ion.system.IonTextWriterBuilder',
87+
'software.amazon.ion.system.IonWriterBuilder',
7988
]
8089

8190
// jarhell with jdk (intentionally, because jaxb was removed from default modules in java 9)

plugins/repository-s3/licenses/aws-java-sdk-core-1.10.69.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c3993cb44f5856fa721b7b7ccfc266377c0bf9c0

plugins/repository-s3/licenses/aws-java-sdk-kms-1.10.69.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c24e6ebe108c60a08098aeaad5ae0b6a5a77b618

plugins/repository-s3/licenses/aws-java-sdk-s3-1.10.69.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c2ef96732e22d97952fbcd0a94f1dc376d157eda

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3Wrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.amazonaws.AmazonWebServiceRequest;
2525
import com.amazonaws.HttpMethod;
2626
import com.amazonaws.regions.Region;
27+
import com.amazonaws.services.s3.AbstractAmazonS3;
2728
import com.amazonaws.services.s3.AmazonS3;
2829
import com.amazonaws.services.s3.S3ClientOptions;
2930
import com.amazonaws.services.s3.S3ResponseMetadata;
@@ -118,15 +119,14 @@
118119
import java.util.List;
119120

120121
@SuppressForbidden(reason = "implements AWS api that uses java.io.File!")
121-
public class AmazonS3Wrapper implements AmazonS3 {
122+
public class AmazonS3Wrapper extends AbstractAmazonS3 {
122123

123124
protected AmazonS3 delegate;
124125

125126
public AmazonS3Wrapper(AmazonS3 delegate) {
126127
this.delegate = delegate;
127128
}
128129

129-
130130
@Override
131131
public void setEndpoint(String endpoint) {
132132
delegate.setEndpoint(endpoint);

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AwsS3ServiceImplTests.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ private void assertCredentials(Settings singleRepositorySettings, Settings setti
9595
}
9696

9797
public void testAWSDefaultConfiguration() {
98-
launchAWSConfigurationTest(Settings.EMPTY, Settings.EMPTY, Protocol.HTTPS, null, -1, null, null, 3, false,
99-
ClientConfiguration.DEFAULT_SOCKET_TIMEOUT);
98+
launchAWSConfigurationTest(Settings.EMPTY, Settings.EMPTY, Protocol.HTTPS, null, -1, null, null, 3,
99+
ClientConfiguration.DEFAULT_THROTTLE_RETRIES, ClientConfiguration.DEFAULT_SOCKET_TIMEOUT);
100100
}
101101

102102
public void testAWSConfigurationWithAwsSettings() {
@@ -111,23 +111,22 @@ public void testAWSConfigurationWithAwsSettings() {
111111
.put("s3.client.default.read_timeout", "10s")
112112
.build();
113113
launchAWSConfigurationTest(settings, Settings.EMPTY, Protocol.HTTP, "aws_proxy_host", 8080, "aws_proxy_username",
114-
"aws_proxy_password", 3, false, 10000);
114+
"aws_proxy_password", 3, ClientConfiguration.DEFAULT_THROTTLE_RETRIES, 10000);
115115
}
116116

117117
public void testRepositoryMaxRetries() {
118118
Settings settings = Settings.builder()
119119
.put("s3.client.default.max_retries", 5)
120120
.build();
121121
launchAWSConfigurationTest(settings, Settings.EMPTY, Protocol.HTTPS, null, -1, null,
122-
null, 5, false, 50000);
122+
null, 5, ClientConfiguration.DEFAULT_THROTTLE_RETRIES, 50000);
123123
}
124124

125125
public void testRepositoryThrottleRetries() {
126-
Settings settings = Settings.builder()
127-
.put("s3.client.default.use_throttle_retries", true)
128-
.build();
129-
launchAWSConfigurationTest(settings, Settings.EMPTY, Protocol.HTTPS, null, -1, null,
130-
null, 3, true, 50000);
126+
final boolean throttling = randomBoolean();
127+
128+
Settings settings = Settings.builder().put("s3.client.default.use_throttle_retries", throttling).build();
129+
launchAWSConfigurationTest(settings, Settings.EMPTY, Protocol.HTTPS, null, -1, null, null, 3, throttling, 50000);
131130
}
132131

133132
private void launchAWSConfigurationTest(Settings settings,

0 commit comments

Comments
 (0)