diff --git a/.changes/2.14.7.json b/.changes/2.14.7.json new file mode 100644 index 000000000000..a1445a7116d8 --- /dev/null +++ b/.changes/2.14.7.json @@ -0,0 +1,31 @@ +{ + "version": "2.14.7", + "date": "2020-08-28", + "entries": [ + { + "type": "feature", + "category": "AWS Cost and Usage Report Service", + "description": "This release add MONTHLY as the new supported TimeUnit for ReportDefinition." + }, + { + "type": "feature", + "category": "Amazon CloudFront", + "description": "You can now manage CloudFront's additional, real-time metrics with the CloudFront API." + }, + { + "type": "feature", + "category": "Amazon Route 53", + "description": "Documentation updates for Route 53" + }, + { + "type": "feature", + "category": "Amazon Elastic MapReduce", + "description": "Amazon EMR adds support for ICMP, port -1, in Block Public Access Exceptions and API access for EMR Notebooks execution. You can now non-interactively execute EMR Notebooks and pass input parameters." + }, + { + "type": "feature", + "category": "AWS SDK for Java v2", + "description": "Updated service endpoint metadata." + } + ] +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index cbf1f203433c..0358b84ccae7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +# __2.14.7__ __2020-08-28__ +## __AWS Cost and Usage Report Service__ + - ### Features + - This release add MONTHLY as the new supported TimeUnit for ReportDefinition. + +## __AWS SDK for Java v2__ + - ### Features + - Updated service endpoint metadata. + +## __Amazon CloudFront__ + - ### Features + - You can now manage CloudFront's additional, real-time metrics with the CloudFront API. + +## __Amazon Elastic MapReduce__ + - ### Features + - Amazon EMR adds support for ICMP, port -1, in Block Public Access Exceptions and API access for EMR Notebooks execution. You can now non-interactively execute EMR Notebooks and pass input parameters. + +## __Amazon Route 53__ + - ### Features + - Documentation updates for Route 53 + # __2.14.6__ __2020-08-27__ ## __AWS Elemental MediaConvert__ - ### Features diff --git a/README.md b/README.md index 64dbc2b8a292..f40b4cdc9837 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver software.amazon.awssdk bom - 2.14.6 + 2.14.7 pom import @@ -83,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only: software.amazon.awssdk ec2 - 2.14.6 + 2.14.7 software.amazon.awssdk s3 - 2.14.6 + 2.14.7 ``` @@ -100,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please software.amazon.awssdk aws-sdk-java - 2.14.6 + 2.14.7 ``` diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml index 263afabf5808..dd2b0a36cc1b 100644 --- a/archetypes/archetype-lambda/pom.xml +++ b/archetypes/archetype-lambda/pom.xml @@ -20,7 +20,7 @@ archetypes software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 archetype-lambda diff --git a/archetypes/pom.xml b/archetypes/pom.xml index cb991b742aee..801bd4d40292 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 archetypes diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml index c92967b04801..451f06434782 100644 --- a/aws-sdk-java/pom.xml +++ b/aws-sdk-java/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../pom.xml aws-sdk-java diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml index ade1af1c6fe4..579d412080b1 100644 --- a/bom-internal/pom.xml +++ b/bom-internal/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index 8f555bf688fa..e587210bed5e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../pom.xml bom diff --git a/bundle/pom.xml b/bundle/pom.xml index f0bc7d7aa770..d4b0c693a398 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 bundle jar diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml index c3d2aaf0c0b4..867a180a684e 100644 --- a/codegen-lite-maven-plugin/pom.xml +++ b/codegen-lite-maven-plugin/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../pom.xml codegen-lite-maven-plugin diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml index 756a2a8f3f8c..4f57aefe829c 100644 --- a/codegen-lite/pom.xml +++ b/codegen-lite/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 codegen-lite AWS Java SDK :: Code Generator Lite diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml index 4f58b9fd2d45..128a742c1da6 100644 --- a/codegen-maven-plugin/pom.xml +++ b/codegen-maven-plugin/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../pom.xml codegen-maven-plugin diff --git a/codegen/pom.xml b/codegen/pom.xml index 929b928dad27..1a0d467d9447 100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 codegen AWS Java SDK :: Code Generator diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java index 8b2230310c46..5146ab82d9f5 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java @@ -165,6 +165,13 @@ public class CustomizationConfig { */ private boolean enableEndpointDiscoveryMethodRequired = false; + /** + * Allow a customer to set an endpoint override AND bypass endpoint discovery on their client even when endpoint discovery + * enabled is true and endpoint discovery is required for an operation. This customization should almost never be "true" + * because it creates a confusing customer experience. + */ + private boolean allowEndpointOverrideForEndpointDiscoveryRequiredOperations = false; + private CustomizationConfig() { } @@ -420,4 +427,14 @@ public boolean isEnableEndpointDiscoveryMethodRequired() { public void setEnableEndpointDiscoveryMethodRequired(boolean enableEndpointDiscoveryMethodRequired) { this.enableEndpointDiscoveryMethodRequired = enableEndpointDiscoveryMethodRequired; } + + public boolean allowEndpointOverrideForEndpointDiscoveryRequiredOperations() { + return allowEndpointOverrideForEndpointDiscoveryRequiredOperations; + } + + public void setAllowEndpointOverrideForEndpointDiscoveryRequiredOperations( + boolean allowEndpointOverrideForEndpointDiscoveryRequiredOperations) { + this.allowEndpointOverrideForEndpointDiscoveryRequiredOperations = + allowEndpointOverrideForEndpointDiscoveryRequiredOperations; + } } diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java index 13ac033c3617..27443913d10d 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java @@ -166,6 +166,17 @@ private MethodSpec constructor(Builder classBuilder) { EndpointDiscoveryRefreshCache.class, poetExtensions.getClientClass(model.getNamingStrategy().getServiceName() + "AsyncEndpointDiscoveryCacheLoader")); + + if (model.getCustomizationConfig().allowEndpointOverrideForEndpointDiscoveryRequiredOperations()) { + builder.beginControlFlow("if (clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == " + + "Boolean.TRUE)"); + builder.addStatement("log.warn($S)", + "Endpoint discovery is enabled for this client, and an endpoint override was also " + + "specified. This will disable endpoint discovery for methods that require it, instead " + + "using the specified endpoint override. This may or may not be what you intended."); + builder.endControlFlow(); + } + builder.endControlFlow(); } @@ -220,8 +231,37 @@ protected MethodSpec.Builder operationBody(MethodSpec.Builder builder, Operation builder.addCode(eventToByteBufferPublisher(opModel)); if (opModel.getEndpointDiscovery() != null) { + builder.addStatement("boolean endpointDiscoveryEnabled = " + + "clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)"); + builder.addStatement("boolean endpointOverridden = " + + "clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE"); + + if (opModel.getEndpointDiscovery().isRequired()) { + if (!model.getCustomizationConfig().allowEndpointOverrideForEndpointDiscoveryRequiredOperations()) { + builder.beginControlFlow("if (endpointOverridden)"); + builder.addStatement("throw new $T($S)", IllegalStateException.class, + "This operation requires endpoint discovery, but an endpoint override was specified " + + "when the client was created. This is not supported."); + builder.endControlFlow(); + + builder.beginControlFlow("if (!endpointDiscoveryEnabled)"); + builder.addStatement("throw new $T($S)", IllegalStateException.class, + "This operation requires endpoint discovery, but endpoint discovery was disabled on the " + + "client."); + builder.endControlFlow(); + } else { + builder.beginControlFlow("if (endpointOverridden)"); + builder.addStatement("endpointDiscoveryEnabled = false"); + builder.nextControlFlow("else if (!endpointDiscoveryEnabled)"); + builder.addStatement("throw new $T($S)", IllegalStateException.class, + "This operation requires endpoint discovery to be enabled, or for you to specify an " + + "endpoint override when the client is created."); + builder.endControlFlow(); + } + } + builder.addStatement("$T cachedEndpoint = null", URI.class); - builder.beginControlFlow("if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED))"); + builder.beginControlFlow("if (endpointDiscoveryEnabled)"); builder.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER).resolveCredentials()" + ".accessKeyId()", AwsClientOption.class); builder.addStatement("EndpointDiscoveryRequest endpointDiscoveryRequest = $T.builder().required($L)" + diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java index d1e8d569475f..bff7d7e92a92 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java @@ -60,6 +60,7 @@ import software.amazon.awssdk.metrics.MetricCollector; import software.amazon.awssdk.metrics.MetricPublisher; import software.amazon.awssdk.metrics.NoOpMetricCollector; +import software.amazon.awssdk.utils.Logger; //TODO Make SyncClientClass extend SyncClientInterface (similar to what we do in AsyncClientClass) public class SyncClientClass implements ClassSpec { @@ -86,6 +87,7 @@ public TypeSpec poetSpec() { .addSuperinterface(interfaceClass) .addJavadoc("Internal implementation of {@link $1T}.\n\n@see $1T#builder()", interfaceClass) + .addField(logger()) .addField(SyncClientHandler.class, "clientHandler", PRIVATE, FINAL) .addField(protocolSpec.protocolFactory(model)) .addField(SdkClientConfiguration.class, "clientConfiguration", PRIVATE, FINAL) @@ -119,6 +121,12 @@ public TypeSpec poetSpec() { return classBuilder.build(); } + private FieldSpec logger() { + return FieldSpec.builder(Logger.class, "log", PRIVATE, STATIC, FINAL) + .initializer("$T.loggerFor($T.class)", Logger.class, className) + .build(); + } + private MethodSpec nameMethod() { return MethodSpec.methodBuilder("serviceName") .addAnnotation(Override.class) @@ -154,6 +162,17 @@ private MethodSpec constructor() { EndpointDiscoveryRefreshCache.class, poetExtensions.getClientClass(model.getNamingStrategy().getServiceName() + "EndpointDiscoveryCacheLoader")); + + if (model.getCustomizationConfig().allowEndpointOverrideForEndpointDiscoveryRequiredOperations()) { + builder.beginControlFlow("if (clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == " + + "Boolean.TRUE)"); + builder.addStatement("log.warn(() -> $S)", + "Endpoint discovery is enabled for this client, and an endpoint override was also " + + "specified. This will disable endpoint discovery for methods that require it, instead " + + "using the specified endpoint override. This may or may not be what you intended."); + builder.endControlFlow(); + } + builder.endControlFlow(); } @@ -181,8 +200,37 @@ private List operationMethodSpecs(OperationModel opModel) { protocolSpec.errorResponseHandler(opModel).ifPresent(method::addCode); if (opModel.getEndpointDiscovery() != null) { + method.addStatement("boolean endpointDiscoveryEnabled = " + + "clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)"); + method.addStatement("boolean endpointOverridden = " + + "clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE"); + + if (opModel.getEndpointDiscovery().isRequired()) { + if (!model.getCustomizationConfig().allowEndpointOverrideForEndpointDiscoveryRequiredOperations()) { + method.beginControlFlow("if (endpointOverridden)"); + method.addStatement("throw new $T($S)", IllegalStateException.class, + "This operation requires endpoint discovery, but an endpoint override was specified " + + "when the client was created. This is not supported."); + method.endControlFlow(); + + method.beginControlFlow("if (!endpointDiscoveryEnabled)"); + method.addStatement("throw new $T($S)", IllegalStateException.class, + "This operation requires endpoint discovery, but endpoint discovery was disabled on the " + + "client."); + method.endControlFlow(); + } else { + method.beginControlFlow("if (endpointOverridden)"); + method.addStatement("endpointDiscoveryEnabled = false"); + method.nextControlFlow("else if (!endpointDiscoveryEnabled)"); + method.addStatement("throw new $T($S)", IllegalStateException.class, + "This operation requires endpoint discovery to be enabled, or for you to specify an " + + "endpoint override when the client is created."); + method.endControlFlow(); + } + } + method.addStatement("$T cachedEndpoint = null", URI.class); - method.beginControlFlow("if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED))"); + method.beginControlFlow("if (endpointDiscoveryEnabled)"); method.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER)." + "resolveCredentials().accessKeyId()", AwsClientOption.class); method.addStatement("EndpointDiscoveryRequest endpointDiscoveryRequest = $T.builder().required($L)" + diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java index 10e45085470f..edf28f14c1d9 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-async.java @@ -167,8 +167,18 @@ public CompletableFuture testDiscovery HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata); + boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); + boolean endpointOverridden = clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE; + if (endpointOverridden) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but an endpoint override was specified when the client was created. This is not supported."); + } + if (!endpointDiscoveryEnabled) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but endpoint discovery was disabled on the client."); + } URI cachedEndpoint = null; - if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)) { + if (endpointDiscoveryEnabled) { String key = clientConfiguration.option(AwsClientOption.CREDENTIALS_PROVIDER).resolveCredentials().accessKeyId(); EndpointDiscoveryRequest endpointDiscoveryRequest = EndpointDiscoveryRequest.builder().required(true) @@ -231,8 +241,10 @@ public CompletableFuture testDiscoveryOptional( HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata); + boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); + boolean endpointOverridden = clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE; URI cachedEndpoint = null; - if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)) { + if (endpointDiscoveryEnabled) { String key = clientConfiguration.option(AwsClientOption.CREDENTIALS_PROVIDER).resolveCredentials().accessKeyId(); EndpointDiscoveryRequest endpointDiscoveryRequest = EndpointDiscoveryRequest.builder().required(false) @@ -295,8 +307,18 @@ public CompletableFuture testDiscoveryRequired( HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata); + boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); + boolean endpointOverridden = clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE; + if (endpointOverridden) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but an endpoint override was specified when the client was created. This is not supported."); + } + if (!endpointDiscoveryEnabled) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but endpoint discovery was disabled on the client."); + } URI cachedEndpoint = null; - if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)) { + if (endpointDiscoveryEnabled) { String key = clientConfiguration.option(AwsClientOption.CREDENTIALS_PROVIDER).resolveCredentials().accessKeyId(); EndpointDiscoveryRequest endpointDiscoveryRequest = EndpointDiscoveryRequest.builder().required(true) diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java index e87c377e9dc1..2a8faa80e18f 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java @@ -38,6 +38,7 @@ import software.amazon.awssdk.services.endpointdiscoverytest.transform.TestDiscoveryIdentifiersRequiredRequestMarshaller; import software.amazon.awssdk.services.endpointdiscoverytest.transform.TestDiscoveryOptionalRequestMarshaller; import software.amazon.awssdk.services.endpointdiscoverytest.transform.TestDiscoveryRequiredRequestMarshaller; +import software.amazon.awssdk.utils.Logger; /** * Internal implementation of {@link EndpointDiscoveryTestClient}. @@ -47,6 +48,8 @@ @Generated("software.amazon.awssdk:codegen") @SdkInternalApi final class DefaultEndpointDiscoveryTestClient implements EndpointDiscoveryTestClient { + private static final Logger log = Logger.loggerFor(DefaultEndpointDiscoveryTestClient.class); + private final SyncClientHandler clientHandler; private final AwsJsonProtocolFactory protocolFactory; @@ -139,8 +142,18 @@ public TestDiscoveryIdentifiersRequiredResponse testDiscoveryIdentifiersRequired HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata); + boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); + boolean endpointOverridden = clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE; + if (endpointOverridden) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but an endpoint override was specified when the client was created. This is not supported."); + } + if (!endpointDiscoveryEnabled) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but endpoint discovery was disabled on the client."); + } URI cachedEndpoint = null; - if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)) { + if (endpointDiscoveryEnabled) { String key = clientConfiguration.option(AwsClientOption.CREDENTIALS_PROVIDER).resolveCredentials().accessKeyId(); EndpointDiscoveryRequest endpointDiscoveryRequest = EndpointDiscoveryRequest.builder().required(true) @@ -191,8 +204,10 @@ public TestDiscoveryOptionalResponse testDiscoveryOptional(TestDiscoveryOptional HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata); + boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); + boolean endpointOverridden = clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE; URI cachedEndpoint = null; - if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)) { + if (endpointDiscoveryEnabled) { String key = clientConfiguration.option(AwsClientOption.CREDENTIALS_PROVIDER).resolveCredentials().accessKeyId(); EndpointDiscoveryRequest endpointDiscoveryRequest = EndpointDiscoveryRequest.builder().required(false) @@ -242,8 +257,18 @@ public TestDiscoveryRequiredResponse testDiscoveryRequired(TestDiscoveryRequired HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, operationMetadata); + boolean endpointDiscoveryEnabled = clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED); + boolean endpointOverridden = clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN) == Boolean.TRUE; + if (endpointOverridden) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but an endpoint override was specified when the client was created. This is not supported."); + } + if (!endpointDiscoveryEnabled) { + throw new IllegalStateException( + "This operation requires endpoint discovery, but endpoint discovery was disabled on the client."); + } URI cachedEndpoint = null; - if (clientConfiguration.option(SdkClientOption.ENDPOINT_DISCOVERY_ENABLED)) { + if (endpointDiscoveryEnabled) { String key = clientConfiguration.option(AwsClientOption.CREDENTIALS_PROVIDER).resolveCredentials().accessKeyId(); EndpointDiscoveryRequest endpointDiscoveryRequest = EndpointDiscoveryRequest.builder().required(true) diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java index 569ed383c88e..0fc88ac35dd9 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java @@ -60,6 +60,7 @@ import software.amazon.awssdk.services.json.transform.StreamingInputOperationRequestMarshaller; import software.amazon.awssdk.services.json.transform.StreamingInputOutputOperationRequestMarshaller; import software.amazon.awssdk.services.json.transform.StreamingOutputOperationRequestMarshaller; +import software.amazon.awssdk.utils.Logger; import software.amazon.awssdk.utils.Validate; /** @@ -70,6 +71,8 @@ @Generated("software.amazon.awssdk:codegen") @SdkInternalApi final class DefaultJsonClient implements JsonClient { + private static final Logger log = Logger.loggerFor(DefaultJsonClient.class); + private final SyncClientHandler clientHandler; private final AwsJsonProtocolFactory protocolFactory; diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java index c4526fc54be0..dd32d0e83044 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java @@ -36,6 +36,7 @@ import software.amazon.awssdk.services.query.transform.APostOperationWithOutputRequestMarshaller; import software.amazon.awssdk.services.query.transform.StreamingInputOperationRequestMarshaller; import software.amazon.awssdk.services.query.transform.StreamingOutputOperationRequestMarshaller; +import software.amazon.awssdk.utils.Logger; /** * Internal implementation of {@link QueryClient}. @@ -45,6 +46,8 @@ @Generated("software.amazon.awssdk:codegen") @SdkInternalApi final class DefaultQueryClient implements QueryClient { + private static final Logger log = Logger.loggerFor(DefaultQueryClient.class); + private final SyncClientHandler clientHandler; private final AwsQueryProtocolFactory protocolFactory; diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml index 2c4227061133..b0a2a9ca99c5 100644 --- a/core/annotations/pom.xml +++ b/core/annotations/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/arns/pom.xml b/core/arns/pom.xml index b9d15cf68347..a35f0b33c298 100644 --- a/core/arns/pom.xml +++ b/core/arns/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/auth/pom.xml b/core/auth/pom.xml index 5294f6f63640..0c55c4f9712a 100644 --- a/core/auth/pom.xml +++ b/core/auth/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.14.6 + 2.14.7 auth diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml index 3c5c4d25fb23..89d588cca8b6 100644 --- a/core/aws-core/pom.xml +++ b/core/aws-core/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.14.6 + 2.14.7 aws-core diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml index 09cca7c8c884..27ee886389c7 100644 --- a/core/metrics-spi/pom.xml +++ b/core/metrics-spi/pom.xml @@ -5,7 +5,7 @@ core software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index db31c3f02924..a75e2ae708df 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 core diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml index 74df8fc9f09f..aa61c76f68b4 100644 --- a/core/profiles/pom.xml +++ b/core/profiles/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.14.6 + 2.14.7 profiles diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml index 48f635b0b5c9..50d1c967ad42 100644 --- a/core/protocols/aws-cbor-protocol/pom.xml +++ b/core/protocols/aws-cbor-protocol/pom.xml @@ -20,7 +20,7 @@ protocols software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/protocols/aws-ion-protocol/pom.xml b/core/protocols/aws-ion-protocol/pom.xml index 49a6a9770dbd..7b2f7e6d9b1b 100644 --- a/core/protocols/aws-ion-protocol/pom.xml +++ b/core/protocols/aws-ion-protocol/pom.xml @@ -20,7 +20,7 @@ protocols software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml index 00dc652f1986..e1d3e9ce2350 100644 --- a/core/protocols/aws-json-protocol/pom.xml +++ b/core/protocols/aws-json-protocol/pom.xml @@ -20,7 +20,7 @@ protocols software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml index 5ec34ee6e2c5..edddea119839 100644 --- a/core/protocols/aws-query-protocol/pom.xml +++ b/core/protocols/aws-query-protocol/pom.xml @@ -20,7 +20,7 @@ protocols software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml index 2e3461f169bd..a00ecf91c269 100644 --- a/core/protocols/aws-xml-protocol/pom.xml +++ b/core/protocols/aws-xml-protocol/pom.xml @@ -20,7 +20,7 @@ protocols software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml index 2f44275dbb2f..5b76a4a98b15 100644 --- a/core/protocols/pom.xml +++ b/core/protocols/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml index bd58226cb53d..48ba89bc3529 100644 --- a/core/protocols/protocol-core/pom.xml +++ b/core/protocols/protocol-core/pom.xml @@ -20,7 +20,7 @@ protocols software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/core/regions/pom.xml b/core/regions/pom.xml index 6c3344126561..6cb025cf8d7f 100644 --- a/core/regions/pom.xml +++ b/core/regions/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.14.6 + 2.14.7 regions diff --git a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json index 36759dcf79c0..eda02db66db9 100644 --- a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json +++ b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json @@ -3549,6 +3549,7 @@ "ap-northeast-2" : { }, "ap-southeast-1" : { }, "eu-west-1" : { }, + "eu-west-2" : { }, "us-east-1" : { } } }, diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml index 60d1d21d44dc..f0a55356167e 100644 --- a/core/sdk-core/pom.xml +++ b/core/sdk-core/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk core - 2.14.6 + 2.14.7 sdk-core AWS Java SDK :: SDK Core diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java index 6725771e737b..1628c97cdd59 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java @@ -27,12 +27,14 @@ import static software.amazon.awssdk.core.client.config.SdkClientOption.API_CALL_TIMEOUT; import static software.amazon.awssdk.core.client.config.SdkClientOption.ASYNC_HTTP_CLIENT; import static software.amazon.awssdk.core.client.config.SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED; +import static software.amazon.awssdk.core.client.config.SdkClientOption.ENDPOINT_OVERRIDDEN; import static software.amazon.awssdk.core.client.config.SdkClientOption.EXECUTION_INTERCEPTORS; import static software.amazon.awssdk.core.client.config.SdkClientOption.METRIC_PUBLISHERS; import static software.amazon.awssdk.core.client.config.SdkClientOption.PROFILE_FILE; import static software.amazon.awssdk.core.client.config.SdkClientOption.PROFILE_NAME; import static software.amazon.awssdk.core.client.config.SdkClientOption.RETRY_POLICY; import static software.amazon.awssdk.core.client.config.SdkClientOption.SCHEDULED_EXECUTOR_SERVICE; +import static software.amazon.awssdk.core.internal.SdkInternalTestAdvancedClientOption.ENDPOINT_OVERRIDDEN_OVERRIDE; import static software.amazon.awssdk.utils.CollectionUtils.mergeLists; import static software.amazon.awssdk.utils.Validate.paramNotNull; @@ -367,6 +369,9 @@ public final B overrideConfiguration(ClientOverrideConfiguration overrideConfig) clientConfiguration.option(PROFILE_FILE, overrideConfig.defaultProfileFile().orElse(null)); clientConfiguration.option(PROFILE_NAME, overrideConfig.defaultProfileName().orElse(null)); clientConfiguration.option(METRIC_PUBLISHERS, overrideConfig.metricPublishers()); + overrideConfig.advancedOption(ENDPOINT_OVERRIDDEN_OVERRIDE).ifPresent(value -> { + clientConfiguration.option(ENDPOINT_OVERRIDDEN, value); + }); return thisBuilder(); } diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java index e4b819ddd2a0..8676ba5bcb49 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java @@ -45,7 +45,6 @@ public class SdkAdvancedClientOption extends ClientOption { */ public static final SdkAdvancedClientOption SIGNER = new SdkAdvancedClientOption<>(Signer.class); - /** * SDK uses endpoint trait and hostPrefix trait specified in service model to modify * the endpoint host that the API request is sent to. diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/SdkInternalTestAdvancedClientOption.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/SdkInternalTestAdvancedClientOption.java new file mode 100644 index 000000000000..9bebbe2fd600 --- /dev/null +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/SdkInternalTestAdvancedClientOption.java @@ -0,0 +1,46 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.awssdk.core.internal; + +import java.net.URI; +import software.amazon.awssdk.annotations.SdkInternalApi; +import software.amazon.awssdk.annotations.SdkTestInternalApi; +import software.amazon.awssdk.core.client.builder.SdkClientBuilder; +import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption; +import software.amazon.awssdk.core.client.config.SdkClientOption; + +/** + * Options of {@link SdkAdvancedClientOption} that must not be used outside of tests that are stored in this project. + * Changes to this class are not guaranteed to be backwards compatible. + */ +@SdkInternalApi +public class SdkInternalTestAdvancedClientOption extends SdkAdvancedClientOption { + /** + * By default, the SDK handles endpoints specified via {@link SdkClientBuilder#endpointOverride(URI)} differently than + * endpoints generated from a specific region. For example, endpoint discovery is not supported in some cases when endpoint + * overrides are used. + * + * When this option is set, the {@link SdkClientOption#ENDPOINT_OVERRIDDEN} is forced to this value. Because of the way this + * is implemented, the client configuration must be configured *after* the {@code endpointOverride} is configured. + */ + @SdkTestInternalApi + public static final SdkInternalTestAdvancedClientOption ENDPOINT_OVERRIDDEN_OVERRIDE = + new SdkInternalTestAdvancedClientOption<>(Boolean.class); + + protected SdkInternalTestAdvancedClientOption(Class valueClass) { + super(valueClass); + } +} diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml index efb46a53b6ea..d4d2cf792e9d 100644 --- a/http-client-spi/pom.xml +++ b/http-client-spi/pom.xml @@ -22,7 +22,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 http-client-spi AWS Java SDK :: HTTP Client Interface diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml index c6924e3d5021..128687216e55 100644 --- a/http-clients/apache-client/pom.xml +++ b/http-clients/apache-client/pom.xml @@ -21,7 +21,7 @@ http-clients software.amazon.awssdk - 2.14.6 + 2.14.7 apache-client diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml index afc5bc7120bf..6a2d68434d07 100644 --- a/http-clients/netty-nio-client/pom.xml +++ b/http-clients/netty-nio-client/pom.xml @@ -20,7 +20,7 @@ http-clients software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/http-clients/pom.xml b/http-clients/pom.xml index eb70b0907569..ecd20bbe0889 100644 --- a/http-clients/pom.xml +++ b/http-clients/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 47ff6a4879fa..0327616220f5 100644 --- a/http-clients/url-connection-client/pom.xml +++ b/http-clients/url-connection-client/pom.xml @@ -20,7 +20,7 @@ http-clients software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml index aadb60fc7c4e..3b8958a87978 100644 --- a/metric-publishers/cloudwatch-metric-publisher/pom.xml +++ b/metric-publishers/cloudwatch-metric-publisher/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk metric-publishers - 2.14.6 + 2.14.7 cloudwatch-metric-publisher diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml index 5bbd53fcb1f3..dbd0bdc22fc5 100644 --- a/metric-publishers/pom.xml +++ b/metric-publishers/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 metric-publishers diff --git a/pom.xml b/pom.xml index 0a6d5a7dcf87..0033836aba40 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 pom AWS Java SDK :: Parent The Amazon Web Services SDK for Java provides Java APIs diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml index f8c84462c6d6..4837a4e43d15 100644 --- a/release-scripts/pom.xml +++ b/release-scripts/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../pom.xml release-scripts diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml index fde5c9e57a53..7b6f08386f88 100644 --- a/services-custom/dynamodb-enhanced/pom.xml +++ b/services-custom/dynamodb-enhanced/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services-custom - 2.14.6 + 2.14.7 dynamodb-enhanced ${awsjavasdk.version} diff --git a/services-custom/pom.xml b/services-custom/pom.xml index 5c8b568876c7..4814b9558dcb 100644 --- a/services-custom/pom.xml +++ b/services-custom/pom.xml @@ -19,7 +19,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 services-custom AWS Java SDK :: Custom Services diff --git a/services/accessanalyzer/pom.xml b/services/accessanalyzer/pom.xml index 0cd6960050ee..fa0025d1b446 100644 --- a/services/accessanalyzer/pom.xml +++ b/services/accessanalyzer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 accessanalyzer AWS Java SDK :: Services :: AccessAnalyzer diff --git a/services/acm/pom.xml b/services/acm/pom.xml index d2ca7957b9a9..480c1e808ed8 100644 --- a/services/acm/pom.xml +++ b/services/acm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 acm AWS Java SDK :: Services :: AWS Certificate Manager diff --git a/services/acmpca/pom.xml b/services/acmpca/pom.xml index 1525c5a6d13b..6b1540a58c36 100644 --- a/services/acmpca/pom.xml +++ b/services/acmpca/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 acmpca AWS Java SDK :: Services :: ACM PCA diff --git a/services/alexaforbusiness/pom.xml b/services/alexaforbusiness/pom.xml index 43fc07adf789..1922c175c5b3 100644 --- a/services/alexaforbusiness/pom.xml +++ b/services/alexaforbusiness/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 alexaforbusiness diff --git a/services/amplify/pom.xml b/services/amplify/pom.xml index 3db0823e406d..0282e689fa6b 100644 --- a/services/amplify/pom.xml +++ b/services/amplify/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 amplify AWS Java SDK :: Services :: Amplify diff --git a/services/apigateway/pom.xml b/services/apigateway/pom.xml index 9d1654977665..02e3b5573be6 100644 --- a/services/apigateway/pom.xml +++ b/services/apigateway/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 apigateway AWS Java SDK :: Services :: Amazon API Gateway diff --git a/services/apigatewaymanagementapi/pom.xml b/services/apigatewaymanagementapi/pom.xml index c6afe50cf389..80a0cfec8ea8 100644 --- a/services/apigatewaymanagementapi/pom.xml +++ b/services/apigatewaymanagementapi/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 apigatewaymanagementapi AWS Java SDK :: Services :: ApiGatewayManagementApi diff --git a/services/apigatewayv2/pom.xml b/services/apigatewayv2/pom.xml index 17e3cdce0465..d37b0bb26d79 100644 --- a/services/apigatewayv2/pom.xml +++ b/services/apigatewayv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 apigatewayv2 AWS Java SDK :: Services :: ApiGatewayV2 diff --git a/services/appconfig/pom.xml b/services/appconfig/pom.xml index 9bfe345e560c..fd050e3ec181 100644 --- a/services/appconfig/pom.xml +++ b/services/appconfig/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 appconfig AWS Java SDK :: Services :: AppConfig diff --git a/services/appflow/pom.xml b/services/appflow/pom.xml index 63002441feb8..3d6239882974 100644 --- a/services/appflow/pom.xml +++ b/services/appflow/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 appflow AWS Java SDK :: Services :: Appflow diff --git a/services/applicationautoscaling/pom.xml b/services/applicationautoscaling/pom.xml index b5603ea02f93..07b4e659f26c 100644 --- a/services/applicationautoscaling/pom.xml +++ b/services/applicationautoscaling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 applicationautoscaling AWS Java SDK :: Services :: AWS Application Auto Scaling diff --git a/services/applicationdiscovery/pom.xml b/services/applicationdiscovery/pom.xml index a30d2e8e8363..01bc20539bdb 100644 --- a/services/applicationdiscovery/pom.xml +++ b/services/applicationdiscovery/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 applicationdiscovery AWS Java SDK :: Services :: AWS Application Discovery Service diff --git a/services/applicationinsights/pom.xml b/services/applicationinsights/pom.xml index 1a8e8b3f6da5..ec9cb722fc99 100644 --- a/services/applicationinsights/pom.xml +++ b/services/applicationinsights/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 applicationinsights AWS Java SDK :: Services :: Application Insights diff --git a/services/appmesh/pom.xml b/services/appmesh/pom.xml index 98b7f9621d50..63739d813100 100644 --- a/services/appmesh/pom.xml +++ b/services/appmesh/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 appmesh AWS Java SDK :: Services :: App Mesh diff --git a/services/appstream/pom.xml b/services/appstream/pom.xml index aa750fd52fe3..6cb717ef2a2f 100644 --- a/services/appstream/pom.xml +++ b/services/appstream/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 appstream AWS Java SDK :: Services :: Amazon AppStream diff --git a/services/appsync/pom.xml b/services/appsync/pom.xml index f0fd9658efdb..f135c9a06f7a 100644 --- a/services/appsync/pom.xml +++ b/services/appsync/pom.xml @@ -21,7 +21,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 appsync diff --git a/services/athena/pom.xml b/services/athena/pom.xml index d7fee380ca48..88d52b7110bf 100644 --- a/services/athena/pom.xml +++ b/services/athena/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 athena AWS Java SDK :: Services :: Amazon Athena diff --git a/services/autoscaling/pom.xml b/services/autoscaling/pom.xml index 49aefad9ecd3..7e25604d27a5 100644 --- a/services/autoscaling/pom.xml +++ b/services/autoscaling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 autoscaling AWS Java SDK :: Services :: Auto Scaling diff --git a/services/autoscalingplans/pom.xml b/services/autoscalingplans/pom.xml index 4c652d950635..3e504e711c72 100644 --- a/services/autoscalingplans/pom.xml +++ b/services/autoscalingplans/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 autoscalingplans AWS Java SDK :: Services :: Auto Scaling Plans diff --git a/services/backup/pom.xml b/services/backup/pom.xml index 0616117bb320..66f77a7aaa31 100644 --- a/services/backup/pom.xml +++ b/services/backup/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 backup AWS Java SDK :: Services :: Backup diff --git a/services/batch/pom.xml b/services/batch/pom.xml index aaf1fa483244..fe3accb3e881 100644 --- a/services/batch/pom.xml +++ b/services/batch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 batch AWS Java SDK :: Services :: AWS Batch diff --git a/services/braket/pom.xml b/services/braket/pom.xml index 7ff4d73768ce..5ee5af6a83cf 100644 --- a/services/braket/pom.xml +++ b/services/braket/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 braket AWS Java SDK :: Services :: Braket diff --git a/services/budgets/pom.xml b/services/budgets/pom.xml index 706eb5cdcbb8..29d254b80aab 100644 --- a/services/budgets/pom.xml +++ b/services/budgets/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 budgets AWS Java SDK :: Services :: AWS Budgets diff --git a/services/chime/pom.xml b/services/chime/pom.xml index b711fcbc88c1..bce198f31a7a 100644 --- a/services/chime/pom.xml +++ b/services/chime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 chime AWS Java SDK :: Services :: Chime diff --git a/services/cloud9/pom.xml b/services/cloud9/pom.xml index 9e088d076e5b..e82947440022 100644 --- a/services/cloud9/pom.xml +++ b/services/cloud9/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 cloud9 diff --git a/services/clouddirectory/pom.xml b/services/clouddirectory/pom.xml index a542b3973358..87aa92b113ac 100644 --- a/services/clouddirectory/pom.xml +++ b/services/clouddirectory/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 clouddirectory AWS Java SDK :: Services :: Amazon CloudDirectory diff --git a/services/cloudformation/pom.xml b/services/cloudformation/pom.xml index 54ab30e6df07..1470f6d7b396 100644 --- a/services/cloudformation/pom.xml +++ b/services/cloudformation/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudformation AWS Java SDK :: Services :: AWS CloudFormation diff --git a/services/cloudfront/pom.xml b/services/cloudfront/pom.xml index a1b6d848bd77..5ca964509b10 100644 --- a/services/cloudfront/pom.xml +++ b/services/cloudfront/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudfront AWS Java SDK :: Services :: Amazon CloudFront diff --git a/services/cloudfront/src/main/resources/codegen-resources/service-2.json b/services/cloudfront/src/main/resources/codegen-resources/service-2.json index ce62f4bfe165..00b237f7a742 100644 --- a/services/cloudfront/src/main/resources/codegen-resources/service-2.json +++ b/services/cloudfront/src/main/resources/codegen-resources/service-2.json @@ -238,6 +238,20 @@ ], "documentation":"

Create a new invalidation.

" }, + "CreateMonitoringSubscription":{ + "name":"CreateMonitoringSubscription2020_05_31", + "http":{ + "method":"POST", + "requestUri":"/2020-05-31/distributions/{DistributionId}/monitoring-subscription" + }, + "input":{"shape":"CreateMonitoringSubscriptionRequest"}, + "output":{"shape":"CreateMonitoringSubscriptionResult"}, + "errors":[ + {"shape":"AccessDenied"}, + {"shape":"NoSuchDistribution"} + ], + "documentation":"

Enables additional CloudWatch metrics for the specified CloudFront distribution. The additional metrics incur an additional cost.

For more information, see Viewing additional CloudFront distribution metrics in the Amazon CloudFront Developer Guide.

" + }, "CreateOriginRequestPolicy":{ "name":"CreateOriginRequestPolicy2020_05_31", "http":{ @@ -412,6 +426,20 @@ ], "documentation":"

Remove a field-level encryption profile.

" }, + "DeleteMonitoringSubscription":{ + "name":"DeleteMonitoringSubscription2020_05_31", + "http":{ + "method":"DELETE", + "requestUri":"/2020-05-31/distributions/{DistributionId}/monitoring-subscription" + }, + "input":{"shape":"DeleteMonitoringSubscriptionRequest"}, + "output":{"shape":"DeleteMonitoringSubscriptionResult"}, + "errors":[ + {"shape":"AccessDenied"}, + {"shape":"NoSuchDistribution"} + ], + "documentation":"

Disables additional CloudWatch metrics for the specified CloudFront distribution.

" + }, "DeleteOriginRequestPolicy":{ "name":"DeleteOriginRequestPolicy2020_05_31", "http":{ @@ -619,6 +647,20 @@ ], "documentation":"

Get the information about an invalidation.

" }, + "GetMonitoringSubscription":{ + "name":"GetMonitoringSubscription2020_05_31", + "http":{ + "method":"GET", + "requestUri":"/2020-05-31/distributions/{DistributionId}/monitoring-subscription" + }, + "input":{"shape":"GetMonitoringSubscriptionRequest"}, + "output":{"shape":"GetMonitoringSubscriptionResult"}, + "errors":[ + {"shape":"AccessDenied"}, + {"shape":"NoSuchDistribution"} + ], + "documentation":"

Gets information about whether additional CloudWatch metrics are enabled for the specified CloudFront distribution.

" + }, "GetOriginRequestPolicy":{ "name":"GetOriginRequestPolicy2020_05_31", "http":{ @@ -2063,6 +2105,38 @@ "documentation":"

The returned result of the corresponding request.

", "payload":"Invalidation" }, + "CreateMonitoringSubscriptionRequest":{ + "type":"structure", + "required":[ + "MonitoringSubscription", + "DistributionId" + ], + "members":{ + "DistributionId":{ + "shape":"string", + "documentation":"

The ID of the distribution that you are enabling metrics for.

", + "location":"uri", + "locationName":"DistributionId" + }, + "MonitoringSubscription":{ + "shape":"MonitoringSubscription", + "documentation":"

A monitoring subscription. This structure contains information about whether additional CloudWatch metrics are enabled for a given CloudFront distribution.

", + "locationName":"MonitoringSubscription", + "xmlNamespace":{"uri":"http://cloudfront.amazonaws.com/doc/2020-05-31/"} + } + }, + "payload":"MonitoringSubscription" + }, + "CreateMonitoringSubscriptionResult":{ + "type":"structure", + "members":{ + "MonitoringSubscription":{ + "shape":"MonitoringSubscription", + "documentation":"

A monitoring subscription. This structure contains information about whether additional CloudWatch metrics are enabled for a given CloudFront distribution.

" + } + }, + "payload":"MonitoringSubscription" + }, "CreateOriginRequestPolicyRequest":{ "type":"structure", "required":["OriginRequestPolicyConfig"], @@ -2462,6 +2536,23 @@ } } }, + "DeleteMonitoringSubscriptionRequest":{ + "type":"structure", + "required":["DistributionId"], + "members":{ + "DistributionId":{ + "shape":"string", + "documentation":"

The ID of the distribution that you are disabling metrics for.

", + "location":"uri", + "locationName":"DistributionId" + } + } + }, + "DeleteMonitoringSubscriptionResult":{ + "type":"structure", + "members":{ + } + }, "DeleteOriginRequestPolicyRequest":{ "type":"structure", "required":["Id"], @@ -3604,6 +3695,28 @@ "documentation":"

The returned result of the corresponding request.

", "payload":"Invalidation" }, + "GetMonitoringSubscriptionRequest":{ + "type":"structure", + "required":["DistributionId"], + "members":{ + "DistributionId":{ + "shape":"string", + "documentation":"

The ID of the distribution that you are getting metrics information for.

", + "location":"uri", + "locationName":"DistributionId" + } + } + }, + "GetMonitoringSubscriptionResult":{ + "type":"structure", + "members":{ + "MonitoringSubscription":{ + "shape":"MonitoringSubscription", + "documentation":"

A monitoring subscription. This structure contains information about whether additional CloudWatch metrics are enabled for a given CloudFront distribution.

" + } + }, + "payload":"MonitoringSubscription" + }, "GetOriginRequestPolicyConfigRequest":{ "type":"structure", "required":["Id"], @@ -4716,6 +4829,16 @@ "error":{"httpStatusCode":400}, "exception":true }, + "MonitoringSubscription":{ + "type":"structure", + "members":{ + "RealtimeMetricsSubscriptionConfig":{ + "shape":"RealtimeMetricsSubscriptionConfig", + "documentation":"

A subscription configuration for additional CloudWatch metrics.

" + } + }, + "documentation":"

A monitoring subscription. This structure contains information about whether additional CloudWatch metrics are enabled for a given CloudFront distribution.

" + }, "NoSuchCachePolicy":{ "type":"structure", "members":{ @@ -5533,6 +5656,24 @@ "locationName":"Name" } }, + "RealtimeMetricsSubscriptionConfig":{ + "type":"structure", + "required":["RealtimeMetricsSubscriptionStatus"], + "members":{ + "RealtimeMetricsSubscriptionStatus":{ + "shape":"RealtimeMetricsSubscriptionStatus", + "documentation":"

A flag that indicates whether additional CloudWatch metrics are enabled for a given CloudFront distribution.

" + } + }, + "documentation":"

A subscription configuration for additional CloudWatch metrics.

" + }, + "RealtimeMetricsSubscriptionStatus":{ + "type":"string", + "enum":[ + "Enabled", + "Disabled" + ] + }, "ResourceARN":{ "type":"string", "pattern":"arn:aws(-cn)?:cloudfront::[0-9]+:.*" diff --git a/services/cloudhsm/pom.xml b/services/cloudhsm/pom.xml index 68ecc71c5f1a..0a913b6d281b 100644 --- a/services/cloudhsm/pom.xml +++ b/services/cloudhsm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudhsm AWS Java SDK :: Services :: AWS CloudHSM diff --git a/services/cloudhsmv2/pom.xml b/services/cloudhsmv2/pom.xml index ef434ec5ec62..d630e3ece46e 100644 --- a/services/cloudhsmv2/pom.xml +++ b/services/cloudhsmv2/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 cloudhsmv2 diff --git a/services/cloudsearch/pom.xml b/services/cloudsearch/pom.xml index eeb16f6fdcad..c7c4cc2b1079 100644 --- a/services/cloudsearch/pom.xml +++ b/services/cloudsearch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudsearch AWS Java SDK :: Services :: Amazon CloudSearch diff --git a/services/cloudsearchdomain/pom.xml b/services/cloudsearchdomain/pom.xml index 0acdd04f9511..f11c09fb0ef0 100644 --- a/services/cloudsearchdomain/pom.xml +++ b/services/cloudsearchdomain/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudsearchdomain AWS Java SDK :: Services :: Amazon CloudSearch Domain diff --git a/services/cloudtrail/pom.xml b/services/cloudtrail/pom.xml index 3725d849da77..e3460664b116 100644 --- a/services/cloudtrail/pom.xml +++ b/services/cloudtrail/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudtrail AWS Java SDK :: Services :: AWS CloudTrail diff --git a/services/cloudwatch/pom.xml b/services/cloudwatch/pom.xml index fd290d3f9e52..55c8b1781450 100644 --- a/services/cloudwatch/pom.xml +++ b/services/cloudwatch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudwatch AWS Java SDK :: Services :: Amazon CloudWatch diff --git a/services/cloudwatchevents/pom.xml b/services/cloudwatchevents/pom.xml index 2451ae2b39a0..b0c621eabab9 100644 --- a/services/cloudwatchevents/pom.xml +++ b/services/cloudwatchevents/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudwatchevents AWS Java SDK :: Services :: Amazon CloudWatch Events diff --git a/services/cloudwatchlogs/pom.xml b/services/cloudwatchlogs/pom.xml index d306ec2eb1cc..e12c660222df 100644 --- a/services/cloudwatchlogs/pom.xml +++ b/services/cloudwatchlogs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cloudwatchlogs AWS Java SDK :: Services :: Amazon CloudWatch Logs diff --git a/services/codeartifact/pom.xml b/services/codeartifact/pom.xml index ed383e260c27..3c62e11826ea 100644 --- a/services/codeartifact/pom.xml +++ b/services/codeartifact/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codeartifact AWS Java SDK :: Services :: Codeartifact diff --git a/services/codebuild/pom.xml b/services/codebuild/pom.xml index 280b80c0267e..4cf5c9327d45 100644 --- a/services/codebuild/pom.xml +++ b/services/codebuild/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codebuild AWS Java SDK :: Services :: AWS Code Build diff --git a/services/codecommit/pom.xml b/services/codecommit/pom.xml index d604866bf54f..2f39b1107fcb 100644 --- a/services/codecommit/pom.xml +++ b/services/codecommit/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codecommit AWS Java SDK :: Services :: AWS CodeCommit diff --git a/services/codedeploy/pom.xml b/services/codedeploy/pom.xml index 9cd06db5d2ed..594b0a9aee6e 100644 --- a/services/codedeploy/pom.xml +++ b/services/codedeploy/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codedeploy AWS Java SDK :: Services :: AWS CodeDeploy diff --git a/services/codeguruprofiler/pom.xml b/services/codeguruprofiler/pom.xml index 8f461aa76cf1..4244bb066289 100644 --- a/services/codeguruprofiler/pom.xml +++ b/services/codeguruprofiler/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codeguruprofiler AWS Java SDK :: Services :: CodeGuruProfiler diff --git a/services/codegurureviewer/pom.xml b/services/codegurureviewer/pom.xml index 1e7d89c32d93..a544e37c7552 100644 --- a/services/codegurureviewer/pom.xml +++ b/services/codegurureviewer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codegurureviewer AWS Java SDK :: Services :: CodeGuru Reviewer diff --git a/services/codepipeline/pom.xml b/services/codepipeline/pom.xml index 84850e55e9bf..e4bb98f656fb 100644 --- a/services/codepipeline/pom.xml +++ b/services/codepipeline/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codepipeline AWS Java SDK :: Services :: AWS CodePipeline diff --git a/services/codestar/pom.xml b/services/codestar/pom.xml index 5a78aa4af027..c0ce965faccf 100644 --- a/services/codestar/pom.xml +++ b/services/codestar/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codestar AWS Java SDK :: Services :: AWS CodeStar diff --git a/services/codestarconnections/pom.xml b/services/codestarconnections/pom.xml index 3e5e295e227c..a6cc991ff129 100644 --- a/services/codestarconnections/pom.xml +++ b/services/codestarconnections/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codestarconnections AWS Java SDK :: Services :: CodeStar connections diff --git a/services/codestarnotifications/pom.xml b/services/codestarnotifications/pom.xml index 8368606acc56..532d5feef17d 100644 --- a/services/codestarnotifications/pom.xml +++ b/services/codestarnotifications/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 codestarnotifications AWS Java SDK :: Services :: Codestar Notifications diff --git a/services/cognitoidentity/pom.xml b/services/cognitoidentity/pom.xml index 2bda8c37e59b..9e36ea98aa52 100644 --- a/services/cognitoidentity/pom.xml +++ b/services/cognitoidentity/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cognitoidentity AWS Java SDK :: Services :: Amazon Cognito Identity diff --git a/services/cognitoidentityprovider/pom.xml b/services/cognitoidentityprovider/pom.xml index eca831ab5c15..355f79177d64 100644 --- a/services/cognitoidentityprovider/pom.xml +++ b/services/cognitoidentityprovider/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cognitoidentityprovider AWS Java SDK :: Services :: Amazon Cognito Identity Provider Service diff --git a/services/cognitosync/pom.xml b/services/cognitosync/pom.xml index bc01938b4435..867e0f735fce 100644 --- a/services/cognitosync/pom.xml +++ b/services/cognitosync/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 cognitosync AWS Java SDK :: Services :: Amazon Cognito Sync diff --git a/services/comprehend/pom.xml b/services/comprehend/pom.xml index bd8018377247..f2a8bccd64f3 100644 --- a/services/comprehend/pom.xml +++ b/services/comprehend/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 comprehend diff --git a/services/comprehendmedical/pom.xml b/services/comprehendmedical/pom.xml index 6d8de88f06e5..c904831351bb 100644 --- a/services/comprehendmedical/pom.xml +++ b/services/comprehendmedical/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 comprehendmedical AWS Java SDK :: Services :: ComprehendMedical diff --git a/services/computeoptimizer/pom.xml b/services/computeoptimizer/pom.xml index b8b24f1caf1c..957ae312061f 100644 --- a/services/computeoptimizer/pom.xml +++ b/services/computeoptimizer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 computeoptimizer AWS Java SDK :: Services :: Compute Optimizer diff --git a/services/config/pom.xml b/services/config/pom.xml index 8f8b989c1fa0..c07baee5d9a9 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 config AWS Java SDK :: Services :: AWS Config diff --git a/services/connect/pom.xml b/services/connect/pom.xml index cb19b35fb8db..d68163409973 100644 --- a/services/connect/pom.xml +++ b/services/connect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 connect AWS Java SDK :: Services :: Connect diff --git a/services/connectparticipant/pom.xml b/services/connectparticipant/pom.xml index 5656f8a59cf3..c697cabfdba2 100644 --- a/services/connectparticipant/pom.xml +++ b/services/connectparticipant/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 connectparticipant AWS Java SDK :: Services :: ConnectParticipant diff --git a/services/costandusagereport/pom.xml b/services/costandusagereport/pom.xml index a855d4b8b332..4c4af636ced7 100644 --- a/services/costandusagereport/pom.xml +++ b/services/costandusagereport/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 costandusagereport AWS Java SDK :: Services :: AWS Cost and Usage Report diff --git a/services/costandusagereport/src/main/resources/codegen-resources/service-2.json b/services/costandusagereport/src/main/resources/codegen-resources/service-2.json index 959e90ffccbe..84fe1318d4a8 100644 --- a/services/costandusagereport/src/main/resources/codegen-resources/service-2.json +++ b/services/costandusagereport/src/main/resources/codegen-resources/service-2.json @@ -76,17 +76,29 @@ "type":"string", "documentation":"

The region of the S3 bucket that AWS delivers the report into.

", "enum":[ - "us-east-1", - "us-west-1", - "us-west-2", - "eu-central-1", - "eu-west-1", + "af-south-1", + "ap-east-1", + "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", - "eu-north-1", + "ap-northeast-2", "ap-northeast-3", - "ap-east-1" + "ca-central-1", + "eu-central-1", + "eu-west-1", + "eu-west-2", + "eu-west-3", + "eu-north-1", + "eu-south-1", + "me-south-1", + "sa-east-1", + "us-east-1", + "us-east-2", + "us-west-1", + "us-west-2", + "cn-north-1", + "cn-northwest-1" ] }, "AdditionalArtifact":{ @@ -115,7 +127,10 @@ "DeleteReportDefinitionRequest":{ "type":"structure", "members":{ - "ReportName":{"shape":"ReportName"} + "ReportName":{ + "shape":"ReportName", + "documentation":"

The name of the report that you want to delete. The name must be unique, is case sensitive, and can't include spaces.

" + } }, "documentation":"

Deletes the specified report.

" }, @@ -163,7 +178,9 @@ }, "GenericString":{ "type":"string", - "documentation":"

A generic string.

" + "documentation":"

A generic string.

", + "max":256, + "pattern":"[A-Za-z0-9_\\.\\-=]*" }, "InternalErrorException":{ "type":"structure", @@ -294,7 +311,8 @@ "S3Bucket":{ "type":"string", "documentation":"

The S3 bucket where AWS delivers the report.

", - "max":256 + "max":256, + "pattern":"[A-Za-z0-9_\\.\\-]+" }, "S3Prefix":{ "type":"string", @@ -317,7 +335,8 @@ "documentation":"

The length of time covered by the report.

", "enum":[ "HOURLY", - "DAILY" + "DAILY", + "MONTHLY" ] }, "ValidationException":{ diff --git a/services/costexplorer/pom.xml b/services/costexplorer/pom.xml index c8b1afd34065..12ceef04e1c2 100644 --- a/services/costexplorer/pom.xml +++ b/services/costexplorer/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 costexplorer diff --git a/services/databasemigration/pom.xml b/services/databasemigration/pom.xml index dae815376cd9..39d620752645 100644 --- a/services/databasemigration/pom.xml +++ b/services/databasemigration/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 databasemigration AWS Java SDK :: Services :: AWS Database Migration Service diff --git a/services/dataexchange/pom.xml b/services/dataexchange/pom.xml index 174647433d87..f979fd9d5e96 100644 --- a/services/dataexchange/pom.xml +++ b/services/dataexchange/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 dataexchange AWS Java SDK :: Services :: DataExchange diff --git a/services/datapipeline/pom.xml b/services/datapipeline/pom.xml index 4c2577bff0b1..0a029aab1c40 100644 --- a/services/datapipeline/pom.xml +++ b/services/datapipeline/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 datapipeline AWS Java SDK :: Services :: AWS Data Pipeline diff --git a/services/datasync/pom.xml b/services/datasync/pom.xml index 33c95b9d340c..e970c02668dc 100644 --- a/services/datasync/pom.xml +++ b/services/datasync/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 datasync AWS Java SDK :: Services :: DataSync diff --git a/services/dax/pom.xml b/services/dax/pom.xml index c15edbcc27ec..fa13816542ff 100644 --- a/services/dax/pom.xml +++ b/services/dax/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 dax AWS Java SDK :: Services :: Amazon DynamoDB Accelerator (DAX) diff --git a/services/detective/pom.xml b/services/detective/pom.xml index c7b51065ffdc..70c3fc59b1b2 100644 --- a/services/detective/pom.xml +++ b/services/detective/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 detective AWS Java SDK :: Services :: Detective diff --git a/services/devicefarm/pom.xml b/services/devicefarm/pom.xml index f121e7d78a77..00c2f9a87143 100644 --- a/services/devicefarm/pom.xml +++ b/services/devicefarm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 devicefarm AWS Java SDK :: Services :: AWS Device Farm diff --git a/services/directconnect/pom.xml b/services/directconnect/pom.xml index 3bb6005c83ab..abd18c1536e7 100644 --- a/services/directconnect/pom.xml +++ b/services/directconnect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 directconnect AWS Java SDK :: Services :: AWS Direct Connect diff --git a/services/directory/pom.xml b/services/directory/pom.xml index 3b4ae7525b3f..42640148a0b7 100644 --- a/services/directory/pom.xml +++ b/services/directory/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 directory AWS Java SDK :: Services :: AWS Directory Service diff --git a/services/dlm/pom.xml b/services/dlm/pom.xml index d48b26d5258c..64ce5ee91bf5 100644 --- a/services/dlm/pom.xml +++ b/services/dlm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 dlm AWS Java SDK :: Services :: DLM diff --git a/services/docdb/pom.xml b/services/docdb/pom.xml index d308a61afd31..c9eb9e4e857a 100644 --- a/services/docdb/pom.xml +++ b/services/docdb/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 docdb AWS Java SDK :: Services :: DocDB diff --git a/services/dynamodb/pom.xml b/services/dynamodb/pom.xml index 05922dfdbb97..aa0814c08051 100644 --- a/services/dynamodb/pom.xml +++ b/services/dynamodb/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 dynamodb AWS Java SDK :: Services :: Amazon DynamoDB diff --git a/services/ebs/pom.xml b/services/ebs/pom.xml index 17635ecc008e..e503beef547b 100644 --- a/services/ebs/pom.xml +++ b/services/ebs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ebs AWS Java SDK :: Services :: EBS diff --git a/services/ec2/pom.xml b/services/ec2/pom.xml index b4dbe38fe341..edf2d4187472 100644 --- a/services/ec2/pom.xml +++ b/services/ec2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ec2 AWS Java SDK :: Services :: Amazon EC2 diff --git a/services/ec2instanceconnect/pom.xml b/services/ec2instanceconnect/pom.xml index ad9b1f03dc60..e9edf3c7eb0d 100644 --- a/services/ec2instanceconnect/pom.xml +++ b/services/ec2instanceconnect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ec2instanceconnect AWS Java SDK :: Services :: EC2 Instance Connect diff --git a/services/ecr/pom.xml b/services/ecr/pom.xml index 11d38e0cce37..1b66f7aac150 100644 --- a/services/ecr/pom.xml +++ b/services/ecr/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ecr AWS Java SDK :: Services :: Amazon EC2 Container Registry diff --git a/services/ecs/pom.xml b/services/ecs/pom.xml index 8dec3175232c..f5b29e44741d 100644 --- a/services/ecs/pom.xml +++ b/services/ecs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ecs AWS Java SDK :: Services :: Amazon EC2 Container Service diff --git a/services/efs/pom.xml b/services/efs/pom.xml index 71afdb2698ac..5f3cac3ae966 100644 --- a/services/efs/pom.xml +++ b/services/efs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 efs AWS Java SDK :: Services :: Amazon Elastic File System diff --git a/services/eks/pom.xml b/services/eks/pom.xml index 43964022481e..0e106e448248 100644 --- a/services/eks/pom.xml +++ b/services/eks/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 eks AWS Java SDK :: Services :: EKS diff --git a/services/elasticache/pom.xml b/services/elasticache/pom.xml index 6379792e8dce..dba1099cd0be 100644 --- a/services/elasticache/pom.xml +++ b/services/elasticache/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 elasticache AWS Java SDK :: Services :: Amazon ElastiCache diff --git a/services/elasticbeanstalk/pom.xml b/services/elasticbeanstalk/pom.xml index 8b97b79de04c..41805b770d79 100644 --- a/services/elasticbeanstalk/pom.xml +++ b/services/elasticbeanstalk/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 elasticbeanstalk AWS Java SDK :: Services :: AWS Elastic Beanstalk diff --git a/services/elasticinference/pom.xml b/services/elasticinference/pom.xml index f8daa736eff1..0f93f22e06d8 100644 --- a/services/elasticinference/pom.xml +++ b/services/elasticinference/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 elasticinference AWS Java SDK :: Services :: Elastic Inference diff --git a/services/elasticloadbalancing/pom.xml b/services/elasticloadbalancing/pom.xml index e84cf8e89f63..da081ae47bb9 100644 --- a/services/elasticloadbalancing/pom.xml +++ b/services/elasticloadbalancing/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 elasticloadbalancing AWS Java SDK :: Services :: Elastic Load Balancing diff --git a/services/elasticloadbalancingv2/pom.xml b/services/elasticloadbalancingv2/pom.xml index 53c0fba2736d..562c892824e2 100644 --- a/services/elasticloadbalancingv2/pom.xml +++ b/services/elasticloadbalancingv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 elasticloadbalancingv2 AWS Java SDK :: Services :: Elastic Load Balancing V2 diff --git a/services/elasticsearch/pom.xml b/services/elasticsearch/pom.xml index 90f7f2ab3a7e..976f19c24799 100644 --- a/services/elasticsearch/pom.xml +++ b/services/elasticsearch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 elasticsearch AWS Java SDK :: Services :: Amazon Elasticsearch Service diff --git a/services/elastictranscoder/pom.xml b/services/elastictranscoder/pom.xml index 4495014342b2..f632d6ccade0 100644 --- a/services/elastictranscoder/pom.xml +++ b/services/elastictranscoder/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 elastictranscoder AWS Java SDK :: Services :: Amazon Elastic Transcoder diff --git a/services/emr/pom.xml b/services/emr/pom.xml index ace2638cdb9b..d56db7014d97 100644 --- a/services/emr/pom.xml +++ b/services/emr/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 emr AWS Java SDK :: Services :: Amazon EMR diff --git a/services/emr/src/main/resources/codegen-resources/paginators-1.json b/services/emr/src/main/resources/codegen-resources/paginators-1.json index 2d164cac3cae..7d72c7c103b0 100644 --- a/services/emr/src/main/resources/codegen-resources/paginators-1.json +++ b/services/emr/src/main/resources/codegen-resources/paginators-1.json @@ -28,6 +28,11 @@ "output_token": "Marker", "result_key": "Instances" }, + "ListNotebookExecutions": { + "input_token": "Marker", + "output_token": "Marker", + "result_key": "NotebookExecutions" + }, "ListSecurityConfigurations": { "input_token": "Marker", "output_token": "Marker", diff --git a/services/emr/src/main/resources/codegen-resources/service-2.json b/services/emr/src/main/resources/codegen-resources/service-2.json index 1b4bdd199e81..bdd8b33ef874 100644 --- a/services/emr/src/main/resources/codegen-resources/service-2.json +++ b/services/emr/src/main/resources/codegen-resources/service-2.json @@ -137,6 +137,20 @@ "documentation":"

This API is deprecated and will eventually be removed. We recommend you use ListClusters, DescribeCluster, ListSteps, ListInstanceGroups and ListBootstrapActions instead.

DescribeJobFlows returns a list of job flows that match all of the supplied parameters. The parameters can include a list of job flow IDs, job flow states, and restrictions on job flow creation date and time.

Regardless of supplied parameters, only job flows created within the last two months are returned.

If no parameters are supplied, then job flows matching either of the following criteria are returned:

  • Job flows created and completed in the last two weeks

  • Job flows created within the last two months that are in one of the following states: RUNNING, WAITING, SHUTTING_DOWN, STARTING

Amazon EMR can return a maximum of 512 job flow descriptions.

", "deprecated":true }, + "DescribeNotebookExecution":{ + "name":"DescribeNotebookExecution", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"DescribeNotebookExecutionInput"}, + "output":{"shape":"DescribeNotebookExecutionOutput"}, + "errors":[ + {"shape":"InternalServerError"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"

Provides details of a notebook execution.

" + }, "DescribeSecurityConfiguration":{ "name":"DescribeSecurityConfiguration", "http":{ @@ -259,6 +273,20 @@ ], "documentation":"

Provides information for all active EC2 instances and EC2 instances terminated in the last 30 days, up to a maximum of 2,000. EC2 instances in any of the following states are considered active: AWAITING_FULFILLMENT, PROVISIONING, BOOTSTRAPPING, RUNNING.

" }, + "ListNotebookExecutions":{ + "name":"ListNotebookExecutions", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ListNotebookExecutionsInput"}, + "output":{"shape":"ListNotebookExecutionsOutput"}, + "errors":[ + {"shape":"InternalServerError"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"

Provides summaries of all notebook executions. You can filter the list based on multiple criteria such as status, time range, and editor id. Returns a maximum of 50 notebook executions and a marker to track the paging of a longer notebook execution list across multiple ListNotebookExecution calls.

" + }, "ListSecurityConfigurations":{ "name":"ListSecurityConfigurations", "http":{ @@ -431,6 +459,33 @@ ], "documentation":"

Sets the Cluster$VisibleToAllUsers value, which determines whether the cluster is visible to all IAM users of the AWS account associated with the cluster. Only the IAM user who created the cluster or the AWS account root user can call this action. The default value, true, indicates that all IAM users in the AWS account can perform cluster actions if they have the proper IAM policy permissions. If set to false, only the IAM user that created the cluster can perform actions. This action works on running clusters. You can override the default true setting when you create a cluster by using the VisibleToAllUsers parameter with RunJobFlow.

" }, + "StartNotebookExecution":{ + "name":"StartNotebookExecution", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"StartNotebookExecutionInput"}, + "output":{"shape":"StartNotebookExecutionOutput"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"

Starts a notebook execution.

" + }, + "StopNotebookExecution":{ + "name":"StopNotebookExecution", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"StopNotebookExecutionInput"}, + "errors":[ + {"shape":"InternalServerError"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"

Stops a notebook execution.

" + }, "TerminateJobFlows":{ "name":"TerminateJobFlows", "http":{ @@ -1309,6 +1364,25 @@ }, "documentation":"

The output for the DescribeJobFlows operation.

" }, + "DescribeNotebookExecutionInput":{ + "type":"structure", + "required":["NotebookExecutionId"], + "members":{ + "NotebookExecutionId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the notebook execution.

" + } + } + }, + "DescribeNotebookExecutionOutput":{ + "type":"structure", + "members":{ + "NotebookExecution":{ + "shape":"NotebookExecution", + "documentation":"

Properties of the notebook execution.

" + } + } + }, "DescribeSecurityConfigurationInput":{ "type":"structure", "required":["Name"], @@ -1497,6 +1571,29 @@ "min":1 }, "ErrorMessage":{"type":"string"}, + "ExecutionEngineConfig":{ + "type":"structure", + "required":["Id"], + "members":{ + "Id":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the execution engine. For an EMR cluster, this is the cluster ID.

" + }, + "Type":{ + "shape":"ExecutionEngineType", + "documentation":"

The type of execution engine. A value of EMR specifies an EMR cluster.

" + }, + "MasterInstanceSecurityGroupId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

An optional unique ID of an EC2 security group to associate with the master instance of the EMR cluster for this notebook execution. For more information see Specifying EC2 Security Groups for EMR Notebooks in the EMR Management Guide.

" + } + }, + "documentation":"

Specifies the execution engine (cluster) to run the notebook and perform the notebook execution, for example, an EMR cluster.

" + }, + "ExecutionEngineType":{ + "type":"string", + "enum":["EMR"] + }, "FailureDetails":{ "type":"structure", "members":{ @@ -2889,6 +2986,44 @@ }, "documentation":"

This output contains the list of instances.

" }, + "ListNotebookExecutionsInput":{ + "type":"structure", + "members":{ + "EditorId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique ID of the editor associated with the notebook execution.

" + }, + "Status":{ + "shape":"NotebookExecutionStatus", + "documentation":"

The status filter for listing notebook executions.

  • START_PENDING indicates that the cluster has received the execution request but execution has not begun.

  • STARTING indicates that the execution is starting on the cluster.

  • RUNNING indicates that the execution is being processed by the cluster.

  • FINISHING indicates that execution processing is in the final stages.

  • FINISHED indicates that the execution has completed without error.

  • FAILING indicates that the execution is failing and will not finish successfully.

  • FAILED indicates that the execution failed.

  • STOP_PENDING indicates that the cluster has received a StopNotebookExecution request and the stop is pending.

  • STOPPING indicates that the cluster is in the process of stopping the execution as a result of a StopNotebookExecution request.

  • STOPPED indicates that the execution stopped because of a StopNotebookExecution request.

" + }, + "From":{ + "shape":"Date", + "documentation":"

The beginning of time range filter for listing notebook executions. The default is the timestamp of 30 days ago.

" + }, + "To":{ + "shape":"Date", + "documentation":"

The end of time range filter for listing notebook executions. The default is the current timestamp.

" + }, + "Marker":{ + "shape":"Marker", + "documentation":"

The pagination token, returned by a previous ListNotebookExecutions call, that indicates the start of the list for this ListNotebookExecutions call.

" + } + } + }, + "ListNotebookExecutionsOutput":{ + "type":"structure", + "members":{ + "NotebookExecutions":{ + "shape":"NotebookExecutionSummaryList", + "documentation":"

A list of notebook executions.

" + }, + "Marker":{ + "shape":"Marker", + "documentation":"

A pagination token that a subsequent ListNotebookExecutions can use to determine the next set of results to retrieve.

" + } + } + }, "ListSecurityConfigurationsInput":{ "type":"structure", "members":{ @@ -2954,7 +3089,7 @@ "members":{ "ComputeLimits":{ "shape":"ComputeLimits", - "documentation":"

The EC2 unit limits for a managed scaling policy. The managed scaling activity of a cluster is not allowed to go above or below these limits. The limit only applies to the core and task nodes. The master node cannot be scaled after initial configuration.

" + "documentation":"

The EC2 unit limits for a managed scaling policy. The managed scaling activity of a cluster is not allowed to go above or below these limits. The limit only applies to the core and task nodes. The master node cannot be scaled after initial configuration.

" } }, "documentation":"

Managed scaling policy for an Amazon EMR cluster. The policy specifies the limits for resources that can be added or terminated from a cluster. The policy only applies to the core and task nodes. The master node cannot be scaled after initial configuration.

" @@ -3047,6 +3182,113 @@ "type":"double", "min":0.0 }, + "NotebookExecution":{ + "type":"structure", + "members":{ + "NotebookExecutionId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of a notebook execution.

" + }, + "EditorId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the EMR Notebook that is used for the notebook execution.

" + }, + "ExecutionEngine":{ + "shape":"ExecutionEngineConfig", + "documentation":"

The execution engine, such as an EMR cluster, used to run the EMR notebook and perform the notebook execution.

" + }, + "NotebookExecutionName":{ + "shape":"XmlStringMaxLen256", + "documentation":"

A name for the notebook execution.

" + }, + "NotebookParams":{ + "shape":"XmlString", + "documentation":"

Input parameters in JSON format passed to the EMR Notebook at runtime for execution.

" + }, + "Status":{ + "shape":"NotebookExecutionStatus", + "documentation":"

The status of the notebook execution.

  • START_PENDING indicates that the cluster has received the execution request but execution has not begun.

  • STARTING indicates that the execution is starting on the cluster.

  • RUNNING indicates that the execution is being processed by the cluster.

  • FINISHING indicates that execution processing is in the final stages.

  • FINISHED indicates that the execution has completed without error.

  • FAILING indicates that the execution is failing and will not finish successfully.

  • FAILED indicates that the execution failed.

  • STOP_PENDING indicates that the cluster has received a StopNotebookExecution request and the stop is pending.

  • STOPPING indicates that the cluster is in the process of stopping the execution as a result of a StopNotebookExecution request.

  • STOPPED indicates that the execution stopped because of a StopNotebookExecution request.

" + }, + "StartTime":{ + "shape":"Date", + "documentation":"

The timestamp when notebook execution started.

" + }, + "EndTime":{ + "shape":"Date", + "documentation":"

The timestamp when notebook execution ended.

" + }, + "Arn":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The Amazon Resource Name (ARN) of the notebook execution.

" + }, + "OutputNotebookURI":{ + "shape":"XmlString", + "documentation":"

The location of the notebook execution's output file in Amazon S3.

" + }, + "LastStateChangeReason":{ + "shape":"XmlString", + "documentation":"

The reason for the latest status change of the notebook execution.

" + }, + "NotebookInstanceSecurityGroupId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the EC2 security group associated with the EMR Notebook instance. For more information see Specifying EC2 Security Groups for EMR Notebooks in the EMR Management Guide.

" + }, + "Tags":{ + "shape":"TagList", + "documentation":"

A list of tags associated with a notebook execution. Tags are user-defined key value pairs that consist of a required key string with a maximum of 128 characters and an optional value string with a maximum of 256 characters.

" + } + }, + "documentation":"

A notebook execution. An execution is a specific instance that an EMR Notebook is run using the StartNotebookExecution action.

" + }, + "NotebookExecutionStatus":{ + "type":"string", + "enum":[ + "START_PENDING", + "STARTING", + "RUNNING", + "FINISHING", + "FINISHED", + "FAILING", + "FAILED", + "STOP_PENDING", + "STOPPING", + "STOPPED" + ] + }, + "NotebookExecutionSummary":{ + "type":"structure", + "members":{ + "NotebookExecutionId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the notebook execution.

" + }, + "EditorId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the editor associated with the notebook execution.

" + }, + "NotebookExecutionName":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The name of the notebook execution.

" + }, + "Status":{ + "shape":"NotebookExecutionStatus", + "documentation":"

The status of the notebook execution.

  • START_PENDING indicates that the cluster has received the execution request but execution has not begun.

  • STARTING indicates that the execution is starting on the cluster.

  • RUNNING indicates that the execution is being processed by the cluster.

  • FINISHING indicates that execution processing is in the final stages.

  • FINISHED indicates that the execution has completed without error.

  • FAILING indicates that the execution is failing and will not finish successfully.

  • FAILED indicates that the execution failed.

  • STOP_PENDING indicates that the cluster has received a StopNotebookExecution request and the stop is pending.

  • STOPPING indicates that the cluster is in the process of stopping the execution as a result of a StopNotebookExecution request.

  • STOPPED indicates that the execution stopped because of a StopNotebookExecution request.

" + }, + "StartTime":{ + "shape":"Date", + "documentation":"

The timestamp when notebook execution started.

" + }, + "EndTime":{ + "shape":"Date", + "documentation":"

The timestamp when notebook execution started.

" + } + }, + "documentation":"

" + }, + "NotebookExecutionSummaryList":{ + "type":"list", + "member":{"shape":"NotebookExecutionSummary"} + }, "OnDemandProvisioningAllocationStrategy":{ "type":"string", "enum":["lowest-price"] @@ -3084,7 +3326,7 @@ "Port":{ "type":"integer", "max":65535, - "min":0 + "min":-1 }, "PortRange":{ "type":"structure", @@ -3607,6 +3849,58 @@ "TERMINATE_CLUSTER" ] }, + "StartNotebookExecutionInput":{ + "type":"structure", + "required":[ + "EditorId", + "RelativePath", + "ExecutionEngine", + "ServiceRole" + ], + "members":{ + "EditorId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the EMR Notebook to use for notebook execution.

" + }, + "RelativePath":{ + "shape":"XmlString", + "documentation":"

The path and file name of the notebook file for this execution, relative to the path specified for the EMR Notebook. For example, if you specify a path of s3://MyBucket/MyNotebooks when you create an EMR Notebook for a notebook with an ID of e-ABCDEFGHIJK1234567890ABCD (the EditorID of this request), and you specify a RelativePath of my_notebook_executions/notebook_execution.ipynb, the location of the file for the notebook execution is s3://MyBucket/MyNotebooks/e-ABCDEFGHIJK1234567890ABCD/my_notebook_executions/notebook_execution.ipynb.

" + }, + "NotebookExecutionName":{ + "shape":"XmlStringMaxLen256", + "documentation":"

An optional name for the notebook execution.

" + }, + "NotebookParams":{ + "shape":"XmlString", + "documentation":"

Input parameters in JSON format passed to the EMR Notebook at runtime for execution.

" + }, + "ExecutionEngine":{ + "shape":"ExecutionEngineConfig", + "documentation":"

Specifies the execution engine (cluster) that runs the notebook execution.

" + }, + "ServiceRole":{ + "shape":"XmlString", + "documentation":"

The name or ARN of the IAM role that is used as the service role for Amazon EMR (the EMR role) for the notebook execution.

" + }, + "NotebookInstanceSecurityGroupId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the Amazon EC2 security group to associate with the EMR Notebook for this notebook execution.

" + }, + "Tags":{ + "shape":"TagList", + "documentation":"

A list of tags associated with a notebook execution. Tags are user-defined key value pairs that consist of a required key string with a maximum of 128 characters and an optional value string with a maximum of 256 characters.

" + } + } + }, + "StartNotebookExecutionOutput":{ + "type":"structure", + "members":{ + "NotebookExecutionId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the notebook execution.

" + } + } + }, "Statistic":{ "type":"string", "enum":[ @@ -3849,6 +4143,16 @@ }, "documentation":"

The timeline of the cluster step lifecycle.

" }, + "StopNotebookExecutionInput":{ + "type":"structure", + "required":["NotebookExecutionId"], + "members":{ + "NotebookExecutionId":{ + "shape":"XmlStringMaxLen256", + "documentation":"

The unique identifier of the notebook execution.

" + } + } + }, "String":{"type":"string"}, "StringList":{ "type":"list", diff --git a/services/eventbridge/pom.xml b/services/eventbridge/pom.xml index 6536dd53005c..b87787991c08 100644 --- a/services/eventbridge/pom.xml +++ b/services/eventbridge/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 eventbridge AWS Java SDK :: Services :: EventBridge diff --git a/services/firehose/pom.xml b/services/firehose/pom.xml index 0a67a4566af8..618dc97635cd 100644 --- a/services/firehose/pom.xml +++ b/services/firehose/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 firehose AWS Java SDK :: Services :: Amazon Kinesis Firehose diff --git a/services/fms/pom.xml b/services/fms/pom.xml index 8001d2c66f29..491001d5ec06 100644 --- a/services/fms/pom.xml +++ b/services/fms/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 fms AWS Java SDK :: Services :: FMS diff --git a/services/forecast/pom.xml b/services/forecast/pom.xml index 97d6291c797b..e352c6b5ce44 100644 --- a/services/forecast/pom.xml +++ b/services/forecast/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 forecast AWS Java SDK :: Services :: Forecast diff --git a/services/forecastquery/pom.xml b/services/forecastquery/pom.xml index 24a622bcbf8a..8ab47b0adcb4 100644 --- a/services/forecastquery/pom.xml +++ b/services/forecastquery/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 forecastquery AWS Java SDK :: Services :: Forecastquery diff --git a/services/frauddetector/pom.xml b/services/frauddetector/pom.xml index 2ba840e3d1b4..49ecaff01cdd 100644 --- a/services/frauddetector/pom.xml +++ b/services/frauddetector/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 frauddetector AWS Java SDK :: Services :: FraudDetector diff --git a/services/fsx/pom.xml b/services/fsx/pom.xml index 29991fe4b753..6ba1a10eb3fe 100644 --- a/services/fsx/pom.xml +++ b/services/fsx/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 fsx AWS Java SDK :: Services :: FSx diff --git a/services/gamelift/pom.xml b/services/gamelift/pom.xml index 1ef2df007e71..adc22ad07cd3 100644 --- a/services/gamelift/pom.xml +++ b/services/gamelift/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 gamelift AWS Java SDK :: Services :: AWS GameLift diff --git a/services/glacier/pom.xml b/services/glacier/pom.xml index bbf791b3dc67..2cc19e889736 100644 --- a/services/glacier/pom.xml +++ b/services/glacier/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 glacier AWS Java SDK :: Services :: Amazon Glacier diff --git a/services/globalaccelerator/pom.xml b/services/globalaccelerator/pom.xml index 09e8f1e34672..9b2eeab16d69 100644 --- a/services/globalaccelerator/pom.xml +++ b/services/globalaccelerator/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 globalaccelerator AWS Java SDK :: Services :: Global Accelerator diff --git a/services/glue/pom.xml b/services/glue/pom.xml index 2d3999e8e2b7..1560a4a47866 100644 --- a/services/glue/pom.xml +++ b/services/glue/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 glue diff --git a/services/greengrass/pom.xml b/services/greengrass/pom.xml index 25b2f5dc868e..7d5513576485 100644 --- a/services/greengrass/pom.xml +++ b/services/greengrass/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 greengrass AWS Java SDK :: Services :: AWS Greengrass diff --git a/services/groundstation/pom.xml b/services/groundstation/pom.xml index d3ddb936e363..05e81272fc5b 100644 --- a/services/groundstation/pom.xml +++ b/services/groundstation/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 groundstation AWS Java SDK :: Services :: GroundStation diff --git a/services/guardduty/pom.xml b/services/guardduty/pom.xml index 498dd38bdb15..f4ef81ec4b89 100644 --- a/services/guardduty/pom.xml +++ b/services/guardduty/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 guardduty diff --git a/services/health/pom.xml b/services/health/pom.xml index 23c68271d74a..fca278238299 100644 --- a/services/health/pom.xml +++ b/services/health/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 health AWS Java SDK :: Services :: AWS Health APIs and Notifications diff --git a/services/honeycode/pom.xml b/services/honeycode/pom.xml index 6f424aeffafe..57050158ff36 100644 --- a/services/honeycode/pom.xml +++ b/services/honeycode/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 honeycode AWS Java SDK :: Services :: Honeycode diff --git a/services/iam/pom.xml b/services/iam/pom.xml index f77d54a05033..8b4261dd5663 100644 --- a/services/iam/pom.xml +++ b/services/iam/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iam AWS Java SDK :: Services :: AWS IAM diff --git a/services/identitystore/pom.xml b/services/identitystore/pom.xml index 70f0f9dac2d7..b5470cabe150 100644 --- a/services/identitystore/pom.xml +++ b/services/identitystore/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 identitystore AWS Java SDK :: Services :: Identitystore diff --git a/services/imagebuilder/pom.xml b/services/imagebuilder/pom.xml index b22cf8163384..a0cc7fbed213 100644 --- a/services/imagebuilder/pom.xml +++ b/services/imagebuilder/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 imagebuilder AWS Java SDK :: Services :: Imagebuilder diff --git a/services/inspector/pom.xml b/services/inspector/pom.xml index c2ac7a0e4a7a..9dcb50a61bbf 100644 --- a/services/inspector/pom.xml +++ b/services/inspector/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 inspector AWS Java SDK :: Services :: Amazon Inspector Service diff --git a/services/iot/pom.xml b/services/iot/pom.xml index 91f24525e531..c9eff4c1b142 100644 --- a/services/iot/pom.xml +++ b/services/iot/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iot AWS Java SDK :: Services :: AWS IoT diff --git a/services/iot1clickdevices/pom.xml b/services/iot1clickdevices/pom.xml index bb2e741911f3..4dd2087d01a5 100644 --- a/services/iot1clickdevices/pom.xml +++ b/services/iot1clickdevices/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iot1clickdevices AWS Java SDK :: Services :: IoT 1Click Devices Service diff --git a/services/iot1clickprojects/pom.xml b/services/iot1clickprojects/pom.xml index b5424453aa7c..2e0c174bf31c 100644 --- a/services/iot1clickprojects/pom.xml +++ b/services/iot1clickprojects/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iot1clickprojects AWS Java SDK :: Services :: IoT 1Click Projects diff --git a/services/iotanalytics/pom.xml b/services/iotanalytics/pom.xml index 9c7270f8ebf9..7a6acfebeadd 100644 --- a/services/iotanalytics/pom.xml +++ b/services/iotanalytics/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iotanalytics AWS Java SDK :: Services :: IoTAnalytics diff --git a/services/iotdataplane/pom.xml b/services/iotdataplane/pom.xml index 3646daa4b473..362f0ee84298 100644 --- a/services/iotdataplane/pom.xml +++ b/services/iotdataplane/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iotdataplane AWS Java SDK :: Services :: AWS IoT Data Plane diff --git a/services/iotevents/pom.xml b/services/iotevents/pom.xml index 514dceee6827..58d63a3ad550 100644 --- a/services/iotevents/pom.xml +++ b/services/iotevents/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iotevents AWS Java SDK :: Services :: IoT Events diff --git a/services/ioteventsdata/pom.xml b/services/ioteventsdata/pom.xml index 56b8129e3a12..83ac3eb96130 100644 --- a/services/ioteventsdata/pom.xml +++ b/services/ioteventsdata/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ioteventsdata AWS Java SDK :: Services :: IoT Events Data diff --git a/services/iotjobsdataplane/pom.xml b/services/iotjobsdataplane/pom.xml index 3478e72d8cf3..cdf4e3c6e461 100644 --- a/services/iotjobsdataplane/pom.xml +++ b/services/iotjobsdataplane/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iotjobsdataplane AWS Java SDK :: Services :: IoT Jobs Data Plane diff --git a/services/iotsecuretunneling/pom.xml b/services/iotsecuretunneling/pom.xml index a61d9a341a1e..634237fbe70b 100644 --- a/services/iotsecuretunneling/pom.xml +++ b/services/iotsecuretunneling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iotsecuretunneling AWS Java SDK :: Services :: IoTSecureTunneling diff --git a/services/iotsitewise/pom.xml b/services/iotsitewise/pom.xml index 5e5492b8b41c..a7cb0d76495b 100644 --- a/services/iotsitewise/pom.xml +++ b/services/iotsitewise/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iotsitewise AWS Java SDK :: Services :: Io T Site Wise diff --git a/services/iotthingsgraph/pom.xml b/services/iotthingsgraph/pom.xml index f89eef78d9d0..e29f6cba4e48 100644 --- a/services/iotthingsgraph/pom.xml +++ b/services/iotthingsgraph/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 iotthingsgraph AWS Java SDK :: Services :: IoTThingsGraph diff --git a/services/ivs/pom.xml b/services/ivs/pom.xml index 3c0733371012..27923ae1a9fd 100644 --- a/services/ivs/pom.xml +++ b/services/ivs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ivs AWS Java SDK :: Services :: Ivs diff --git a/services/kafka/pom.xml b/services/kafka/pom.xml index fd273aa99911..9b5c04799e41 100644 --- a/services/kafka/pom.xml +++ b/services/kafka/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kafka AWS Java SDK :: Services :: Kafka diff --git a/services/kendra/pom.xml b/services/kendra/pom.xml index e435dfea7463..0fa9a66cdc14 100644 --- a/services/kendra/pom.xml +++ b/services/kendra/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kendra AWS Java SDK :: Services :: Kendra diff --git a/services/kinesis/pom.xml b/services/kinesis/pom.xml index 8b0f9c512140..d061824b0873 100644 --- a/services/kinesis/pom.xml +++ b/services/kinesis/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kinesis AWS Java SDK :: Services :: Amazon Kinesis diff --git a/services/kinesisanalytics/pom.xml b/services/kinesisanalytics/pom.xml index 9d8e39a2a178..fa96226df672 100644 --- a/services/kinesisanalytics/pom.xml +++ b/services/kinesisanalytics/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kinesisanalytics AWS Java SDK :: Services :: Amazon Kinesis Analytics diff --git a/services/kinesisanalyticsv2/pom.xml b/services/kinesisanalyticsv2/pom.xml index d768c218bee9..61ce409250e8 100644 --- a/services/kinesisanalyticsv2/pom.xml +++ b/services/kinesisanalyticsv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kinesisanalyticsv2 AWS Java SDK :: Services :: Kinesis Analytics V2 diff --git a/services/kinesisvideo/pom.xml b/services/kinesisvideo/pom.xml index 77a355451b67..5841d3f4f491 100644 --- a/services/kinesisvideo/pom.xml +++ b/services/kinesisvideo/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 kinesisvideo diff --git a/services/kinesisvideoarchivedmedia/pom.xml b/services/kinesisvideoarchivedmedia/pom.xml index 0abf0a3ee8bb..b291defb5b0d 100644 --- a/services/kinesisvideoarchivedmedia/pom.xml +++ b/services/kinesisvideoarchivedmedia/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kinesisvideoarchivedmedia AWS Java SDK :: Services :: Kinesis Video Archived Media diff --git a/services/kinesisvideomedia/pom.xml b/services/kinesisvideomedia/pom.xml index 4b8221aa4477..1195de5300e3 100644 --- a/services/kinesisvideomedia/pom.xml +++ b/services/kinesisvideomedia/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kinesisvideomedia AWS Java SDK :: Services :: Kinesis Video Media diff --git a/services/kinesisvideosignaling/pom.xml b/services/kinesisvideosignaling/pom.xml index ff285efb5f82..5437c0cae249 100644 --- a/services/kinesisvideosignaling/pom.xml +++ b/services/kinesisvideosignaling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kinesisvideosignaling AWS Java SDK :: Services :: Kinesis Video Signaling diff --git a/services/kms/pom.xml b/services/kms/pom.xml index 04016a19c23c..0e97db8191a7 100644 --- a/services/kms/pom.xml +++ b/services/kms/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 kms AWS Java SDK :: Services :: AWS KMS diff --git a/services/lakeformation/pom.xml b/services/lakeformation/pom.xml index 0f65a3b70e43..83624eec82c4 100644 --- a/services/lakeformation/pom.xml +++ b/services/lakeformation/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 lakeformation AWS Java SDK :: Services :: LakeFormation diff --git a/services/lambda/pom.xml b/services/lambda/pom.xml index 89e580e48105..861150e5d6e3 100644 --- a/services/lambda/pom.xml +++ b/services/lambda/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 lambda AWS Java SDK :: Services :: AWS Lambda diff --git a/services/lexmodelbuilding/pom.xml b/services/lexmodelbuilding/pom.xml index 638d95246046..a31757b9f9df 100644 --- a/services/lexmodelbuilding/pom.xml +++ b/services/lexmodelbuilding/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 lexmodelbuilding AWS Java SDK :: Services :: Amazon Lex Model Building diff --git a/services/lexruntime/pom.xml b/services/lexruntime/pom.xml index 66b1bac8a793..1fff851a6969 100644 --- a/services/lexruntime/pom.xml +++ b/services/lexruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 lexruntime AWS Java SDK :: Services :: Amazon Lex Runtime diff --git a/services/licensemanager/pom.xml b/services/licensemanager/pom.xml index beed669836b5..d1ca9ccb6edb 100644 --- a/services/licensemanager/pom.xml +++ b/services/licensemanager/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 licensemanager AWS Java SDK :: Services :: License Manager diff --git a/services/lightsail/pom.xml b/services/lightsail/pom.xml index 1660b47bb4a2..086f61161fb6 100644 --- a/services/lightsail/pom.xml +++ b/services/lightsail/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 lightsail AWS Java SDK :: Services :: Amazon Lightsail diff --git a/services/machinelearning/pom.xml b/services/machinelearning/pom.xml index 81b987b839fd..3d22569f31f6 100644 --- a/services/machinelearning/pom.xml +++ b/services/machinelearning/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 machinelearning AWS Java SDK :: Services :: Amazon Machine Learning diff --git a/services/macie/pom.xml b/services/macie/pom.xml index 01aa27556a85..6756df32e559 100644 --- a/services/macie/pom.xml +++ b/services/macie/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 macie AWS Java SDK :: Services :: Macie diff --git a/services/macie2/pom.xml b/services/macie2/pom.xml index e4f33be9314f..646046b55ed0 100644 --- a/services/macie2/pom.xml +++ b/services/macie2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 macie2 AWS Java SDK :: Services :: Macie2 diff --git a/services/managedblockchain/pom.xml b/services/managedblockchain/pom.xml index 84ad821ca20b..82b5ede925c4 100644 --- a/services/managedblockchain/pom.xml +++ b/services/managedblockchain/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 managedblockchain AWS Java SDK :: Services :: ManagedBlockchain diff --git a/services/marketplacecatalog/pom.xml b/services/marketplacecatalog/pom.xml index 8b360b951e2d..6cf640dc4610 100644 --- a/services/marketplacecatalog/pom.xml +++ b/services/marketplacecatalog/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 marketplacecatalog AWS Java SDK :: Services :: Marketplace Catalog diff --git a/services/marketplacecommerceanalytics/pom.xml b/services/marketplacecommerceanalytics/pom.xml index fc19a7963327..52c867573630 100644 --- a/services/marketplacecommerceanalytics/pom.xml +++ b/services/marketplacecommerceanalytics/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 marketplacecommerceanalytics AWS Java SDK :: Services :: AWS Marketplace Commerce Analytics diff --git a/services/marketplaceentitlement/pom.xml b/services/marketplaceentitlement/pom.xml index cb34322a383a..1c6843aab47f 100644 --- a/services/marketplaceentitlement/pom.xml +++ b/services/marketplaceentitlement/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 marketplaceentitlement AWS Java SDK :: Services :: AWS Marketplace Entitlement diff --git a/services/marketplacemetering/pom.xml b/services/marketplacemetering/pom.xml index 31e59be5c968..ee773d53827a 100644 --- a/services/marketplacemetering/pom.xml +++ b/services/marketplacemetering/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 marketplacemetering AWS Java SDK :: Services :: AWS Marketplace Metering Service diff --git a/services/mediaconnect/pom.xml b/services/mediaconnect/pom.xml index 5e57a8c289cf..98791df11bf7 100644 --- a/services/mediaconnect/pom.xml +++ b/services/mediaconnect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 mediaconnect AWS Java SDK :: Services :: MediaConnect diff --git a/services/mediaconvert/pom.xml b/services/mediaconvert/pom.xml index 011fb2b823f7..6f37af2d204c 100644 --- a/services/mediaconvert/pom.xml +++ b/services/mediaconvert/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 mediaconvert diff --git a/services/medialive/pom.xml b/services/medialive/pom.xml index bbfe1d8d5ee1..46b36cdce239 100644 --- a/services/medialive/pom.xml +++ b/services/medialive/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 medialive diff --git a/services/mediapackage/pom.xml b/services/mediapackage/pom.xml index a030dc20092e..124ee4cb46cb 100644 --- a/services/mediapackage/pom.xml +++ b/services/mediapackage/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 mediapackage diff --git a/services/mediapackagevod/pom.xml b/services/mediapackagevod/pom.xml index db98ad6bd178..a836d21e3186 100644 --- a/services/mediapackagevod/pom.xml +++ b/services/mediapackagevod/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 mediapackagevod AWS Java SDK :: Services :: MediaPackage Vod diff --git a/services/mediastore/pom.xml b/services/mediastore/pom.xml index 4e4f05800c5f..7e7ac18d939b 100644 --- a/services/mediastore/pom.xml +++ b/services/mediastore/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 mediastore diff --git a/services/mediastoredata/pom.xml b/services/mediastoredata/pom.xml index 3a71d378f79c..f3a018619b8b 100644 --- a/services/mediastoredata/pom.xml +++ b/services/mediastoredata/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 mediastoredata diff --git a/services/mediatailor/pom.xml b/services/mediatailor/pom.xml index 3c11d00b39e3..45411ff28278 100644 --- a/services/mediatailor/pom.xml +++ b/services/mediatailor/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 mediatailor AWS Java SDK :: Services :: MediaTailor diff --git a/services/migrationhub/pom.xml b/services/migrationhub/pom.xml index e90f252773e3..a038fe8d35f3 100644 --- a/services/migrationhub/pom.xml +++ b/services/migrationhub/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 migrationhub diff --git a/services/migrationhubconfig/pom.xml b/services/migrationhubconfig/pom.xml index 94dd6dded57c..dea84695295d 100644 --- a/services/migrationhubconfig/pom.xml +++ b/services/migrationhubconfig/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 migrationhubconfig AWS Java SDK :: Services :: MigrationHub Config diff --git a/services/mobile/pom.xml b/services/mobile/pom.xml index e1510493e8bf..3ebe2787cc88 100644 --- a/services/mobile/pom.xml +++ b/services/mobile/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 mobile diff --git a/services/mq/pom.xml b/services/mq/pom.xml index 6d7acebe3e8b..7389f0fe795d 100644 --- a/services/mq/pom.xml +++ b/services/mq/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 mq diff --git a/services/mturk/pom.xml b/services/mturk/pom.xml index e829cc3e999c..916924bfa1e8 100644 --- a/services/mturk/pom.xml +++ b/services/mturk/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 mturk AWS Java SDK :: Services :: Amazon Mechanical Turk Requester diff --git a/services/neptune/pom.xml b/services/neptune/pom.xml index 9e4a48c9fbbd..b7452cb43d25 100644 --- a/services/neptune/pom.xml +++ b/services/neptune/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 neptune AWS Java SDK :: Services :: Neptune diff --git a/services/networkmanager/pom.xml b/services/networkmanager/pom.xml index 1c91f17c1959..08ef4aa9a978 100644 --- a/services/networkmanager/pom.xml +++ b/services/networkmanager/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 networkmanager AWS Java SDK :: Services :: NetworkManager diff --git a/services/opsworks/pom.xml b/services/opsworks/pom.xml index 53d56ac6daee..16b45b89cfc6 100644 --- a/services/opsworks/pom.xml +++ b/services/opsworks/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 opsworks AWS Java SDK :: Services :: AWS OpsWorks diff --git a/services/opsworkscm/pom.xml b/services/opsworkscm/pom.xml index 8c7c3f06c90f..4791936c5539 100644 --- a/services/opsworkscm/pom.xml +++ b/services/opsworkscm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 opsworkscm AWS Java SDK :: Services :: AWS OpsWorks for Chef Automate diff --git a/services/organizations/pom.xml b/services/organizations/pom.xml index 0a7fd68ce92d..e87ce404a7c5 100644 --- a/services/organizations/pom.xml +++ b/services/organizations/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 organizations AWS Java SDK :: Services :: AWS Organizations diff --git a/services/outposts/pom.xml b/services/outposts/pom.xml index 43eacede2ea8..7374fb9f3c5a 100644 --- a/services/outposts/pom.xml +++ b/services/outposts/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 outposts AWS Java SDK :: Services :: Outposts diff --git a/services/personalize/pom.xml b/services/personalize/pom.xml index 61cb8b6f9ea8..c67ff0c07e33 100644 --- a/services/personalize/pom.xml +++ b/services/personalize/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 personalize AWS Java SDK :: Services :: Personalize diff --git a/services/personalizeevents/pom.xml b/services/personalizeevents/pom.xml index 6459b691080d..970f8bd183ad 100644 --- a/services/personalizeevents/pom.xml +++ b/services/personalizeevents/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 personalizeevents AWS Java SDK :: Services :: Personalize Events diff --git a/services/personalizeruntime/pom.xml b/services/personalizeruntime/pom.xml index 131591afd12b..bbe47bc04fae 100644 --- a/services/personalizeruntime/pom.xml +++ b/services/personalizeruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 personalizeruntime AWS Java SDK :: Services :: Personalize Runtime diff --git a/services/pi/pom.xml b/services/pi/pom.xml index 1f518ccfdc8d..4de7cf39dcde 100644 --- a/services/pi/pom.xml +++ b/services/pi/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 pi AWS Java SDK :: Services :: PI diff --git a/services/pinpoint/pom.xml b/services/pinpoint/pom.xml index c2f368bcb44e..1fd4da618385 100644 --- a/services/pinpoint/pom.xml +++ b/services/pinpoint/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 pinpoint AWS Java SDK :: Services :: Amazon Pinpoint diff --git a/services/pinpointemail/pom.xml b/services/pinpointemail/pom.xml index c2b97a391d0b..7aa0bc99e6a1 100644 --- a/services/pinpointemail/pom.xml +++ b/services/pinpointemail/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 pinpointemail AWS Java SDK :: Services :: Pinpoint Email diff --git a/services/pinpointsmsvoice/pom.xml b/services/pinpointsmsvoice/pom.xml index 0e8ab6a5d018..ab565627105f 100644 --- a/services/pinpointsmsvoice/pom.xml +++ b/services/pinpointsmsvoice/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 pinpointsmsvoice AWS Java SDK :: Services :: Pinpoint SMS Voice diff --git a/services/polly/pom.xml b/services/polly/pom.xml index 3266cf6c468d..ff4ecadfd111 100644 --- a/services/polly/pom.xml +++ b/services/polly/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 polly AWS Java SDK :: Services :: Amazon Polly diff --git a/services/pom.xml b/services/pom.xml index a3cdd72c0c34..bf752fdc2123 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 services AWS Java SDK :: Services diff --git a/services/pricing/pom.xml b/services/pricing/pom.xml index ca1ff25a43f1..96b7a62b0f91 100644 --- a/services/pricing/pom.xml +++ b/services/pricing/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 pricing diff --git a/services/qldb/pom.xml b/services/qldb/pom.xml index 76db67102f57..9dfbf269c0b8 100644 --- a/services/qldb/pom.xml +++ b/services/qldb/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 qldb AWS Java SDK :: Services :: QLDB diff --git a/services/qldbsession/pom.xml b/services/qldbsession/pom.xml index 5bfc590288d6..3c765f31dd76 100644 --- a/services/qldbsession/pom.xml +++ b/services/qldbsession/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 qldbsession AWS Java SDK :: Services :: QLDB Session diff --git a/services/quicksight/pom.xml b/services/quicksight/pom.xml index 9a36c87d7d7d..262ec30a87e4 100644 --- a/services/quicksight/pom.xml +++ b/services/quicksight/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 quicksight AWS Java SDK :: Services :: QuickSight diff --git a/services/ram/pom.xml b/services/ram/pom.xml index 6d92a9512e19..6243ccf093f8 100644 --- a/services/ram/pom.xml +++ b/services/ram/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ram AWS Java SDK :: Services :: RAM diff --git a/services/rds/pom.xml b/services/rds/pom.xml index b84c5abeed6b..afc302889fb0 100644 --- a/services/rds/pom.xml +++ b/services/rds/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 rds AWS Java SDK :: Services :: Amazon RDS diff --git a/services/rdsdata/pom.xml b/services/rdsdata/pom.xml index 56a3922599a5..20bc5fa98b8e 100644 --- a/services/rdsdata/pom.xml +++ b/services/rdsdata/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 rdsdata AWS Java SDK :: Services :: RDS Data diff --git a/services/redshift/pom.xml b/services/redshift/pom.xml index 6a3d08a7a57a..51330916b7cc 100644 --- a/services/redshift/pom.xml +++ b/services/redshift/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 redshift AWS Java SDK :: Services :: Amazon Redshift diff --git a/services/rekognition/pom.xml b/services/rekognition/pom.xml index ef13383f931d..724c09196cef 100644 --- a/services/rekognition/pom.xml +++ b/services/rekognition/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 rekognition AWS Java SDK :: Services :: Amazon Rekognition diff --git a/services/resourcegroups/pom.xml b/services/resourcegroups/pom.xml index 2327af163e4c..94ba34605b41 100644 --- a/services/resourcegroups/pom.xml +++ b/services/resourcegroups/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 resourcegroups diff --git a/services/resourcegroupstaggingapi/pom.xml b/services/resourcegroupstaggingapi/pom.xml index 7b1021e9ca46..5d0efb8bd750 100644 --- a/services/resourcegroupstaggingapi/pom.xml +++ b/services/resourcegroupstaggingapi/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 resourcegroupstaggingapi AWS Java SDK :: Services :: AWS Resource Groups Tagging API diff --git a/services/robomaker/pom.xml b/services/robomaker/pom.xml index 496123c0b469..195192d51230 100644 --- a/services/robomaker/pom.xml +++ b/services/robomaker/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 robomaker AWS Java SDK :: Services :: RoboMaker diff --git a/services/route53/pom.xml b/services/route53/pom.xml index 6a24b84fa861..dcd890aa0ba2 100644 --- a/services/route53/pom.xml +++ b/services/route53/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 route53 AWS Java SDK :: Services :: Amazon Route53 diff --git a/services/route53/src/main/resources/codegen-resources/service-2.json b/services/route53/src/main/resources/codegen-resources/service-2.json index 38313f8d315a..2b176f8216a7 100644 --- a/services/route53/src/main/resources/codegen-resources/service-2.json +++ b/services/route53/src/main/resources/codegen-resources/service-2.json @@ -34,7 +34,7 @@ {"shape":"LimitsExceeded"}, {"shape":"PriorRequestNotComplete"} ], - "documentation":"

Associates an Amazon VPC with a private hosted zone.

To perform the association, the VPC and the private hosted zone must already exist. Also, you can't convert a public hosted zone into a private hosted zone.

If you want to associate a VPC that was created by one AWS account with a private hosted zone that was created by a different account, do one of the following:

  • Use the AWS account that created the private hosted zone to submit a CreateVPCAssociationAuthorization request. Then use the account that created the VPC to submit an AssociateVPCWithHostedZone request.

  • If a subnet in the VPC was shared with another account, you can use the account that the subnet was shared with to submit an AssociateVPCWithHostedZone request. For more information about sharing subnets, see Working with Shared VPCs.

" + "documentation":"

Associates an Amazon VPC with a private hosted zone.

To perform the association, the VPC and the private hosted zone must already exist. You can't convert a public hosted zone into a private hosted zone.

If you want to associate a VPC that was created by using one AWS account with a private hosted zone that was created by using a different account, the AWS account that created the private hosted zone must first submit a CreateVPCAssociationAuthorization request. Then the account that created the VPC must submit an AssociateVPCWithHostedZone request.

" }, "ChangeResourceRecordSets":{ "name":"ChangeResourceRecordSets", @@ -334,7 +334,7 @@ {"shape":"TrafficPolicyInUse"}, {"shape":"ConcurrentModification"} ], - "documentation":"

Deletes a traffic policy.

" + "documentation":"

Deletes a traffic policy.

When you delete a traffic policy, Route 53 sets a flag on the policy to indicate that it has been deleted. However, Route 53 never fully deletes the traffic policy. Note the following:

  • Deleted traffic policies aren't listed if you run ListTrafficPolicies.

  • There's no way to get a list of deleted policies.

  • If you retain the ID of the policy, you can get information about the policy, including the traffic policy document, by running GetTrafficPolicy.

" }, "DeleteTrafficPolicyInstance":{ "name":"DeleteTrafficPolicyInstance", @@ -594,7 +594,7 @@ {"shape":"NoSuchTrafficPolicy"}, {"shape":"InvalidInput"} ], - "documentation":"

Gets information about a specific traffic policy version.

" + "documentation":"

Gets information about a specific traffic policy version.

For information about how of deleting a traffic policy affects the response from GetTrafficPolicy, see DeleteTrafficPolicy.

" }, "GetTrafficPolicyInstance":{ "name":"GetTrafficPolicyInstance", @@ -781,7 +781,7 @@ "errors":[ {"shape":"InvalidInput"} ], - "documentation":"

Gets information about the latest version for every traffic policy that is associated with the current AWS account. Policies are listed in the order that they were created in.

" + "documentation":"

Gets information about the latest version for every traffic policy that is associated with the current AWS account. Policies are listed in the order that they were created in.

For information about how of deleting a traffic policy affects the response from ListTrafficPolicies, see DeleteTrafficPolicy.

" }, "ListTrafficPolicyInstances":{ "name":"ListTrafficPolicyInstances", @@ -3323,7 +3323,7 @@ }, "MaxItems":{ "shape":"PageMaxItems", - "documentation":"

(Optional) The maximum number of hosted zones that you want Amazon Route 53 to return. If the specified VPC is associated with more than MaxItems hosted zones, the response includes a NextToken element. NextToken contains the hosted zone ID of the first hosted zone that Route 53 will return if you submit another request.

", + "documentation":"

(Optional) The maximum number of hosted zones that you want Amazon Route 53 to return. If the specified VPC is associated with more than MaxItems hosted zones, the response includes a NextToken element. NextToken contains an encrypted token that identifies the first hosted zone that Route 53 will return if you submit another request.

", "location":"querystring", "locationName":"maxitems" }, diff --git a/services/route53domains/pom.xml b/services/route53domains/pom.xml index ce32f1b2e321..aa3636036a07 100644 --- a/services/route53domains/pom.xml +++ b/services/route53domains/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 route53domains AWS Java SDK :: Services :: Amazon Route53 Domains diff --git a/services/route53resolver/pom.xml b/services/route53resolver/pom.xml index cf4987b9ac10..4282bf9fbe45 100644 --- a/services/route53resolver/pom.xml +++ b/services/route53resolver/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 route53resolver AWS Java SDK :: Services :: Route53Resolver diff --git a/services/s3/pom.xml b/services/s3/pom.xml index 8ba39536104e..3badbea900b4 100644 --- a/services/s3/pom.xml +++ b/services/s3/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 s3 AWS Java SDK :: Services :: Amazon S3 diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml index 37d7eca0dca8..e3ec0ebddbf6 100644 --- a/services/s3control/pom.xml +++ b/services/s3control/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 s3control AWS Java SDK :: Services :: Amazon S3 Control diff --git a/services/sagemaker/pom.xml b/services/sagemaker/pom.xml index 98c752ca8511..466281966de2 100644 --- a/services/sagemaker/pom.xml +++ b/services/sagemaker/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 sagemaker diff --git a/services/sagemakera2iruntime/pom.xml b/services/sagemakera2iruntime/pom.xml index 78f02ca51f18..0225d5635b52 100644 --- a/services/sagemakera2iruntime/pom.xml +++ b/services/sagemakera2iruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sagemakera2iruntime AWS Java SDK :: Services :: SageMaker A2I Runtime diff --git a/services/sagemakerruntime/pom.xml b/services/sagemakerruntime/pom.xml index 2fa4e1524323..269199ee413e 100644 --- a/services/sagemakerruntime/pom.xml +++ b/services/sagemakerruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sagemakerruntime AWS Java SDK :: Services :: SageMaker Runtime diff --git a/services/savingsplans/pom.xml b/services/savingsplans/pom.xml index 55b5c280bc24..6c056d997e41 100644 --- a/services/savingsplans/pom.xml +++ b/services/savingsplans/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 savingsplans AWS Java SDK :: Services :: Savingsplans diff --git a/services/schemas/pom.xml b/services/schemas/pom.xml index 86d038fa56fb..8608c44f5c80 100644 --- a/services/schemas/pom.xml +++ b/services/schemas/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 schemas AWS Java SDK :: Services :: Schemas diff --git a/services/secretsmanager/pom.xml b/services/secretsmanager/pom.xml index c030bfff0242..7d1e71214545 100644 --- a/services/secretsmanager/pom.xml +++ b/services/secretsmanager/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 secretsmanager AWS Java SDK :: Services :: AWS Secrets Manager diff --git a/services/securityhub/pom.xml b/services/securityhub/pom.xml index cd8fbc974496..24c97a8397f9 100644 --- a/services/securityhub/pom.xml +++ b/services/securityhub/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 securityhub AWS Java SDK :: Services :: SecurityHub diff --git a/services/serverlessapplicationrepository/pom.xml b/services/serverlessapplicationrepository/pom.xml index 37b5d213f9e3..86c5f69c36db 100644 --- a/services/serverlessapplicationrepository/pom.xml +++ b/services/serverlessapplicationrepository/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 serverlessapplicationrepository diff --git a/services/servicecatalog/pom.xml b/services/servicecatalog/pom.xml index e88d7eadaf15..8fe26808d262 100644 --- a/services/servicecatalog/pom.xml +++ b/services/servicecatalog/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 servicecatalog AWS Java SDK :: Services :: AWS Service Catalog diff --git a/services/servicediscovery/pom.xml b/services/servicediscovery/pom.xml index 6e836d7fedff..da0a012edd77 100644 --- a/services/servicediscovery/pom.xml +++ b/services/servicediscovery/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 servicediscovery diff --git a/services/servicequotas/pom.xml b/services/servicequotas/pom.xml index 43dd3b3d70aa..abe0612ee0fb 100644 --- a/services/servicequotas/pom.xml +++ b/services/servicequotas/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 servicequotas AWS Java SDK :: Services :: Service Quotas diff --git a/services/ses/pom.xml b/services/ses/pom.xml index 0e393a370145..e438e566ab6b 100644 --- a/services/ses/pom.xml +++ b/services/ses/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ses AWS Java SDK :: Services :: Amazon SES diff --git a/services/sesv2/pom.xml b/services/sesv2/pom.xml index 76206da83b02..ac1ec12bf0bd 100644 --- a/services/sesv2/pom.xml +++ b/services/sesv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sesv2 AWS Java SDK :: Services :: SESv2 diff --git a/services/sfn/pom.xml b/services/sfn/pom.xml index e2b5d7ac6466..f374e0bc1c76 100644 --- a/services/sfn/pom.xml +++ b/services/sfn/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sfn AWS Java SDK :: Services :: AWS Step Functions diff --git a/services/shield/pom.xml b/services/shield/pom.xml index 08172b1a05b7..143ef4e5ca84 100644 --- a/services/shield/pom.xml +++ b/services/shield/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 shield AWS Java SDK :: Services :: AWS Shield diff --git a/services/signer/pom.xml b/services/signer/pom.xml index 025f19ccf469..b1de11ed2aee 100644 --- a/services/signer/pom.xml +++ b/services/signer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 signer AWS Java SDK :: Services :: Signer diff --git a/services/sms/pom.xml b/services/sms/pom.xml index 494044b0bbd7..aac91d35dd72 100644 --- a/services/sms/pom.xml +++ b/services/sms/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sms AWS Java SDK :: Services :: AWS Server Migration diff --git a/services/snowball/pom.xml b/services/snowball/pom.xml index f556808999f8..decca1b3460f 100644 --- a/services/snowball/pom.xml +++ b/services/snowball/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 snowball AWS Java SDK :: Services :: Amazon Snowball diff --git a/services/sns/pom.xml b/services/sns/pom.xml index 740fde6cef03..ff60540a159b 100644 --- a/services/sns/pom.xml +++ b/services/sns/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sns AWS Java SDK :: Services :: Amazon SNS diff --git a/services/sqs/pom.xml b/services/sqs/pom.xml index 4ae75acb959e..a263c3a9a3f4 100644 --- a/services/sqs/pom.xml +++ b/services/sqs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sqs AWS Java SDK :: Services :: Amazon SQS diff --git a/services/ssm/pom.xml b/services/ssm/pom.xml index d2604c831ac4..921d790469c2 100644 --- a/services/ssm/pom.xml +++ b/services/ssm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ssm AWS Java SDK :: Services :: AWS Simple Systems Management (SSM) diff --git a/services/sso/pom.xml b/services/sso/pom.xml index 70e520da8b79..96d30543b60c 100644 --- a/services/sso/pom.xml +++ b/services/sso/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sso AWS Java SDK :: Services :: SSO diff --git a/services/ssooidc/pom.xml b/services/ssooidc/pom.xml index bd4199b6568b..b5bb231cc222 100644 --- a/services/ssooidc/pom.xml +++ b/services/ssooidc/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 ssooidc AWS Java SDK :: Services :: SSO OIDC diff --git a/services/storagegateway/pom.xml b/services/storagegateway/pom.xml index d2c4c6bc09a7..e8b220c0ba97 100644 --- a/services/storagegateway/pom.xml +++ b/services/storagegateway/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 storagegateway AWS Java SDK :: Services :: AWS Storage Gateway diff --git a/services/sts/pom.xml b/services/sts/pom.xml index 367237020b54..09ee3fab534c 100644 --- a/services/sts/pom.xml +++ b/services/sts/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 sts AWS Java SDK :: Services :: AWS STS diff --git a/services/support/pom.xml b/services/support/pom.xml index 1b98e080a4df..3c3174168327 100644 --- a/services/support/pom.xml +++ b/services/support/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 support AWS Java SDK :: Services :: AWS Support diff --git a/services/swf/pom.xml b/services/swf/pom.xml index 91f2d6e7ebcf..fa1dfd9185bb 100644 --- a/services/swf/pom.xml +++ b/services/swf/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 swf AWS Java SDK :: Services :: Amazon SWF diff --git a/services/synthetics/pom.xml b/services/synthetics/pom.xml index 65be219775d6..691042696ffd 100644 --- a/services/synthetics/pom.xml +++ b/services/synthetics/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 synthetics AWS Java SDK :: Services :: Synthetics diff --git a/services/textract/pom.xml b/services/textract/pom.xml index 4b8b13a03231..2bc7420cb4ff 100644 --- a/services/textract/pom.xml +++ b/services/textract/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 textract AWS Java SDK :: Services :: Textract diff --git a/services/transcribe/pom.xml b/services/transcribe/pom.xml index 8fb4b05ed79b..8b74a6faf79c 100644 --- a/services/transcribe/pom.xml +++ b/services/transcribe/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 transcribe AWS Java SDK :: Services :: Transcribe diff --git a/services/transcribestreaming/pom.xml b/services/transcribestreaming/pom.xml index 813df55834fe..acbcea3f6783 100644 --- a/services/transcribestreaming/pom.xml +++ b/services/transcribestreaming/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 transcribestreaming AWS Java SDK :: Services :: AWS Transcribe Streaming diff --git a/services/transfer/pom.xml b/services/transfer/pom.xml index 69e109c280a8..b6bd6e1c4e27 100644 --- a/services/transfer/pom.xml +++ b/services/transfer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 transfer AWS Java SDK :: Services :: Transfer diff --git a/services/translate/pom.xml b/services/translate/pom.xml index 2c867b2ef795..4289073a82c1 100644 --- a/services/translate/pom.xml +++ b/services/translate/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 translate diff --git a/services/waf/pom.xml b/services/waf/pom.xml index 6edb2ba8129e..46b52b004503 100644 --- a/services/waf/pom.xml +++ b/services/waf/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 waf AWS Java SDK :: Services :: AWS WAF diff --git a/services/wafv2/pom.xml b/services/wafv2/pom.xml index 5a744b5065e0..91f8a2020ace 100644 --- a/services/wafv2/pom.xml +++ b/services/wafv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 wafv2 AWS Java SDK :: Services :: WAFV2 diff --git a/services/workdocs/pom.xml b/services/workdocs/pom.xml index fcdd5e48817d..70c001841bf9 100644 --- a/services/workdocs/pom.xml +++ b/services/workdocs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 workdocs AWS Java SDK :: Services :: Amazon WorkDocs diff --git a/services/worklink/pom.xml b/services/worklink/pom.xml index ed7967d9017d..2214149035f1 100644 --- a/services/worklink/pom.xml +++ b/services/worklink/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 worklink AWS Java SDK :: Services :: WorkLink diff --git a/services/workmail/pom.xml b/services/workmail/pom.xml index fd7501cb09cb..c55afdcc19f0 100644 --- a/services/workmail/pom.xml +++ b/services/workmail/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0 workmail diff --git a/services/workmailmessageflow/pom.xml b/services/workmailmessageflow/pom.xml index 47e417ce693c..94fb2a93e761 100644 --- a/services/workmailmessageflow/pom.xml +++ b/services/workmailmessageflow/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 workmailmessageflow AWS Java SDK :: Services :: WorkMailMessageFlow diff --git a/services/workspaces/pom.xml b/services/workspaces/pom.xml index 303a056c366a..499c17682c98 100644 --- a/services/workspaces/pom.xml +++ b/services/workspaces/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 workspaces AWS Java SDK :: Services :: Amazon WorkSpaces diff --git a/services/xray/pom.xml b/services/xray/pom.xml index 6f65b414f1c2..cb68775207d4 100644 --- a/services/xray/pom.xml +++ b/services/xray/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.14.6 + 2.14.7 xray AWS Java SDK :: Services :: AWS X-Ray diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml index a6221b3f1a5a..54de086d6f34 100644 --- a/test/codegen-generated-classes-test/pom.xml +++ b/test/codegen-generated-classes-test/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 ../../pom.xml diff --git a/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired-withcustomization/customization.config b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired-withcustomization/customization.config new file mode 100644 index 000000000000..8175efc28858 --- /dev/null +++ b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired-withcustomization/customization.config @@ -0,0 +1,3 @@ +{ + "allowEndpointOverrideForEndpointDiscoveryRequiredOperations": true +} \ No newline at end of file diff --git a/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired-withcustomization/service-2.json b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired-withcustomization/service-2.json new file mode 100644 index 000000000000..1adcc3ac2d95 --- /dev/null +++ b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired-withcustomization/service-2.json @@ -0,0 +1,113 @@ +{ + "version":"2.0", + "metadata":{ + "apiVersion":"2018-08-31", + "endpointPrefix":"awsendpointdiscoveryrequiredwithcustomizationtestservice", + "jsonVersion":"1.1", + "protocol":"json", + "serviceAbbreviation":"AwsEndpointDiscoveryRequiredWithCustomizationTest", + "serviceFullName":"AwsEndpointDiscoveryRequiredWithCustomizationTest", + "serviceId":"AwsEndpointDiscoveryRequiredWithCustomizationTest", + "signatureVersion":"v4", + "signingName":"awsendpointdiscoveryrequiredtestwithcustomizationservice", + "targetPrefix":"AwsEndpointDiscoveryRequiredWithCustomizationTestService" + }, + "operations":{ + "DescribeEndpoints":{ + "name":"DescribeEndpoints", + "http":{ + "method":"POST", + "requestUri":"/DescribeEndpoints" + }, + "input":{"shape":"DescribeEndpointsRequest"}, + "output":{"shape":"DescribeEndpointsResponse"}, + "endpointoperation":true + }, + "TestDiscoveryIdentifiersRequired":{ + "name":"TestDiscoveryIdentifiersRequired", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"TestDiscoveryIdentifiersRequiredRequest"}, + "output":{"shape":"TestDiscoveryIdentifiersRequiredResponse"}, + "endpointdiscovery":{"required":true} + }, + "TestDiscoveryRequired":{ + "name":"TestDiscoveryRequired", + "http":{ + "method":"POST", + "requestUri":"/TestDiscoveryRequired" + }, + "input":{"shape":"TestDiscoveryRequiredRequest"}, + "output":{"shape":"TestDiscoveryRequiredResponse"}, + "endpointdiscovery":{"required":true} + } + }, + "shapes":{ + "Boolean":{"type":"boolean"}, + "DescribeEndpointsRequest":{ + "type":"structure", + "members":{ + "Operation":{"shape":"String"}, + "Identifiers":{"shape":"Identifiers"} + } + }, + "DescribeEndpointsResponse":{ + "type":"structure", + "required":["Endpoints"], + "members":{ + "Endpoints":{"shape":"Endpoints"} + } + }, + "Endpoint":{ + "type":"structure", + "required":[ + "Address", + "CachePeriodInMinutes" + ], + "members":{ + "Address":{"shape":"String"}, + "CachePeriodInMinutes":{"shape":"Long"} + } + }, + "Endpoints":{ + "type":"list", + "member":{"shape":"Endpoint"} + }, + "Identifiers":{ + "type":"map", + "key":{"shape":"String"}, + "value":{"shape":"String"} + }, + "Long":{"type":"long"}, + "String":{"type":"string"}, + "TestDiscoveryIdentifiersRequiredRequest":{ + "type":"structure", + "required":["Sdk"], + "members":{ + "Sdk":{ + "shape":"String", + "endpointdiscoveryid":true + } + } + }, + "TestDiscoveryIdentifiersRequiredResponse":{ + "type":"structure", + "members":{ + "DiscoveredEndpoint":{"shape":"Boolean"} + } + }, + "TestDiscoveryRequiredRequest":{ + "type":"structure", + "members":{ + } + }, + "TestDiscoveryRequiredResponse":{ + "type":"structure", + "members":{ + "DiscoveredEndpoint":{"shape":"Boolean"} + } + } + } +} \ No newline at end of file diff --git a/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired/service-2.json b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired/service-2.json new file mode 100644 index 000000000000..580005251e25 --- /dev/null +++ b/test/codegen-generated-classes-test/src/main/resources/codegen-resources/endpointdiscoveryrequired/service-2.json @@ -0,0 +1,113 @@ +{ + "version":"2.0", + "metadata":{ + "apiVersion":"2018-08-31", + "endpointPrefix":"awsendpointdiscoveryrequiredtestservice", + "jsonVersion":"1.1", + "protocol":"json", + "serviceAbbreviation":"AwsEndpointDiscoveryRequiredTest", + "serviceFullName":"AwsEndpointDiscoveryRequiredTest", + "serviceId":"AwsEndpointDiscoveryRequiredTest", + "signatureVersion":"v4", + "signingName":"awsendpointdiscoveryrequiredtestservice", + "targetPrefix":"AwsEndpointDiscoveryRequiredTestService" + }, + "operations":{ + "DescribeEndpoints":{ + "name":"DescribeEndpoints", + "http":{ + "method":"POST", + "requestUri":"/DescribeEndpoints" + }, + "input":{"shape":"DescribeEndpointsRequest"}, + "output":{"shape":"DescribeEndpointsResponse"}, + "endpointoperation":true + }, + "TestDiscoveryIdentifiersRequired":{ + "name":"TestDiscoveryIdentifiersRequired", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"TestDiscoveryIdentifiersRequiredRequest"}, + "output":{"shape":"TestDiscoveryIdentifiersRequiredResponse"}, + "endpointdiscovery":{"required":true} + }, + "TestDiscoveryRequired":{ + "name":"TestDiscoveryRequired", + "http":{ + "method":"POST", + "requestUri":"/TestDiscoveryRequired" + }, + "input":{"shape":"TestDiscoveryRequiredRequest"}, + "output":{"shape":"TestDiscoveryRequiredResponse"}, + "endpointdiscovery":{"required":true} + } + }, + "shapes":{ + "Boolean":{"type":"boolean"}, + "DescribeEndpointsRequest":{ + "type":"structure", + "members":{ + "Operation":{"shape":"String"}, + "Identifiers":{"shape":"Identifiers"} + } + }, + "DescribeEndpointsResponse":{ + "type":"structure", + "required":["Endpoints"], + "members":{ + "Endpoints":{"shape":"Endpoints"} + } + }, + "Endpoint":{ + "type":"structure", + "required":[ + "Address", + "CachePeriodInMinutes" + ], + "members":{ + "Address":{"shape":"String"}, + "CachePeriodInMinutes":{"shape":"Long"} + } + }, + "Endpoints":{ + "type":"list", + "member":{"shape":"Endpoint"} + }, + "Identifiers":{ + "type":"map", + "key":{"shape":"String"}, + "value":{"shape":"String"} + }, + "Long":{"type":"long"}, + "String":{"type":"string"}, + "TestDiscoveryIdentifiersRequiredRequest":{ + "type":"structure", + "required":["Sdk"], + "members":{ + "Sdk":{ + "shape":"String", + "endpointdiscoveryid":true + } + } + }, + "TestDiscoveryIdentifiersRequiredResponse":{ + "type":"structure", + "members":{ + "DiscoveredEndpoint":{"shape":"Boolean"} + } + }, + "TestDiscoveryRequiredRequest":{ + "type":"structure", + "members":{ + } + }, + "TestDiscoveryRequiredResponse":{ + "type":"structure", + "members":{ + "DiscoveredEndpoint":{"shape":"Boolean"} + } + } + } +} \ No newline at end of file diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryAndEndpointOverrideTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryAndEndpointOverrideTest.java new file mode 100644 index 000000000000..c58b2fdbbf79 --- /dev/null +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryAndEndpointOverrideTest.java @@ -0,0 +1,231 @@ +package software.amazon.awssdk.services; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.net.URI; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletionException; +import java.util.function.Consumer; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import software.amazon.awssdk.core.client.builder.SdkClientBuilder; +import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.core.interceptor.Context; +import software.amazon.awssdk.core.interceptor.ExecutionAttributes; +import software.amazon.awssdk.core.interceptor.ExecutionInterceptor; +import software.amazon.awssdk.services.endpointdiscoveryrequiredtest.EndpointDiscoveryRequiredTestAsyncClient; +import software.amazon.awssdk.services.endpointdiscoveryrequiredtest.EndpointDiscoveryRequiredTestClient; +import software.amazon.awssdk.services.endpointdiscoveryrequiredwithcustomizationtest.EndpointDiscoveryRequiredWithCustomizationTestAsyncClient; +import software.amazon.awssdk.services.endpointdiscoveryrequiredwithcustomizationtest.EndpointDiscoveryRequiredWithCustomizationTestClient; +import software.amazon.awssdk.services.endpointdiscoverytest.EndpointDiscoveryTestAsyncClient; +import software.amazon.awssdk.services.endpointdiscoverytest.EndpointDiscoveryTestClient; + +/** + * Verify the behavior of endpoint discovery when combined with endpoint override configuration. + */ +@RunWith(Parameterized.class) +public class EndpointDiscoveryAndEndpointOverrideTest { + private static final String OPTIONAL_SERVICE_ENDPOINT = "https://awsendpointdiscoverytestservice.us-west-2.amazonaws.com"; + private static final String REQUIRED_SERVICE_ENDPOINT = "https://awsendpointdiscoveryrequiredtestservice.us-west-2.amazonaws.com"; + private static final String REQUIRED_CUSTOMIZED_SERVICE_ENDPOINT = "https://awsendpointdiscoveryrequiredwithcustomizationtestservice.us-west-2.amazonaws.com"; + private static final String ENDPOINT_OVERRIDE = "https://endpointoverride"; + + private static final List> ALL_TEST_CASES = new ArrayList<>(); + + private final TestCase testCase; + + static { + // This first case (case 0/1) is different than other SDKs/the SEP. This should probably actually throw an exception. + ALL_TEST_CASES.addAll(endpointDiscoveryOptionalCases(true, true, ENDPOINT_OVERRIDE + "/DescribeEndpoints", ENDPOINT_OVERRIDE + "/TestDiscoveryOptional")); + ALL_TEST_CASES.addAll(endpointDiscoveryOptionalCases(true, false, OPTIONAL_SERVICE_ENDPOINT + "/DescribeEndpoints", OPTIONAL_SERVICE_ENDPOINT + "/TestDiscoveryOptional")); + ALL_TEST_CASES.addAll(endpointDiscoveryOptionalCases(false, true, ENDPOINT_OVERRIDE + "/TestDiscoveryOptional")); + ALL_TEST_CASES.addAll(endpointDiscoveryOptionalCases(false, false, OPTIONAL_SERVICE_ENDPOINT + "/TestDiscoveryOptional")); + + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredCases(true, true)); + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredCases(true, false, REQUIRED_SERVICE_ENDPOINT + "/DescribeEndpoints")); + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredCases(false, true)); + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredCases(false, false)); + + // These cases are different from what one would expect. Even though endpoint discovery is required (based on the model), + // if the customer specifies an endpoint override AND the service is customized, we actually bypass endpoint discovery. + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredAndCustomizedCases(true, true, ENDPOINT_OVERRIDE + "/TestDiscoveryRequired")); + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredAndCustomizedCases(true, false, REQUIRED_CUSTOMIZED_SERVICE_ENDPOINT + "/DescribeEndpoints")); + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredAndCustomizedCases(false, true, ENDPOINT_OVERRIDE + "/TestDiscoveryRequired")); + ALL_TEST_CASES.addAll(endpointDiscoveryRequiredAndCustomizedCases(false, false)); + } + + public EndpointDiscoveryAndEndpointOverrideTest(TestCase testCase) { + this.testCase = testCase; + } + + @Before + public void reset() { + EndpointCapturingInterceptor.reset(); + } + + @Parameterized.Parameters(name = "{index} - {0}") + public static List> testCases() { + return ALL_TEST_CASES; + } + + @Test(timeout = 5_000) + public void invokeTestCase() { + try { + testCase.callClient(); + Assert.fail(); + } catch (Throwable e) { + // Unwrap async exceptions so that they can be tested the same as async ones. + if (e instanceof CompletionException) { + e = e.getCause(); + } + + if (testCase.expectedPaths.length > 0) { + // We're using fake endpoints, so we expect even "valid" requests to fail because of unknown host exceptions. + assertThat(e.getCause()).hasRootCauseInstanceOf(UnknownHostException.class); + } else { + // If the requests are not expected to go through, we expect to see illegal state exceptions because the + // client is configured incorrectly. + assertThat(e).isInstanceOf(IllegalStateException.class); + } + } + + if (testCase.enforcePathOrder) { + assertThat(EndpointCapturingInterceptor.ENDPOINTS).containsExactly(testCase.expectedPaths); + } else { + // Async is involved when order doesn't matter, so wait a little while until the expected number of paths arrive. + while (EndpointCapturingInterceptor.ENDPOINTS.size() < testCase.expectedPaths.length) { + Thread.yield(); + } + assertThat(EndpointCapturingInterceptor.ENDPOINTS).containsExactlyInAnyOrder(testCase.expectedPaths); + } + } + + private static List> endpointDiscoveryOptionalCases(boolean endpointDiscoveryEnabled, + boolean endpointOverridden, + String... expectedEndpoints) { + TestCase syncCase = new TestCase<>(createClient(EndpointDiscoveryTestClient.builder().endpointDiscoveryEnabled(endpointDiscoveryEnabled), + endpointOverridden), + c -> c.testDiscoveryOptional(r -> {}), + caseName(EndpointDiscoveryTestClient.class, endpointDiscoveryEnabled, endpointOverridden, expectedEndpoints), + false, + expectedEndpoints); + + TestCase asyncCase = new TestCase<>(createClient(EndpointDiscoveryTestAsyncClient.builder().endpointDiscoveryEnabled(endpointDiscoveryEnabled), + endpointOverridden), + c -> c.testDiscoveryOptional(r -> {}).join(), + caseName(EndpointDiscoveryTestAsyncClient.class, endpointDiscoveryEnabled, endpointOverridden, expectedEndpoints), + false, + expectedEndpoints); + + return Arrays.asList(syncCase, asyncCase); + } + + private static List> endpointDiscoveryRequiredCases(boolean endpointDiscoveryEnabled, + boolean endpointOverridden, + String... expectedEndpoints) { + TestCase syncCase = new TestCase<>(createClient(EndpointDiscoveryRequiredTestClient.builder().endpointDiscoveryEnabled(endpointDiscoveryEnabled), + endpointOverridden), + c -> c.testDiscoveryRequired(r -> {}), + caseName(EndpointDiscoveryRequiredTestClient.class, endpointDiscoveryEnabled, endpointOverridden, expectedEndpoints), + true, + expectedEndpoints); + + TestCase asyncCase = new TestCase<>(createClient(EndpointDiscoveryRequiredTestAsyncClient.builder().endpointDiscoveryEnabled(endpointDiscoveryEnabled), + endpointOverridden), + c -> c.testDiscoveryRequired(r -> {}).join(), + caseName(EndpointDiscoveryRequiredTestAsyncClient.class, endpointDiscoveryEnabled, endpointOverridden, expectedEndpoints), + true, + expectedEndpoints); + + return Arrays.asList(syncCase, asyncCase); + } + + private static List> endpointDiscoveryRequiredAndCustomizedCases(boolean endpointDiscoveryEnabled, + boolean endpointOverridden, + String... expectedEndpoints) { + TestCase syncCase = new TestCase<>(createClient(EndpointDiscoveryRequiredWithCustomizationTestClient.builder().endpointDiscoveryEnabled(endpointDiscoveryEnabled), + endpointOverridden), + c -> c.testDiscoveryRequired(r -> {}), + caseName(EndpointDiscoveryRequiredWithCustomizationTestClient.class, endpointDiscoveryEnabled, endpointOverridden, expectedEndpoints), + true, + expectedEndpoints); + + TestCase asyncCase = new TestCase<>(createClient(EndpointDiscoveryRequiredWithCustomizationTestAsyncClient.builder().endpointDiscoveryEnabled(endpointDiscoveryEnabled), + endpointOverridden), + c -> c.testDiscoveryRequired(r -> {}).join(), + caseName(EndpointDiscoveryRequiredWithCustomizationTestAsyncClient.class, endpointDiscoveryEnabled, endpointOverridden, expectedEndpoints), + true, + expectedEndpoints); + + return Arrays.asList(syncCase, asyncCase); + } + + private static T createClient(SdkClientBuilder clientBuilder, + boolean endpointOverridden) { + return clientBuilder.applyMutation(c -> addEndpointOverride(c, endpointOverridden)) + .overrideConfiguration(c -> c.retryPolicy(p -> p.numRetries(0)) + .addExecutionInterceptor(new EndpointCapturingInterceptor())) + .build(); + } + + private static String caseName(Class client, + boolean endpointDiscoveryEnabled, + boolean endpointOverridden, + String... expectedEndpoints) { + return "(Client=" + client.getSimpleName() + + ", DiscoveryEnabled=" + endpointDiscoveryEnabled + + ", EndpointOverridden=" + endpointOverridden + + ") => (ExpectedEndpoints=" + Arrays.toString(expectedEndpoints) + ")"; + } + + private static void addEndpointOverride(SdkClientBuilder builder, boolean endpointOverridden) { + if (endpointOverridden) { + builder.endpointOverride(URI.create(ENDPOINT_OVERRIDE)); + } + } + + private static class TestCase { + private final T client; + private final Consumer methodCall; + private final String caseName; + private final boolean enforcePathOrder; + private final String[] expectedPaths; + + private TestCase(T client, Consumer methodCall, String caseName, boolean enforcePathOrder, String... expectedPaths) { + this.client = client; + this.methodCall = methodCall; + this.caseName = caseName; + this.enforcePathOrder = enforcePathOrder; + this.expectedPaths = expectedPaths; + } + + private void callClient() { + methodCall.accept(client); + } + + @Override + public String toString() { + return caseName; + } + } + + private static class EndpointCapturingInterceptor implements ExecutionInterceptor { + private static final List ENDPOINTS = Collections.synchronizedList(new ArrayList<>()); + + @Override + public void beforeTransmission(Context.BeforeTransmission context, ExecutionAttributes executionAttributes) { + ENDPOINTS.add(context.httpRequest().getUri().toString()); + } + + private static void reset() { + ENDPOINTS.clear(); + } + } +} diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java index 50fdd40116a7..3a78b0e356a9 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java @@ -34,6 +34,7 @@ import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryFailedException; import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.core.internal.SdkInternalTestAdvancedClientOption; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.endpointdiscoverytest.EndpointDiscoveryTestAsyncClient; import software.amazon.awssdk.services.endpointdiscoverytest.EndpointDiscoveryTestClient; @@ -55,6 +56,8 @@ public void setupClient() { .region(Region.US_EAST_1) .endpointOverride(URI.create("http://localhost:" + wireMock.port())) .endpointDiscoveryEnabled(true) + .overrideConfiguration(c -> c.putAdvancedOption( + SdkInternalTestAdvancedClientOption.ENDPOINT_OVERRIDDEN_OVERRIDE, false)) .build(); asyncClient = EndpointDiscoveryTestAsyncClient.builder() @@ -62,6 +65,8 @@ public void setupClient() { .region(Region.US_EAST_1) .endpointOverride(URI.create("http://localhost:" + wireMock.port())) .endpointDiscoveryEnabled(true) + .overrideConfiguration(c -> c.putAdvancedOption( + SdkInternalTestAdvancedClientOption.ENDPOINT_OVERRIDDEN_OVERRIDE, false)) .build(); } @@ -69,8 +74,7 @@ public void setupClient() { public void syncRequiredOperation_EmptyEndpointDiscoveryResponse_CausesEndpointDiscoveryFailedException() { stubEmptyResponse(); assertThatThrownBy(() -> client.testDiscoveryRequired(r -> {})) - .isInstanceOf(EndpointDiscoveryFailedException.class) - .hasCauseInstanceOf(IllegalArgumentException.class); + .isInstanceOf(EndpointDiscoveryFailedException.class); } @Test @@ -93,8 +97,7 @@ public void syncRequiredOperation_NonRetryableEndpointDiscoveryResponse_CausesEn public void asyncRequiredOperation_NonRetryableEndpointDiscoveryResponse_CausesEndpointDiscoveryFailedException() { stubDescribeEndpointsResponse(404); assertAsyncRequiredOperationCallThrowable() - .isInstanceOf(EndpointDiscoveryFailedException.class) - .hasCauseInstanceOf(EndpointDiscoveryTestException.class); + .isInstanceOf(EndpointDiscoveryFailedException.class); } @Test diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml index 69f628bf3599..b38b5a1aa5a8 100644 --- a/test/http-client-tests/pom.xml +++ b/test/http-client-tests/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 ../../pom.xml http-client-tests diff --git a/test/module-path-tests/pom.xml b/test/module-path-tests/pom.xml index e1208dc83a97..9dc9bf0f2d41 100644 --- a/test/module-path-tests/pom.xml +++ b/test/module-path-tests/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 ../../pom.xml 4.0.0 diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml index 004fcb5522b0..d25e1a202830 100644 --- a/test/protocol-tests-core/pom.xml +++ b/test/protocol-tests-core/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 ../../pom.xml 4.0.0 diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml index a38df820f9b4..500d19edb186 100644 --- a/test/protocol-tests/pom.xml +++ b/test/protocol-tests/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 ../../pom.xml 4.0.0 diff --git a/test/sdk-benchmarks/pom.xml b/test/sdk-benchmarks/pom.xml index 2d8b2f0219f9..3846eaa61b83 100755 --- a/test/sdk-benchmarks/pom.xml +++ b/test/sdk-benchmarks/pom.xml @@ -19,7 +19,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../../pom.xml diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml index fef9538b7b61..a7d0537a1de0 100644 --- a/test/service-test-utils/pom.xml +++ b/test/service-test-utils/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../../pom.xml service-test-utils diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml index 4e0c4b3f9903..a291c1e48e0a 100644 --- a/test/stability-tests/pom.xml +++ b/test/stability-tests/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 ../../pom.xml 4.0.0 diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml index 65a97fe94cf5..24e430a28302 100644 --- a/test/test-utils/pom.xml +++ b/test/test-utils/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.14.6 + 2.14.7 ../../pom.xml test-utils diff --git a/test/tests-coverage-reporting/pom.xml b/test/tests-coverage-reporting/pom.xml index 710698ed19ee..77871fb79afd 100644 --- a/test/tests-coverage-reporting/pom.xml +++ b/test/tests-coverage-reporting/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 ../../pom.xml 4.0.0 diff --git a/utils/pom.xml b/utils/pom.xml index 8c6441a57bb9..5294a132fb52 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.14.6 + 2.14.7 4.0.0