Skip to content

Commit 3be174d

Browse files
committed
Deprecate protocol setting for removal
1 parent c692ffd commit 3be174d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2ServiceImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ private Ec2Client buildClient(Ec2ClientSettings clientSettings) {
4747

4848
// proxy for testing
4949
Ec2Client buildClient(AwsCredentialsProvider credentials, Ec2ClientSettings clientSettings) {
50-
// TODO NOMERGE protocol no longer supported? clientConfiguration.setProtocol(clientSettings.protocol);
51-
5250
final var httpClientBuilder = ApacheHttpClient.builder();
5351
httpClientBuilder.socketTimeout(Duration.of(clientSettings.readTimeoutMillis, ChronoUnit.MILLIS));
5452

plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2ClientSettings.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
package org.elasticsearch.discovery.ec2;
1111

12+
import org.elasticsearch.core.UpdateForV10;
13+
1214
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
1315
import software.amazon.awssdk.auth.credentials.AwsCredentials;
1416
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
@@ -64,11 +66,13 @@ final class Ec2ClientSettings {
6466
);
6567

6668
/** The protocol to use to connect to ec2. */
69+
@UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION) // no longer used, should be removed in v10
6770
static final Setting<HttpScheme> PROTOCOL_SETTING = new Setting<>(
6871
"discovery.ec2.protocol",
6972
"https",
7073
s -> HttpScheme.valueOf(s.toUpperCase(Locale.ROOT)),
71-
Property.NodeScope
74+
Property.NodeScope,
75+
Property.Deprecated
7276
);
7377
// NOMERGE should we now reject this if set to `http` or just silently ignore it?
7478

0 commit comments

Comments
 (0)