diff --git a/.changes/2.13.63.json b/.changes/2.13.63.json
new file mode 100644
index 000000000000..1e518347e25a
--- /dev/null
+++ b/.changes/2.13.63.json
@@ -0,0 +1,56 @@
+{
+ "version": "2.13.63",
+ "date": "2020-07-28",
+ "entries": [
+ {
+ "type": "feature",
+ "category": "AWS SDK for Java v2",
+ "description": "Slight performance improvement when metrics are disabled."
+ },
+ {
+ "type": "feature",
+ "category": "Auto Scaling",
+ "description": "Now you can enable Instance Metadata Service Version 2 (IMDSv2) or disable the instance metadata endpoint with Launch Configurations."
+ },
+ {
+ "type": "feature",
+ "category": "Amazon Interactive Video Service",
+ "description": "Added a new error code, PendingVerification, to differentiate between errors caused by insufficient IAM permissions and errors caused by account verification."
+ },
+ {
+ "type": "feature",
+ "category": "AWS Elemental MediaLive",
+ "description": "AWS Elemental MediaLive now supports several new features: EBU-TT-D captions in Microsoft Smooth outputs; interlaced video in HEVC outputs; video noise reduction (using temporal filtering) in HEVC outputs."
+ },
+ {
+ "type": "feature",
+ "category": "AWS SecurityHub",
+ "description": "Added UpdateSecurityHubConfiguration API. Security Hub now allows customers to choose whether to automatically enable new controls that are added to an existing standard that the customer enabled. For example, if you enabled Foundational Security Best Practices for an account, you can automatically enable new controls as we add them to that standard. By default, new controls are enabled."
+ },
+ {
+ "type": "bugfix",
+ "category": "AWS SDK for Java v2",
+ "description": "Fixed an issue where HTTP status code metrics were not always published for async clients."
+ },
+ {
+ "type": "feature",
+ "category": "EC2 Image Builder",
+ "description": "This release updates distribution configurations to allow periods in AMI names."
+ },
+ {
+ "type": "feature",
+ "category": "Amazon Elastic Compute Cloud",
+ "description": "Introduces support for tag-on-create capability for the following APIs: CreateVpnConnection, CreateVpnGateway, and CreateCustomerGateway. A user can now add tags while creating these resources. For further detail, please see AWS Tagging Strategies."
+ },
+ {
+ "type": "feature",
+ "category": "AWS SDK for Java v2",
+ "description": "Updated service endpoint metadata."
+ },
+ {
+ "type": "feature",
+ "category": "Amazon Relational Database Service",
+ "description": "Adds reporting of manual cluster snapshot quota to DescribeAccountAttributes API"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb6fb253c5c..a81524ea81b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+# __2.13.63__ __2020-07-28__
+## __AWS Elemental MediaLive__
+ - ### Features
+ - AWS Elemental MediaLive now supports several new features: EBU-TT-D captions in Microsoft Smooth outputs; interlaced video in HEVC outputs; video noise reduction (using temporal filtering) in HEVC outputs.
+
+## __AWS SDK for Java v2__
+ - ### Features
+ - Slight performance improvement when metrics are disabled.
+ - Updated service endpoint metadata.
+
+ - ### Bugfixes
+ - Fixed an issue where HTTP status code metrics were not always published for async clients.
+
+## __AWS SecurityHub__
+ - ### Features
+ - Added UpdateSecurityHubConfiguration API. Security Hub now allows customers to choose whether to automatically enable new controls that are added to an existing standard that the customer enabled. For example, if you enabled Foundational Security Best Practices for an account, you can automatically enable new controls as we add them to that standard. By default, new controls are enabled.
+
+## __Amazon Elastic Compute Cloud__
+ - ### Features
+ - Introduces support for tag-on-create capability for the following APIs: CreateVpnConnection, CreateVpnGateway, and CreateCustomerGateway. A user can now add tags while creating these resources. For further detail, please see AWS Tagging Strategies.
+
+## __Amazon Interactive Video Service__
+ - ### Features
+ - Added a new error code, PendingVerification, to differentiate between errors caused by insufficient IAM permissions and errors caused by account verification.
+
+## __Amazon Relational Database Service__
+ - ### Features
+ - Adds reporting of manual cluster snapshot quota to DescribeAccountAttributes API
+
+## __Auto Scaling__
+ - ### Features
+ - Now you can enable Instance Metadata Service Version 2 (IMDSv2) or disable the instance metadata endpoint with Launch Configurations.
+
+## __EC2 Image Builder__
+ - ### Features
+ - This release updates distribution configurations to allow periods in AMI names.
+
# __2.13.62__ __2020-07-27__
## __AWS DataSync__
- ### Features
diff --git a/README.md b/README.md
index d5d8be27ce78..92f4e832b652 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
* {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request); @@ -656,19 +657,19 @@ public CompletableFuture* * 2) Using a custom subscriber - * + * *paginatedOpera *
* {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request); * publisher.subscribe(new Subscriber- * + * * As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2. *() { - * + * * public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... }; - * - * + * + * * public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyResponse response) { //... }; * });} *
* Please notice that the configuration of MaxResults won't limit the number of results you get with the
@@ -697,7 +698,7 @@ public CompletableFuture
* {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request); @@ -791,19 +792,19 @@ public CompletableFuture* * 2) Using a custom subscriber - * + * *paginatedOp *
* {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request); * publisher.subscribe(new Subscriber- * + * * As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2. *() { - * + * * public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... }; - * - * + * + * * public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyResponse response) { //... }; * });} *
* Please notice that the configuration of MaxResults won't limit the number of results you get with the
@@ -832,9 +833,9 @@ public CompletableFuture
* {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyIterable responses = client.paginatedOperationWithResultKeyPaginator(request); @@ -311,7 +316,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey( ** * 2) Using For loop - * + * *
* { * @code @@ -324,7 +329,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey( ** * 3) Use iterator directly - * + * *
* {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyIterable responses = client.paginatedOperationWithResultKeyPaginator(request); @@ -356,8 +361,8 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey( */ @Override public PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyPaginator( - PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException, - SdkClientException, JsonException { + PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException, + SdkClientException, JsonException { return new PaginatedOperationWithResultKeyIterable(this, applyPaginatorUserAgent(paginatedOperationWithResultKeyRequest)); } @@ -379,30 +384,31 @@ public PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyPa */ @Override public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResultKey( - PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException, - SdkClientException, JsonException { + PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException, + SdkClientException, JsonException { JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false) - .isPayloadJson(true).build(); + .isPayloadJson(true).build(); HttpResponseHandlerresponseHandler = protocolFactory.createResponseHandler( - operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder); + operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder); HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, - operationMetadata); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + operationMetadata); + List metricPublishers = resolveMetricPublishers(clientConfiguration, + paginatedOperationWithoutResultKeyRequest.overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "PaginatedOperationWithoutResultKey"); return clientHandler - .execute(new ClientExecutionParams () - .withOperationName("PaginatedOperationWithoutResultKey").withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler).withInput(paginatedOperationWithoutResultKeyRequest) - .withMetricCollector(apiCallMetricCollector) - .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory))); + .execute(new ClientExecutionParams () + .withOperationName("PaginatedOperationWithoutResultKey").withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler).withInput(paginatedOperationWithoutResultKeyRequest) + .withMetricCollector(apiCallMetricCollector) + .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory))); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, - paginatedOperationWithoutResultKeyRequest.overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } @@ -426,7 +432,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul * The following are few ways to iterate through the response pages: * * 1) Using a Stream - * + * * * {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyIterable responses = client.paginatedOperationWithoutResultKeyPaginator(request); @@ -435,7 +441,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul ** * 2) Using For loop - * + * ** { * @code @@ -448,7 +454,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul ** * 3) Use iterator directly - * + * ** {@code * software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyIterable responses = client.paginatedOperationWithoutResultKeyPaginator(request); @@ -480,10 +486,10 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul */ @Override public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResultKeyPaginator( - PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException, - SdkClientException, JsonException { + PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException, + SdkClientException, JsonException { return new PaginatedOperationWithoutResultKeyIterable(this, - applyPaginatorUserAgent(paginatedOperationWithoutResultKeyRequest)); + applyPaginatorUserAgent(paginatedOperationWithoutResultKeyRequest)); } /** @@ -494,11 +500,11 @@ public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResul * The content to send to the service. A {@link RequestBody} can be created using one of several factory * methods for various sources of data. For example, to create a request body from a file you can do the * following. - * + * ** {@code RequestBody.fromFile(new File("myfile.txt"))} *- * + * * See documentation in {@link RequestBody} for additional details and which sources of data are supported. * The service documentation for the request content is as follows 'This be a stream' * @return Result of the StreamingInputOperation operation returned by the service. @@ -515,35 +521,36 @@ public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResul */ @Override public StreamingInputOperationResponse streamingInputOperation(StreamingInputOperationRequest streamingInputOperationRequest, - RequestBody requestBody) throws AwsServiceException, SdkClientException, JsonException { + RequestBody requestBody) throws AwsServiceException, SdkClientException, JsonException { JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false) - .isPayloadJson(true).build(); + .isPayloadJson(true).build(); HttpResponseHandlerresponseHandler = protocolFactory.createResponseHandler( - operationMetadata, StreamingInputOperationResponse::builder); + operationMetadata, StreamingInputOperationResponse::builder); HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, - operationMetadata); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + operationMetadata); + List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOperation"); return clientHandler - .execute(new ClientExecutionParams () - .withOperationName("StreamingInputOperation") - .withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler) - .withInput(streamingInputOperationRequest) - .withMetricCollector(apiCallMetricCollector) - .withRequestBody(requestBody) - .withMarshaller( - StreamingRequestMarshaller.builder() - .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory)) - .requestBody(requestBody).build())); + .execute(new ClientExecutionParams () + .withOperationName("StreamingInputOperation") + .withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler) + .withInput(streamingInputOperationRequest) + .withMetricCollector(apiCallMetricCollector) + .withRequestBody(requestBody) + .withMarshaller( + StreamingRequestMarshaller.builder() + .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory)) + .requestBody(requestBody).build())); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } @@ -556,11 +563,11 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe * The content to send to the service. A {@link RequestBody} can be created using one of several factory * methods for various sources of data. For example, to create a request body from a file you can do the * following. - * + * * * {@code RequestBody.fromFile(new File("myfile.txt"))} *- * + * * See documentation in {@link RequestBody} for additional details and which sources of data are supported. * The service documentation for the request content is as follows 'This be a stream' * @param responseTransformer @@ -584,41 +591,42 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe */ @Override publicReturnT streamingInputOutputOperation( - StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, RequestBody requestBody, - ResponseTransformer responseTransformer) throws AwsServiceException, - SdkClientException, JsonException { + StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, RequestBody requestBody, + ResponseTransformer responseTransformer) throws AwsServiceException, + SdkClientException, JsonException { streamingInputOutputOperationRequest = applySignerOverride(streamingInputOutputOperationRequest, - Aws4UnsignedPayloadSigner.create()); + Aws4UnsignedPayloadSigner.create()); JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true) - .isPayloadJson(false).build(); + .isPayloadJson(false).build(); HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( - operationMetadata, StreamingInputOutputOperationResponse::builder); + operationMetadata, StreamingInputOutputOperationResponse::builder); HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, - operationMetadata); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + operationMetadata); + List metricPublishers = resolveMetricPublishers(clientConfiguration, + streamingInputOutputOperationRequest.overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOutputOperation"); return clientHandler.execute( - new ClientExecutionParams () - .withOperationName("StreamingInputOutputOperation") - .withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler) - .withInput(streamingInputOutputOperationRequest) - .withMetricCollector(apiCallMetricCollector) - .withRequestBody(requestBody) - .withMarshaller( - StreamingRequestMarshaller - .builder() - .delegateMarshaller( - new StreamingInputOutputOperationRequestMarshaller(protocolFactory)) - .requestBody(requestBody).transferEncoding(true).build()), responseTransformer); + new ClientExecutionParams () + .withOperationName("StreamingInputOutputOperation") + .withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler) + .withInput(streamingInputOutputOperationRequest) + .withMetricCollector(apiCallMetricCollector) + .withRequestBody(requestBody) + .withMarshaller( + StreamingRequestMarshaller + .builder() + .delegateMarshaller( + new StreamingInputOutputOperationRequestMarshaller(protocolFactory)) + .requestBody(requestBody).transferEncoding(true).build()), responseTransformer); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, - streamingInputOutputOperationRequest.overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } @@ -648,36 +656,37 @@ public ReturnT streamingInputOutputOperation( */ @Override public ReturnT streamingOutputOperation(StreamingOutputOperationRequest streamingOutputOperationRequest, - ResponseTransformer responseTransformer) throws AwsServiceException, - SdkClientException, JsonException { + ResponseTransformer responseTransformer) throws AwsServiceException, + SdkClientException, JsonException { JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true) - .isPayloadJson(false).build(); + .isPayloadJson(false).build(); HttpResponseHandler responseHandler = protocolFactory.createResponseHandler( - operationMetadata, StreamingOutputOperationResponse::builder); + operationMetadata, StreamingOutputOperationResponse::builder); HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory, - operationMetadata); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + operationMetadata); + List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Json Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingOutputOperation"); return clientHandler.execute( - new ClientExecutionParams () - .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest) - .withMetricCollector(apiCallMetricCollector) - .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer); + new ClientExecutionParams () + .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest) + .withMetricCollector(apiCallMetricCollector) + .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration, - RequestOverrideConfiguration requestOverrideConfiguration) { + RequestOverrideConfiguration requestOverrideConfiguration) { List publishers = null; if (requestOverrideConfiguration != null) { publishers = requestOverrideConfiguration.metricPublishers(); @@ -692,19 +701,19 @@ private static List resolveMetricPublishers(SdkClientConfigurat } private HttpResponseHandler createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory, - JsonOperationMetadata operationMetadata) { + JsonOperationMetadata operationMetadata) { return protocolFactory.createErrorResponseHandler(operationMetadata); } private > T init(T builder) { return builder - .clientConfiguration(clientConfiguration) - .defaultServiceExceptionSupplier(JsonException::builder) - .protocol(AwsJsonProtocol.REST_JSON) - .protocolVersion("1.1") - .registerModeledException( - ExceptionMetadata.builder().errorCode("InvalidInput") - .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build()); + .clientConfiguration(clientConfiguration) + .defaultServiceExceptionSupplier(JsonException::builder) + .protocol(AwsJsonProtocol.REST_JSON) + .protocolVersion("1.1") + .registerModeledException( + ExceptionMetadata.builder().errorCode("InvalidInput") + .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build()); } @Override @@ -714,10 +723,10 @@ public void close() { private T applyPaginatorUserAgent(T request) { Consumer userAgentApplier = b -> b.addApiName(ApiName.builder() - .version(VersionInfo.SDK_VERSION).name("PAGINATED").build()); + .version(VersionInfo.SDK_VERSION).name("PAGINATED").build()); AwsRequestOverrideConfiguration overrideConfiguration = request.overrideConfiguration() - .map(c -> c.toBuilder().applyMutation(userAgentApplier).build()) - .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(userAgentApplier).build())); + .map(c -> c.toBuilder().applyMutation(userAgentApplier).build()) + .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(userAgentApplier).build())); return (T) request.toBuilder().overrideConfiguration(overrideConfiguration).build(); } @@ -727,8 +736,8 @@ private T applySignerOverride(T request, Signer signer) } Consumer signerOverride = b -> b.signer(signer).build(); AwsRequestOverrideConfiguration overrideConfiguration = request.overrideConfiguration() - .map(c -> c.toBuilder().applyMutation(signerOverride).build()) - .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(signerOverride).build())); + .map(c -> c.toBuilder().applyMutation(signerOverride).build()) + .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(signerOverride).build())); return (T) request.toBuilder().overrideConfiguration(overrideConfiguration).build(); } @@ -737,4 +746,3 @@ public JsonUtilities utilities() { return JsonUtilities.create(param1, param2, param3); } } - diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java index 17cda3c110f3..bff8ef80c77e 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java @@ -24,6 +24,7 @@ import software.amazon.awssdk.core.runtime.transform.AsyncStreamingRequestMarshaller; import software.amazon.awssdk.metrics.MetricCollector; import software.amazon.awssdk.metrics.MetricPublisher; +import software.amazon.awssdk.metrics.NoOpMetricCollector; import software.amazon.awssdk.protocols.core.ExceptionMetadata; import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory; import software.amazon.awssdk.services.query.model.APostOperationRequest; @@ -94,7 +95,10 @@ public final String serviceName() { */ @Override public CompletableFuture aPostOperation(APostOperationRequest aPostOperationRequest) { - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation"); @@ -102,27 +106,24 @@ public CompletableFuture aPostOperation(APostOperationRe String resolvedHostExpression = "foo-"; HttpResponseHandler responseHandler = protocolFactory - .createResponseHandler(APostOperationResponse::builder); + .createResponseHandler(APostOperationResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); CompletableFuture executeFuture = clientHandler - .execute(new ClientExecutionParams () - .withOperationName("APostOperation") - .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)) - .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler) - .withMetricCollector(apiCallMetricCollector).hostPrefixExpression(resolvedHostExpression) - .withInput(aPostOperationRequest)); + .execute(new ClientExecutionParams () + .withOperationName("APostOperation") + .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)) + .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler) + .withMetricCollector(apiCallMetricCollector).hostPrefixExpression(resolvedHostExpression) + .withInput(aPostOperationRequest)); AwsRequestOverrideConfiguration requestOverrideConfig = aPostOperationRequest.overrideConfiguration().orElse(null); CompletableFuture whenCompleteFuture = null; whenCompleteFuture = executeFuture.whenComplete((r, e) -> { - List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); }); return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture); } catch (Throwable t) { - List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); return CompletableFutureUtils.failedFuture(t); } @@ -153,34 +154,34 @@ public CompletableFuture aPostOperation(APostOperationRe */ @Override public CompletableFuture aPostOperationWithOutput( - APostOperationWithOutputRequest aPostOperationWithOutputRequest) { - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + APostOperationWithOutputRequest aPostOperationWithOutputRequest) { + List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperationWithOutput"); HttpResponseHandler responseHandler = protocolFactory - .createResponseHandler(APostOperationWithOutputResponse::builder); + .createResponseHandler(APostOperationWithOutputResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); CompletableFuture executeFuture = clientHandler - .execute(new ClientExecutionParams () - .withOperationName("APostOperationWithOutput") - .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)) - .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler) - .withMetricCollector(apiCallMetricCollector).withInput(aPostOperationWithOutputRequest)); + .execute(new ClientExecutionParams () + .withOperationName("APostOperationWithOutput") + .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)) + .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler) + .withMetricCollector(apiCallMetricCollector).withInput(aPostOperationWithOutputRequest)); AwsRequestOverrideConfiguration requestOverrideConfig = aPostOperationWithOutputRequest.overrideConfiguration() - .orElse(null); + .orElse(null); CompletableFuture whenCompleteFuture = null; whenCompleteFuture = executeFuture.whenComplete((r, e) -> { - List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); }); return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture); } catch (Throwable t) { - List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); return CompletableFutureUtils.failedFuture(t); } @@ -212,37 +213,37 @@ public CompletableFuture aPostOperationWithOut */ @Override public CompletableFuture streamingInputOperation( - StreamingInputOperationRequest streamingInputOperationRequest, AsyncRequestBody requestBody) { - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + StreamingInputOperationRequest streamingInputOperationRequest, AsyncRequestBody requestBody) { + List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOperation"); HttpResponseHandler responseHandler = protocolFactory - .createResponseHandler(StreamingInputOperationResponse::builder); + .createResponseHandler(StreamingInputOperationResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); CompletableFuture executeFuture = clientHandler - .execute(new ClientExecutionParams () - .withOperationName("StreamingInputOperation") - .withMarshaller( - AsyncStreamingRequestMarshaller.builder() - .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory)) - .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler).withMetricCollector(apiCallMetricCollector) - .withAsyncRequestBody(requestBody).withInput(streamingInputOperationRequest)); + .execute(new ClientExecutionParams () + .withOperationName("StreamingInputOperation") + .withMarshaller( + AsyncStreamingRequestMarshaller.builder() + .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory)) + .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler).withMetricCollector(apiCallMetricCollector) + .withAsyncRequestBody(requestBody).withInput(streamingInputOperationRequest)); AwsRequestOverrideConfiguration requestOverrideConfig = streamingInputOperationRequest.overrideConfiguration() - .orElse(null); + .orElse(null); CompletableFuture whenCompleteFuture = null; whenCompleteFuture = executeFuture.whenComplete((r, e) -> { - List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); }); return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture); } catch (Throwable t) { - List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); return CompletableFutureUtils.failedFuture(t); } @@ -274,42 +275,42 @@ public CompletableFuture streamingInputOperatio */ @Override public CompletableFuture streamingOutputOperation( - StreamingOutputOperationRequest streamingOutputOperationRequest, - AsyncResponseTransformer asyncResponseTransformer) { - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + StreamingOutputOperationRequest streamingOutputOperationRequest, + AsyncResponseTransformer asyncResponseTransformer) { + List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingOutputOperation"); HttpResponseHandler responseHandler = protocolFactory - .createResponseHandler(StreamingOutputOperationResponse::builder); + .createResponseHandler(StreamingOutputOperationResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); CompletableFuture executeFuture = clientHandler.execute( - new ClientExecutionParams () - .withOperationName("StreamingOutputOperation") - .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)) - .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler) - .withMetricCollector(apiCallMetricCollector).withInput(streamingOutputOperationRequest), - asyncResponseTransformer); + new ClientExecutionParams () + .withOperationName("StreamingOutputOperation") + .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)) + .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler) + .withMetricCollector(apiCallMetricCollector).withInput(streamingOutputOperationRequest), + asyncResponseTransformer); AwsRequestOverrideConfiguration requestOverrideConfig = streamingOutputOperationRequest.overrideConfiguration() - .orElse(null); + .orElse(null); CompletableFuture whenCompleteFuture = null; whenCompleteFuture = executeFuture.whenComplete((r, e) -> { if (e != null) { runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring", - () -> asyncResponseTransformer.exceptionOccurred(e)); + () -> asyncResponseTransformer.exceptionOccurred(e)); } - List metricPublishers = resolveMetricPublishers(clientConfiguration, requestOverrideConfig); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); }); return CompletableFutureUtils.forwardExceptionTo(whenCompleteFuture, executeFuture); } catch (Throwable t) { runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring", - () -> asyncResponseTransformer.exceptionOccurred(t)); - List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest - .overrideConfiguration().orElse(null)); + () -> asyncResponseTransformer.exceptionOccurred(t)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); return CompletableFutureUtils.failedFuture(t); } @@ -322,15 +323,15 @@ public void close() { private AwsQueryProtocolFactory init() { return AwsQueryProtocolFactory - .builder() - .registerModeledException( - ExceptionMetadata.builder().errorCode("InvalidInput") - .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build()) - .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build(); + .builder() + .registerModeledException( + ExceptionMetadata.builder().errorCode("InvalidInput") + .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build()) + .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build(); } private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration, - RequestOverrideConfiguration requestOverrideConfiguration) { + RequestOverrideConfiguration requestOverrideConfiguration) { List publishers = null; if (requestOverrideConfiguration != null) { publishers = requestOverrideConfiguration.metricPublishers(); @@ -344,4 +345,3 @@ private static List resolveMetricPublishers(SdkClientConfigurat return publishers; } } - 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 28cc96b95475..c4526fc54be0 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 @@ -19,6 +19,7 @@ import software.amazon.awssdk.core.sync.ResponseTransformer; import software.amazon.awssdk.metrics.MetricCollector; import software.amazon.awssdk.metrics.MetricPublisher; +import software.amazon.awssdk.metrics.NoOpMetricCollector; import software.amazon.awssdk.protocols.core.ExceptionMetadata; import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory; import software.amazon.awssdk.services.query.model.APostOperationRequest; @@ -83,27 +84,28 @@ public final String serviceName() { */ @Override public APostOperationResponse aPostOperation(APostOperationRequest aPostOperationRequest) throws InvalidInputException, - AwsServiceException, SdkClientException, QueryException { + AwsServiceException, SdkClientException, QueryException { String hostPrefix = "foo-"; String resolvedHostExpression = "foo-"; HttpResponseHandler responseHandler = protocolFactory - .createResponseHandler(APostOperationResponse::builder); + .createResponseHandler(APostOperationResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperation"); return clientHandler.execute(new ClientExecutionParams () - .withOperationName("APostOperation").withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression) - .withInput(aPostOperationRequest).withMetricCollector(apiCallMetricCollector) - .withMarshaller(new APostOperationRequestMarshaller(protocolFactory))); + .withOperationName("APostOperation").withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression) + .withInput(aPostOperationRequest).withMetricCollector(apiCallMetricCollector) + .withMarshaller(new APostOperationRequestMarshaller(protocolFactory))); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } @@ -130,27 +132,28 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio */ @Override public APostOperationWithOutputResponse aPostOperationWithOutput( - APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException, - SdkClientException, QueryException { + APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException, + SdkClientException, QueryException { HttpResponseHandler responseHandler = protocolFactory - .createResponseHandler(APostOperationWithOutputResponse::builder); + .createResponseHandler(APostOperationWithOutputResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "APostOperationWithOutput"); return clientHandler - .execute(new ClientExecutionParams () - .withOperationName("APostOperationWithOutput").withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler).withInput(aPostOperationWithOutputRequest) - .withMetricCollector(apiCallMetricCollector) - .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))); + .execute(new ClientExecutionParams () + .withOperationName("APostOperationWithOutput").withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler).withInput(aPostOperationWithOutputRequest) + .withMetricCollector(apiCallMetricCollector) + .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, aPostOperationWithOutputRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } @@ -163,11 +166,11 @@ public APostOperationWithOutputResponse aPostOperationWithOutput( * The content to send to the service. A {@link RequestBody} can be created using one of several factory * methods for various sources of data. For example, to create a request body from a file you can do the * following. - * + * * * {@code RequestBody.fromFile(new File("myfile.txt"))} *- * + * * See documentation in {@link RequestBody} for additional details and which sources of data are supported. * The service documentation for the request content is as follows 'This be a stream' * @return Result of the StreamingInputOperation operation returned by the service. @@ -184,32 +187,33 @@ public APostOperationWithOutputResponse aPostOperationWithOutput( */ @Override public StreamingInputOperationResponse streamingInputOperation(StreamingInputOperationRequest streamingInputOperationRequest, - RequestBody requestBody) throws AwsServiceException, SdkClientException, QueryException { + RequestBody requestBody) throws AwsServiceException, SdkClientException, QueryException { HttpResponseHandlerresponseHandler = protocolFactory - .createResponseHandler(StreamingInputOperationResponse::builder); + .createResponseHandler(StreamingInputOperationResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingInputOperation"); return clientHandler - .execute(new ClientExecutionParams () - .withOperationName("StreamingInputOperation") - .withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler) - .withInput(streamingInputOperationRequest) - .withMetricCollector(apiCallMetricCollector) - .withRequestBody(requestBody) - .withMarshaller( - StreamingRequestMarshaller.builder() - .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory)) - .requestBody(requestBody).build())); + .execute(new ClientExecutionParams () + .withOperationName("StreamingInputOperation") + .withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler) + .withInput(streamingInputOperationRequest) + .withMetricCollector(apiCallMetricCollector) + .withRequestBody(requestBody) + .withMarshaller( + StreamingRequestMarshaller.builder() + .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory)) + .requestBody(requestBody).build())); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingInputOperationRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } @@ -239,33 +243,34 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe */ @Override public ReturnT streamingOutputOperation(StreamingOutputOperationRequest streamingOutputOperationRequest, - ResponseTransformer responseTransformer) throws AwsServiceException, - SdkClientException, QueryException { + ResponseTransformer responseTransformer) throws AwsServiceException, + SdkClientException, QueryException { HttpResponseHandler responseHandler = protocolFactory - .createResponseHandler(StreamingOutputOperationResponse::builder); + .createResponseHandler(StreamingOutputOperationResponse::builder); HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler(); - MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall"); + List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest + .overrideConfiguration().orElse(null)); + MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector + .create("ApiCall"); try { apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Query Service"); apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "StreamingOutputOperation"); return clientHandler.execute( - new ClientExecutionParams () - .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler) - .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest) - .withMetricCollector(apiCallMetricCollector) - .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer); + new ClientExecutionParams () + .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler) + .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest) + .withMetricCollector(apiCallMetricCollector) + .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer); } finally { - List metricPublishers = resolveMetricPublishers(clientConfiguration, streamingOutputOperationRequest - .overrideConfiguration().orElse(null)); metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect())); } } private static List resolveMetricPublishers(SdkClientConfiguration clientConfiguration, - RequestOverrideConfiguration requestOverrideConfiguration) { + RequestOverrideConfiguration requestOverrideConfiguration) { List publishers = null; if (requestOverrideConfiguration != null) { publishers = requestOverrideConfiguration.metricPublishers(); @@ -281,11 +286,11 @@ private static List resolveMetricPublishers(SdkClientConfigurat private AwsQueryProtocolFactory init() { return AwsQueryProtocolFactory - .builder() - .registerModeledException( - ExceptionMetadata.builder().errorCode("InvalidInput") - .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build()) - .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build(); + .builder() + .registerModeledException( + ExceptionMetadata.builder().errorCode("InvalidInput") + .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build()) + .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build(); } @Override @@ -293,4 +298,3 @@ public void close() { clientHandler.close(); } } - diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml index e11eddfbbb04..4b9b32a190e1 100644 --- a/core/annotations/pom.xml +++ b/core/annotations/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 diff --git a/core/arns/pom.xml b/core/arns/pom.xml index a8e00bc6a0f5..fe162c4638e1 100644 --- a/core/arns/pom.xml +++ b/core/arns/pom.xml @@ -20,7 +20,7 @@core software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 diff --git a/core/auth/pom.xml b/core/auth/pom.xml index 6c69e36ef20d..f33aaef4af69 100644 --- a/core/auth/pom.xml +++ b/core/auth/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk core -2.13.62 +2.13.63 auth diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml index 5a63e2a89af1..a7d51d6576b9 100644 --- a/core/aws-core/pom.xml +++ b/core/aws-core/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk core -2.13.62 +2.13.63 aws-core diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml index e90f16487b12..a9b7bacb3cdb 100644 --- a/core/metrics-spi/pom.xml +++ b/core/metrics-spi/pom.xml @@ -5,7 +5,7 @@core software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 diff --git a/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollection.java b/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollection.java index ace8b0860130..7047be072806 100644 --- a/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollection.java +++ b/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollection.java @@ -18,7 +18,9 @@ import static java.util.stream.Collectors.toList; import java.time.Instant; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -38,8 +40,8 @@ public final class DefaultMetricCollection implements MetricCollection { public DefaultMetricCollection(String name, Map, List >> metrics, List children) { this.name = name; - this.metrics = metrics; - this.children = children != null ? Collections.unmodifiableList(children) : Collections.emptyList(); + this.metrics = new HashMap<>(metrics); + this.children = children != null ? Collections.unmodifiableList(new ArrayList<>(children)) : Collections.emptyList(); this.creationTime = Instant.now(); } diff --git a/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollector.java b/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollector.java index 2f4f99adc21f..a63dc6ed85e1 100644 --- a/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollector.java +++ b/core/metrics-spi/src/main/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollector.java @@ -29,9 +29,6 @@ import software.amazon.awssdk.utils.ToString; import software.amazon.awssdk.utils.Validate; -/** - * TODO: Before launch, we should iterate on the performance of this collector, because it's currently very naive. - */ @SdkInternalApi public final class DefaultMetricCollector implements MetricCollector { private static final Logger log = Logger.loggerFor(DefaultMetricCollector.class); diff --git a/core/pom.xml b/core/pom.xml index 31a3f50e5eaa..66d66cae6d27 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk -2.13.62 +2.13.63 core diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml index 673eab9b7802..346bc2e10f7e 100644 --- a/core/profiles/pom.xml +++ b/core/profiles/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk core -2.13.62 +2.13.63 profiles diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml index a932d5d7dbc1..c6d9e58b1b07 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.13.62 +2.13.63 4.0.0 diff --git a/core/protocols/aws-ion-protocol/pom.xml b/core/protocols/aws-ion-protocol/pom.xml index adcf83db70fe..77c625e5d221 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.13.62 +2.13.63 4.0.0 diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml index 3227161a7a29..06498b297bc4 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.13.62 +2.13.63 4.0.0 diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml index e87cb530cead..ee124c4f7956 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.13.62 +2.13.63 4.0.0 diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml index a08b706b40aa..c99607965126 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.13.62 +2.13.63 4.0.0 diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml index d306927fc768..4812a6e0d842 100644 --- a/core/protocols/pom.xml +++ b/core/protocols/pom.xml @@ -20,7 +20,7 @@core software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml index 40bfade73426..bb36369b235f 100644 --- a/core/protocols/protocol-core/pom.xml +++ b/core/protocols/protocol-core/pom.xml @@ -20,7 +20,7 @@protocols software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 diff --git a/core/regions/pom.xml b/core/regions/pom.xml index c35e94b2e8eb..379a695ebc88 100644 --- a/core/regions/pom.xml +++ b/core/regions/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk core -2.13.62 +2.13.63 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 524e8d62c22b..9f2181de22a4 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 @@ -889,6 +889,7 @@ } }, "endpoints" : { + "af-south-1" : { }, "ap-east-1" : { }, "ap-northeast-1" : { }, "ap-northeast-2" : { }, @@ -898,6 +899,7 @@ "ca-central-1" : { }, "eu-central-1" : { }, "eu-north-1" : { }, + "eu-south-1" : { }, "eu-west-1" : { }, "eu-west-2" : { }, "eu-west-3" : { }, @@ -2603,6 +2605,7 @@ "eu-north-1" : { }, "eu-west-1" : { }, "eu-west-2" : { }, + "eu-west-3" : { }, "us-east-1" : { }, "us-east-2" : { }, "us-west-1" : { }, diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml index d9388132ee61..50af9165b3ee 100644 --- a/core/sdk-core/pom.xml +++ b/core/sdk-core/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk core -2.13.62 +2.13.63 sdk-core AWS Java SDK :: SDK Core diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallAttemptMetricCollectionStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallAttemptMetricCollectionStage.java index ddb1c66643e2..c576da162fba 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallAttemptMetricCollectionStage.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallAttemptMetricCollectionStage.java @@ -28,6 +28,7 @@ import software.amazon.awssdk.core.metrics.CoreMetric; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.metrics.MetricCollector; +import software.amazon.awssdk.utils.CompletableFutureUtils; /** * Wrapper pipeline that initializes and tracks the API call attempt metric collection. This wrapper and any wrapped @@ -52,14 +53,14 @@ public CompletableFuture> execute(SdkHttpFullRequest input, reportBackoffDelay(context); CompletableFuture > executeFuture = wrapped.execute(input, context); - - executeFuture.whenComplete((r, t) -> { + CompletableFuture > metricsCollectedFuture = executeFuture.whenComplete((r, t) -> { if (t == null) { collectHttpMetrics(apiCallAttemptMetrics, r.httpResponse()); } }); + CompletableFutureUtils.forwardExceptionTo(metricsCollectedFuture, executeFuture); - return executeFuture; + return metricsCollectedFuture; } private void reportBackoffDelay(RequestExecutionContext context) { diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java index 0e26fb1c53c0..d0ef18e089c2 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java @@ -67,11 +67,13 @@ public static Pair measureDurationUnsafe(Callable c) throws } public static void collectHttpMetrics(MetricCollector metricCollector, SdkHttpFullResponse httpResponse) { - metricCollector.reportMetric(HttpMetric.HTTP_STATUS_CODE, httpResponse.statusCode()); - SdkHttpUtils.allMatchingHeadersFromCollection(httpResponse.headers(), X_AMZN_REQUEST_ID_HEADERS) - .forEach(v -> metricCollector.reportMetric(CoreMetric.AWS_REQUEST_ID, v)); - httpResponse.firstMatchingHeader(X_AMZ_ID_2_HEADER) - .ifPresent(v -> metricCollector.reportMetric(CoreMetric.AWS_EXTENDED_REQUEST_ID, v)); + if (metricCollector != null && httpResponse != null) { + metricCollector.reportMetric(HttpMetric.HTTP_STATUS_CODE, httpResponse.statusCode()); + SdkHttpUtils.allMatchingHeadersFromCollection(httpResponse.headers(), X_AMZN_REQUEST_ID_HEADERS) + .forEach(v -> metricCollector.reportMetric(CoreMetric.AWS_REQUEST_ID, v)); + httpResponse.firstMatchingHeader(X_AMZ_ID_2_HEADER) + .ifPresent(v -> metricCollector.reportMetric(CoreMetric.AWS_EXTENDED_REQUEST_ID, v)); + } } public static MetricCollector createAttemptMetricsCollector(RequestExecutionContext context) { diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml index 6d9a35d58dec..126641e6869a 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.13.62 +2.13.63 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 f9dcec0b323b..2e2f3099564a 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.13.62 +2.13.63 apache-client diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java index e0b8ac71bf8e..7a0804242b10 100644 --- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java +++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java @@ -297,7 +297,7 @@ private ApacheHttpRequestConfig createRequestConfig(DefaultBuilder builder, private void collectPoolMetric(MetricCollector metricCollector) { HttpClientConnectionManager cm = httpClient.getHttpClientConnectionManager(); - if (cm instanceof PoolingHttpClientConnectionManager) { + if (cm instanceof PoolingHttpClientConnectionManager && !(metricCollector instanceof NoOpMetricCollector)) { PoolingHttpClientConnectionManager poolingCm = (PoolingHttpClientConnectionManager) cm; PoolStats totalStats = poolingCm.getTotalStats(); metricCollector.reportMetric(MAX_CONCURRENCY, totalStats.getMax()); diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml index 87b43425b46c..3a80b2abb5ad 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.13.62 +2.13.63 4.0.0 diff --git a/http-clients/pom.xml b/http-clients/pom.xml index 048681efa677..d2c0422e0d83 100644 --- a/http-clients/pom.xml +++ b/http-clients/pom.xml @@ -21,7 +21,7 @@aws-sdk-java-pom software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 1bfb8761e7eb..d968900708a0 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.13.62 +2.13.63 4.0.0 diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml index 2b9ebf927f32..25d2138d043d 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.13.62 +2.13.63 cloudwatch-metric-publisher diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml index f2f4eec45c22..f930894156d3 100644 --- a/metric-publishers/pom.xml +++ b/metric-publishers/pom.xml @@ -17,7 +17,7 @@software.amazon.awssdk aws-sdk-java-pom -2.13.62 +2.13.63 metric-publishers diff --git a/pom.xml b/pom.xml index 1a5a0adca09e..41e51d4b3147 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@4.0.0 software.amazon.awssdk aws-sdk-java-pom -2.13.62 +2.13.63 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 d85d44161152..837f32ace3bf 100644 --- a/release-scripts/pom.xml +++ b/release-scripts/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk aws-sdk-java-pom -2.13.62 +2.13.63 ../pom.xml release-scripts diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml index c7cba6f499f4..0a68d0be4d98 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.13.62 +2.13.63 dynamodb-enhanced ${awsjavasdk.version} diff --git a/services-custom/pom.xml b/services-custom/pom.xml index aad758f72235..e21b8425ac2c 100644 --- a/services-custom/pom.xml +++ b/services-custom/pom.xml @@ -19,7 +19,7 @@software.amazon.awssdk aws-sdk-java-pom -2.13.62 +2.13.63 services-custom AWS Java SDK :: Custom Services diff --git a/services/accessanalyzer/pom.xml b/services/accessanalyzer/pom.xml index 267a1a1af65a..3c6d25649326 100644 --- a/services/accessanalyzer/pom.xml +++ b/services/accessanalyzer/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 accessanalyzer AWS Java SDK :: Services :: AccessAnalyzer diff --git a/services/acm/pom.xml b/services/acm/pom.xml index 6baaf5968698..4581d5257c58 100644 --- a/services/acm/pom.xml +++ b/services/acm/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 acm AWS Java SDK :: Services :: AWS Certificate Manager diff --git a/services/acmpca/pom.xml b/services/acmpca/pom.xml index 0cc726bf09a9..298196d17d97 100644 --- a/services/acmpca/pom.xml +++ b/services/acmpca/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 acmpca AWS Java SDK :: Services :: ACM PCA diff --git a/services/alexaforbusiness/pom.xml b/services/alexaforbusiness/pom.xml index 77975d650a39..7f7174d87aca 100644 --- a/services/alexaforbusiness/pom.xml +++ b/services/alexaforbusiness/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 alexaforbusiness diff --git a/services/amplify/pom.xml b/services/amplify/pom.xml index c07d60ab81b6..d0c0707b9b11 100644 --- a/services/amplify/pom.xml +++ b/services/amplify/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 amplify AWS Java SDK :: Services :: Amplify diff --git a/services/apigateway/pom.xml b/services/apigateway/pom.xml index 8c18d86a0f21..bc67256e9d73 100644 --- a/services/apigateway/pom.xml +++ b/services/apigateway/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 apigateway AWS Java SDK :: Services :: Amazon API Gateway diff --git a/services/apigatewaymanagementapi/pom.xml b/services/apigatewaymanagementapi/pom.xml index aaa019093e46..5a9bc30e31e0 100644 --- a/services/apigatewaymanagementapi/pom.xml +++ b/services/apigatewaymanagementapi/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 apigatewaymanagementapi AWS Java SDK :: Services :: ApiGatewayManagementApi diff --git a/services/apigatewayv2/pom.xml b/services/apigatewayv2/pom.xml index 0f35aee64c1d..99ab523df54f 100644 --- a/services/apigatewayv2/pom.xml +++ b/services/apigatewayv2/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 apigatewayv2 AWS Java SDK :: Services :: ApiGatewayV2 diff --git a/services/appconfig/pom.xml b/services/appconfig/pom.xml index 167ad857c54f..3565902a607f 100644 --- a/services/appconfig/pom.xml +++ b/services/appconfig/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 appconfig AWS Java SDK :: Services :: AppConfig diff --git a/services/applicationautoscaling/pom.xml b/services/applicationautoscaling/pom.xml index 30763a836f23..e9f4a0e6cbaf 100644 --- a/services/applicationautoscaling/pom.xml +++ b/services/applicationautoscaling/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 applicationautoscaling AWS Java SDK :: Services :: AWS Application Auto Scaling diff --git a/services/applicationdiscovery/pom.xml b/services/applicationdiscovery/pom.xml index 30596036acc7..3890e121ba0a 100644 --- a/services/applicationdiscovery/pom.xml +++ b/services/applicationdiscovery/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 applicationdiscovery AWS Java SDK :: Services :: AWS Application Discovery Service diff --git a/services/applicationinsights/pom.xml b/services/applicationinsights/pom.xml index 6786e3c2c15c..32906718a379 100644 --- a/services/applicationinsights/pom.xml +++ b/services/applicationinsights/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 applicationinsights AWS Java SDK :: Services :: Application Insights diff --git a/services/appmesh/pom.xml b/services/appmesh/pom.xml index 65a374035719..875732b1648c 100644 --- a/services/appmesh/pom.xml +++ b/services/appmesh/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 appmesh AWS Java SDK :: Services :: App Mesh diff --git a/services/appstream/pom.xml b/services/appstream/pom.xml index 7457d1417855..0cd6ceea80c7 100644 --- a/services/appstream/pom.xml +++ b/services/appstream/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 appstream AWS Java SDK :: Services :: Amazon AppStream diff --git a/services/appsync/pom.xml b/services/appsync/pom.xml index c70c04f648cd..e8a0bd2acc38 100644 --- a/services/appsync/pom.xml +++ b/services/appsync/pom.xml @@ -21,7 +21,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 appsync diff --git a/services/athena/pom.xml b/services/athena/pom.xml index 40054a55d34d..ab3602789add 100644 --- a/services/athena/pom.xml +++ b/services/athena/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 athena AWS Java SDK :: Services :: Amazon Athena diff --git a/services/autoscaling/pom.xml b/services/autoscaling/pom.xml index 9335213930dc..1078964edadb 100644 --- a/services/autoscaling/pom.xml +++ b/services/autoscaling/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 autoscaling AWS Java SDK :: Services :: Auto Scaling diff --git a/services/autoscaling/src/main/resources/codegen-resources/service-2.json b/services/autoscaling/src/main/resources/codegen-resources/service-2.json index 84d964fdacca..ceffe8c946cb 100644 --- a/services/autoscaling/src/main/resources/codegen-resources/service-2.json +++ b/services/autoscaling/src/main/resources/codegen-resources/service-2.json @@ -139,7 +139,7 @@ {"shape":"ResourceContentionFault"}, {"shape":"ServiceLinkedRoleFailure"} ], - "documentation":"Creates an Auto Scaling group with the specified name and attributes.
If you exceed your maximum limit of Auto Scaling groups, the call fails. To query this limit, call the DescribeAccountLimits API. For information about updating this limit, see Amazon EC2 Auto Scaling Service Quotas in the Amazon EC2 Auto Scaling User Guide.
For introductory exercises for creating an Auto Scaling group, see Getting Started with Amazon EC2 Auto Scaling and Tutorial: Set Up a Scaled and Load-Balanced Application in the Amazon EC2 Auto Scaling User Guide. For more information, see Auto Scaling Groups in the Amazon EC2 Auto Scaling User Guide.
" + "documentation":"Creates an Auto Scaling group with the specified name and attributes.
If you exceed your maximum limit of Auto Scaling groups, the call fails. To query this limit, call the DescribeAccountLimits API. For information about updating this limit, see Amazon EC2 Auto Scaling Service Quotas in the Amazon EC2 Auto Scaling User Guide.
For introductory exercises for creating an Auto Scaling group, see Getting Started with Amazon EC2 Auto Scaling and Tutorial: Set Up a Scaled and Load-Balanced Application in the Amazon EC2 Auto Scaling User Guide. For more information, see Auto Scaling Groups in the Amazon EC2 Auto Scaling User Guide.
Every Auto Scaling group has three size parameters (
" }, "CreateLaunchConfiguration":{ "name":"CreateLaunchConfiguration", @@ -1526,7 +1526,7 @@ }, "MaxSize":{ "shape":"AutoScalingGroupMaxSize", - "documentation":"DesiredCapacity
,MaxSize
, andMinSize
). Usually, you set these sizes based on a specific number of instances. However, if you configure a mixed instances policy that defines weights for the instance types, you must specify these sizes with the same units that you use for weighting instances.The maximum size of the group.
" + "documentation":" With a mixed instances policy that uses instance weighting, Amazon EC2 Auto Scaling may need to go above
MaxSize
to meet your capacity requirements. In this event, Amazon EC2 Auto Scaling will never go aboveMaxSize
by more than your maximum instance weight (weights that define how many capacity units each instance contributes to the capacity of the group).The maximum size of the group.
" }, "DesiredCapacity":{ "shape":"AutoScalingGroupDesiredCapacity", @@ -1665,6 +1665,10 @@ "PlacementTenancy":{ "shape":"XmlStringMaxLen64", "documentation":" With a mixed instances policy that uses instance weighting, Amazon EC2 Auto Scaling may need to go above
MaxSize
to meet your capacity requirements. In this event, Amazon EC2 Auto Scaling will never go aboveMaxSize
by more than your largest instance weight (weights that define how many units each instance contributes to the desired capacity of the group).The tenancy of the instance. An instance with
dedicated
tenancy runs on isolated, single-tenant hardware and can only be launched into a VPC.To launch dedicated instances into a shared tenancy VPC (a VPC with the instance placement tenancy attribute set to
default
), you must set the value of this parameter todedicated
.If you specify
PlacementTenancy
, you must specify at least one subnet forVPCZoneIdentifier
when you create your group.For more information, see Instance Placement Tenancy in the Amazon EC2 Auto Scaling User Guide.
Valid Values:
" + }, + "MetadataOptions":{ + "shape":"InstanceMetadataOptions", + "documentation":"default
|dedicated
The metadata options for the instances. For more information, see Instance Metadata and User Data in the Amazon EC2 User Guide for Linux Instances.
" } } }, @@ -2471,6 +2475,43 @@ "type":"list", "member":{"shape":"XmlStringMaxLen19"} }, + "InstanceMetadataEndpointState":{ + "type":"string", + "enum":[ + "disabled", + "enabled" + ] + }, + "InstanceMetadataHttpPutResponseHopLimit":{ + "type":"integer", + "max":64, + "min":1 + }, + "InstanceMetadataHttpTokensState":{ + "type":"string", + "enum":[ + "optional", + "required" + ] + }, + "InstanceMetadataOptions":{ + "type":"structure", + "members":{ + "HttpTokens":{ + "shape":"InstanceMetadataHttpTokensState", + "documentation":"The state of token usage for your instance metadata requests. If the parameter is not specified in the request, the default state is
optional
.If the state is
optional
, you can choose to retrieve instance metadata with or without a signed token header on your request. If you retrieve the IAM role credentials without a token, the version 1.0 role credentials are returned. If you retrieve the IAM role credentials using a valid signed token, the version 2.0 role credentials are returned.If the state is
" + }, + "HttpPutResponseHopLimit":{ + "shape":"InstanceMetadataHttpPutResponseHopLimit", + "documentation":"required
, you must send a signed token header with any instance metadata retrieval requests. In this state, retrieving the IAM role credentials always returns the version 2.0 credentials; the version 1.0 credentials are not available.The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.
Default: 1
Possible values: Integers from 1 to 64
" + }, + "HttpEndpoint":{ + "shape":"InstanceMetadataEndpointState", + "documentation":"This parameter enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is
enabled
." + } + }, + "documentation":" If you specify a value of
disabled
, you will not be able to access your instance metadata.The metadata options for the instances. For more information, see Instance Metadata and User Data in the Amazon EC2 User Guide for Linux Instances.
" + }, "InstanceMonitoring":{ "type":"structure", "members":{ @@ -2695,6 +2736,10 @@ "PlacementTenancy":{ "shape":"XmlStringMaxLen64", "documentation":"The tenancy of the instance, either
default
ordedicated
. An instance withdedicated
tenancy runs on isolated, single-tenant hardware and can only be launched into a VPC.For more information, see Instance Placement Tenancy in the Amazon EC2 Auto Scaling User Guide.
" + }, + "MetadataOptions":{ + "shape":"InstanceMetadataOptions", + "documentation":"The metadata options for the instances. For more information, see Instance Metadata and User Data in the Amazon EC2 User Guide for Linux Instances.
" } }, "documentation":"Describes a launch configuration.
" @@ -2983,7 +3028,7 @@ "members":{ "Metric":{ "shape":"XmlStringMaxLen255", - "documentation":"One of the following metrics:
" + "documentation":"
GroupMinSize
GroupMaxSize
GroupDesiredCapacity
GroupInServiceInstances
GroupPendingInstances
GroupStandbyInstances
GroupTerminatingInstances
GroupTotalInstances
One of the following metrics:
" } }, "documentation":"
GroupMinSize
GroupMaxSize
GroupDesiredCapacity
GroupInServiceInstances
GroupPendingInstances
GroupStandbyInstances
GroupTerminatingInstances
GroupTotalInstances
GroupInServiceCapacity
GroupPendingCapacity
GroupStandbyCapacity
GroupTerminatingCapacity
GroupTotalCapacity
Describes a metric.
" @@ -3290,7 +3335,7 @@ }, "AdjustmentType":{ "shape":"XmlStringMaxLen255", - "documentation":"Specifies how the scaling adjustment is interpreted (either an absolute number or a percentage). The valid values are
ChangeInCapacity
,ExactCapacity
, andPercentChangeInCapacity
.Required if the policy type is
" + "documentation":"StepScaling
orSimpleScaling
. For more information, see Scaling Adjustment Types in the Amazon EC2 Auto Scaling User Guide.Specifies how the scaling adjustment is interpreted (for example, an absolute number or a percentage). The valid values are
ChangeInCapacity
,ExactCapacity
, andPercentChangeInCapacity
.Required if the policy type is
" }, "MinAdjustmentStep":{ "shape":"MinAdjustmentStep", @@ -3523,7 +3568,7 @@ }, "AdjustmentType":{ "shape":"XmlStringMaxLen255", - "documentation":"StepScaling
orSimpleScaling
. For more information, see Scaling Adjustment Types in the Amazon EC2 Auto Scaling User Guide.Specifies how the scaling adjustment is interpreted (either an absolute number or a percentage). The valid values are
" + "documentation":"ChangeInCapacity
,ExactCapacity
, andPercentChangeInCapacity
.Specifies how the scaling adjustment is interpreted (for example, an absolute number or a percentage). The valid values are
" }, "MinAdjustmentStep":{ "shape":"MinAdjustmentStep", @@ -4012,7 +4057,7 @@ }, "MaxSize":{ "shape":"AutoScalingGroupMaxSize", - "documentation":"ChangeInCapacity
,ExactCapacity
, andPercentChangeInCapacity
.The maximum size of the Auto Scaling group.
" + "documentation":" With a mixed instances policy that uses instance weighting, Amazon EC2 Auto Scaling may need to go above
MaxSize
to meet your capacity requirements. In this event, Amazon EC2 Auto Scaling will never go aboveMaxSize
by more than your maximum instance weight (weights that define how many capacity units each instance contributes to the capacity of the group).The maximum size of the Auto Scaling group.
" }, "DesiredCapacity":{ "shape":"AutoScalingGroupDesiredCapacity", diff --git a/services/autoscalingplans/pom.xml b/services/autoscalingplans/pom.xml index d0e75269120e..f564e7513047 100644 --- a/services/autoscalingplans/pom.xml +++ b/services/autoscalingplans/pom.xml @@ -21,7 +21,7 @@ With a mixed instances policy that uses instance weighting, Amazon EC2 Auto Scaling may need to go above
MaxSize
to meet your capacity requirements. In this event, Amazon EC2 Auto Scaling will never go aboveMaxSize
by more than your largest instance weight (weights that define how many units each instance contributes to the desired capacity of the group).software.amazon.awssdk services -2.13.62 +2.13.63 autoscalingplans AWS Java SDK :: Services :: Auto Scaling Plans diff --git a/services/backup/pom.xml b/services/backup/pom.xml index 1f3b2dacd645..bd57090588e5 100644 --- a/services/backup/pom.xml +++ b/services/backup/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 backup AWS Java SDK :: Services :: Backup diff --git a/services/batch/pom.xml b/services/batch/pom.xml index cacdab5644d0..c0f2fb2846f1 100644 --- a/services/batch/pom.xml +++ b/services/batch/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 batch AWS Java SDK :: Services :: AWS Batch diff --git a/services/budgets/pom.xml b/services/budgets/pom.xml index 456079104f4e..b42286a96a30 100644 --- a/services/budgets/pom.xml +++ b/services/budgets/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 budgets AWS Java SDK :: Services :: AWS Budgets diff --git a/services/chime/pom.xml b/services/chime/pom.xml index 0eb1d2a4a48a..e87b553206ad 100644 --- a/services/chime/pom.xml +++ b/services/chime/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 chime AWS Java SDK :: Services :: Chime diff --git a/services/cloud9/pom.xml b/services/cloud9/pom.xml index 8ce3fd2d009b..56efb158c5af 100644 --- a/services/cloud9/pom.xml +++ b/services/cloud9/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 cloud9 diff --git a/services/clouddirectory/pom.xml b/services/clouddirectory/pom.xml index 652bffa6387f..e08e42fcc035 100644 --- a/services/clouddirectory/pom.xml +++ b/services/clouddirectory/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 clouddirectory AWS Java SDK :: Services :: Amazon CloudDirectory diff --git a/services/cloudformation/pom.xml b/services/cloudformation/pom.xml index ff8198f0543e..0b63d029d6a4 100644 --- a/services/cloudformation/pom.xml +++ b/services/cloudformation/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudformation AWS Java SDK :: Services :: AWS CloudFormation diff --git a/services/cloudfront/pom.xml b/services/cloudfront/pom.xml index 44ea0d69dbe5..a39fa37e368a 100644 --- a/services/cloudfront/pom.xml +++ b/services/cloudfront/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudfront AWS Java SDK :: Services :: Amazon CloudFront diff --git a/services/cloudhsm/pom.xml b/services/cloudhsm/pom.xml index 41c26451f3a9..380284ce01e6 100644 --- a/services/cloudhsm/pom.xml +++ b/services/cloudhsm/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudhsm AWS Java SDK :: Services :: AWS CloudHSM diff --git a/services/cloudhsmv2/pom.xml b/services/cloudhsmv2/pom.xml index 84c6b8e4b2cf..3784326c9939 100644 --- a/services/cloudhsmv2/pom.xml +++ b/services/cloudhsmv2/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 cloudhsmv2 diff --git a/services/cloudsearch/pom.xml b/services/cloudsearch/pom.xml index 137d36df94f0..931c2fff114e 100644 --- a/services/cloudsearch/pom.xml +++ b/services/cloudsearch/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudsearch AWS Java SDK :: Services :: Amazon CloudSearch diff --git a/services/cloudsearchdomain/pom.xml b/services/cloudsearchdomain/pom.xml index 66e07d57c353..f5e51575e67c 100644 --- a/services/cloudsearchdomain/pom.xml +++ b/services/cloudsearchdomain/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudsearchdomain AWS Java SDK :: Services :: Amazon CloudSearch Domain diff --git a/services/cloudtrail/pom.xml b/services/cloudtrail/pom.xml index 735faaa293c9..b666b56b002d 100644 --- a/services/cloudtrail/pom.xml +++ b/services/cloudtrail/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudtrail AWS Java SDK :: Services :: AWS CloudTrail diff --git a/services/cloudwatch/pom.xml b/services/cloudwatch/pom.xml index 79ef481023fc..2d212296a10b 100644 --- a/services/cloudwatch/pom.xml +++ b/services/cloudwatch/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudwatch AWS Java SDK :: Services :: Amazon CloudWatch diff --git a/services/cloudwatchevents/pom.xml b/services/cloudwatchevents/pom.xml index 0a0d8fa90312..df2305fde591 100644 --- a/services/cloudwatchevents/pom.xml +++ b/services/cloudwatchevents/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudwatchevents AWS Java SDK :: Services :: Amazon CloudWatch Events diff --git a/services/cloudwatchlogs/pom.xml b/services/cloudwatchlogs/pom.xml index 88849f7c7861..983c7ab55770 100644 --- a/services/cloudwatchlogs/pom.xml +++ b/services/cloudwatchlogs/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cloudwatchlogs AWS Java SDK :: Services :: Amazon CloudWatch Logs diff --git a/services/codeartifact/pom.xml b/services/codeartifact/pom.xml index b05900641863..cb1e19fe0329 100644 --- a/services/codeartifact/pom.xml +++ b/services/codeartifact/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codeartifact AWS Java SDK :: Services :: Codeartifact diff --git a/services/codebuild/pom.xml b/services/codebuild/pom.xml index 54f1751199c7..8bb4d6cbdc11 100644 --- a/services/codebuild/pom.xml +++ b/services/codebuild/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codebuild AWS Java SDK :: Services :: AWS Code Build diff --git a/services/codecommit/pom.xml b/services/codecommit/pom.xml index abe949652513..dc5b7673b8d9 100644 --- a/services/codecommit/pom.xml +++ b/services/codecommit/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codecommit AWS Java SDK :: Services :: AWS CodeCommit diff --git a/services/codedeploy/pom.xml b/services/codedeploy/pom.xml index 2a0779b20499..9fba10627c8f 100644 --- a/services/codedeploy/pom.xml +++ b/services/codedeploy/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codedeploy AWS Java SDK :: Services :: AWS CodeDeploy diff --git a/services/codeguruprofiler/pom.xml b/services/codeguruprofiler/pom.xml index 6d8068a1f8f0..514216dd9bbc 100644 --- a/services/codeguruprofiler/pom.xml +++ b/services/codeguruprofiler/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codeguruprofiler AWS Java SDK :: Services :: CodeGuruProfiler diff --git a/services/codegurureviewer/pom.xml b/services/codegurureviewer/pom.xml index c595708165a1..a8dd616711df 100644 --- a/services/codegurureviewer/pom.xml +++ b/services/codegurureviewer/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codegurureviewer AWS Java SDK :: Services :: CodeGuru Reviewer diff --git a/services/codepipeline/pom.xml b/services/codepipeline/pom.xml index 5229834fb4ae..9543f2beef8a 100644 --- a/services/codepipeline/pom.xml +++ b/services/codepipeline/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codepipeline AWS Java SDK :: Services :: AWS CodePipeline diff --git a/services/codestar/pom.xml b/services/codestar/pom.xml index 14e2741e169e..605aac0055ab 100644 --- a/services/codestar/pom.xml +++ b/services/codestar/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codestar AWS Java SDK :: Services :: AWS CodeStar diff --git a/services/codestarconnections/pom.xml b/services/codestarconnections/pom.xml index 88d3d302285d..4ed21deb68c1 100644 --- a/services/codestarconnections/pom.xml +++ b/services/codestarconnections/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codestarconnections AWS Java SDK :: Services :: CodeStar connections diff --git a/services/codestarnotifications/pom.xml b/services/codestarnotifications/pom.xml index 80e1e07bb545..ceb15c5ee3e3 100644 --- a/services/codestarnotifications/pom.xml +++ b/services/codestarnotifications/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 codestarnotifications AWS Java SDK :: Services :: Codestar Notifications diff --git a/services/cognitoidentity/pom.xml b/services/cognitoidentity/pom.xml index 986c3f9cebd3..4960d5600adb 100644 --- a/services/cognitoidentity/pom.xml +++ b/services/cognitoidentity/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cognitoidentity AWS Java SDK :: Services :: Amazon Cognito Identity diff --git a/services/cognitoidentityprovider/pom.xml b/services/cognitoidentityprovider/pom.xml index a82157eb4a25..062159f8a211 100644 --- a/services/cognitoidentityprovider/pom.xml +++ b/services/cognitoidentityprovider/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cognitoidentityprovider AWS Java SDK :: Services :: Amazon Cognito Identity Provider Service diff --git a/services/cognitosync/pom.xml b/services/cognitosync/pom.xml index 3c96c66e3bcf..79f65435c55d 100644 --- a/services/cognitosync/pom.xml +++ b/services/cognitosync/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 cognitosync AWS Java SDK :: Services :: Amazon Cognito Sync diff --git a/services/comprehend/pom.xml b/services/comprehend/pom.xml index e14f8c9bff80..ccd51aa7de2f 100644 --- a/services/comprehend/pom.xml +++ b/services/comprehend/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 comprehend diff --git a/services/comprehendmedical/pom.xml b/services/comprehendmedical/pom.xml index df0c9c0ba09d..891016df8029 100644 --- a/services/comprehendmedical/pom.xml +++ b/services/comprehendmedical/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 comprehendmedical AWS Java SDK :: Services :: ComprehendMedical diff --git a/services/computeoptimizer/pom.xml b/services/computeoptimizer/pom.xml index d8727ae2c4d5..458780e2e19a 100644 --- a/services/computeoptimizer/pom.xml +++ b/services/computeoptimizer/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 computeoptimizer AWS Java SDK :: Services :: Compute Optimizer diff --git a/services/config/pom.xml b/services/config/pom.xml index e0af9c90d0da..3376a08b678e 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 config AWS Java SDK :: Services :: AWS Config diff --git a/services/connect/pom.xml b/services/connect/pom.xml index a2462c2206aa..e9575dc75bc5 100644 --- a/services/connect/pom.xml +++ b/services/connect/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 connect AWS Java SDK :: Services :: Connect diff --git a/services/connectparticipant/pom.xml b/services/connectparticipant/pom.xml index b28b09ecfbbe..ac1a23f91701 100644 --- a/services/connectparticipant/pom.xml +++ b/services/connectparticipant/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 connectparticipant AWS Java SDK :: Services :: ConnectParticipant diff --git a/services/costandusagereport/pom.xml b/services/costandusagereport/pom.xml index c93c5c32f32e..39f9badbcc57 100644 --- a/services/costandusagereport/pom.xml +++ b/services/costandusagereport/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 costandusagereport AWS Java SDK :: Services :: AWS Cost and Usage Report diff --git a/services/costexplorer/pom.xml b/services/costexplorer/pom.xml index 1e6a55a9f0e0..52157cf34919 100644 --- a/services/costexplorer/pom.xml +++ b/services/costexplorer/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 costexplorer diff --git a/services/databasemigration/pom.xml b/services/databasemigration/pom.xml index 2ccc1fbb9abd..8020a5146f34 100644 --- a/services/databasemigration/pom.xml +++ b/services/databasemigration/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 databasemigration AWS Java SDK :: Services :: AWS Database Migration Service diff --git a/services/dataexchange/pom.xml b/services/dataexchange/pom.xml index c71b4a901b95..4e8eb8691649 100644 --- a/services/dataexchange/pom.xml +++ b/services/dataexchange/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 dataexchange AWS Java SDK :: Services :: DataExchange diff --git a/services/datapipeline/pom.xml b/services/datapipeline/pom.xml index a199d088cbcc..3549a42115f8 100644 --- a/services/datapipeline/pom.xml +++ b/services/datapipeline/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 datapipeline AWS Java SDK :: Services :: AWS Data Pipeline diff --git a/services/datasync/pom.xml b/services/datasync/pom.xml index 79cc16f5d119..79936fb5d5db 100644 --- a/services/datasync/pom.xml +++ b/services/datasync/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 datasync AWS Java SDK :: Services :: DataSync diff --git a/services/dax/pom.xml b/services/dax/pom.xml index 75273023d89b..0356d8207f76 100644 --- a/services/dax/pom.xml +++ b/services/dax/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 dax AWS Java SDK :: Services :: Amazon DynamoDB Accelerator (DAX) diff --git a/services/detective/pom.xml b/services/detective/pom.xml index 3ff6405f8421..4ee776e934c1 100644 --- a/services/detective/pom.xml +++ b/services/detective/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 detective AWS Java SDK :: Services :: Detective diff --git a/services/devicefarm/pom.xml b/services/devicefarm/pom.xml index 82be58b527e5..3c75df423c7b 100644 --- a/services/devicefarm/pom.xml +++ b/services/devicefarm/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 devicefarm AWS Java SDK :: Services :: AWS Device Farm diff --git a/services/directconnect/pom.xml b/services/directconnect/pom.xml index 63dd5b4713d4..84f1d6b795ff 100644 --- a/services/directconnect/pom.xml +++ b/services/directconnect/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 directconnect AWS Java SDK :: Services :: AWS Direct Connect diff --git a/services/directory/pom.xml b/services/directory/pom.xml index e8b9a43eec91..85dfd3c7bf0c 100644 --- a/services/directory/pom.xml +++ b/services/directory/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 directory AWS Java SDK :: Services :: AWS Directory Service diff --git a/services/dlm/pom.xml b/services/dlm/pom.xml index ec3066922b0f..d4a0f27efb23 100644 --- a/services/dlm/pom.xml +++ b/services/dlm/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 dlm AWS Java SDK :: Services :: DLM diff --git a/services/docdb/pom.xml b/services/docdb/pom.xml index 81c5729dd9c2..2ed9311968ba 100644 --- a/services/docdb/pom.xml +++ b/services/docdb/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 docdb AWS Java SDK :: Services :: DocDB diff --git a/services/dynamodb/pom.xml b/services/dynamodb/pom.xml index 1fe38966f96e..d787d661c560 100644 --- a/services/dynamodb/pom.xml +++ b/services/dynamodb/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 dynamodb AWS Java SDK :: Services :: Amazon DynamoDB diff --git a/services/ebs/pom.xml b/services/ebs/pom.xml index 3ab276c934c7..2aa922597586 100644 --- a/services/ebs/pom.xml +++ b/services/ebs/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ebs AWS Java SDK :: Services :: EBS diff --git a/services/ec2/pom.xml b/services/ec2/pom.xml index 4b411e99369b..58a81d4bc23a 100644 --- a/services/ec2/pom.xml +++ b/services/ec2/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ec2 AWS Java SDK :: Services :: Amazon EC2 diff --git a/services/ec2/src/main/resources/codegen-resources/service-2.json b/services/ec2/src/main/resources/codegen-resources/service-2.json index 49560f8753ea..9d18f615e45a 100755 --- a/services/ec2/src/main/resources/codegen-resources/service-2.json +++ b/services/ec2/src/main/resources/codegen-resources/service-2.json @@ -7797,6 +7797,11 @@ "shape":"GatewayType", "documentation":"The type of VPN connection that this customer gateway supports (
" }, + "TagSpecifications":{ + "shape":"TagSpecificationList", + "documentation":"ipsec.1
).The tags to apply to the customer gateway.
", + "locationName":"TagSpecification" + }, "DeviceName":{ "shape":"String", "documentation":"A name for the customer gateway device.
Length Constraints: Up to 255 characters.
" @@ -10079,6 +10084,11 @@ "shape":"VpnConnectionOptionsSpecification", "documentation":"The options for the VPN connection.
", "locationName":"options" + }, + "TagSpecifications":{ + "shape":"TagSpecificationList", + "documentation":"The tags to apply to the VPN connection.
", + "locationName":"TagSpecification" } }, "documentation":"Contains the parameters for CreateVpnConnection.
" @@ -10124,6 +10134,11 @@ "shape":"GatewayType", "documentation":"The type of VPN connection this virtual private gateway supports.
" }, + "TagSpecifications":{ + "shape":"TagSpecificationList", + "documentation":"The tags to apply to the virtual private gateway.
", + "locationName":"TagSpecification" + }, "AmazonSideAsn":{ "shape":"Long", "documentation":"A private Autonomous System Number (ASN) for the Amazon side of a BGP session. If you're using a 16-bit ASN, it must be in the 64512 to 65534 range. If you're using a 32-bit ASN, it must be in the 4200000000 to 4294967294 range.
Default: 64512
" @@ -34959,7 +34974,7 @@ "members":{ "ResourceType":{ "shape":"ResourceType", - "documentation":"The type of resource to tag. Currently, the resource types that support tagging on creation are:
capacity-reservation
|client-vpn-endpoint
|dedicated-host
|dhcp-options
|export-image-task
|export-instance-task
|fleet
|fpga-image
|host-reservation
|import-image-task
|import-snapshot-task
|instance
|internet-gateway
|ipv4pool-ec2
|ipv6pool-ec2
|key-pair
|launch-template
|placement-group
|prefix-list
|natgateway
|network-acl
|security-group
|spot-fleet-request
|spot-instances-request
|snapshot
|subnet
|traffic-mirror-filter
|traffic-mirror-session
|traffic-mirror-target
|transit-gateway
|transit-gateway-attachment
|transit-gateway-route-table
|volume
|vpc
|vpc-endpoint
(for interface and gateway endpoints) |vpc-endpoint-service
(for AWS PrivateLink) |vpc-flow-log
.To tag a resource after it has been created, see CreateTags.
", + "documentation":"The type of resource to tag. Currently, the resource types that support tagging on creation are:
capacity-reservation
|client-vpn-endpoint
|customer-gateway
|dedicated-host
|dhcp-options
|export-image-task
|export-instance-task
|fleet
|fpga-image
|host-reservation
|import-image-task
|import-snapshot-task
|instance
|internet-gateway
|ipv4pool-ec2
|ipv6pool-ec2
|key-pair
|launch-template
|placement-group
|prefix-list
|natgateway
|network-acl
|route-table
|security-group
|spot-fleet-request
|spot-instances-request
|snapshot
|subnet
|traffic-mirror-filter
|traffic-mirror-session
|traffic-mirror-target
|transit-gateway
|transit-gateway-attachment
|transit-gateway-route-table
|volume
|vpc
|vpc-peering-connection
|vpc-endpoint
(for interface and gateway endpoints) |vpc-endpoint-service
(for AWS PrivateLink) |vpc-flow-log
|vpn-connection
|vpn-gateway
.To tag a resource after it has been created, see CreateTags.
", "locationName":"resourceType" }, "Tags":{ diff --git a/services/ec2instanceconnect/pom.xml b/services/ec2instanceconnect/pom.xml index 493cc2ec5a3e..26f6ae3e7aca 100644 --- a/services/ec2instanceconnect/pom.xml +++ b/services/ec2instanceconnect/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ec2instanceconnect AWS Java SDK :: Services :: EC2 Instance Connect diff --git a/services/ecr/pom.xml b/services/ecr/pom.xml index 10e7f56da9c2..3651c544415f 100644 --- a/services/ecr/pom.xml +++ b/services/ecr/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ecr AWS Java SDK :: Services :: Amazon EC2 Container Registry diff --git a/services/ecs/pom.xml b/services/ecs/pom.xml index 21d2f387fc32..0854a34b927c 100644 --- a/services/ecs/pom.xml +++ b/services/ecs/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ecs AWS Java SDK :: Services :: Amazon EC2 Container Service diff --git a/services/efs/pom.xml b/services/efs/pom.xml index 6cac6684a87b..ddfc01e3aa35 100644 --- a/services/efs/pom.xml +++ b/services/efs/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 efs AWS Java SDK :: Services :: Amazon Elastic File System diff --git a/services/eks/pom.xml b/services/eks/pom.xml index 66bfd07b4cec..e2f9e906f172 100644 --- a/services/eks/pom.xml +++ b/services/eks/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 eks AWS Java SDK :: Services :: EKS diff --git a/services/elasticache/pom.xml b/services/elasticache/pom.xml index a6899beea5fb..057e26c5c52d 100644 --- a/services/elasticache/pom.xml +++ b/services/elasticache/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 elasticache AWS Java SDK :: Services :: Amazon ElastiCache diff --git a/services/elasticbeanstalk/pom.xml b/services/elasticbeanstalk/pom.xml index 422a3d49198b..c527fd6182ff 100644 --- a/services/elasticbeanstalk/pom.xml +++ b/services/elasticbeanstalk/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 elasticbeanstalk AWS Java SDK :: Services :: AWS Elastic Beanstalk diff --git a/services/elasticinference/pom.xml b/services/elasticinference/pom.xml index 05b1fde4a6ea..14d01b5608db 100644 --- a/services/elasticinference/pom.xml +++ b/services/elasticinference/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 elasticinference AWS Java SDK :: Services :: Elastic Inference diff --git a/services/elasticloadbalancing/pom.xml b/services/elasticloadbalancing/pom.xml index d5d2a73165e8..db94780753ab 100644 --- a/services/elasticloadbalancing/pom.xml +++ b/services/elasticloadbalancing/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 elasticloadbalancing AWS Java SDK :: Services :: Elastic Load Balancing diff --git a/services/elasticloadbalancingv2/pom.xml b/services/elasticloadbalancingv2/pom.xml index 36897fa3898e..14c9c05f2256 100644 --- a/services/elasticloadbalancingv2/pom.xml +++ b/services/elasticloadbalancingv2/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 elasticloadbalancingv2 AWS Java SDK :: Services :: Elastic Load Balancing V2 diff --git a/services/elasticsearch/pom.xml b/services/elasticsearch/pom.xml index 2f4231273d53..f0b59399141a 100644 --- a/services/elasticsearch/pom.xml +++ b/services/elasticsearch/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 elasticsearch AWS Java SDK :: Services :: Amazon Elasticsearch Service diff --git a/services/elastictranscoder/pom.xml b/services/elastictranscoder/pom.xml index 1ab3689e1c7d..1d204b1c2faa 100644 --- a/services/elastictranscoder/pom.xml +++ b/services/elastictranscoder/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 elastictranscoder AWS Java SDK :: Services :: Amazon Elastic Transcoder diff --git a/services/emr/pom.xml b/services/emr/pom.xml index fa31c37cffd4..d45e775dd644 100644 --- a/services/emr/pom.xml +++ b/services/emr/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 emr AWS Java SDK :: Services :: Amazon EMR diff --git a/services/eventbridge/pom.xml b/services/eventbridge/pom.xml index dca4387d070b..8ca62067989e 100644 --- a/services/eventbridge/pom.xml +++ b/services/eventbridge/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 eventbridge AWS Java SDK :: Services :: EventBridge diff --git a/services/firehose/pom.xml b/services/firehose/pom.xml index 47cbdf50a0b0..da0ae6b1dae5 100644 --- a/services/firehose/pom.xml +++ b/services/firehose/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 firehose AWS Java SDK :: Services :: Amazon Kinesis Firehose diff --git a/services/fms/pom.xml b/services/fms/pom.xml index 02fffc7ee040..ecafc7b93704 100644 --- a/services/fms/pom.xml +++ b/services/fms/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 fms AWS Java SDK :: Services :: FMS diff --git a/services/forecast/pom.xml b/services/forecast/pom.xml index 6e1b3b986d12..fa6dc079e991 100644 --- a/services/forecast/pom.xml +++ b/services/forecast/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 forecast AWS Java SDK :: Services :: Forecast diff --git a/services/forecastquery/pom.xml b/services/forecastquery/pom.xml index 3461c1dbc197..f25587d1e479 100644 --- a/services/forecastquery/pom.xml +++ b/services/forecastquery/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 forecastquery AWS Java SDK :: Services :: Forecastquery diff --git a/services/frauddetector/pom.xml b/services/frauddetector/pom.xml index 588772150f91..b85b40e7d625 100644 --- a/services/frauddetector/pom.xml +++ b/services/frauddetector/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 frauddetector AWS Java SDK :: Services :: FraudDetector diff --git a/services/fsx/pom.xml b/services/fsx/pom.xml index e93d617a67a8..8bc98b1c1a20 100644 --- a/services/fsx/pom.xml +++ b/services/fsx/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 fsx AWS Java SDK :: Services :: FSx diff --git a/services/gamelift/pom.xml b/services/gamelift/pom.xml index daf5c4b9fa03..5dd9708d82fe 100644 --- a/services/gamelift/pom.xml +++ b/services/gamelift/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 gamelift AWS Java SDK :: Services :: AWS GameLift diff --git a/services/glacier/pom.xml b/services/glacier/pom.xml index 3bc74e61b011..0e64533c55c8 100644 --- a/services/glacier/pom.xml +++ b/services/glacier/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 glacier AWS Java SDK :: Services :: Amazon Glacier diff --git a/services/globalaccelerator/pom.xml b/services/globalaccelerator/pom.xml index d898304bc5c9..03880fc9c1a3 100644 --- a/services/globalaccelerator/pom.xml +++ b/services/globalaccelerator/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 globalaccelerator AWS Java SDK :: Services :: Global Accelerator diff --git a/services/glue/pom.xml b/services/glue/pom.xml index b6c05409f051..521e677c4922 100644 --- a/services/glue/pom.xml +++ b/services/glue/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 glue diff --git a/services/greengrass/pom.xml b/services/greengrass/pom.xml index 26c30f8c10c8..cd24bb30f6e5 100644 --- a/services/greengrass/pom.xml +++ b/services/greengrass/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 greengrass AWS Java SDK :: Services :: AWS Greengrass diff --git a/services/groundstation/pom.xml b/services/groundstation/pom.xml index 8a6b98f3cb21..a4b32a259f55 100644 --- a/services/groundstation/pom.xml +++ b/services/groundstation/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 groundstation AWS Java SDK :: Services :: GroundStation diff --git a/services/guardduty/pom.xml b/services/guardduty/pom.xml index e7d6ad26a941..8a86de93c12b 100644 --- a/services/guardduty/pom.xml +++ b/services/guardduty/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 guardduty diff --git a/services/health/pom.xml b/services/health/pom.xml index 679c4515ad25..50bc3318a296 100644 --- a/services/health/pom.xml +++ b/services/health/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 health AWS Java SDK :: Services :: AWS Health APIs and Notifications diff --git a/services/honeycode/pom.xml b/services/honeycode/pom.xml index b224acdc3576..b4e2610778a4 100644 --- a/services/honeycode/pom.xml +++ b/services/honeycode/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 honeycode AWS Java SDK :: Services :: Honeycode diff --git a/services/iam/pom.xml b/services/iam/pom.xml index 0e0d8c23db23..547cfab3165f 100644 --- a/services/iam/pom.xml +++ b/services/iam/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iam AWS Java SDK :: Services :: AWS IAM diff --git a/services/imagebuilder/pom.xml b/services/imagebuilder/pom.xml index ef02a824847e..b7d80a5bbc37 100644 --- a/services/imagebuilder/pom.xml +++ b/services/imagebuilder/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 imagebuilder AWS Java SDK :: Services :: Imagebuilder diff --git a/services/imagebuilder/src/main/resources/codegen-resources/service-2.json b/services/imagebuilder/src/main/resources/codegen-resources/service-2.json index 1a8848de3cc5..3caa8a62148e 100644 --- a/services/imagebuilder/src/main/resources/codegen-resources/service-2.json +++ b/services/imagebuilder/src/main/resources/codegen-resources/service-2.json @@ -887,7 +887,7 @@ "type":"string", "max":127, "min":1, - "pattern":"^[-_A-Za-z0-9{][-_A-Za-z0-9\\s:{}]+[-_A-Za-z0-9}]$" + "pattern":"^[-_A-Za-z0-9{][-_A-Za-z0-9\\s:{}\\.]+[-_A-Za-z0-9}]$" }, "Arn":{"type":"string"}, "ArnList":{ @@ -2913,7 +2913,7 @@ "members":{ "filters":{ "shape":"FilterList", - "documentation":"The filters.
" + "documentation":"The filters.
" }, "maxResults":{ "shape":"RestrictedInteger", diff --git a/services/inspector/pom.xml b/services/inspector/pom.xml index 3a67b5164e1b..3bbbdf4d68e0 100644 --- a/services/inspector/pom.xml +++ b/services/inspector/pom.xml @@ -21,7 +21,7 @@
name
- The name of this distribution configuration.software.amazon.awssdk services -2.13.62 +2.13.63 inspector AWS Java SDK :: Services :: Amazon Inspector Service diff --git a/services/iot/pom.xml b/services/iot/pom.xml index a8c0a4987666..8d83a1d7778a 100644 --- a/services/iot/pom.xml +++ b/services/iot/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iot AWS Java SDK :: Services :: AWS IoT diff --git a/services/iot1clickdevices/pom.xml b/services/iot1clickdevices/pom.xml index fc018f621cea..2e94f32110dd 100644 --- a/services/iot1clickdevices/pom.xml +++ b/services/iot1clickdevices/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iot1clickdevices AWS Java SDK :: Services :: IoT 1Click Devices Service diff --git a/services/iot1clickprojects/pom.xml b/services/iot1clickprojects/pom.xml index 2d7e9b2c5bdb..68925deb5abb 100644 --- a/services/iot1clickprojects/pom.xml +++ b/services/iot1clickprojects/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iot1clickprojects AWS Java SDK :: Services :: IoT 1Click Projects diff --git a/services/iotanalytics/pom.xml b/services/iotanalytics/pom.xml index b8e981e4c36c..17e9d3992c8e 100644 --- a/services/iotanalytics/pom.xml +++ b/services/iotanalytics/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iotanalytics AWS Java SDK :: Services :: IoTAnalytics diff --git a/services/iotdataplane/pom.xml b/services/iotdataplane/pom.xml index ef33f9e94e33..aec052ba495d 100644 --- a/services/iotdataplane/pom.xml +++ b/services/iotdataplane/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iotdataplane AWS Java SDK :: Services :: AWS IoT Data Plane diff --git a/services/iotevents/pom.xml b/services/iotevents/pom.xml index 3ed342e7ea6e..fb491621b636 100644 --- a/services/iotevents/pom.xml +++ b/services/iotevents/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iotevents AWS Java SDK :: Services :: IoT Events diff --git a/services/ioteventsdata/pom.xml b/services/ioteventsdata/pom.xml index a7c0b030b333..3a3cf5459416 100644 --- a/services/ioteventsdata/pom.xml +++ b/services/ioteventsdata/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ioteventsdata AWS Java SDK :: Services :: IoT Events Data diff --git a/services/iotjobsdataplane/pom.xml b/services/iotjobsdataplane/pom.xml index 3b5845f6a780..acb47f4d2583 100644 --- a/services/iotjobsdataplane/pom.xml +++ b/services/iotjobsdataplane/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iotjobsdataplane AWS Java SDK :: Services :: IoT Jobs Data Plane diff --git a/services/iotsecuretunneling/pom.xml b/services/iotsecuretunneling/pom.xml index a6900f8b0f4a..a51478d22c0d 100644 --- a/services/iotsecuretunneling/pom.xml +++ b/services/iotsecuretunneling/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iotsecuretunneling AWS Java SDK :: Services :: IoTSecureTunneling diff --git a/services/iotsitewise/pom.xml b/services/iotsitewise/pom.xml index 52397e96b634..0e2f9d84f3c3 100644 --- a/services/iotsitewise/pom.xml +++ b/services/iotsitewise/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iotsitewise AWS Java SDK :: Services :: Io T Site Wise diff --git a/services/iotthingsgraph/pom.xml b/services/iotthingsgraph/pom.xml index 79dd89f13348..f2f9e48aa390 100644 --- a/services/iotthingsgraph/pom.xml +++ b/services/iotthingsgraph/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 iotthingsgraph AWS Java SDK :: Services :: IoTThingsGraph diff --git a/services/ivs/pom.xml b/services/ivs/pom.xml index d0f130ab0bcf..4b78d18b6e07 100644 --- a/services/ivs/pom.xml +++ b/services/ivs/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ivs AWS Java SDK :: Services :: Ivs diff --git a/services/ivs/src/main/resources/codegen-resources/service-2.json b/services/ivs/src/main/resources/codegen-resources/service-2.json index 18aa30d0b178..5dcbea425bde 100644 --- a/services/ivs/src/main/resources/codegen-resources/service-2.json +++ b/services/ivs/src/main/resources/codegen-resources/service-2.json @@ -43,7 +43,8 @@ "errors":[ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"}, - {"shape":"ServiceQuotaExceededException"} + {"shape":"ServiceQuotaExceededException"}, + {"shape":"PendingVerification"} ], "documentation":"Creates a new channel and an associated stream key to start streaming.
" }, @@ -59,9 +60,10 @@ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"}, {"shape":"ResourceNotFoundException"}, - {"shape":"ServiceQuotaExceededException"} + {"shape":"ServiceQuotaExceededException"}, + {"shape":"PendingVerification"} ], - "documentation":"Creates a stream key, used to initiate a stream, for a specified channel ARN.
Note that CreateChannel creates a stream key. If you subsequently use CreateStreamKey on the same channel, it will fail because a stream key already exists and there is a limit of 1 stream key per channel. To reset the stream key on a channel, use DeleteStreamKey and then CreateStreamKey.
" + "documentation":"Creates a stream key, used to initiate a stream, for the specified channel ARN.
Note that CreateChannel creates a stream key. If you subsequently use CreateStreamKey on the same channel, it will fail because a stream key already exists and there is a limit of 1 stream key per channel. To reset the stream key on a channel, use DeleteStreamKey and then CreateStreamKey.
" }, "DeleteChannel":{ "name":"DeleteChannel", @@ -74,9 +76,10 @@ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"}, {"shape":"ResourceNotFoundException"}, - {"shape":"ConflictException"} + {"shape":"ConflictException"}, + {"shape":"PendingVerification"} ], - "documentation":"Deletes a specified channel and its associated stream keys.
" + "documentation":"Deletes the specified channel and its associated stream keys.
" }, "DeleteStreamKey":{ "name":"DeleteStreamKey", @@ -88,9 +91,10 @@ "errors":[ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"}, - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"PendingVerification"} ], - "documentation":"Deletes the stream key for a specified ARN, so it can no longer be used to stream.
" + "documentation":"Deletes the stream key for the specified ARN, so it can no longer be used to stream.
" }, "GetChannel":{ "name":"GetChannel", @@ -105,7 +109,7 @@ {"shape":"AccessDeniedException"}, {"shape":"ResourceNotFoundException"} ], - "documentation":"Gets the channel configuration for a specified channel ARN. See also BatchGetChannel.
" + "documentation":"Gets the channel configuration for the specified channel ARN. See also BatchGetChannel.
" }, "GetStream":{ "name":"GetStream", @@ -150,7 +154,7 @@ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"} ], - "documentation":"Gets summary information about channels. This list can be filtered to match a specified string.
" + "documentation":"Gets summary information about all channels in your account, in the AWS region where the API request is processed. This list can be filtered to match a specified string.
" }, "ListStreamKeys":{ "name":"ListStreamKeys", @@ -165,7 +169,7 @@ {"shape":"AccessDeniedException"}, {"shape":"ResourceNotFoundException"} ], - "documentation":"Gets summary information about stream keys. The list can be filtered to a particular channel.
" + "documentation":"Gets summary information about stream keys for the specified channel.
" }, "ListStreams":{ "name":"ListStreams", @@ -178,7 +182,7 @@ "errors":[ {"shape":"AccessDeniedException"} ], - "documentation":"Gets summary information about live streams.
" + "documentation":"Gets summary information about live streams in your account, in the AWS region where the API request is processed.
" }, "ListTagsForResource":{ "name":"ListTagsForResource", @@ -193,7 +197,7 @@ {"shape":"ValidationException"}, {"shape":"ResourceNotFoundException"} ], - "documentation":"Gets information about the tags for a specified ARN.
" + "documentation":"Gets information about AWS tags for the specified ARN.
" }, "PutMetadata":{ "name":"PutMetadata", @@ -209,7 +213,7 @@ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"} ], - "documentation":"Inserts metadata into an RTMP stream for a specified channel. A maximum of 5 requests per second per channel is allowed, each with a maximum 1KB payload.
" + "documentation":"Inserts metadata into an RTMPS stream for the specified channel. A maximum of 5 requests per second per channel is allowed, each with a maximum 1KB payload.
" }, "StopStream":{ "name":"StopStream", @@ -226,7 +230,7 @@ {"shape":"AccessDeniedException"}, {"shape":"StreamUnavailable"} ], - "documentation":"Disconnects the stream for the specified channel. This disconnects the incoming RTMP stream from the client. Can be used in conjunction with DeleteStreamKey to prevent further streaming to a channel.
" + "documentation":" Many streaming client-software libraries automatically reconnect a dropped RTMP session, so to stop the stream permanently, you may want to first revoke the
streamKey
attached to the channel.Disconnects the incoming RTMPS stream for the specified channel. Can be used in conjunction with DeleteStreamKey to prevent further streaming to a channel.
" }, "TagResource":{ "name":"TagResource", @@ -241,7 +245,7 @@ {"shape":"ValidationException"}, {"shape":"ResourceNotFoundException"} ], - "documentation":" Many streaming client-software libraries automatically reconnect a dropped RTMPS session, so to stop the stream permanently, you may want to first revoke the
streamKey
attached to the channel.Adds or updates tags for a resource with a specified ARN.
" + "documentation":"Adds or updates tags for the AWS resource with the specified ARN.
" }, "UntagResource":{ "name":"UntagResource", @@ -256,7 +260,7 @@ {"shape":"ValidationException"}, {"shape":"ResourceNotFoundException"} ], - "documentation":"Removes tags for a resource with a specified ARN.
" + "documentation":"Removes tags from the resource with the specified ARN.
" }, "UpdateChannel":{ "name":"UpdateChannel", @@ -270,7 +274,8 @@ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"}, {"shape":"ResourceNotFoundException"}, - {"shape":"ConflictException"} + {"shape":"ConflictException"}, + {"shape":"PendingVerification"} ], "documentation":"Updates a channel's configuration. This does not affect an ongoing stream of this channel. You must stop and restart the stream for the changes to take effect.
" } @@ -363,7 +368,7 @@ }, "type":{ "shape":"ChannelType", - "documentation":"Channel type, which determines the allowable resolution and bitrate. STANDARD: The stream is transcoded; resolution (width, in landscape orientation) can be up to 1080p or the input source resolution, whichever is lower; and bitrate can be up to 8.5 Mbps. BASIC: The stream is transfixed; resolution can be up to 480p; and bitrate can be up to 1.5 Mbps. Default STANDARD.
" + "documentation":"Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable resolution or bitrate, the stream probably will disconnect immediately. Valid values:
STANDARD
: Multiple qualities are generated from the original input, to automatically give viewers the best experience for their devices and network conditions. Vertical resolution can be up to 1080 and bitrate can be up to 8.5 Mbps.
BASIC
: Amazon IVS delivers the original input to viewers. The viewer’s video-quality choice is limited to the original input. Vertical resolution can be up to 480 and bitrate can be up to 1.5 Mbps.Default:
" }, "ingestEndpoint":{ "shape":"IngestEndpoint", @@ -477,7 +482,7 @@ }, "type":{ "shape":"ChannelType", - "documentation":"STANDARD
.Channel type, which determines the allowable resolution and bitrate.
" + "documentation":"STANDARD
: The stream is transcoded; resolution (width, in landscape orientation) can be up to 1080p or the input source resolution, whichever is lower; and bitrate can be up to 8.5 Mbps.BASIC
: The stream is transfixed; resolution can be up to 480p; and bitrate can be up to 1.5 Mbps. Default:STANDARD
.Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable resolution or bitrate, the stream probably will disconnect immediately. Valid values:
STANDARD
: Multiple qualities are generated from the original input, to automatically give viewers the best experience for their devices and network conditions. Vertical resolution can be up to 1080 and bitrate can be up to 8.5 Mbps.
BASIC
: Amazon IVS delivers the original input to viewers. The viewer’s video-quality choice is limited to the original input. Vertical resolution can be up to 480 and bitrate can be up to 1.5 Mbps.Default:
" }, "tags":{ "shape":"Tags", @@ -511,7 +516,7 @@ "members":{ "streamKey":{ "shape":"StreamKey", - "documentation":"STANDARD
.Stream key used to authenticate an RTMP stream for ingestion.
" + "documentation":"Stream key used to authenticate an RTMPS stream for ingestion.
" } } }, @@ -741,6 +746,17 @@ "max":500, "min":0 }, + "PendingVerification":{ + "type":"structure", + "members":{ + "exceptionMessage":{ + "shape":"errorMessage", + "documentation":"Your account is pending verification.
" + } + }, + "error":{"httpStatusCode":403}, + "exception":true + }, "PlaybackURL":{"type":"string"}, "PutMetadataRequest":{ "type":"structure", @@ -1054,7 +1070,7 @@ }, "type":{ "shape":"ChannelType", - "documentation":"Channel type, which determines the allowable resolution and bitrate.
" + "documentation":"STANDARD
: The stream is transcoded; resolution (width, in landscape orientation) can be up to 1080p or the input source resolution, whichever is lower; and bitrate can be up to 8.5 Mbps.BASIC
: The stream is transfixed; resolution can be up to 480p; and bitrate can be up to 1.5 Mbps. DefaultSTANDARD
.Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable resolution or bitrate, the stream probably will disconnect immediately. Valid values:
STANDARD
: Multiple qualities are generated from the original input, to automatically give viewers the best experience for their devices and network conditions. Vertical resolution can be up to 1080 and bitrate can be up to 8.5 Mbps.
BASIC
: Amazon IVS delivers the original input to viewers. The viewer’s video-quality choice is limited to the original input. Vertical resolution can be up to 480 and bitrate can be up to 1.5 Mbps.Default:
" } } }, @@ -1078,5 +1094,5 @@ "errorCode":{"type":"string"}, "errorMessage":{"type":"string"} }, - "documentation":"STANDARD
.Introduction
The Amazon Interactive Video Service (IVS) API is REST compatible, using a standard HTTP API and an AWS SNS event stream for responses. JSON is used for both requests and responses, including errors.
The API is an AWS regional service, currently in these regions: us-west-2, us-east-2, and eu-west-1.
All API request parameters and URLs are case sensitive.
For a summary of notable documentation changes in each release, see Document History.
Allowed Header Values
Accept:
application/json
Accept-Encoding:
gzip, deflate
Content-Type:
application/jsonResources
The following resources contain information about your IVS live stream (see Getting Started with Amazon IVS):
Channel — Stores configuration data related to your live stream. You first create a channel and then use the channel’s stream key to start your live stream. See the Channel endpoints for more information.
Stream key — An identifier assigned by Amazon IVS when you create a channel, which is then used to authorize streaming. See the StreamKey endpoints for more information. Treat the stream key like a secret, since it allows anyone to stream to the channel.
Tagging
A tag is a metadata label that you assign to an AWS resource. A tag comprises a key and a value, both set by you. For example, you might set a tag as
topic:nature
to label a particular video category. See Tagging AWS Resources for more information, including restrictions that apply to tags.Tags can help you identify and organize your AWS resources. For example, you can use the same tag for different resources to indicate that they are related. You can also use tags to manage access (see Access Tags).
The Amazon IVS API has these tag-related endpoints: TagResource, UntagResource, and ListTagsForResource. The following resources support tagging: Channels and Stream Keys.
API Endpoints
CreateChannel — Creates a new channel and an associated stream key to start streaming.
GetChannel — Gets the channel configuration for a specified channel ARN (Amazon Resource Name).
BatchGetChannel — Performs GetChannel on multiple ARNs simultaneously.
ListChannels — Gets summary information about channels. This list can be filtered to match a specified string.
UpdateChannel — Updates a channel's configuration. This does not affect an ongoing stream of this channel. You must stop and restart the stream for the changes to take effect.
DeleteChannel — Deletes a specified channel.
CreateStreamKey — Creates a stream key, used to initiate a stream, for a specified channel ARN.
GetStreamKey — Gets stream key information for the specified ARN.
BatchGetStreamKey — Performs GetStreamKey on multiple ARNs simultaneously.
ListStreamKeys — Gets a list of stream keys. The list can be filtered to a particular channel.
DeleteStreamKey — Deletes the stream key for a specified ARN, so it can no longer be used to stream.
GetStream — Gets information about the active (live) stream on a specified channel.
ListStreams — Gets summary information about live streams.
StopStream — Disconnects a streamer on a specified channel. This disconnects the incoming RTMP stream from the client. Can be used in conjunction with DeleteStreamKey to prevent further streaming to a channel.
PutMetadata Inserts metadata into an RTMP stream for a specified channel. A maximum of 5 requests per second per channel is allowed, each with a maximum 1KB payload.
" + "documentation":"
TagResource — Adds or updates tags for an AWS resource with a specified ARN.
UntagResource — Removes tags from a resource with a specified ARN.
ListTagsForResource — Gets information about AWS tags for a specified ARN.
Introduction
The Amazon Interactive Video Service (IVS) API is REST compatible, using a standard HTTP API and an AWS SNS event stream for responses. JSON is used for both requests and responses, including errors.
The API is an AWS regional service, currently in these regions: us-west-2, us-east-1, and eu-west-1.
All API request parameters and URLs are case sensitive.
For a summary of notable documentation changes in each release, see Document History.
Service Endpoints
The following are the Amazon IVS service endpoints (all HTTPS):
Region name: US West (Oregon)
Region:
us-west-2
Endpoint:
ivs.us-west-2.amazonaws.com
Region name: US East (Virginia)
Region:
us-east-1
Endpoint:
ivs.us-east-1.amazonaws.com
Region name: EU West (Dublin)
Region:
eu-west-1
Endpoint:
ivs.eu-west-1.amazonaws.com
Allowed Header Values
Accept:
application/json
Accept-Encoding:
gzip, deflate
Content-Type:
application/jsonResources
The following resources contain information about your IVS live stream (see Getting Started with Amazon IVS):
Channel — Stores configuration data related to your live stream. You first create a channel and then use the channel’s stream key to start your live stream. See the Channel endpoints for more information.
Stream key — An identifier assigned by Amazon IVS when you create a channel, which is then used to authorize streaming. See the StreamKey endpoints for more information. Treat the stream key like a secret, since it allows anyone to stream to the channel.
Tagging
A tag is a metadata label that you assign to an AWS resource. A tag comprises a key and a value, both set by you. For example, you might set a tag as
topic:nature
to label a particular video category. See Tagging AWS Resources for more information, including restrictions that apply to tags.Tags can help you identify and organize your AWS resources. For example, you can use the same tag for different resources to indicate that they are related. You can also use tags to manage access (see Access Tags).
The Amazon IVS API has these tag-related endpoints: TagResource, UntagResource, and ListTagsForResource. The following resources support tagging: Channels and Stream Keys.
API Endpoints
CreateChannel — Creates a new channel and an associated stream key to start streaming.
GetChannel — Gets the channel configuration for the specified channel ARN (Amazon Resource Name).
BatchGetChannel — Performs GetChannel on multiple ARNs simultaneously.
ListChannels — Gets summary information about all channels in your account, in the AWS region where the API request is processed. This list can be filtered to match a specified string.
UpdateChannel — Updates a channel's configuration. This does not affect an ongoing stream of this channel. You must stop and restart the stream for the changes to take effect.
DeleteChannel — Deletes the specified channel.
CreateStreamKey — Creates a stream key, used to initiate a stream, for the specified channel ARN.
GetStreamKey — Gets stream key information for the specified ARN.
BatchGetStreamKey — Performs GetStreamKey on multiple ARNs simultaneously.
ListStreamKeys — Gets summary information about stream keys for the specified channel.
DeleteStreamKey — Deletes the stream key for the specified ARN, so it can no longer be used to stream.
GetStream — Gets information about the active (live) stream on a specified channel.
ListStreams — Gets summary information about live streams in your account, in the AWS region where the API request is processed.
StopStream — Disconnects the incoming RTMPS stream for the specified channel. Can be used in conjunction with DeleteStreamKey to prevent further streaming to a channel.
PutMetadata — Inserts metadata into an RTMPS stream for the specified channel. A maximum of 5 requests per second per channel is allowed, each with a maximum 1KB payload.
" } diff --git a/services/kafka/pom.xml b/services/kafka/pom.xml index c4708c3a1839..1fc2889d0157 100644 --- a/services/kafka/pom.xml +++ b/services/kafka/pom.xml @@ -21,7 +21,7 @@
TagResource — Adds or updates tags for the AWS resource with the specified ARN.
UntagResource — Removes tags from the resource with the specified ARN.
ListTagsForResource — Gets information about AWS tags for the specified ARN.
software.amazon.awssdk services -2.13.62 +2.13.63 kafka AWS Java SDK :: Services :: Kafka diff --git a/services/kendra/pom.xml b/services/kendra/pom.xml index 70381d426f4a..feb8fa8a5a8c 100644 --- a/services/kendra/pom.xml +++ b/services/kendra/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kendra AWS Java SDK :: Services :: Kendra diff --git a/services/kinesis/pom.xml b/services/kinesis/pom.xml index d4ab1c56decd..0031fb96c4ec 100644 --- a/services/kinesis/pom.xml +++ b/services/kinesis/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kinesis AWS Java SDK :: Services :: Amazon Kinesis diff --git a/services/kinesisanalytics/pom.xml b/services/kinesisanalytics/pom.xml index 34a3bc8f650b..999049e99dfb 100644 --- a/services/kinesisanalytics/pom.xml +++ b/services/kinesisanalytics/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kinesisanalytics AWS Java SDK :: Services :: Amazon Kinesis Analytics diff --git a/services/kinesisanalyticsv2/pom.xml b/services/kinesisanalyticsv2/pom.xml index 5c1b65694b21..611f48741abc 100644 --- a/services/kinesisanalyticsv2/pom.xml +++ b/services/kinesisanalyticsv2/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kinesisanalyticsv2 AWS Java SDK :: Services :: Kinesis Analytics V2 diff --git a/services/kinesisvideo/pom.xml b/services/kinesisvideo/pom.xml index 16831464913b..33d8d1caa1fa 100644 --- a/services/kinesisvideo/pom.xml +++ b/services/kinesisvideo/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 kinesisvideo diff --git a/services/kinesisvideoarchivedmedia/pom.xml b/services/kinesisvideoarchivedmedia/pom.xml index 6d18873a502d..09485f5ec54d 100644 --- a/services/kinesisvideoarchivedmedia/pom.xml +++ b/services/kinesisvideoarchivedmedia/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kinesisvideoarchivedmedia AWS Java SDK :: Services :: Kinesis Video Archived Media diff --git a/services/kinesisvideomedia/pom.xml b/services/kinesisvideomedia/pom.xml index 4135c273317c..64a7590adb4d 100644 --- a/services/kinesisvideomedia/pom.xml +++ b/services/kinesisvideomedia/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kinesisvideomedia AWS Java SDK :: Services :: Kinesis Video Media diff --git a/services/kinesisvideosignaling/pom.xml b/services/kinesisvideosignaling/pom.xml index be840853560a..757499240109 100644 --- a/services/kinesisvideosignaling/pom.xml +++ b/services/kinesisvideosignaling/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kinesisvideosignaling AWS Java SDK :: Services :: Kinesis Video Signaling diff --git a/services/kms/pom.xml b/services/kms/pom.xml index 91394701bbfc..301178435a8a 100644 --- a/services/kms/pom.xml +++ b/services/kms/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 kms AWS Java SDK :: Services :: AWS KMS diff --git a/services/lakeformation/pom.xml b/services/lakeformation/pom.xml index 26b15e39e0a7..0c7c3f298a44 100644 --- a/services/lakeformation/pom.xml +++ b/services/lakeformation/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 lakeformation AWS Java SDK :: Services :: LakeFormation diff --git a/services/lambda/pom.xml b/services/lambda/pom.xml index e514132418b0..517115b99bac 100644 --- a/services/lambda/pom.xml +++ b/services/lambda/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 lambda AWS Java SDK :: Services :: AWS Lambda diff --git a/services/lexmodelbuilding/pom.xml b/services/lexmodelbuilding/pom.xml index 4838131881d7..508663c81746 100644 --- a/services/lexmodelbuilding/pom.xml +++ b/services/lexmodelbuilding/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 lexmodelbuilding AWS Java SDK :: Services :: Amazon Lex Model Building diff --git a/services/lexruntime/pom.xml b/services/lexruntime/pom.xml index 1943a3215f65..c6f950808f01 100644 --- a/services/lexruntime/pom.xml +++ b/services/lexruntime/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 lexruntime AWS Java SDK :: Services :: Amazon Lex Runtime diff --git a/services/licensemanager/pom.xml b/services/licensemanager/pom.xml index 170074bd8de8..f3dc0942de09 100644 --- a/services/licensemanager/pom.xml +++ b/services/licensemanager/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 licensemanager AWS Java SDK :: Services :: License Manager diff --git a/services/lightsail/pom.xml b/services/lightsail/pom.xml index 310daeec003c..fd8fbb690b72 100644 --- a/services/lightsail/pom.xml +++ b/services/lightsail/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 lightsail AWS Java SDK :: Services :: Amazon Lightsail diff --git a/services/machinelearning/pom.xml b/services/machinelearning/pom.xml index 9ddd90e2b6c0..874e1418679f 100644 --- a/services/machinelearning/pom.xml +++ b/services/machinelearning/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 machinelearning AWS Java SDK :: Services :: Amazon Machine Learning diff --git a/services/macie/pom.xml b/services/macie/pom.xml index 49a9bba7477d..cb9591c68c18 100644 --- a/services/macie/pom.xml +++ b/services/macie/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 macie AWS Java SDK :: Services :: Macie diff --git a/services/macie2/pom.xml b/services/macie2/pom.xml index 7929b22fe754..6ed70fcd8bd0 100644 --- a/services/macie2/pom.xml +++ b/services/macie2/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 macie2 AWS Java SDK :: Services :: Macie2 diff --git a/services/managedblockchain/pom.xml b/services/managedblockchain/pom.xml index fd8dadf59a0b..c4e9789f98a1 100644 --- a/services/managedblockchain/pom.xml +++ b/services/managedblockchain/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 managedblockchain AWS Java SDK :: Services :: ManagedBlockchain diff --git a/services/marketplacecatalog/pom.xml b/services/marketplacecatalog/pom.xml index 14dca8eb3139..9eb9f35333d8 100644 --- a/services/marketplacecatalog/pom.xml +++ b/services/marketplacecatalog/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 marketplacecatalog AWS Java SDK :: Services :: Marketplace Catalog diff --git a/services/marketplacecommerceanalytics/pom.xml b/services/marketplacecommerceanalytics/pom.xml index 7efa6b595fb8..cde72acf1c17 100644 --- a/services/marketplacecommerceanalytics/pom.xml +++ b/services/marketplacecommerceanalytics/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 marketplacecommerceanalytics AWS Java SDK :: Services :: AWS Marketplace Commerce Analytics diff --git a/services/marketplaceentitlement/pom.xml b/services/marketplaceentitlement/pom.xml index 7d0e9f84118f..b05e92a27257 100644 --- a/services/marketplaceentitlement/pom.xml +++ b/services/marketplaceentitlement/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 marketplaceentitlement AWS Java SDK :: Services :: AWS Marketplace Entitlement diff --git a/services/marketplacemetering/pom.xml b/services/marketplacemetering/pom.xml index 65d599eba600..aecda1268702 100644 --- a/services/marketplacemetering/pom.xml +++ b/services/marketplacemetering/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 marketplacemetering AWS Java SDK :: Services :: AWS Marketplace Metering Service diff --git a/services/mediaconnect/pom.xml b/services/mediaconnect/pom.xml index 86b1f6ef3c5e..dea573dd3037 100644 --- a/services/mediaconnect/pom.xml +++ b/services/mediaconnect/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 mediaconnect AWS Java SDK :: Services :: MediaConnect diff --git a/services/mediaconvert/pom.xml b/services/mediaconvert/pom.xml index d7a1ba61979e..0ff2143f3df4 100644 --- a/services/mediaconvert/pom.xml +++ b/services/mediaconvert/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 mediaconvert diff --git a/services/medialive/pom.xml b/services/medialive/pom.xml index 9fd1c19bdfed..54db103ff961 100644 --- a/services/medialive/pom.xml +++ b/services/medialive/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 medialive diff --git a/services/medialive/src/main/resources/codegen-resources/service-2.json b/services/medialive/src/main/resources/codegen-resources/service-2.json index 33d380b04945..d4baf15b85e1 100644 --- a/services/medialive/src/main/resources/codegen-resources/service-2.json +++ b/services/medialive/src/main/resources/codegen-resources/service-2.json @@ -3242,6 +3242,10 @@ "shape": "DvbSubDestinationSettings", "locationName": "dvbSubDestinationSettings" }, + "EbuTtDDestinationSettings": { + "shape": "EbuTtDDestinationSettings", + "locationName": "ebuTtDDestinationSettings" + }, "EmbeddedDestinationSettings": { "shape": "EmbeddedDestinationSettings", "locationName": "embeddedDestinationSettings" @@ -5688,6 +5692,43 @@ "NOT_INDICATED" ] }, + "EbuTtDDestinationSettings": { + "type": "structure", + "members": { + "FillLineGap": { + "shape": "EbuTtDFillLineGapControl", + "locationName": "fillLineGap", + "documentation": "Specifies how to handle the gap between the lines (in multi-line captions).\n\n- enabled: Fill with the captions background color (as specified in the input captions).\n- disabled: Leave the gap unfilled." + }, + "FontFamily": { + "shape": "__string", + "locationName": "fontFamily", + "documentation": "Specifies the font family to include in the font data attached to the EBU-TT captions. Valid only if styleControl is set to include. If you leave this field empty, the font family is set to \"monospaced\". (If styleControl is set to exclude, the font family is always set to \"monospaced\".)\n\nYou specify only the font family. All other style information (color, bold, position and so on) is copied from the input captions. The size is always set to 100% to allow the downstream player to choose the size.\n\n- Enter a list of font families, as a comma-separated list of font names, in order of preference. The name can be a font family (such as “Arial”), or a generic font family (such as “serif”), or “default” (to let the downstream player choose the font).\n- Leave blank to set the family to “monospace”." + }, + "StyleControl": { + "shape": "EbuTtDDestinationStyleControl", + "locationName": "styleControl", + "documentation": "Specifies the style information (font color, font position, and so on) to include in the font data that is attached to the EBU-TT captions.\n\n- include: Take the style information (font color, font position, and so on) from the source captions and include that information in the font data attached to the EBU-TT captions. This option is valid only if the source captions are Embedded or Teletext.\n- exclude: In the font data attached to the EBU-TT captions, set the font family to \"monospaced\". Do not include any other style information." + } + }, + "documentation": "Ebu Tt DDestination Settings" + }, + "EbuTtDDestinationStyleControl": { + "type": "string", + "documentation": "Ebu Tt DDestination Style Control", + "enum": [ + "EXCLUDE", + "INCLUDE" + ] + }, + "EbuTtDFillLineGapControl": { + "type": "string", + "documentation": "Ebu Tt DFill Line Gap Control", + "enum": [ + "DISABLED", + "ENABLED" + ] + }, "EmbeddedConvert608To708": { "type": "string", "documentation": "Embedded Convert608 To708", @@ -6584,6 +6625,16 @@ }, "documentation": "H265 Color Space Settings" }, + "H265FilterSettings": { + "type": "structure", + "members": { + "TemporalFilterSettings": { + "shape": "TemporalFilterSettings", + "locationName": "temporalFilterSettings" + } + }, + "documentation": "H265 Filter Settings" + }, "H265FlickerAq": { "type": "string", "documentation": "H265 Flicker Aq", @@ -6650,6 +6701,7 @@ "type": "string", "documentation": "H265 Scan Type", "enum": [ + "INTERLACED", "PROGRESSIVE" ] }, @@ -6699,6 +6751,11 @@ "locationName": "colorSpaceSettings", "documentation": "Color Space settings" }, + "FilterSettings": { + "shape": "H265FilterSettings", + "locationName": "filterSettings", + "documentation": "Optional filters that you can apply to an encode." + }, "FixedAfd": { "shape": "FixedAfd", "locationName": "fixedAfd", @@ -7338,7 +7395,8 @@ "documentation": "Hls Output Selection", "enum": [ "MANIFESTS_AND_SEGMENTS", - "SEGMENTS_ONLY" + "SEGMENTS_ONLY", + "VARIANT_MANIFESTS_AND_SEGMENTS" ] }, "HlsOutputSettings": { @@ -13820,4 +13878,4 @@ } }, "documentation": "API for AWS Elemental MediaLive" -} \ No newline at end of file +} diff --git a/services/mediapackage/pom.xml b/services/mediapackage/pom.xml index 3ac7be538f0d..d7c808c62791 100644 --- a/services/mediapackage/pom.xml +++ b/services/mediapackage/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 mediapackage diff --git a/services/mediapackagevod/pom.xml b/services/mediapackagevod/pom.xml index 9f076883bc8a..4347db114511 100644 --- a/services/mediapackagevod/pom.xml +++ b/services/mediapackagevod/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 mediapackagevod AWS Java SDK :: Services :: MediaPackage Vod diff --git a/services/mediastore/pom.xml b/services/mediastore/pom.xml index 243107a46305..c8907682cc40 100644 --- a/services/mediastore/pom.xml +++ b/services/mediastore/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 mediastore diff --git a/services/mediastoredata/pom.xml b/services/mediastoredata/pom.xml index 1c240f1be4ac..68339caa7154 100644 --- a/services/mediastoredata/pom.xml +++ b/services/mediastoredata/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 mediastoredata diff --git a/services/mediatailor/pom.xml b/services/mediatailor/pom.xml index 3aca693f0ad0..fab2dd161291 100644 --- a/services/mediatailor/pom.xml +++ b/services/mediatailor/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 mediatailor AWS Java SDK :: Services :: MediaTailor diff --git a/services/migrationhub/pom.xml b/services/migrationhub/pom.xml index 9d0dbfaf6103..b9c5514d5a83 100644 --- a/services/migrationhub/pom.xml +++ b/services/migrationhub/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 migrationhub diff --git a/services/migrationhubconfig/pom.xml b/services/migrationhubconfig/pom.xml index c048545dd930..7039bb7ed247 100644 --- a/services/migrationhubconfig/pom.xml +++ b/services/migrationhubconfig/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 migrationhubconfig AWS Java SDK :: Services :: MigrationHub Config diff --git a/services/mobile/pom.xml b/services/mobile/pom.xml index 8e9159e0b4c5..13336208a030 100644 --- a/services/mobile/pom.xml +++ b/services/mobile/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 mobile diff --git a/services/mq/pom.xml b/services/mq/pom.xml index a37013254470..05ce1dc9086b 100644 --- a/services/mq/pom.xml +++ b/services/mq/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 mq diff --git a/services/mturk/pom.xml b/services/mturk/pom.xml index 6782281f5bf2..e3e0a1e1ed85 100644 --- a/services/mturk/pom.xml +++ b/services/mturk/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 mturk AWS Java SDK :: Services :: Amazon Mechanical Turk Requester diff --git a/services/neptune/pom.xml b/services/neptune/pom.xml index 577e757af0d3..700abe952dcc 100644 --- a/services/neptune/pom.xml +++ b/services/neptune/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 neptune AWS Java SDK :: Services :: Neptune diff --git a/services/networkmanager/pom.xml b/services/networkmanager/pom.xml index 16a5d6ba0e5e..427a8be14e23 100644 --- a/services/networkmanager/pom.xml +++ b/services/networkmanager/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 networkmanager AWS Java SDK :: Services :: NetworkManager diff --git a/services/opsworks/pom.xml b/services/opsworks/pom.xml index b84ddd652f94..e2a07bb40ac3 100644 --- a/services/opsworks/pom.xml +++ b/services/opsworks/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 opsworks AWS Java SDK :: Services :: AWS OpsWorks diff --git a/services/opsworkscm/pom.xml b/services/opsworkscm/pom.xml index c2543954d156..daa5285b34f4 100644 --- a/services/opsworkscm/pom.xml +++ b/services/opsworkscm/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 opsworkscm AWS Java SDK :: Services :: AWS OpsWorks for Chef Automate diff --git a/services/organizations/pom.xml b/services/organizations/pom.xml index 878ea03ac288..66a8e045ef45 100644 --- a/services/organizations/pom.xml +++ b/services/organizations/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 organizations AWS Java SDK :: Services :: AWS Organizations diff --git a/services/outposts/pom.xml b/services/outposts/pom.xml index 2c0f5c105f5f..eb82c5e2ec48 100644 --- a/services/outposts/pom.xml +++ b/services/outposts/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 outposts AWS Java SDK :: Services :: Outposts diff --git a/services/personalize/pom.xml b/services/personalize/pom.xml index 38f3b663127f..424a799cea0b 100644 --- a/services/personalize/pom.xml +++ b/services/personalize/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 personalize AWS Java SDK :: Services :: Personalize diff --git a/services/personalizeevents/pom.xml b/services/personalizeevents/pom.xml index 652d918cdcba..5621ad06a0bb 100644 --- a/services/personalizeevents/pom.xml +++ b/services/personalizeevents/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 personalizeevents AWS Java SDK :: Services :: Personalize Events diff --git a/services/personalizeruntime/pom.xml b/services/personalizeruntime/pom.xml index a6b3cb5d1e25..0e526bc76a0b 100644 --- a/services/personalizeruntime/pom.xml +++ b/services/personalizeruntime/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 personalizeruntime AWS Java SDK :: Services :: Personalize Runtime diff --git a/services/pi/pom.xml b/services/pi/pom.xml index 46d33616e94a..f12ae8344df7 100644 --- a/services/pi/pom.xml +++ b/services/pi/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 pi AWS Java SDK :: Services :: PI diff --git a/services/pinpoint/pom.xml b/services/pinpoint/pom.xml index cfc65722e8f6..8b75bfa9b2cd 100644 --- a/services/pinpoint/pom.xml +++ b/services/pinpoint/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 pinpoint AWS Java SDK :: Services :: Amazon Pinpoint diff --git a/services/pinpointemail/pom.xml b/services/pinpointemail/pom.xml index 330cb516d28c..457a23cf1b29 100644 --- a/services/pinpointemail/pom.xml +++ b/services/pinpointemail/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 pinpointemail AWS Java SDK :: Services :: Pinpoint Email diff --git a/services/pinpointsmsvoice/pom.xml b/services/pinpointsmsvoice/pom.xml index e9a562d50b5d..6ec5b7f13c92 100644 --- a/services/pinpointsmsvoice/pom.xml +++ b/services/pinpointsmsvoice/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 pinpointsmsvoice AWS Java SDK :: Services :: Pinpoint SMS Voice diff --git a/services/polly/pom.xml b/services/polly/pom.xml index 9ffaab91ac15..1f4511ca2d58 100644 --- a/services/polly/pom.xml +++ b/services/polly/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 polly AWS Java SDK :: Services :: Amazon Polly diff --git a/services/pom.xml b/services/pom.xml index f3c172f3fb3a..8d7d29ab66ae 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -17,7 +17,7 @@software.amazon.awssdk aws-sdk-java-pom -2.13.62 +2.13.63 services AWS Java SDK :: Services diff --git a/services/pricing/pom.xml b/services/pricing/pom.xml index 2b52af77c664..e7c5a3f809f5 100644 --- a/services/pricing/pom.xml +++ b/services/pricing/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 pricing diff --git a/services/qldb/pom.xml b/services/qldb/pom.xml index 618d7a67706e..8f94e0269305 100644 --- a/services/qldb/pom.xml +++ b/services/qldb/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 qldb AWS Java SDK :: Services :: QLDB diff --git a/services/qldbsession/pom.xml b/services/qldbsession/pom.xml index 2dea4a0b6990..d2526fdb6ae3 100644 --- a/services/qldbsession/pom.xml +++ b/services/qldbsession/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 qldbsession AWS Java SDK :: Services :: QLDB Session diff --git a/services/quicksight/pom.xml b/services/quicksight/pom.xml index 22dd33d2bc2f..0ee4194aef76 100644 --- a/services/quicksight/pom.xml +++ b/services/quicksight/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 quicksight AWS Java SDK :: Services :: QuickSight diff --git a/services/ram/pom.xml b/services/ram/pom.xml index 478c6070a00b..e74141595871 100644 --- a/services/ram/pom.xml +++ b/services/ram/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ram AWS Java SDK :: Services :: RAM diff --git a/services/rds/pom.xml b/services/rds/pom.xml index ac9bac433af9..bc284b6fc4ac 100644 --- a/services/rds/pom.xml +++ b/services/rds/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 rds AWS Java SDK :: Services :: Amazon RDS diff --git a/services/rds/src/main/resources/codegen-resources/service-2.json b/services/rds/src/main/resources/codegen-resources/service-2.json index d652dca11637..1518a7873f77 100755 --- a/services/rds/src/main/resources/codegen-resources/service-2.json +++ b/services/rds/src/main/resources/codegen-resources/service-2.json @@ -2433,7 +2433,7 @@ "documentation":"The maximum allowed value for the quota.
" } }, - "documentation":"Describes a quota for an AWS account.
The following are account quotas:
AllocatedStorage
- The total allocated storage per account, in GiB. The used value is the total allocated storage in the account, in GiB.
AuthorizationsPerDBSecurityGroup
- The number of ingress rules per DB security group. The used value is the highest number of ingress rules in a DB security group in the account. Other DB security groups in the account might have a lower number of ingress rules.
CustomEndpointsPerDBCluster
- The number of custom endpoints per DB cluster. The used value is the highest number of custom endpoints in a DB clusters in the account. Other DB clusters in the account might have a lower number of custom endpoints.
DBClusterParameterGroups
- The number of DB cluster parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB cluster parameter groups in the account.
DBClusterRoles
- The number of associated AWS Identity and Access Management (IAM) roles per DB cluster. The used value is the highest number of associated IAM roles for a DB cluster in the account. Other DB clusters in the account might have a lower number of associated IAM roles.
DBClusters
- The number of DB clusters per account. The used value is the count of DB clusters in the account.
DBInstanceRoles
- The number of associated IAM roles per DB instance. The used value is the highest number of associated IAM roles for a DB instance in the account. Other DB instances in the account might have a lower number of associated IAM roles.
DBInstances
- The number of DB instances per account. The used value is the count of the DB instances in the account.Amazon RDS DB instances, Amazon Aurora DB instances, Amazon Neptune instances, and Amazon DocumentDB instances apply to this quota.
DBParameterGroups
- The number of DB parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB parameter groups in the account.
DBSecurityGroups
- The number of DB security groups (not VPC security groups) per account, excluding the default security group. The used value is the count of nondefault DB security groups in the account.
DBSubnetGroups
- The number of DB subnet groups per account. The used value is the count of the DB subnet groups in the account.
EventSubscriptions
- The number of event subscriptions per account. The used value is the count of the event subscriptions in the account.
ManualSnapshots
- The number of manual DB snapshots per account. The used value is the count of the manual DB snapshots in the account.
OptionGroups
- The number of DB option groups per account, excluding default option groups. The used value is the count of nondefault DB option groups in the account.
ReadReplicasPerMaster
- The number of read replicas per DB instance. The used value is the highest number of read replicas for a DB instance in the account. Other DB instances in the account might have a lower number of read replicas.
ReservedDBInstances
- The number of reserved DB instances per account. The used value is the count of the active reserved DB instances in the account.
SubnetsPerDBSubnetGroup
- The number of subnets per DB subnet group. The used value is highest number of subnets for a DB subnet group in the account. Other DB subnet groups in the account might have a lower number of subnets.For more information, see Quotas for Amazon RDS in the Amazon RDS User Guide and Quotas for Amazon Aurora in the Amazon Aurora User Guide.
", + "documentation":"Describes a quota for an AWS account.
The following are account quotas:
AllocatedStorage
- The total allocated storage per account, in GiB. The used value is the total allocated storage in the account, in GiB.
AuthorizationsPerDBSecurityGroup
- The number of ingress rules per DB security group. The used value is the highest number of ingress rules in a DB security group in the account. Other DB security groups in the account might have a lower number of ingress rules.
CustomEndpointsPerDBCluster
- The number of custom endpoints per DB cluster. The used value is the highest number of custom endpoints in a DB clusters in the account. Other DB clusters in the account might have a lower number of custom endpoints.
DBClusterParameterGroups
- The number of DB cluster parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB cluster parameter groups in the account.
DBClusterRoles
- The number of associated AWS Identity and Access Management (IAM) roles per DB cluster. The used value is the highest number of associated IAM roles for a DB cluster in the account. Other DB clusters in the account might have a lower number of associated IAM roles.
DBClusters
- The number of DB clusters per account. The used value is the count of DB clusters in the account.
DBInstanceRoles
- The number of associated IAM roles per DB instance. The used value is the highest number of associated IAM roles for a DB instance in the account. Other DB instances in the account might have a lower number of associated IAM roles.
DBInstances
- The number of DB instances per account. The used value is the count of the DB instances in the account.Amazon RDS DB instances, Amazon Aurora DB instances, Amazon Neptune instances, and Amazon DocumentDB instances apply to this quota.
DBParameterGroups
- The number of DB parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB parameter groups in the account.
DBSecurityGroups
- The number of DB security groups (not VPC security groups) per account, excluding the default security group. The used value is the count of nondefault DB security groups in the account.
DBSubnetGroups
- The number of DB subnet groups per account. The used value is the count of the DB subnet groups in the account.
EventSubscriptions
- The number of event subscriptions per account. The used value is the count of the event subscriptions in the account.
ManualClusterSnapshots
- The number of manual DB cluster snapshots per account. The used value is the count of the manual DB cluster snapshots in the account.
ManualSnapshots
- The number of manual DB instance snapshots per account. The used value is the count of the manual DB instance snapshots in the account.
OptionGroups
- The number of DB option groups per account, excluding default option groups. The used value is the count of nondefault DB option groups in the account.
ReadReplicasPerMaster
- The number of read replicas per DB instance. The used value is the highest number of read replicas for a DB instance in the account. Other DB instances in the account might have a lower number of read replicas.
ReservedDBInstances
- The number of reserved DB instances per account. The used value is the count of the active reserved DB instances in the account.
SubnetsPerDBSubnetGroup
- The number of subnets per DB subnet group. The used value is highest number of subnets for a DB subnet group in the account. Other DB subnet groups in the account might have a lower number of subnets.For more information, see Quotas for Amazon RDS in the Amazon RDS User Guide and Quotas for Amazon Aurora in the Amazon Aurora User Guide.
", "wrapper":true }, "AccountQuotaList":{ diff --git a/services/rdsdata/pom.xml b/services/rdsdata/pom.xml index d98f77fc36c8..15247d2f091f 100644 --- a/services/rdsdata/pom.xml +++ b/services/rdsdata/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 rdsdata AWS Java SDK :: Services :: RDS Data diff --git a/services/redshift/pom.xml b/services/redshift/pom.xml index 4421616bbbe9..1ae1f5d35de0 100644 --- a/services/redshift/pom.xml +++ b/services/redshift/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 redshift AWS Java SDK :: Services :: Amazon Redshift diff --git a/services/rekognition/pom.xml b/services/rekognition/pom.xml index 15d90d1f807e..40922f1bca4c 100644 --- a/services/rekognition/pom.xml +++ b/services/rekognition/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 rekognition AWS Java SDK :: Services :: Amazon Rekognition diff --git a/services/resourcegroups/pom.xml b/services/resourcegroups/pom.xml index a4b47141129e..2992204c44b8 100644 --- a/services/resourcegroups/pom.xml +++ b/services/resourcegroups/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 resourcegroups diff --git a/services/resourcegroupstaggingapi/pom.xml b/services/resourcegroupstaggingapi/pom.xml index 1c49a81d501f..9d2247e385ef 100644 --- a/services/resourcegroupstaggingapi/pom.xml +++ b/services/resourcegroupstaggingapi/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 resourcegroupstaggingapi AWS Java SDK :: Services :: AWS Resource Groups Tagging API diff --git a/services/robomaker/pom.xml b/services/robomaker/pom.xml index c599e2ff2234..af56a59ab20a 100644 --- a/services/robomaker/pom.xml +++ b/services/robomaker/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 robomaker AWS Java SDK :: Services :: RoboMaker diff --git a/services/route53/pom.xml b/services/route53/pom.xml index 73b780bb7462..32594ddb924f 100644 --- a/services/route53/pom.xml +++ b/services/route53/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 route53 AWS Java SDK :: Services :: Amazon Route53 diff --git a/services/route53domains/pom.xml b/services/route53domains/pom.xml index 57e94122a2d5..bf250b233615 100644 --- a/services/route53domains/pom.xml +++ b/services/route53domains/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 route53domains AWS Java SDK :: Services :: Amazon Route53 Domains diff --git a/services/route53resolver/pom.xml b/services/route53resolver/pom.xml index 95e67ba1680d..19cc6251f82e 100644 --- a/services/route53resolver/pom.xml +++ b/services/route53resolver/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 route53resolver AWS Java SDK :: Services :: Route53Resolver diff --git a/services/s3/pom.xml b/services/s3/pom.xml index 0dc51528129c..aa0a7b7964b4 100644 --- a/services/s3/pom.xml +++ b/services/s3/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 s3 AWS Java SDK :: Services :: Amazon S3 diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml index 3e0f21aa39da..62f65662331a 100644 --- a/services/s3control/pom.xml +++ b/services/s3control/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 s3control AWS Java SDK :: Services :: Amazon S3 Control diff --git a/services/sagemaker/pom.xml b/services/sagemaker/pom.xml index 7bb88ac8944a..b712b9f4b13e 100644 --- a/services/sagemaker/pom.xml +++ b/services/sagemaker/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 sagemaker diff --git a/services/sagemakera2iruntime/pom.xml b/services/sagemakera2iruntime/pom.xml index 3775218e4c2e..e0f663ebdc86 100644 --- a/services/sagemakera2iruntime/pom.xml +++ b/services/sagemakera2iruntime/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sagemakera2iruntime AWS Java SDK :: Services :: SageMaker A2I Runtime diff --git a/services/sagemakerruntime/pom.xml b/services/sagemakerruntime/pom.xml index a6fb778a6df8..2cb96401f202 100644 --- a/services/sagemakerruntime/pom.xml +++ b/services/sagemakerruntime/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sagemakerruntime AWS Java SDK :: Services :: SageMaker Runtime diff --git a/services/savingsplans/pom.xml b/services/savingsplans/pom.xml index 051b3420a249..f5746b53f7c4 100644 --- a/services/savingsplans/pom.xml +++ b/services/savingsplans/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 savingsplans AWS Java SDK :: Services :: Savingsplans diff --git a/services/schemas/pom.xml b/services/schemas/pom.xml index 3b6eb3a35f2b..a301cdb7aaf5 100644 --- a/services/schemas/pom.xml +++ b/services/schemas/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 schemas AWS Java SDK :: Services :: Schemas diff --git a/services/secretsmanager/pom.xml b/services/secretsmanager/pom.xml index 5ab98e91f6df..cc66895fea59 100644 --- a/services/secretsmanager/pom.xml +++ b/services/secretsmanager/pom.xml @@ -22,7 +22,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 secretsmanager AWS Java SDK :: Services :: AWS Secrets Manager diff --git a/services/securityhub/pom.xml b/services/securityhub/pom.xml index 996f59d9f548..286da68e0b44 100644 --- a/services/securityhub/pom.xml +++ b/services/securityhub/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 securityhub AWS Java SDK :: Services :: SecurityHub diff --git a/services/securityhub/src/main/resources/codegen-resources/service-2.json b/services/securityhub/src/main/resources/codegen-resources/service-2.json index 73a22d75f4f0..bdc4d20dd696 100644 --- a/services/securityhub/src/main/resources/codegen-resources/service-2.json +++ b/services/securityhub/src/main/resources/codegen-resources/service-2.json @@ -684,6 +684,23 @@ ], "documentation":"Updates the Security Hub insight identified by the specified insight ARN.
" }, + "UpdateSecurityHubConfiguration":{ + "name":"UpdateSecurityHubConfiguration", + "http":{ + "method":"PATCH", + "requestUri":"/accounts" + }, + "input":{"shape":"UpdateSecurityHubConfigurationRequest"}, + "output":{"shape":"UpdateSecurityHubConfigurationResponse"}, + "errors":[ + {"shape":"InternalException"}, + {"shape":"InvalidInputException"}, + {"shape":"InvalidAccessException"}, + {"shape":"LimitExceededException"}, + {"shape":"ResourceNotFoundException"} + ], + "documentation":"Updates configuration options for Security Hub.
" + }, "UpdateStandardsControl":{ "name":"UpdateStandardsControl", "http":{ @@ -2515,7 +2532,7 @@ }, "WorkflowState":{ "shape":"StringFilterList", - "documentation":"The workflow state of a finding.
" + "documentation":"The workflow state of a finding.
Note that this field is deprecated. To search for a finding based on its workflow status, use
" }, "WorkflowStatus":{ "shape":"StringFilterList", @@ -3231,6 +3248,10 @@ "SubscribedAt":{ "shape":"NonEmptyString", "documentation":"WorkflowStatus
.The date and time when Security Hub was enabled in the account.
" + }, + "AutoEnableControls":{ + "shape":"Boolean", + "documentation":"Whether to automatically enable new controls when they are added to standards that are enabled.
If set to
" } } }, @@ -3461,7 +3482,7 @@ "members":{ "Filters":{ "shape":"AwsSecurityFindingFilters", - "documentation":"true
, then new controls for enabled standards are enabled automatically. If set tofalse
, then new controls are not enabled.The finding attributes used to define a condition to filter the returned findings.
" + "documentation":"The finding attributes used to define a condition to filter the returned findings.
Note that in the available filter fields,
" }, "SortCriteria":{ "shape":"SortCriteria", @@ -4647,18 +4668,18 @@ }, "Label":{ "shape":"SeverityLabel", - "documentation":"WorkflowState
is deprecated. To search for a finding based on its workflow status, useWorkflowStatus
.The severity value of the finding. The allowed values are the following.
" + "documentation":"
INFORMATIONAL
- No issue was found.
LOW
- The issue does not require action on its own.
MEDIUM
- The issue must be addressed but not urgently.
HIGH
- The issue must be addressed as a priority.
CRITICAL
- The issue must be remediated immediately to avoid it escalating.The severity value of the finding. The allowed values are the following.
INFORMATIONAL
- No issue was found.
LOW
- The issue does not require action on its own.
MEDIUM
- The issue must be addressed but not urgently.
HIGH
- The issue must be addressed as a priority.
CRITICAL
- The issue must be remediated immediately to avoid it escalating.If you provide
Normalized
and do not provideLabel
, thenLabel
is set automatically as follows." }, "Normalized":{ "shape":"Integer", - "documentation":"
0 -
INFORMATIONAL
1–39 -
LOW
40–69 -
MEDIUM
70–89 -
HIGH
90–100 -
CRITICAL
Deprecated. This attribute is being deprecated. Instead of providing
Normalized
, provideLabel
.If you provide
Normalized
and do not provideLabel
,Label
is set automatically as follows." + "documentation":"
0 -
INFORMATIONAL
1–39 -
LOW
40–69 -
MEDIUM
70–89 -
HIGH
90–100 -
CRITICAL
Deprecated. The normalized severity of a finding. This attribute is being deprecated. Instead of providing
Normalized
, provideLabel
.If you provide
Label
and do not provideNormalized
, thenNormalized
is set automatically as follows." }, "Original":{ "shape":"NonEmptyString", "documentation":"
INFORMATIONAL
- 0
LOW
- 1
MEDIUM
- 40
HIGH
- 70
CRITICAL
- 90The native severity from the finding product that generated the finding.
" } }, - "documentation":"The severity of the finding.
" + "documentation":"The severity of the finding.
The finding provider can provide the initial severity, but cannot update it after that. The severity can only be updated by a master account. It cannot be updated by a member account.
The finding must have either
" }, "SeverityLabel":{ "type":"string", @@ -5169,6 +5190,20 @@ "members":{ } }, + "UpdateSecurityHubConfigurationRequest":{ + "type":"structure", + "members":{ + "AutoEnableControls":{ + "shape":"Boolean", + "documentation":"Label
orNormalized
populated. If only one of these attributes is populated, then Security Hub automatically populates the other one. If neither attribute is populated, then the finding is invalid.Label
is the preferred attribute.Whether to automatically enable new controls when they are added to standards that are enabled.
By default, this is set to
" + } + } + }, + "UpdateSecurityHubConfigurationResponse":{ + "type":"structure", + "members":{ + } + }, "UpdateStandardsControlRequest":{ "type":"structure", "required":["StandardsControlArn"], diff --git a/services/serverlessapplicationrepository/pom.xml b/services/serverlessapplicationrepository/pom.xml index 516120709773..a0ea6fdbd581 100644 --- a/services/serverlessapplicationrepository/pom.xml +++ b/services/serverlessapplicationrepository/pom.xml @@ -20,7 +20,7 @@true
, and new controls are enabled automatically. To not automatically enable new controls, set this tofalse
.services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 serverlessapplicationrepository diff --git a/services/servicecatalog/pom.xml b/services/servicecatalog/pom.xml index 30b749bb3c43..15f55ac00ffb 100644 --- a/services/servicecatalog/pom.xml +++ b/services/servicecatalog/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 servicecatalog AWS Java SDK :: Services :: AWS Service Catalog diff --git a/services/servicediscovery/pom.xml b/services/servicediscovery/pom.xml index a335d6ac663a..f67caf73c09d 100644 --- a/services/servicediscovery/pom.xml +++ b/services/servicediscovery/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 servicediscovery diff --git a/services/servicequotas/pom.xml b/services/servicequotas/pom.xml index 222bca82f5b9..9b9eefd617a5 100644 --- a/services/servicequotas/pom.xml +++ b/services/servicequotas/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 servicequotas AWS Java SDK :: Services :: Service Quotas diff --git a/services/ses/pom.xml b/services/ses/pom.xml index 0e8d2938c4d8..a86c1ea50ea5 100644 --- a/services/ses/pom.xml +++ b/services/ses/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ses AWS Java SDK :: Services :: Amazon SES diff --git a/services/sesv2/pom.xml b/services/sesv2/pom.xml index c6761f8fcd22..de25bab6d5a2 100644 --- a/services/sesv2/pom.xml +++ b/services/sesv2/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sesv2 AWS Java SDK :: Services :: SESv2 diff --git a/services/sfn/pom.xml b/services/sfn/pom.xml index 4d321efb775b..dbbf51c0faf4 100644 --- a/services/sfn/pom.xml +++ b/services/sfn/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sfn AWS Java SDK :: Services :: AWS Step Functions diff --git a/services/shield/pom.xml b/services/shield/pom.xml index 24df274bfb22..47a40b264f00 100644 --- a/services/shield/pom.xml +++ b/services/shield/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 shield AWS Java SDK :: Services :: AWS Shield diff --git a/services/signer/pom.xml b/services/signer/pom.xml index 8b702df5f760..2e33467cb7a1 100644 --- a/services/signer/pom.xml +++ b/services/signer/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 signer AWS Java SDK :: Services :: Signer diff --git a/services/sms/pom.xml b/services/sms/pom.xml index 16b5b2ddc843..41aaaa3405d8 100644 --- a/services/sms/pom.xml +++ b/services/sms/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sms AWS Java SDK :: Services :: AWS Server Migration diff --git a/services/snowball/pom.xml b/services/snowball/pom.xml index ebbb74f5d535..0b8267d3bf3e 100644 --- a/services/snowball/pom.xml +++ b/services/snowball/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 snowball AWS Java SDK :: Services :: Amazon Snowball diff --git a/services/sns/pom.xml b/services/sns/pom.xml index b5b15125d578..6f638c40d2a6 100644 --- a/services/sns/pom.xml +++ b/services/sns/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sns AWS Java SDK :: Services :: Amazon SNS diff --git a/services/sqs/pom.xml b/services/sqs/pom.xml index 0e2dd79509d4..ef1e51f26fbd 100644 --- a/services/sqs/pom.xml +++ b/services/sqs/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sqs AWS Java SDK :: Services :: Amazon SQS diff --git a/services/ssm/pom.xml b/services/ssm/pom.xml index f9b7e64fad47..4e8eb33a2df4 100644 --- a/services/ssm/pom.xml +++ b/services/ssm/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ssm AWS Java SDK :: Services :: AWS Simple Systems Management (SSM) diff --git a/services/sso/pom.xml b/services/sso/pom.xml index 39afd20c736a..39f0d0534f41 100644 --- a/services/sso/pom.xml +++ b/services/sso/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sso AWS Java SDK :: Services :: SSO diff --git a/services/ssooidc/pom.xml b/services/ssooidc/pom.xml index 48adfec1e4f9..cdeb538c65a1 100644 --- a/services/ssooidc/pom.xml +++ b/services/ssooidc/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 ssooidc AWS Java SDK :: Services :: SSO OIDC diff --git a/services/storagegateway/pom.xml b/services/storagegateway/pom.xml index 8c520c33a5c7..66b02e7acd21 100644 --- a/services/storagegateway/pom.xml +++ b/services/storagegateway/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 storagegateway AWS Java SDK :: Services :: AWS Storage Gateway diff --git a/services/sts/pom.xml b/services/sts/pom.xml index 78f38357b6a5..c65ac506d74d 100644 --- a/services/sts/pom.xml +++ b/services/sts/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 sts AWS Java SDK :: Services :: AWS STS diff --git a/services/support/pom.xml b/services/support/pom.xml index b0a2f29c6356..be267b08b101 100644 --- a/services/support/pom.xml +++ b/services/support/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 support AWS Java SDK :: Services :: AWS Support diff --git a/services/swf/pom.xml b/services/swf/pom.xml index 3b7f3c8028d9..94816bf24335 100644 --- a/services/swf/pom.xml +++ b/services/swf/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 swf AWS Java SDK :: Services :: Amazon SWF diff --git a/services/synthetics/pom.xml b/services/synthetics/pom.xml index 52533fc6c060..d006eb2112c8 100644 --- a/services/synthetics/pom.xml +++ b/services/synthetics/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 synthetics AWS Java SDK :: Services :: Synthetics diff --git a/services/textract/pom.xml b/services/textract/pom.xml index 8275ca5ea3d6..ea65923cc6be 100644 --- a/services/textract/pom.xml +++ b/services/textract/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 textract AWS Java SDK :: Services :: Textract diff --git a/services/transcribe/pom.xml b/services/transcribe/pom.xml index 156ece170631..4ffe4e359cb2 100644 --- a/services/transcribe/pom.xml +++ b/services/transcribe/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 transcribe AWS Java SDK :: Services :: Transcribe diff --git a/services/transcribestreaming/pom.xml b/services/transcribestreaming/pom.xml index 5f45705d08e5..5ad2a7b5189c 100644 --- a/services/transcribestreaming/pom.xml +++ b/services/transcribestreaming/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 transcribestreaming AWS Java SDK :: Services :: AWS Transcribe Streaming diff --git a/services/transfer/pom.xml b/services/transfer/pom.xml index f5c1c12dcd4b..8904359bf5f4 100644 --- a/services/transfer/pom.xml +++ b/services/transfer/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 transfer AWS Java SDK :: Services :: Transfer diff --git a/services/translate/pom.xml b/services/translate/pom.xml index 882e317a5ebb..841de26834bb 100644 --- a/services/translate/pom.xml +++ b/services/translate/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 translate diff --git a/services/waf/pom.xml b/services/waf/pom.xml index fc7cbcaec9d9..bded423008b7 100644 --- a/services/waf/pom.xml +++ b/services/waf/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 waf AWS Java SDK :: Services :: AWS WAF diff --git a/services/wafv2/pom.xml b/services/wafv2/pom.xml index 35e086161b60..7bbb4d3ebfac 100644 --- a/services/wafv2/pom.xml +++ b/services/wafv2/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 wafv2 AWS Java SDK :: Services :: WAFV2 diff --git a/services/workdocs/pom.xml b/services/workdocs/pom.xml index b0e2756be350..08e083d5bf67 100644 --- a/services/workdocs/pom.xml +++ b/services/workdocs/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 workdocs AWS Java SDK :: Services :: Amazon WorkDocs diff --git a/services/worklink/pom.xml b/services/worklink/pom.xml index 71f6c7abba1f..c5cbe29304ff 100644 --- a/services/worklink/pom.xml +++ b/services/worklink/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 worklink AWS Java SDK :: Services :: WorkLink diff --git a/services/workmail/pom.xml b/services/workmail/pom.xml index 37665dfeea09..19319bb8d420 100644 --- a/services/workmail/pom.xml +++ b/services/workmail/pom.xml @@ -20,7 +20,7 @@services software.amazon.awssdk -2.13.62 +2.13.63 4.0.0 workmail diff --git a/services/workmailmessageflow/pom.xml b/services/workmailmessageflow/pom.xml index 3c48842030c5..d68c0edb9977 100644 --- a/services/workmailmessageflow/pom.xml +++ b/services/workmailmessageflow/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 workmailmessageflow AWS Java SDK :: Services :: WorkMailMessageFlow diff --git a/services/workspaces/pom.xml b/services/workspaces/pom.xml index 74a1ae3bff4f..ca5af7bedb74 100644 --- a/services/workspaces/pom.xml +++ b/services/workspaces/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 workspaces AWS Java SDK :: Services :: Amazon WorkSpaces diff --git a/services/xray/pom.xml b/services/xray/pom.xml index 8cc8191f66db..31ef9f6dbcd4 100644 --- a/services/xray/pom.xml +++ b/services/xray/pom.xml @@ -21,7 +21,7 @@software.amazon.awssdk services -2.13.62 +2.13.63 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 a1a386056335..a00c7e943ce7 100644 --- a/test/codegen-generated-classes-test/pom.xml +++ b/test/codegen-generated-classes-test/pom.xml @@ -21,7 +21,7 @@diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml index 66e2f4c5a4a1..1f4533061e36 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.13.62 +2.13.63 ../../pom.xml aws-sdk-java-pom software.amazon.awssdk -2.13.62 +2.13.63 ../../pom.xml http-client-tests diff --git a/test/module-path-tests/pom.xml b/test/module-path-tests/pom.xml index 445a1e99bf70..30f0e5b3c320 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.13.62 +2.13.63 ../../pom.xml 4.0.0 diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml index b63342872a02..4a9b51cb8418 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.13.62 +2.13.63 ../../pom.xml 4.0.0 diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml index 01945967d5ec..5a9c647789cb 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.13.62 +2.13.63 ../../pom.xml 4.0.0 diff --git a/test/sdk-benchmarks/pom.xml b/test/sdk-benchmarks/pom.xml index a606fd6f22b0..d0e99b07baa4 100755 --- a/test/sdk-benchmarks/pom.xml +++ b/test/sdk-benchmarks/pom.xml @@ -19,7 +19,7 @@diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java index 6f815db83983..58dc7e8658d4 100644 --- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java +++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java @@ -25,6 +25,7 @@ import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.ChainedOptionsBuilder; import org.openjdk.jmh.runner.options.OptionsBuilder; +import software.amazon.awssdk.benchmark.apicall.MetricsEnabledBenchmark; import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyClientH1NonTlsBenchmark; import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyHttpClientH1Benchmark; import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyHttpClientH2Benchmark; @@ -77,6 +78,8 @@ public class BenchmarkRunner { EnhancedClientQueryV1MapperComparisonBenchmark.class.getSimpleName() ); + private static final List software.amazon.awssdk aws-sdk-java-pom -2.13.62 +2.13.63 ../../pom.xml METRIC_BENCHMARKS = Arrays.asList(MetricsEnabledBenchmark.class.getSimpleName()); + private static final Logger log = Logger.loggerFor(BenchmarkRunner.class); private final List benchmarksToRun; @@ -94,6 +97,7 @@ public static void main(String... args) throws RunnerException, JsonProcessingEx benchmarksToRun.addAll(PROTOCOL_BENCHMARKS); benchmarksToRun.addAll(COLD_START_BENCHMARKS); benchmarksToRun.addAll(MAPPER_BENCHMARKS); + benchmarksToRun.addAll(METRIC_BENCHMARKS); BenchmarkRunner runner = new BenchmarkRunner(benchmarksToRun); diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/MetricsEnabledBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/MetricsEnabledBenchmark.java new file mode 100644 index 000000000000..c75876c8686b --- /dev/null +++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/MetricsEnabledBenchmark.java @@ -0,0 +1,140 @@ +/* + * 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.benchmark.apicall; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.options.Options; +import org.openjdk.jmh.runner.options.OptionsBuilder; +import software.amazon.awssdk.benchmark.utils.MockServer; +import software.amazon.awssdk.core.async.AsyncRequestBody; +import software.amazon.awssdk.core.async.AsyncResponseTransformer; +import software.amazon.awssdk.core.client.builder.SdkClientBuilder; +import software.amazon.awssdk.core.sync.RequestBody; +import software.amazon.awssdk.http.apache.ApacheHttpClient; +import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; +import software.amazon.awssdk.metrics.MetricCollection; +import software.amazon.awssdk.metrics.MetricPublisher; +import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient; +import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClientBuilder; +import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient; +import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClientBuilder; +import software.amazon.awssdk.services.protocolrestjson.model.StreamingInputOperationRequest; +import software.amazon.awssdk.services.protocolrestjson.model.StreamingOutputOperationRequest; + +/** + * Benchmarking comparing metrics-enabled versus metrics-disabled performance. + */ +@State(Scope.Benchmark) +@BenchmarkMode(Mode.Throughput) +public class MetricsEnabledBenchmark { + private MockServer mockServer; + private ProtocolRestJsonClient enabledMetricsSyncClient; + private ProtocolRestJsonAsyncClient enabledMetricsAsyncClient; + + @Setup(Level.Trial) + public void setup() throws Exception { + mockServer = new MockServer(); + mockServer.start(); + enabledMetricsSyncClient = enableMetrics(syncClientBuilder()).build(); + enabledMetricsAsyncClient = enableMetrics(asyncClientBuilder()).build(); + } + + private > T enableMetrics(T syncClientBuilder) { + return syncClientBuilder.overrideConfiguration(c -> c.addMetricPublisher(new EnabledPublisher())); + } + + private ProtocolRestJsonClientBuilder syncClientBuilder() { + return ProtocolRestJsonClient.builder() + .endpointOverride(mockServer.getHttpUri()) + .httpClientBuilder(ApacheHttpClient.builder()); + } + + private ProtocolRestJsonAsyncClientBuilder asyncClientBuilder() { + return ProtocolRestJsonAsyncClient.builder() + .endpointOverride(mockServer.getHttpUri()) + .httpClientBuilder(NettyNioAsyncHttpClient.builder()); + } + + @TearDown(Level.Trial) + public void tearDown() throws Exception { + mockServer.stop(); + enabledMetricsSyncClient.close(); + enabledMetricsAsyncClient.close(); + } + + @Benchmark + public void metricsEnabledSync() { + enabledMetricsSyncClient.allTypes(); + } + + @Benchmark + public void metricsEnabledAsync() { + enabledMetricsAsyncClient.allTypes().join(); + } + + @Benchmark + public void metricsEnabledSyncStreamingInput() { + enabledMetricsSyncClient.streamingInputOperation(streamingInputRequest(), RequestBody.fromString("")); + } + + @Benchmark + public void metricsEnabledAsyncStreamingInput() { + enabledMetricsAsyncClient.streamingInputOperation(streamingInputRequest(), AsyncRequestBody.fromString("")).join(); + } + + @Benchmark + public void metricsEnabledSyncStreamingOutput() { + enabledMetricsSyncClient.streamingOutputOperationAsBytes(streamingOutputRequest()); + } + + @Benchmark + public void metricsEnabledAsyncStreamingOutput() { + enabledMetricsAsyncClient.streamingOutputOperation(streamingOutputRequest(), AsyncResponseTransformer.toBytes()).join(); + } + + private StreamingInputOperationRequest streamingInputRequest() { + return StreamingInputOperationRequest.builder().build(); + } + + private StreamingOutputOperationRequest streamingOutputRequest() { + return StreamingOutputOperationRequest.builder().build(); + } + + public static void main(String... args) throws Exception { + Options opt = new OptionsBuilder() + .include(MetricsEnabledBenchmark.class.getSimpleName()) + .build(); + new Runner(opt).run(); + } + + private static final class EnabledPublisher implements MetricPublisher { + @Override + public void publish(MetricCollection metricCollection) { + } + + @Override + public void close() { + } + } +} diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml index 8c5488bfbdd2..3e2962d414dc 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.13.62 +2.13.63 ../../pom.xml service-test-utils diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml index 7b097d6947fa..7dfb8bf23762 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.13.62 +2.13.63 ../../pom.xml 4.0.0 diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml index f336e35c3df2..75a7e4ce2cc9 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.13.62 +2.13.63 ../../pom.xml test-utils diff --git a/test/tests-coverage-reporting/pom.xml b/test/tests-coverage-reporting/pom.xml index 2853bd9cb203..d6bf3ca021bc 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.13.62 +2.13.63 ../../pom.xml 4.0.0 diff --git a/utils/pom.xml b/utils/pom.xml index 05a2c7856e44..fdf717d7c190 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@aws-sdk-java-pom software.amazon.awssdk -2.13.62 +2.13.63 4.0.0