Skip to content

[Default Configuration Part 4]: Add tlsNegotiationTimeout #2814

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
merged 1 commit into from
Nov 2, 2021
Merged

[Default Configuration Part 4]: Add tlsNegotiationTimeout #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ...n-lite/src/main/java/software/amazon/awssdk/codegen/lite/defaultsmode/DefaultsLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public final class DefaultsLoader {

static {
UNSUPPORTED_OPTIONS.add("stsRegionalEndpoints");
UNSUPPORTED_OPTIONS.add("tlsNegotiationTimeoutInMillis");
}

private DefaultsLoader() {
Expand Down
13 changes: 11 additions & 2 deletions .../software/amazon/awssdk/codegen/lite/defaultsmode/DefaultsModeConfigurationGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,23 @@ public class DefaultsModeConfigurationGenerator implements PoetClass {
private static final String HTTP_DEFAULTS_VAR_SUFFIX = "_HTTP_DEFAULTS";
private static final Map<String, OptionMetadata> CONFIGURATION_MAPPING = new HashMap<>();
private static final Map<String, OptionMetadata> HTTP_CONFIGURATION_MAPPING = new HashMap<>();
private static final String CONNECT_TIMEOUT_IN_MILLIS = "connectTimeoutInMillis";
private static final String TLS_NEGOTIATION_TIMEOUT_IN_MILLIS = "tlsNegotiationTimeoutInMillis";

private final String basePackage;
private final String defaultsModeBase;
private final DefaultConfiguration configuration;

static {
HTTP_CONFIGURATION_MAPPING.put("connectTimeoutInMillis",
HTTP_CONFIGURATION_MAPPING.put(CONNECT_TIMEOUT_IN_MILLIS,
new OptionMetadata(ClassName.get("java.time", "Duration"),
ClassName.get("software.amazon.awssdk.http",
"SdkHttpConfigurationOption", "CONNECTION_TIMEOUT")));
HTTP_CONFIGURATION_MAPPING.put(TLS_NEGOTIATION_TIMEOUT_IN_MILLIS,
new OptionMetadata(ClassName.get("java.time", "Duration"),
ClassName.get("software.amazon.awssdk.http",
"SdkHttpConfigurationOption",
"TLS_NEGOTIATION_TIMEOUT")));
CONFIGURATION_MAPPING.put("retryMode", new OptionMetadata(ClassName.get("software.amazon.awssdk.core.retry", "RetryMode"
), ClassName.get("software.amazon.awssdk.core.client.config", "SdkClientOption", "DEFAULT_RETRY_MODE")));
}
Expand Down Expand Up @@ -179,7 +187,8 @@ private void attributeMapBuilder(String option, String value, CodeBlock.Builder
private void httpAttributeMapBuilder(String option, String value, CodeBlock.Builder attributeBuilder) {
OptionMetadata optionMetadata = HTTP_CONFIGURATION_MAPPING.get(option);
switch (option) {
case "connectTimeoutInMillis":
case CONNECT_TIMEOUT_IN_MILLIS:
case TLS_NEGOTIATION_TIMEOUT_IN_MILLIS:
attributeBuilder.add(".put($T, $T.ofMillis($N))", optionMetadata.attribute, optionMetadata.type, value);
break;
default:
Expand Down
12 changes: 8 additions & 4 deletions ...sources/software/amazon/awssdk/codegen/lite/defaultsmode/defaults-mode-configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,29 @@ public final class DefaultsModeConfiguration {
.put(SdkClientOption.DEFAULT_RETRY_MODE, RetryMode.STANDARD).build();

private static final AttributeMap STANDARD_HTTP_DEFAULTS = AttributeMap.builder()
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(2000)).build();
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(2000))
.put(SdkHttpConfigurationOption.TLS_NEGOTIATION_TIMEOUT, Duration.ofMillis(2000)).build();

private static final AttributeMap MOBILE_DEFAULTS = AttributeMap.builder()
.put(SdkClientOption.DEFAULT_RETRY_MODE, RetryMode.ADAPTIVE).build();

private static final AttributeMap MOBILE_HTTP_DEFAULTS = AttributeMap.builder()
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(10000)).build();
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(10000))
.put(SdkHttpConfigurationOption.TLS_NEGOTIATION_TIMEOUT, Duration.ofMillis(11000)).build();

private static final AttributeMap CROSS_REGION_DEFAULTS = AttributeMap.builder()
.put(SdkClientOption.DEFAULT_RETRY_MODE, RetryMode.STANDARD).build();

private static final AttributeMap CROSS_REGION_HTTP_DEFAULTS = AttributeMap.builder()
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(2800)).build();
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(2800))
.put(SdkHttpConfigurationOption.TLS_NEGOTIATION_TIMEOUT, Duration.ofMillis(2800)).build();

private static final AttributeMap IN_REGION_DEFAULTS = AttributeMap.builder()
.put(SdkClientOption.DEFAULT_RETRY_MODE, RetryMode.STANDARD).build();

private static final AttributeMap IN_REGION_HTTP_DEFAULTS = AttributeMap.builder()
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(1000)).build();
.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, Duration.ofMillis(1000))
.put(SdkHttpConfigurationOption.TLS_NEGOTIATION_TIMEOUT, Duration.ofMillis(1000)).build();

private static final AttributeMap LEGACY_DEFAULTS = AttributeMap.empty();

Expand Down
1 change: 1 addition & 0 deletions ...te/src/test/resources/software/amazon/awssdk/codegen/lite/defaultsmode/defaults-mode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* <li>retryMode: PLACEHOLDER</li>
* <li>s3UsEast1RegionalEndpoints: PLACEHOLDER</li>
* <li>connectTimeoutInMillis: PLACEHOLDER</li>
* <li>tlsNegotiationTimeoutInMillis: PLACEHOLDER</li>
* </ul>
* <p>
* All options above can be configured by users, and the overridden value will take precedence.
Expand Down