Skip to content

Commit 629b48f

Browse files
authored
Deprecated AWS settings should be DeprecatedWarning (elastic#127861)
We deprecated various settings during the upgrades to AWS SDK v2 with the intention of removing them in 10.0.0, but this means that they are not critically deprecated in the backport to 8.19.x since they will continue to work in the 9.x series too. This commit downgrades these settings from `Deprecated` to `DeprecatedWarning` in the `8.19` branch.
1 parent 673d593 commit 629b48f

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3ClientSettings.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@ final class S3ClientSettings {
8282
static final Setting.AffixSetting<HttpScheme> PROTOCOL_SETTING = Setting.affixKeySetting(
8383
PREFIX,
8484
"protocol",
85-
key -> new Setting<>(key, "https", s -> HttpScheme.valueOf(s.toUpperCase(Locale.ROOT)), Property.NodeScope, Property.Deprecated)
85+
key -> new Setting<>(
86+
key,
87+
"https",
88+
s -> HttpScheme.valueOf(s.toUpperCase(Locale.ROOT)),
89+
Property.NodeScope,
90+
Property.DeprecatedWarning
91+
)
8692
);
8793

8894
/** The host name of a proxy to connect to s3 through. */
@@ -145,7 +151,7 @@ final class S3ClientSettings {
145151
static final Setting.AffixSetting<Boolean> UNUSED_USE_THROTTLE_RETRIES_SETTING = Setting.affixKeySetting(
146152
PREFIX,
147153
"use_throttle_retries",
148-
key -> Setting.boolSetting(key, true, Property.NodeScope, Property.Deprecated)
154+
key -> Setting.boolSetting(key, true, Property.NodeScope, Property.DeprecatedWarning)
149155
);
150156

151157
/** Whether the s3 client should use path style access. */
@@ -173,7 +179,7 @@ final class S3ClientSettings {
173179
static final Setting.AffixSetting<String> UNUSED_SIGNER_OVERRIDE = Setting.affixKeySetting(
174180
PREFIX,
175181
"signer_override",
176-
key -> Setting.simpleString(key, Property.NodeScope, Property.Deprecated)
182+
key -> Setting.simpleString(key, Property.NodeScope, Property.DeprecatedWarning)
177183
);
178184

179185
/** Credentials to authenticate with s3. */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ final class Ec2ClientSettings {
6767
"https",
6868
s -> HttpScheme.valueOf(s.toUpperCase(Locale.ROOT)),
6969
Property.NodeScope,
70-
Property.Deprecated
70+
Property.DeprecatedWarning
7171
);
7272

7373
/** The username of a proxy to connect to EC2 through. */

0 commit comments

Comments
 (0)