diff --git a/.changes/2.17.68.json b/.changes/2.17.68.json new file mode 100644 index 000000000000..0b667f7eea6f --- /dev/null +++ b/.changes/2.17.68.json @@ -0,0 +1,36 @@ +{ + "version": "2.17.68", + "date": "2021-10-26", + "entries": [ + { + "type": "feature", + "category": "Amazon Chime SDK Identity", + "contributor": "", + "description": "The Amazon Chime SDK now supports push notifications through Amazon Pinpoint" + }, + { + "type": "feature", + "category": "Amazon EMR Containers", + "contributor": "", + "description": "This feature enables auto-generation of certificate to secure the managed-endpoint and removes the need for customer provided certificate-arn during managed-endpoint setup." + }, + { + "type": "bugfix", + "category": "Amazon S3", + "contributor": "", + "description": "Truncate the async request body when the content-length is shorter than the request body, instead of raising a \"Data read has a different checksum\" exception." + }, + { + "type": "bugfix", + "category": "Amazon S3", + "contributor": "", + "description": "Raise an exception instead of hanging when a put-object content-length exceeds the data written by the async request body." + }, + { + "type": "feature", + "category": "Amazon Chime SDK Messaging", + "contributor": "", + "description": "The Amazon Chime SDK now supports push notifications through Amazon Pinpoint" + } + ] +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 875bd2e26dfa..e04484d9071c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +# __2.17.68__ __2021-10-26__ +## __Amazon Chime SDK Identity__ + - ### Features + - The Amazon Chime SDK now supports push notifications through Amazon Pinpoint + +## __Amazon Chime SDK Messaging__ + - ### Features + - The Amazon Chime SDK now supports push notifications through Amazon Pinpoint + +## __Amazon EMR Containers__ + - ### Features + - This feature enables auto-generation of certificate to secure the managed-endpoint and removes the need for customer provided certificate-arn during managed-endpoint setup. + +## __Amazon S3__ + - ### Bugfixes + - Raise an exception instead of hanging when a put-object content-length exceeds the data written by the async request body. + - Truncate the async request body when the content-length is shorter than the request body, instead of raising a "Data read has a different checksum" exception. + # __2.17.67__ __2021-10-25__ ## __AWS Audit Manager__ - ### Features diff --git a/README.md b/README.md index 238122c1c1f9..11273798e110 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver software.amazon.awssdk bom - 2.17.67 + 2.17.68 pom import @@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only: software.amazon.awssdk ec2 - 2.17.67 + 2.17.68 software.amazon.awssdk s3 - 2.17.67 + 2.17.68 ``` @@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please software.amazon.awssdk aws-sdk-java - 2.17.67 + 2.17.68 ``` diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml index 9a7ba9cf180c..f669af7e52d4 100644 --- a/archetypes/archetype-app-quickstart/pom.xml +++ b/archetypes/archetype-app-quickstart/pom.xml @@ -20,7 +20,7 @@ archetypes software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml index 32a38e1dada0..ae464671aec0 100644 --- a/archetypes/archetype-lambda/pom.xml +++ b/archetypes/archetype-lambda/pom.xml @@ -20,7 +20,7 @@ archetypes software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 archetype-lambda diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml index 3a52cc9e46ed..92fac8891c9f 100644 --- a/archetypes/archetype-tools/pom.xml +++ b/archetypes/archetype-tools/pom.xml @@ -20,7 +20,7 @@ archetypes software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 12bb5a8498bc..978c8c7c19e4 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 archetypes diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml index 058d533734ba..d25b04dfceb2 100644 --- a/aws-sdk-java/pom.xml +++ b/aws-sdk-java/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 ../pom.xml aws-sdk-java diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml index 576f4d55ea05..6540dbf74b08 100644 --- a/bom-internal/pom.xml +++ b/bom-internal/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index 38fd8672ea69..27956cfd3249 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 ../pom.xml bom diff --git a/bundle/pom.xml b/bundle/pom.xml index 9acf149942e9..1c871f39ac10 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 bundle jar diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml index 6fa637695280..83b49fd80c09 100644 --- a/codegen-lite-maven-plugin/pom.xml +++ b/codegen-lite-maven-plugin/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 ../pom.xml codegen-lite-maven-plugin diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml index faddae27103f..37afa7a5a030 100644 --- a/codegen-lite/pom.xml +++ b/codegen-lite/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 codegen-lite AWS Java SDK :: Code Generator Lite diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml index 7422d441645c..5b191342817d 100644 --- a/codegen-maven-plugin/pom.xml +++ b/codegen-maven-plugin/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 ../pom.xml codegen-maven-plugin diff --git a/codegen/pom.xml b/codegen/pom.xml index a949928df27d..a07984075d07 100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 codegen AWS Java SDK :: Code Generator diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java index 43deea8d5ba7..26b797637805 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java @@ -187,17 +187,11 @@ public List getUnboundMembers() { List unboundMembers = new ArrayList<>(); if (members != null) { for (MemberModel member : members) { - if (member.getHttp().getLocation() == null && !member.getHttp().getIsPayload()) { + if (member.getHttp().getLocation() == null) { if (hasPayloadMember) { - // There is an explicit payload, but this unbound - // member isn't it. - // Note: Somewhat unintuitive, explicit payloads don't - // have an explicit location; they're identified by - // the payload HTTP trait being true. throw new IllegalStateException(String.format( - "C2J Shape %s has both an explicit payload member and unbound (no explicit location) member, %s." - + " This is undefined behavior, verify the correctness of the C2J model.", - c2jName, member.getName())); + "C2J Shape %s has both an explicit payload member and unbound (no explicit location) members. " + + "This is undefined behavior, verify the correctness of the C2J model", c2jName)); } unboundMembers.add(member); } @@ -227,12 +221,7 @@ public List getUnboundEventMembers() { public boolean hasPayloadMembers() { return hasPayloadMember || getExplicitEventPayloadMember() != null || - hasImplicitPayloadMembers(); - - } - - public boolean hasImplicitPayloadMembers() { - return !getUnboundMembers().isEmpty() || + !getUnboundMembers().isEmpty() || (isEvent() && !getUnboundEventMembers().isEmpty()); } diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java index eaed3ee87135..be28936b5a8d 100644 --- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java +++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java @@ -95,7 +95,6 @@ protected FieldSpec operationInfoField() { .add(".httpMethod($T.$L)", SdkHttpMethod.class, shapeModel.getMarshaller().getVerb()) .add(".hasExplicitPayloadMember($L)", shapeModel.isHasPayloadMember() || shapeModel.getExplicitEventPayloadMember() != null) - .add(".hasImplicitPayloadMembers($L)", shapeModel.hasImplicitPayloadMembers()) .add(".hasPayloadMembers($L)", shapeModel.hasPayloadMembers()); if (StringUtils.isNotBlank(shapeModel.getMarshaller().getTarget())) { diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/alltypesrequestmarshaller.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/alltypesrequestmarshaller.java index 4fd6fff40c66..1666fa85e098 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/alltypesrequestmarshaller.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/alltypesrequestmarshaller.java @@ -19,8 +19,7 @@ @SdkInternalApi public class AllTypesRequestMarshaller implements Marshaller { private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/") - .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true) - .hasPayloadMembers(true).build(); + .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).build(); private final BaseAwsJsonProtocolFactory protocolFactory; @@ -33,10 +32,11 @@ public SdkHttpFullRequest marshall(AllTypesRequest allTypesRequest) { Validate.paramNotNull(allTypesRequest, "allTypesRequest"); try { ProtocolMarshaller protocolMarshaller = protocolFactory - .createProtocolMarshaller(SDK_OPERATION_BINDING); + .createProtocolMarshaller(SDK_OPERATION_BINDING); return protocolMarshaller.marshall(allTypesRequest); } catch (Exception e) { throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build(); } } } + diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationrequestmarshaller.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationrequestmarshaller.java index 4d546227a0ed..e62c6efe66d7 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationrequestmarshaller.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationrequestmarshaller.java @@ -19,8 +19,8 @@ @SdkInternalApi public class EventStreamOperationRequestMarshaller implements Marshaller { private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder() - .requestUri("/2016-03-11/eventStreamOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true) - .hasImplicitPayloadMembers(false).hasPayloadMembers(true).hasEventStreamingInput(true).build(); + .requestUri("/2016-03-11/eventStreamOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true) + .hasPayloadMembers(true).hasEventStreamingInput(true).build(); private final BaseAwsJsonProtocolFactory protocolFactory; @@ -33,7 +33,7 @@ public SdkHttpFullRequest marshall(EventStreamOperationRequest eventStreamOperat Validate.paramNotNull(eventStreamOperationRequest, "eventStreamOperationRequest"); try { ProtocolMarshaller protocolMarshaller = protocolFactory - .createProtocolMarshaller(SDK_OPERATION_BINDING); + .createProtocolMarshaller(SDK_OPERATION_BINDING); return protocolMarshaller.marshall(eventStreamOperationRequest); } catch (Exception e) { throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build(); diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationwithonlyinputrequestmarshaller.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationwithonlyinputrequestmarshaller.java index eb88d39c638b..e96817e5bfca 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationwithonlyinputrequestmarshaller.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationwithonlyinputrequestmarshaller.java @@ -17,11 +17,11 @@ */ @Generated("software.amazon.awssdk:codegen") @SdkInternalApi -public class EventStreamOperationWithOnlyInputRequestMarshaller implements Marshaller { +public class EventStreamOperationWithOnlyInputRequestMarshaller implements + Marshaller { private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder() - .requestUri("/2016-03-11/EventStreamOperationWithOnlyInput").httpMethod(SdkHttpMethod.POST) - .hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true).hasPayloadMembers(true).hasEventStreamingInput(true) - .build(); + .requestUri("/2016-03-11/EventStreamOperationWithOnlyInput").httpMethod(SdkHttpMethod.POST) + .hasExplicitPayloadMember(false).hasPayloadMembers(true).hasEventStreamingInput(true).build(); private final BaseAwsJsonProtocolFactory protocolFactory; @@ -34,10 +34,11 @@ public SdkHttpFullRequest marshall(EventStreamOperationWithOnlyInputRequest even Validate.paramNotNull(eventStreamOperationWithOnlyInputRequest, "eventStreamOperationWithOnlyInputRequest"); try { ProtocolMarshaller protocolMarshaller = protocolFactory - .createProtocolMarshaller(SDK_OPERATION_BINDING); + .createProtocolMarshaller(SDK_OPERATION_BINDING); return protocolMarshaller.marshall(eventStreamOperationWithOnlyInputRequest); } catch (Exception e) { throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build(); } } } + diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/nestedcontainersrequestmarshaller.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/nestedcontainersrequestmarshaller.java index c8a1fe310b22..6f532a7565da 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/nestedcontainersrequestmarshaller.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/nestedcontainersrequestmarshaller.java @@ -19,8 +19,7 @@ @SdkInternalApi public class NestedContainersRequestMarshaller implements Marshaller { private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/") - .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true) - .hasPayloadMembers(true).build(); + .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).build(); private final BaseAwsJsonProtocolFactory protocolFactory; @@ -33,10 +32,11 @@ public SdkHttpFullRequest marshall(NestedContainersRequest nestedContainersReque Validate.paramNotNull(nestedContainersRequest, "nestedContainersRequest"); try { ProtocolMarshaller protocolMarshaller = protocolFactory - .createProtocolMarshaller(SDK_OPERATION_BINDING); + .createProtocolMarshaller(SDK_OPERATION_BINDING); return protocolMarshaller.marshall(nestedContainersRequest); } catch (Exception e) { throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build(); } } } + diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/operationwithnoinputoroutputrequestmarshaller.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/operationwithnoinputoroutputrequestmarshaller.java index 8247936f0b4c..f1a30e56ffcd 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/operationwithnoinputoroutputrequestmarshaller.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/operationwithnoinputoroutputrequestmarshaller.java @@ -17,10 +17,10 @@ */ @Generated("software.amazon.awssdk:codegen") @SdkInternalApi -public class OperationWithNoInputOrOutputRequestMarshaller implements Marshaller { +public class OperationWithNoInputOrOutputRequestMarshaller implements + Marshaller { private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/") - .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(false) - .hasPayloadMembers(false).build(); + .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(false).build(); private final BaseAwsJsonProtocolFactory protocolFactory; @@ -33,10 +33,11 @@ public SdkHttpFullRequest marshall(OperationWithNoInputOrOutputRequest operation Validate.paramNotNull(operationWithNoInputOrOutputRequest, "operationWithNoInputOrOutputRequest"); try { ProtocolMarshaller protocolMarshaller = protocolFactory - .createProtocolMarshaller(SDK_OPERATION_BINDING); + .createProtocolMarshaller(SDK_OPERATION_BINDING); return protocolMarshaller.marshall(operationWithNoInputOrOutputRequest); } catch (Exception e) { throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build(); } } } + diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streaminginputoperationrequestmarshaller.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streaminginputoperationrequestmarshaller.java index 79101f27edc4..8513a752adc1 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streaminginputoperationrequestmarshaller.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streaminginputoperationrequestmarshaller.java @@ -19,8 +19,8 @@ @SdkInternalApi public class StreamingInputOperationRequestMarshaller implements Marshaller { private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder() - .requestUri("/2016-03-11/streamingInputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true) - .hasImplicitPayloadMembers(false).hasPayloadMembers(true).hasStreamingInput(true).build(); + .requestUri("/2016-03-11/streamingInputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true) + .hasPayloadMembers(true).hasStreamingInput(true).build(); private final BaseAwsJsonProtocolFactory protocolFactory; @@ -33,10 +33,11 @@ public SdkHttpFullRequest marshall(StreamingInputOperationRequest streamingInput Validate.paramNotNull(streamingInputOperationRequest, "streamingInputOperationRequest"); try { ProtocolMarshaller protocolMarshaller = protocolFactory - .createProtocolMarshaller(SDK_OPERATION_BINDING); + .createProtocolMarshaller(SDK_OPERATION_BINDING); return protocolMarshaller.marshall(streamingInputOperationRequest); } catch (Exception e) { throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build(); } } } + diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streamingoutputoperationrequestmarshaller.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streamingoutputoperationrequestmarshaller.java index 1ffe8a4471a7..06c982a0fe49 100644 --- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streamingoutputoperationrequestmarshaller.java +++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streamingoutputoperationrequestmarshaller.java @@ -19,8 +19,8 @@ @SdkInternalApi public class StreamingOutputOperationRequestMarshaller implements Marshaller { private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder() - .requestUri("/2016-03-11/streamingOutputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false) - .hasImplicitPayloadMembers(false).hasPayloadMembers(false).build(); + .requestUri("/2016-03-11/streamingOutputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false) + .hasPayloadMembers(false).build(); private final BaseAwsJsonProtocolFactory protocolFactory; @@ -33,10 +33,11 @@ public SdkHttpFullRequest marshall(StreamingOutputOperationRequest streamingOutp Validate.paramNotNull(streamingOutputOperationRequest, "streamingOutputOperationRequest"); try { ProtocolMarshaller protocolMarshaller = protocolFactory - .createProtocolMarshaller(SDK_OPERATION_BINDING); + .createProtocolMarshaller(SDK_OPERATION_BINDING); return protocolMarshaller.marshall(streamingOutputOperationRequest); } catch (Exception e) { throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build(); } } } + diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml index 79f4c05877b3..13313ea4dd45 100644 --- a/core/annotations/pom.xml +++ b/core/annotations/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/core/arns/pom.xml b/core/arns/pom.xml index 36d2446a548d..09b70439edd4 100644 --- a/core/arns/pom.xml +++ b/core/arns/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/core/auth-crt/pom.xml b/core/auth-crt/pom.xml index a652e03467c1..a904faefebc8 100644 --- a/core/auth-crt/pom.xml +++ b/core/auth-crt/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.17.67 + 2.17.68 auth-crt diff --git a/core/auth/pom.xml b/core/auth/pom.xml index 263bbb730dad..7fe50308a347 100644 --- a/core/auth/pom.xml +++ b/core/auth/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.17.67 + 2.17.68 auth diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml index 39de0a821679..221814a2b17b 100644 --- a/core/aws-core/pom.xml +++ b/core/aws-core/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.17.67 + 2.17.68 aws-core diff --git a/core/json-utils/pom.xml b/core/json-utils/pom.xml index 9638a3dccf9d..4613214c4955 100644 --- a/core/json-utils/pom.xml +++ b/core/json-utils/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml index 96b626f69308..c956f7ff83a6 100644 --- a/core/metrics-spi/pom.xml +++ b/core/metrics-spi/pom.xml @@ -5,7 +5,7 @@ core software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index cf213e239d84..5c4a3254d67f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 core diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml index 8551fa688f3d..2f183cbde1ee 100644 --- a/core/profiles/pom.xml +++ b/core/profiles/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.17.67 + 2.17.68 profiles diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml index 6d939143e41e..7a158f778209 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.17.67 + 2.17.68 4.0.0 diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml index b67202a55a68..f064e95f6146 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.17.67 + 2.17.68 4.0.0 diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java index 586803f13c0b..12b6eda2b838 100644 --- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java +++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java @@ -23,7 +23,6 @@ */ @SdkProtectedApi public class DefaultJsonContentTypeResolver implements JsonContentTypeResolver { - private static final String REST_JSON_CONTENT_TYPE = "application/json"; private final String prefix; @@ -33,9 +32,7 @@ public DefaultJsonContentTypeResolver(String prefix) { @Override public String resolveContentType(AwsJsonProtocolMetadata protocolMetadata) { - if (AwsJsonProtocol.REST_JSON.equals(protocolMetadata.protocol())) { - return REST_JSON_CONTENT_TYPE; - } + //Changing this to 'application/json' may break clients expecting 'application/x-amz-json-1.1' return prefix + protocolMetadata.protocolVersion(); } } diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java index 509b0c8af92f..aaee61c14e9d 100644 --- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java +++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java @@ -16,6 +16,7 @@ package software.amazon.awssdk.protocols.json.internal.marshall; import static software.amazon.awssdk.core.internal.util.Mimetype.MIMETYPE_EVENT_STREAM; +import static software.amazon.awssdk.core.protocol.MarshallingType.DOCUMENT; import static software.amazon.awssdk.http.Header.CHUNKED; import static software.amazon.awssdk.http.Header.CONTENT_LENGTH; import static software.amazon.awssdk.http.Header.CONTENT_TYPE; @@ -62,7 +63,6 @@ public class JsonProtocolMarshaller implements ProtocolMarshaller field : pojo.sdkFields()) { Object val = field.getValueOrDefault(pojo); - if (isExplicitBinaryPayload(field)) { - if (val != null) { - request.contentStreamProvider(((SdkBytes) val)::asInputStream); - } - } else if (isExplicitPayloadMember(field)) { - marshallExplicitJsonPayload(field, val); + if (isBinary(field, val)) { + request.contentStreamProvider(((SdkBytes) val)::asInputStream); + } else if (isDocumentType(field) && val != null) { + marshalDocumentType(field, val); } else { - marshallField(field, val); + if (val != null && field.containsTrait(PayloadTrait.class)) { + jsonGenerator.writeStartObject(); + doMarshall((SdkPojo) val); + jsonGenerator.writeEndObject(); + } else { + MARSHALLER_REGISTRY.getMarshaller(field.location(), field.marshallingType(), val) + .marshall(val, marshallerContext, field.locationName(), (SdkField) field); + } } } } - private boolean isExplicitBinaryPayload(SdkField field) { - return isExplicitPayloadMember(field) && MarshallingType.SDK_BYTES.equals(field.marshallingType()); + private boolean isBinary(SdkField field, Object val) { + return isExplicitPayloadMember(field) && val instanceof SdkBytes; } private boolean isExplicitPayloadMember(SdkField field) { return field.containsTrait(PayloadTrait.class); } - private void marshallExplicitJsonPayload(SdkField field, Object val) { - // Explicit JSON payloads are always marshalled as an object, - // even if they're null, in which case it's an empty object. - jsonGenerator.writeStartObject(); - if (val != null) { - if (MarshallingType.DOCUMENT.equals(field.marshallingType())) { - marshallField(field, val); - } else { - doMarshall((SdkPojo) val); - } - } - jsonGenerator.writeEndObject(); - } - @Override public SdkHttpFullRequest marshall(SdkPojo pojo) { startMarshalling(); @@ -223,7 +212,7 @@ private SdkHttpFullRequest finishMarshalling() { // Content may already be set if the payload is binary data. if (request.contentStreamProvider() == null) { // End the implicit request object if needed. - if (needTopLevelJsonObject()) { + if (!hasExplicitPayloadMember) { jsonGenerator.writeEndObject(); } @@ -254,7 +243,7 @@ private SdkHttpFullRequest finishMarshalling() { } request.removeHeader(CONTENT_LENGTH); request.putHeader(TRANSFER_ENCODING, CHUNKED); - } else if (contentType != null && !hasStreamingInput && request.headers().containsKey(CONTENT_LENGTH)) { + } else if (contentType != null && !hasStreamingInput && request.contentStreamProvider() != null) { request.putHeader(CONTENT_TYPE, contentType); } } @@ -262,14 +251,19 @@ private SdkHttpFullRequest finishMarshalling() { return request.build(); } - private void marshallField(SdkField field, Object val) { - MARSHALLER_REGISTRY.getMarshaller(field.location(), field.marshallingType(), val) - .marshall(val, marshallerContext, field.locationName(), (SdkField) field); + private boolean isDocumentType(SdkField field) { + return DOCUMENT.equals(field.marshallingType()); } - private boolean needTopLevelJsonObject() { - return AwsJsonProtocol.AWS_JSON.equals(protocolMetadata.protocol()) - || (!hasExplicitPayloadMember && hasImplicitPayloadMembers); - + private void marshalDocumentType(SdkField field, Object val) { + boolean isExplicitPayloadField = hasExplicitPayloadMember && field.containsTrait(PayloadTrait.class); + if (isExplicitPayloadField) { + jsonGenerator.writeStartObject(); + } + MARSHALLER_REGISTRY.getMarshaller(field.location(), field.marshallingType(), val) + .marshall(val, marshallerContext, field.locationName(), (SdkField) field); + if (isExplicitPayloadField) { + jsonGenerator.writeEndObject(); + } } } diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml index 995b74df284e..dfc7e5ba1895 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.17.67 + 2.17.68 4.0.0 diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml index 1d1725b9e1a3..455ebfd49533 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.17.67 + 2.17.68 4.0.0 diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml index ce575e57eab7..bd6d66366e05 100644 --- a/core/protocols/pom.xml +++ b/core/protocols/pom.xml @@ -20,7 +20,7 @@ core software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml index c6391ca3d338..7a6d9e2e901c 100644 --- a/core/protocols/protocol-core/pom.xml +++ b/core/protocols/protocol-core/pom.xml @@ -20,7 +20,7 @@ protocols software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java index 1a55ee8c9dca..8b4dbf287e49 100644 --- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java +++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java @@ -31,7 +31,6 @@ public final class OperationInfo { private final String apiVersion; private final boolean hasExplicitPayloadMember; private final boolean hasPayloadMembers; - private final boolean hasImplicitPayloadMembers; private final boolean hasStreamingInput; private final boolean hasEventStreamingInput; private final boolean hasEvent; @@ -43,7 +42,6 @@ private OperationInfo(Builder builder) { this.operationIdentifier = builder.operationIdentifier; this.apiVersion = builder.apiVersion; this.hasExplicitPayloadMember = builder.hasExplicitPayloadMember; - this.hasImplicitPayloadMembers = builder.hasImplicitPayloadMembers; this.hasPayloadMembers = builder.hasPayloadMembers; this.hasStreamingInput = builder.hasStreamingInput; this.additionalMetadata = builder.additionalMetadata.build(); @@ -97,14 +95,6 @@ public boolean hasPayloadMembers() { return hasPayloadMembers; } - /** - * @return True if the operation has members that are not explicitly bound to a marshalling location, and thus are - * implicitly bound to the body. - */ - public boolean hasImplicitPayloadMembers() { - return hasImplicitPayloadMembers; - } - /** * @return True if the operation has streaming input. */ @@ -154,7 +144,6 @@ public static final class Builder { private String operationIdentifier; private String apiVersion; private boolean hasExplicitPayloadMember; - private boolean hasImplicitPayloadMembers; private boolean hasPayloadMembers; private boolean hasStreamingInput; private boolean hasEventStreamingInput; @@ -194,11 +183,6 @@ public Builder hasPayloadMembers(boolean hasPayloadMembers) { return this; } - public Builder hasImplicitPayloadMembers(boolean hasImplicitPayloadMembers) { - this.hasImplicitPayloadMembers = hasImplicitPayloadMembers; - return this; - } - public Builder hasStreamingInput(boolean hasStreamingInput) { this.hasStreamingInput = hasStreamingInput; return this; diff --git a/core/regions/pom.xml b/core/regions/pom.xml index 31795cf88912..b761ca0872cf 100644 --- a/core/regions/pom.xml +++ b/core/regions/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk core - 2.17.67 + 2.17.68 regions diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml index 43f05186f9ae..089ae904d6d8 100644 --- a/core/sdk-core/pom.xml +++ b/core/sdk-core/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk core - 2.17.67 + 2.17.68 sdk-core AWS Java SDK :: SDK Core diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml index db4e61be3b05..c50f306b4dda 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.17.67 + 2.17.68 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 0e1de9a5e0ba..565d4183110a 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.17.67 + 2.17.68 apache-client diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml index e01ce5e15e73..dc753ed4cb97 100644 --- a/http-clients/aws-crt-client/pom.xml +++ b/http-clients/aws-crt-client/pom.xml @@ -21,7 +21,7 @@ http-clients software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml index 5e51548a3180..ed5040c8d8bf 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.17.67 + 2.17.68 4.0.0 diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java index 79809e06d58e..2ded744ed573 100644 --- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java +++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java @@ -536,8 +536,14 @@ public void onError(Throwable t) { @Override public void onComplete() { if (!done) { - done = true; - subscriber.onComplete(); + Long expectedContentLength = requestContentLength.orElse(null); + if (expectedContentLength != null && written < expectedContentLength) { + onError(new IllegalStateException("Request content was only " + written + " bytes, but the specified " + + "content-length was " + expectedContentLength + " bytes.")); + } else { + done = true; + subscriber.onComplete(); + } } } }); diff --git a/http-clients/pom.xml b/http-clients/pom.xml index 87d879b63eb5..5fa63e81b1f4 100644 --- a/http-clients/pom.xml +++ b/http-clients/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 73d58f4e6b55..0759014aecfb 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.17.67 + 2.17.68 4.0.0 diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml index 42d026f991ce..a8f36452c719 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.17.67 + 2.17.68 cloudwatch-metric-publisher diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml index 080b551de881..8065ec49fb01 100644 --- a/metric-publishers/pom.xml +++ b/metric-publishers/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 metric-publishers diff --git a/pom.xml b/pom.xml index dab19bf2b850..4fa722398d93 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 pom AWS Java SDK :: Parent The Amazon Web Services SDK for Java provides Java APIs @@ -88,7 +88,7 @@ ${project.version} - 2.17.66 + 2.17.67 2.12.3 2.12.3 2.12.3 @@ -522,8 +522,8 @@ *.internal.* software.amazon.awssdk.thirdparty.* - software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler - software.amazon.awssdk.awscore.client.handler.AwsSyncClientHandler + software.amazon.awssdk.services.s3.checksums.ChecksumCalculatingAsyncRequestBody + software.amazon.awssdk.protocols.core.OperationInfo diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml index 60d52b6a5f64..3e4afbec3555 100644 --- a/release-scripts/pom.xml +++ b/release-scripts/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 ../pom.xml release-scripts diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml index 8234c507bc9c..d9764d44e9aa 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.17.67 + 2.17.68 dynamodb-enhanced AWS Java SDK :: DynamoDB :: Enhanced Client diff --git a/services-custom/pom.xml b/services-custom/pom.xml index b1c12c7ddf61..80dcde04031c 100644 --- a/services-custom/pom.xml +++ b/services-custom/pom.xml @@ -19,7 +19,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 services-custom AWS Java SDK :: Custom Services diff --git a/services-custom/s3-transfer-manager/pom.xml b/services-custom/s3-transfer-manager/pom.xml index 961135f8de9b..2b83d7ca35b5 100644 --- a/services-custom/s3-transfer-manager/pom.xml +++ b/services-custom/s3-transfer-manager/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 ../../pom.xml s3-transfer-manager diff --git a/services/accessanalyzer/pom.xml b/services/accessanalyzer/pom.xml index faf506658497..1c7754f00cb1 100644 --- a/services/accessanalyzer/pom.xml +++ b/services/accessanalyzer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 accessanalyzer AWS Java SDK :: Services :: AccessAnalyzer diff --git a/services/account/pom.xml b/services/account/pom.xml index 94367fb8b489..a58e937cced9 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 account AWS Java SDK :: Services :: Account diff --git a/services/acm/pom.xml b/services/acm/pom.xml index 18033f6858c7..9f9d578d671d 100644 --- a/services/acm/pom.xml +++ b/services/acm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 acm AWS Java SDK :: Services :: AWS Certificate Manager diff --git a/services/acmpca/pom.xml b/services/acmpca/pom.xml index ae19309911b4..18e99cdb1f49 100644 --- a/services/acmpca/pom.xml +++ b/services/acmpca/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 acmpca AWS Java SDK :: Services :: ACM PCA diff --git a/services/alexaforbusiness/pom.xml b/services/alexaforbusiness/pom.xml index da2add3ba6fe..04a00680c4d2 100644 --- a/services/alexaforbusiness/pom.xml +++ b/services/alexaforbusiness/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 alexaforbusiness diff --git a/services/amp/pom.xml b/services/amp/pom.xml index b7c8793acb7e..01bfdd9dd0af 100644 --- a/services/amp/pom.xml +++ b/services/amp/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 amp AWS Java SDK :: Services :: Amp diff --git a/services/amplify/pom.xml b/services/amplify/pom.xml index f53d39acc122..f96278eec04d 100644 --- a/services/amplify/pom.xml +++ b/services/amplify/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 amplify AWS Java SDK :: Services :: Amplify diff --git a/services/amplifybackend/pom.xml b/services/amplifybackend/pom.xml index a63336ad43fd..f3f2bc8bc367 100644 --- a/services/amplifybackend/pom.xml +++ b/services/amplifybackend/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 amplifybackend AWS Java SDK :: Services :: Amplify Backend diff --git a/services/apigateway/pom.xml b/services/apigateway/pom.xml index 3a98ed1ffe06..773a4b7122a7 100644 --- a/services/apigateway/pom.xml +++ b/services/apigateway/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 apigateway AWS Java SDK :: Services :: Amazon API Gateway diff --git a/services/apigatewaymanagementapi/pom.xml b/services/apigatewaymanagementapi/pom.xml index 8de5a08af4f3..db80d48354b6 100644 --- a/services/apigatewaymanagementapi/pom.xml +++ b/services/apigatewaymanagementapi/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 apigatewaymanagementapi AWS Java SDK :: Services :: ApiGatewayManagementApi diff --git a/services/apigatewayv2/pom.xml b/services/apigatewayv2/pom.xml index 511f24c96322..1231759d6398 100644 --- a/services/apigatewayv2/pom.xml +++ b/services/apigatewayv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 apigatewayv2 AWS Java SDK :: Services :: ApiGatewayV2 diff --git a/services/appconfig/pom.xml b/services/appconfig/pom.xml index c462c6a91b5e..e11fe74f57ec 100644 --- a/services/appconfig/pom.xml +++ b/services/appconfig/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 appconfig AWS Java SDK :: Services :: AppConfig diff --git a/services/appflow/pom.xml b/services/appflow/pom.xml index 48569b578dcb..8add75e3d9b5 100644 --- a/services/appflow/pom.xml +++ b/services/appflow/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 appflow AWS Java SDK :: Services :: Appflow diff --git a/services/appintegrations/pom.xml b/services/appintegrations/pom.xml index ca63ba746519..b250229c9e40 100644 --- a/services/appintegrations/pom.xml +++ b/services/appintegrations/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 appintegrations AWS Java SDK :: Services :: App Integrations diff --git a/services/applicationautoscaling/pom.xml b/services/applicationautoscaling/pom.xml index f4d12d3a91b1..81a245fd6706 100644 --- a/services/applicationautoscaling/pom.xml +++ b/services/applicationautoscaling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 applicationautoscaling AWS Java SDK :: Services :: AWS Application Auto Scaling diff --git a/services/applicationcostprofiler/pom.xml b/services/applicationcostprofiler/pom.xml index 08291636dd89..c68645eba799 100644 --- a/services/applicationcostprofiler/pom.xml +++ b/services/applicationcostprofiler/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 applicationcostprofiler AWS Java SDK :: Services :: Application Cost Profiler diff --git a/services/applicationdiscovery/pom.xml b/services/applicationdiscovery/pom.xml index a0398b421b81..711604690764 100644 --- a/services/applicationdiscovery/pom.xml +++ b/services/applicationdiscovery/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 applicationdiscovery AWS Java SDK :: Services :: AWS Application Discovery Service diff --git a/services/applicationinsights/pom.xml b/services/applicationinsights/pom.xml index 27eb0851c0d7..b728814ab2ec 100644 --- a/services/applicationinsights/pom.xml +++ b/services/applicationinsights/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 applicationinsights AWS Java SDK :: Services :: Application Insights diff --git a/services/appmesh/pom.xml b/services/appmesh/pom.xml index 0cd43bd691fe..9344db4dcdeb 100644 --- a/services/appmesh/pom.xml +++ b/services/appmesh/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 appmesh AWS Java SDK :: Services :: App Mesh diff --git a/services/apprunner/pom.xml b/services/apprunner/pom.xml index 086ee3f7c207..23f7e3a1f752 100644 --- a/services/apprunner/pom.xml +++ b/services/apprunner/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 apprunner AWS Java SDK :: Services :: App Runner diff --git a/services/appstream/pom.xml b/services/appstream/pom.xml index 6fc1c6b45b7e..008b1e718bd5 100644 --- a/services/appstream/pom.xml +++ b/services/appstream/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 appstream AWS Java SDK :: Services :: Amazon AppStream diff --git a/services/appsync/pom.xml b/services/appsync/pom.xml index df4e9d26921a..c8f110543f5e 100644 --- a/services/appsync/pom.xml +++ b/services/appsync/pom.xml @@ -21,7 +21,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 appsync diff --git a/services/athena/pom.xml b/services/athena/pom.xml index f6ff17d99995..f47db505430b 100644 --- a/services/athena/pom.xml +++ b/services/athena/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 athena AWS Java SDK :: Services :: Amazon Athena diff --git a/services/auditmanager/pom.xml b/services/auditmanager/pom.xml index 80a46e6905ca..1f90e83d97d7 100644 --- a/services/auditmanager/pom.xml +++ b/services/auditmanager/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 auditmanager AWS Java SDK :: Services :: Audit Manager diff --git a/services/autoscaling/pom.xml b/services/autoscaling/pom.xml index 97c028da47fb..7e30edf2882d 100644 --- a/services/autoscaling/pom.xml +++ b/services/autoscaling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 autoscaling AWS Java SDK :: Services :: Auto Scaling diff --git a/services/autoscalingplans/pom.xml b/services/autoscalingplans/pom.xml index 7597c6e97482..d0cec01aec39 100644 --- a/services/autoscalingplans/pom.xml +++ b/services/autoscalingplans/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 autoscalingplans AWS Java SDK :: Services :: Auto Scaling Plans diff --git a/services/backup/pom.xml b/services/backup/pom.xml index 3860cb93d6d1..2123b87947b7 100644 --- a/services/backup/pom.xml +++ b/services/backup/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 backup AWS Java SDK :: Services :: Backup diff --git a/services/batch/pom.xml b/services/batch/pom.xml index d1e18de25dcc..06f567c58bea 100644 --- a/services/batch/pom.xml +++ b/services/batch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 batch AWS Java SDK :: Services :: AWS Batch diff --git a/services/braket/pom.xml b/services/braket/pom.xml index befb8a476d5b..56f0d8b7985b 100644 --- a/services/braket/pom.xml +++ b/services/braket/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 braket AWS Java SDK :: Services :: Braket diff --git a/services/budgets/pom.xml b/services/budgets/pom.xml index 2fef774733d8..3704960b468a 100644 --- a/services/budgets/pom.xml +++ b/services/budgets/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 budgets AWS Java SDK :: Services :: AWS Budgets diff --git a/services/chime/pom.xml b/services/chime/pom.xml index fbf404827c44..a44ec020b1aa 100644 --- a/services/chime/pom.xml +++ b/services/chime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 chime AWS Java SDK :: Services :: Chime diff --git a/services/chimesdkidentity/pom.xml b/services/chimesdkidentity/pom.xml index cd1fc4445c31..47247cac83e5 100644 --- a/services/chimesdkidentity/pom.xml +++ b/services/chimesdkidentity/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 chimesdkidentity AWS Java SDK :: Services :: Chime SDK Identity diff --git a/services/chimesdkidentity/src/main/resources/codegen-resources/paginators-1.json b/services/chimesdkidentity/src/main/resources/codegen-resources/paginators-1.json index 03ee29de6c81..b8fa7ee59e76 100644 --- a/services/chimesdkidentity/src/main/resources/codegen-resources/paginators-1.json +++ b/services/chimesdkidentity/src/main/resources/codegen-resources/paginators-1.json @@ -5,6 +5,11 @@ "output_token": "NextToken", "limit_key": "MaxResults" }, + "ListAppInstanceUserEndpoints": { + "input_token": "NextToken", + "output_token": "NextToken", + "limit_key": "MaxResults" + }, "ListAppInstanceUsers": { "input_token": "NextToken", "output_token": "NextToken", diff --git a/services/chimesdkidentity/src/main/resources/codegen-resources/service-2.json b/services/chimesdkidentity/src/main/resources/codegen-resources/service-2.json index 3ba35f582493..fbfebfac3798 100644 --- a/services/chimesdkidentity/src/main/resources/codegen-resources/service-2.json +++ b/services/chimesdkidentity/src/main/resources/codegen-resources/service-2.json @@ -133,6 +133,24 @@ ], "documentation":"

Deletes an AppInstanceUser.

" }, + "DeregisterAppInstanceUserEndpoint":{ + "name":"DeregisterAppInstanceUserEndpoint", + "http":{ + "method":"DELETE", + "requestUri":"/app-instance-users/{appInstanceUserArn}/endpoints/{endpointId}", + "responseCode":204 + }, + "input":{"shape":"DeregisterAppInstanceUserEndpointRequest"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ForbiddenException"}, + {"shape":"ThrottledClientException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Deregisters an AppInstanceUserEndpoint.

" + }, "DescribeAppInstance":{ "name":"DescribeAppInstance", "http":{ @@ -188,6 +206,25 @@ ], "documentation":"

Returns the full details of an AppInstanceUser.

" }, + "DescribeAppInstanceUserEndpoint":{ + "name":"DescribeAppInstanceUserEndpoint", + "http":{ + "method":"GET", + "requestUri":"/app-instance-users/{appInstanceUserArn}/endpoints/{endpointId}", + "responseCode":200 + }, + "input":{"shape":"DescribeAppInstanceUserEndpointRequest"}, + "output":{"shape":"DescribeAppInstanceUserEndpointResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ForbiddenException"}, + {"shape":"ThrottledClientException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Returns the full details of an AppInstanceUserEndpoint.

" + }, "GetAppInstanceRetentionSettings":{ "name":"GetAppInstanceRetentionSettings", "http":{ @@ -227,6 +264,25 @@ ], "documentation":"

Returns a list of the administrators in the AppInstance.

" }, + "ListAppInstanceUserEndpoints":{ + "name":"ListAppInstanceUserEndpoints", + "http":{ + "method":"GET", + "requestUri":"/app-instance-users/{appInstanceUserArn}/endpoints", + "responseCode":200 + }, + "input":{"shape":"ListAppInstanceUserEndpointsRequest"}, + "output":{"shape":"ListAppInstanceUserEndpointsResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ForbiddenException"}, + {"shape":"ThrottledClientException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Lists all the AppInstanceUserEndpoints created under a single AppInstanceUser.

" + }, "ListAppInstanceUsers":{ "name":"ListAppInstanceUsers", "http":{ @@ -263,6 +319,25 @@ ], "documentation":"

Lists all Amazon Chime AppInstances created under a single AWS account.

" }, + "ListTagsForResource":{ + "name":"ListTagsForResource", + "http":{ + "method":"GET", + "requestUri":"/tags", + "responseCode":200 + }, + "input":{"shape":"ListTagsForResourceRequest"}, + "output":{"shape":"ListTagsForResourceResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ForbiddenException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ThrottledClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Lists the tags applied to an Amazon Chime SDK identity resource.

" + }, "PutAppInstanceRetentionSettings":{ "name":"PutAppInstanceRetentionSettings", "http":{ @@ -282,6 +357,64 @@ ], "documentation":"

Sets the amount of time in days that a given AppInstance retains data.

" }, + "RegisterAppInstanceUserEndpoint":{ + "name":"RegisterAppInstanceUserEndpoint", + "http":{ + "method":"POST", + "requestUri":"/app-instance-users/{appInstanceUserArn}/endpoints", + "responseCode":201 + }, + "input":{"shape":"RegisterAppInstanceUserEndpointRequest"}, + "output":{"shape":"RegisterAppInstanceUserEndpointResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ConflictException"}, + {"shape":"ForbiddenException"}, + {"shape":"ResourceLimitExceededException"}, + {"shape":"ThrottledClientException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Registers an endpoint under an Amazon Chime AppInstanceUser. The endpoint receives messages for a user. For push notifications, the endpoint is a mobile device used to receive mobile push notifications for a user.

" + }, + "TagResource":{ + "name":"TagResource", + "http":{ + "method":"POST", + "requestUri":"/tags?operation=tag-resource", + "responseCode":204 + }, + "input":{"shape":"TagResourceRequest"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ForbiddenException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ResourceLimitExceededException"}, + {"shape":"ThrottledClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Applies the specified tags to the specified Amazon Chime SDK identity resource.

" + }, + "UntagResource":{ + "name":"UntagResource", + "http":{ + "method":"POST", + "requestUri":"/tags?operation=untag-resource", + "responseCode":204 + }, + "input":{"shape":"UntagResourceRequest"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ForbiddenException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ThrottledClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Removes the specified tags from the specified Amazon Chime SDK identity resource.

" + }, "UpdateAppInstance":{ "name":"UpdateAppInstance", "http":{ @@ -322,9 +455,36 @@ {"shape":"ServiceFailureException"} ], "documentation":"

Updates the details of an AppInstanceUser. You can update names and metadata.

" + }, + "UpdateAppInstanceUserEndpoint":{ + "name":"UpdateAppInstanceUserEndpoint", + "http":{ + "method":"PUT", + "requestUri":"/app-instance-users/{appInstanceUserArn}/endpoints/{endpointId}", + "responseCode":200 + }, + "input":{"shape":"UpdateAppInstanceUserEndpointRequest"}, + "output":{"shape":"UpdateAppInstanceUserEndpointResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ConflictException"}, + {"shape":"ForbiddenException"}, + {"shape":"ThrottledClientException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Updates the details of an AppInstanceUserEndpoint. You can update the name and AllowMessage values.

" } }, "shapes":{ + "AllowMessages":{ + "type":"string", + "enum":[ + "ALL", + "NONE" + ] + }, "AppInstance":{ "type":"structure", "members":{ @@ -441,6 +601,94 @@ }, "documentation":"

The details of an AppInstanceUser.

" }, + "AppInstanceUserEndpoint":{ + "type":"structure", + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

" + }, + "EndpointId":{ + "shape":"SensitiveString64", + "documentation":"

The unique identifier of the AppInstanceUserEndpoint.

" + }, + "Name":{ + "shape":"SensitiveString1600", + "documentation":"

The name of the AppInstanceUserEndpoint.

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

The type of the AppInstanceUserEndpoint.

" + }, + "ResourceArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the resource to which the endpoint belongs.

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

The attributes of an Endpoint.

" + }, + "CreatedTimestamp":{ + "shape":"Timestamp", + "documentation":"

The time at which an AppInstanceUserEndpoint was created.

" + }, + "LastUpdatedTimestamp":{ + "shape":"Timestamp", + "documentation":"

The time at which an AppInstanceUserEndpoint was last updated.

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

Boolean that controls whether the AppInstanceUserEndpoint is opted in to receive messages. ALL indicates the endpoint will receive all messages. NONE indicates the endpoint will receive no messages.

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

A read-only field that represents the state of an AppInstanceUserEndpoint. Supported values:

  • ACTIVE: The AppInstanceUserEndpoint is active and able to receive messages. When ACTIVE, the EndpointStatusReason remains empty.

  • INACTIVE: The AppInstanceUserEndpoint is inactive and can't receive message. When INACTIVE, the corresponding reason will be conveyed through EndpointStatusReason.

  • INVALID_DEVICE_TOKEN indicates that an AppInstanceUserEndpoint is INACTIVE due to invalid device token

  • INVALID_PINPOINT_ARN indicates that an AppInstanceUserEndpoint is INACTIVE due to an invalid pinpoint ARN that was input through the ResourceArn field.

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

An endpoint under an Amazon Chime AppInstanceUser that receives messages for a user. For push notifications, the endpoint is a mobile device used to receive mobile push notifications for a user.

" + }, + "AppInstanceUserEndpointSummary":{ + "type":"structure", + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

" + }, + "EndpointId":{ + "shape":"SensitiveString64", + "documentation":"

The unique identifier of the AppInstanceUserEndpoint.

" + }, + "Name":{ + "shape":"SensitiveString1600", + "documentation":"

The name of the AppInstanceUserEndpoint.

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

The type of the AppInstanceUserEndpoint.

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

BBoolean that controls whether the AppInstanceUserEndpoint is opted in to receive messages. ALL indicates the endpoint will receive all messages. NONE indicates the endpoint will receive no messages.

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

A read-only field that represent the state of an AppInstanceUserEndpoint.

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

Summary of the details of an AppInstanceUserEndpoint.

" + }, + "AppInstanceUserEndpointSummaryList":{ + "type":"list", + "member":{"shape":"AppInstanceUserEndpointSummary"} + }, + "AppInstanceUserEndpointType":{ + "type":"string", + "enum":[ + "APNS", + "APNS_SANDBOX", + "GCM" + ] + }, "AppInstanceUserList":{ "type":"list", "member":{"shape":"AppInstanceUserSummary"} @@ -663,6 +911,27 @@ } } }, + "DeregisterAppInstanceUserEndpointRequest":{ + "type":"structure", + "required":[ + "AppInstanceUserArn", + "EndpointId" + ], + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

", + "location":"uri", + "locationName":"appInstanceUserArn" + }, + "EndpointId":{ + "shape":"SensitiveString64", + "documentation":"

The unique identifier of the AppInstanceUserEndpoint.

", + "location":"uri", + "locationName":"endpointId" + } + } + }, "DescribeAppInstanceAdminRequest":{ "type":"structure", "required":[ @@ -714,6 +983,36 @@ } } }, + "DescribeAppInstanceUserEndpointRequest":{ + "type":"structure", + "required":[ + "AppInstanceUserArn", + "EndpointId" + ], + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveString1600", + "documentation":"

The ARN of the AppInstanceUser.

", + "location":"uri", + "locationName":"appInstanceUserArn" + }, + "EndpointId":{ + "shape":"SensitiveString64", + "documentation":"

The unique identifier of the AppInstanceUserEndpoint.

", + "location":"uri", + "locationName":"endpointId" + } + } + }, + "DescribeAppInstanceUserEndpointResponse":{ + "type":"structure", + "members":{ + "AppInstanceUserEndpoint":{ + "shape":"AppInstanceUserEndpoint", + "documentation":"

The full details of an AppInstanceUserEndpoint: the AppInstanceUserArn, ID, name, type, resource ARN, attributes, allow messages, state, and created and last updated timestamps. All timestamps use epoch milliseconds.

" + } + } + }, "DescribeAppInstanceUserRequest":{ "type":"structure", "required":["AppInstanceUserArn"], @@ -735,6 +1034,50 @@ } } }, + "EndpointAttributes":{ + "type":"structure", + "required":["DeviceToken"], + "members":{ + "DeviceToken":{ + "shape":"NonEmptySensitiveString1600", + "documentation":"

The device token for the GCM, APNS, and APNS_SANDBOX endpoint types.

" + }, + "VoipDeviceToken":{ + "shape":"NonEmptySensitiveString1600", + "documentation":"

The VOIP device token for the APNS and APNS_SANDBOX endpoint types.

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

The attributes of an Endpoint.

" + }, + "EndpointState":{ + "type":"structure", + "required":["Status"], + "members":{ + "Status":{ + "shape":"EndpointStatus", + "documentation":"

Enum that indicates the Status of an AppInstanceUserEndpoint.

" + }, + "StatusReason":{ + "shape":"EndpointStatusReason", + "documentation":"

The reason for the EndpointStatus.

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

A read-only field that represents the state of an AppInstanceUserEndpoint. Supported values:

  • ACTIVE: The AppInstanceUserEndpoint is active and able to receive messages. When ACTIVE, the EndpointStatusReason remains empty.

  • INACTIVE: The AppInstanceUserEndpoint is inactive and can't receive message. When INACTIVE, the corresponding reason will be conveyed through EndpointStatusReason.

  • INVALID_DEVICE_TOKEN indicates that an AppInstanceUserEndpoint is INACTIVE due to invalid device token

  • INVALID_PINPOINT_ARN indicates that an AppInstanceUserEndpoint is INACTIVE due to an invalid pinpoint ARN that was input through the ResourceArn field.

" + }, + "EndpointStatus":{ + "type":"string", + "enum":[ + "ACTIVE", + "INACTIVE" + ] + }, + "EndpointStatusReason":{ + "type":"string", + "enum":[ + "INVALID_DEVICE_TOKEN", + "INVALID_PINPOINT_ARN" + ] + }, "ErrorCode":{ "type":"string", "enum":[ @@ -845,6 +1188,43 @@ } } }, + "ListAppInstanceUserEndpointsRequest":{ + "type":"structure", + "required":["AppInstanceUserArn"], + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

", + "location":"uri", + "locationName":"appInstanceUserArn" + }, + "MaxResults":{ + "shape":"MaxResults", + "documentation":"

The maximum number of endpoints that you want to return.

", + "location":"querystring", + "locationName":"max-results" + }, + "NextToken":{ + "shape":"NextToken", + "documentation":"

The token passed by previous API calls until all requested endpoints are returned.

", + "location":"querystring", + "locationName":"next-token" + } + } + }, + "ListAppInstanceUserEndpointsResponse":{ + "type":"structure", + "members":{ + "AppInstanceUserEndpoints":{ + "shape":"AppInstanceUserEndpointSummaryList", + "documentation":"

The information for each requested AppInstanceUserEndpoint.

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

The token passed by previous API calls until all requested endpoints are returned.

" + } + } + }, "ListAppInstanceUsersRequest":{ "type":"structure", "required":["AppInstanceArn"], @@ -916,6 +1296,27 @@ } } }, + "ListTagsForResourceRequest":{ + "type":"structure", + "required":["ResourceARN"], + "members":{ + "ResourceARN":{ + "shape":"ChimeArn", + "documentation":"

The ARN of the resource.

", + "location":"querystring", + "locationName":"arn" + } + } + }, + "ListTagsForResourceResponse":{ + "type":"structure", + "members":{ + "Tags":{ + "shape":"TagList", + "documentation":"

The tag key-value pairs.

" + } + } + }, "MaxResults":{ "type":"integer", "max":50, @@ -942,6 +1343,13 @@ "pattern":"[\\u0009\\u000A\\u000D\\u0020-\\u007E\\u0085\\u00A0-\\uD7FF\\uE000-\\uFFFD\\u10000-\\u10FFFF]*", "sensitive":true }, + "NonEmptySensitiveString1600":{ + "type":"string", + "max":1600, + "min":1, + "pattern":".*", + "sensitive":true + }, "PutAppInstanceRetentionSettingsRequest":{ "type":"structure", "required":[ @@ -974,6 +1382,62 @@ } } }, + "RegisterAppInstanceUserEndpointRequest":{ + "type":"structure", + "required":[ + "AppInstanceUserArn", + "Type", + "ResourceArn", + "EndpointAttributes", + "ClientRequestToken" + ], + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

", + "location":"uri", + "locationName":"appInstanceUserArn" + }, + "Name":{ + "shape":"SensitiveString1600", + "documentation":"

The name of the AppInstanceUserEndpoint.

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

The type of the AppInstanceUserEndpoint. Supported types:

  • APNS: The mobile notification service for an Apple device.

  • APNS_SANDBOX: The sandbox environment of the mobile notification service for an Apple device.

  • GCM: The mobile notification service for an Android device.

Populate the ResourceArn value of each type as PinpointAppArn.

" + }, + "ResourceArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the resource to which the endpoint belongs.

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

The attributes of an Endpoint.

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

The idempotency token for each client request.

", + "idempotencyToken":true + }, + "AllowMessages":{ + "shape":"AllowMessages", + "documentation":"

Boolean that controls whether the AppInstanceUserEndpoint is opted in to receive messages. ALL indicates the endpoint receives all messages. NONE indicates the endpoint receives no messages.

" + } + } + }, + "RegisterAppInstanceUserEndpointResponse":{ + "type":"structure", + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

" + }, + "EndpointId":{ + "shape":"SensitiveString64", + "documentation":"

The unique identifier of the AppInstanceUserEndpoint.

" + } + } + }, "ResourceLimitExceededException":{ "type":"structure", "members":{ @@ -996,6 +1460,27 @@ "max":5475, "min":1 }, + "SensitiveChimeArn":{ + "type":"string", + "max":1600, + "min":5, + "pattern":"arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}", + "sensitive":true + }, + "SensitiveString1600":{ + "type":"string", + "max":1600, + "min":0, + "pattern":".*", + "sensitive":true + }, + "SensitiveString64":{ + "type":"string", + "max":64, + "min":0, + "pattern":".*", + "sensitive":true + }, "ServiceFailureException":{ "type":"structure", "members":{ @@ -1028,14 +1513,14 @@ "members":{ "Key":{ "shape":"TagKey", - "documentation":"

The key of the tag.

" + "documentation":"

The key in a tag.

" }, "Value":{ "shape":"TagValue", - "documentation":"

The value of the tag.

" + "documentation":"

The value in a tag.

" } }, - "documentation":"

Describes a tag applied to a resource.

" + "documentation":"

A tag object containing a key-value pair.

" }, "TagKey":{ "type":"string", @@ -1043,12 +1528,35 @@ "min":1, "sensitive":true }, + "TagKeyList":{ + "type":"list", + "member":{"shape":"TagKey"}, + "max":50, + "min":1 + }, "TagList":{ "type":"list", "member":{"shape":"Tag"}, "max":50, "min":1 }, + "TagResourceRequest":{ + "type":"structure", + "required":[ + "ResourceARN", + "Tags" + ], + "members":{ + "ResourceARN":{ + "shape":"ChimeArn", + "documentation":"

The resource ARN.

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

The tag key-value pairs.

" + } + } + }, "TagValue":{ "type":"string", "max":256, @@ -1076,6 +1584,23 @@ "error":{"httpStatusCode":401}, "exception":true }, + "UntagResourceRequest":{ + "type":"structure", + "required":[ + "ResourceARN", + "TagKeys" + ], + "members":{ + "ResourceARN":{ + "shape":"ChimeArn", + "documentation":"

The resource ARN.

" + }, + "TagKeys":{ + "shape":"TagKeyList", + "documentation":"

The tag keys.

" + } + } + }, "UpdateAppInstanceRequest":{ "type":"structure", "required":[ @@ -1109,6 +1634,48 @@ } } }, + "UpdateAppInstanceUserEndpointRequest":{ + "type":"structure", + "required":[ + "AppInstanceUserArn", + "EndpointId" + ], + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

", + "location":"uri", + "locationName":"appInstanceUserArn" + }, + "EndpointId":{ + "shape":"SensitiveString64", + "documentation":"

The unique identifier of the AppInstanceUserEndpoint.

", + "location":"uri", + "locationName":"endpointId" + }, + "Name":{ + "shape":"SensitiveString1600", + "documentation":"

The name of the AppInstanceUserEndpoint.

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

Boolean that controls whether the AppInstanceUserEndpoint is opted in to receive messages. ALL indicates the endpoint will receive all messages. NONE indicates the endpoint will receive no messages.

" + } + } + }, + "UpdateAppInstanceUserEndpointResponse":{ + "type":"structure", + "members":{ + "AppInstanceUserArn":{ + "shape":"SensitiveChimeArn", + "documentation":"

The ARN of the AppInstanceUser.

" + }, + "EndpointId":{ + "shape":"SensitiveString64", + "documentation":"

The unique identifier of the AppInstanceUserEndpoint.

" + } + } + }, "UpdateAppInstanceUserRequest":{ "type":"structure", "required":[ diff --git a/services/chimesdkmessaging/pom.xml b/services/chimesdkmessaging/pom.xml index dc75333cdf4c..f87479b7855e 100644 --- a/services/chimesdkmessaging/pom.xml +++ b/services/chimesdkmessaging/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 chimesdkmessaging AWS Java SDK :: Services :: Chime SDK Messaging diff --git a/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json b/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json index e17de9d75897..2e5dd830374d 100644 --- a/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json +++ b/services/chimesdkmessaging/src/main/resources/codegen-resources/service-2.json @@ -152,7 +152,7 @@ {"shape":"ServiceUnavailableException"}, {"shape":"ServiceFailureException"} ], - "documentation":"

Adds a user to a channel. The InvitedBy response field is derived from the request header. A channel member can:

  • List messages

  • Send messages

  • Receive messages

  • Edit their own messages

  • Leave the channel

Privacy settings impact this action as follows:

  • Public Channels: You do not need to be a member to list messages, but you must be a member to send messages.

  • Private Channels: You must be a member to list or send messages.

The x-amz-chime-bearer request header is mandatory. Use the AppInstanceUserArn of the user that makes the API call as the value in the header.

" + "documentation":"

Adds a user to a channel. The InvitedBy field in ChannelMembership is derived from the request header. A channel member can:

  • List messages

  • Send messages

  • Receive messages

  • Edit their own messages

  • Leave the channel

Privacy settings impact this action as follows:

  • Public Channels: You do not need to be a member to list messages, but you must be a member to send messages.

  • Private Channels: You must be a member to list or send messages.

The x-amz-chime-bearer request header is mandatory. Use the AppInstanceUserArn of the user that makes the API call as the value in the header.

" }, "CreateChannelModerator":{ "name":"CreateChannelModerator", @@ -441,6 +441,25 @@ ], "documentation":"

Disassociates a channel flow from all its channels. Once disassociated, all messages to that channel stop going through the channel flow processor.

Only administrators or channel moderators can disassociate a channel flow. The x-amz-chime-bearer request header is mandatory. Use the AppInstanceUserArn of the user that makes the API call as the value in the header.

" }, + "GetChannelMembershipPreferences":{ + "name":"GetChannelMembershipPreferences", + "http":{ + "method":"GET", + "requestUri":"/channels/{channelArn}/memberships/{memberArn}/preferences", + "responseCode":200 + }, + "input":{"shape":"GetChannelMembershipPreferencesRequest"}, + "output":{"shape":"GetChannelMembershipPreferencesResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ForbiddenException"}, + {"shape":"ThrottledClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Gets the membership preferences of an AppInstanceUser for the specified channel. The AppInstanceUser must be a member of the channel. Only the AppInstanceUser who owns the membership can retrieve preferences. Users in the AppInstanceAdmin and channel moderator roles can't retrieve preferences for other users. Banned users can't retrieve membership preferences for the channel from which they are banned.

" + }, "GetChannelMessage":{ "name":"GetChannelMessage", "http":{ @@ -553,7 +572,7 @@ {"shape":"ServiceUnavailableException"}, {"shape":"ServiceFailureException"} ], - "documentation":"

Lists all channel memberships in a channel.

The x-amz-chime-bearer request header is mandatory. Use the AppInstanceUserArn of the user that makes the API call as the value in the header.

" + "documentation":"

Lists all channel memberships in a channel.

The x-amz-chime-bearer request header is mandatory. Use the AppInstanceUserArn of the user that makes the API call as the value in the header.

If you want to list the channels to which a specific app instance user belongs, see the ListChannelMembershipsForAppInstanceUser API.

" }, "ListChannelMembershipsForAppInstanceUser":{ "name":"ListChannelMembershipsForAppInstanceUser", @@ -688,6 +707,26 @@ ], "documentation":"

Lists the tags applied to an Amazon Chime SDK messaging resource.

" }, + "PutChannelMembershipPreferences":{ + "name":"PutChannelMembershipPreferences", + "http":{ + "method":"PUT", + "requestUri":"/channels/{channelArn}/memberships/{memberArn}/preferences", + "responseCode":200 + }, + "input":{"shape":"PutChannelMembershipPreferencesRequest"}, + "output":{"shape":"PutChannelMembershipPreferencesResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"ConflictException"}, + {"shape":"UnauthorizedClientException"}, + {"shape":"ForbiddenException"}, + {"shape":"ThrottledClientException"}, + {"shape":"ServiceUnavailableException"}, + {"shape":"ServiceFailureException"} + ], + "documentation":"

Sets the membership preferences of an AppInstanceUser for the specified channel. The AppInstanceUser must be a member of the channel. Only the AppInstanceUser who owns the membership can set preferences. Users in the AppInstanceAdmin and channel moderator roles can't set preferences for other users. Banned users can't set membership preferences for the channel from which they are banned.

" + }, "RedactChannelMessage":{ "name":"RedactChannelMessage", "http":{ @@ -846,6 +885,14 @@ } }, "shapes":{ + "AllowNotifications":{ + "type":"string", + "enum":[ + "ALL", + "NONE", + "FILTERED" + ] + }, "AppInstanceUserMembershipSummary":{ "type":"structure", "members":{ @@ -923,7 +970,7 @@ "members":{ "MemberArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the member that the service couldn't add.

" + "documentation":"

The AppInstanceUserArn of the member that the service couldn't add.

" }, "ErrorCode":{ "shape":"ErrorCode", @@ -960,7 +1007,7 @@ }, "MemberArns":{ "shape":"MemberArns", - "documentation":"

The ARNs of the members you want to add to the channel.

" + "documentation":"

The AppInstanceUserArns of the members you want to add to the channel.

" }, "ChimeBearer":{ "shape":"ChimeArn", @@ -1243,6 +1290,16 @@ "type":"list", "member":{"shape":"ChannelMembershipForAppInstanceUserSummary"} }, + "ChannelMembershipPreferences":{ + "type":"structure", + "members":{ + "PushNotifications":{ + "shape":"PushNotificationPreferences", + "documentation":"

The push notification configuration of a message.

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

The channel membership preferences for an AppInstanceUser.

" + }, "ChannelMembershipSummary":{ "type":"structure", "members":{ @@ -1314,6 +1371,10 @@ "Status":{ "shape":"ChannelMessageStatusStructure", "documentation":"

The status of the channel message.

" + }, + "MessageAttributes":{ + "shape":"MessageAttributeMap", + "documentation":"

The attributes for the message, used for message filtering along with a FilterRule defined in the PushNotificationPreferences.

" } }, "documentation":"

The details of a message in a channel.

" @@ -1409,6 +1470,10 @@ "Status":{ "shape":"ChannelMessageStatusStructure", "documentation":"

The message status. The status value is SENT for messages sent to a channel without a channel flow. For channels associated with channel flow, the value determines the processing stage.

" + }, + "MessageAttributes":{ + "shape":"MessageAttributeMap", + "documentation":"

The message attribues listed in a the summary of a channel message.

" } }, "documentation":"

Summary of the messages in a Channel.

" @@ -1568,7 +1633,7 @@ }, "MemberArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the member being banned.

" + "documentation":"

The AppInstanceUserArn of the member being banned.

" }, "ChimeBearer":{ "shape":"ChimeArn", @@ -1648,7 +1713,7 @@ }, "MemberArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the member you want to add to the channel.

" + "documentation":"

The AppInstanceUserArn of the member you want to add to the channel.

" }, "Type":{ "shape":"ChannelMembershipType", @@ -1691,7 +1756,7 @@ }, "ChannelModeratorArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the moderator.

" + "documentation":"

The AppInstanceUserArn of the moderator.

" }, "ChimeBearer":{ "shape":"ChimeArn", @@ -1825,7 +1890,7 @@ }, "MemberArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the member that you're removing from the channel.

", + "documentation":"

The AppInstanceUserArn of the member that you're removing from the channel.

", "location":"uri", "locationName":"memberArn" }, @@ -1881,7 +1946,7 @@ }, "ChannelModeratorArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the moderator being deleted.

", + "documentation":"

The AppInstanceUserArn of the moderator being deleted.

", "location":"uri", "locationName":"channelModeratorArn" }, @@ -1930,7 +1995,7 @@ }, "MemberArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the member being banned.

", + "documentation":"

The AppInstanceUserArn of the member being banned.

", "location":"uri", "locationName":"memberArn" }, @@ -2025,7 +2090,7 @@ }, "MemberArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the member.

", + "documentation":"

The AppInstanceUserArn of the member.

", "location":"uri", "locationName":"memberArn" }, @@ -2099,7 +2164,7 @@ }, "ChannelModeratorArn":{ "shape":"ChimeArn", - "documentation":"

The ARN of the channel moderator.

", + "documentation":"

The AppInstanceUserArn of the channel moderator.

", "location":"uri", "locationName":"channelModeratorArn" }, @@ -2205,6 +2270,12 @@ "ABORT" ] }, + "FilterRule":{ + "type":"string", + "min":1, + "pattern":"[\\s\\S]*", + "sensitive":true + }, "ForbiddenException":{ "type":"structure", "members":{ @@ -2215,6 +2286,48 @@ "error":{"httpStatusCode":403}, "exception":true }, + "GetChannelMembershipPreferencesRequest":{ + "type":"structure", + "required":[ + "ChannelArn", + "MemberArn", + "ChimeBearer" + ], + "members":{ + "ChannelArn":{ + "shape":"ChimeArn", + "documentation":"

The ARN of the channel.

", + "location":"uri", + "locationName":"channelArn" + }, + "MemberArn":{ + "shape":"ChimeArn", + "documentation":"

The AppInstanceUserArn of the member retrieving the preferences.

", + "location":"uri", + "locationName":"memberArn" + }, + "ChimeBearer":{ + "shape":"ChimeArn", + "documentation":"

The AppInstanceUserARN of the user making the API call.

", + "location":"header", + "locationName":"x-amz-chime-bearer" + } + } + }, + "GetChannelMembershipPreferencesResponse":{ + "type":"structure", + "members":{ + "ChannelArn":{ + "shape":"ChimeArn", + "documentation":"

The ARN of the channel.

" + }, + "Member":{"shape":"Identity"}, + "Preferences":{ + "shape":"ChannelMembershipPreferences", + "documentation":"

The channel membership preferences for an AppInstanceUser .

" + } + } + }, "GetChannelMessageRequest":{ "type":"structure", "required":[ @@ -2817,6 +2930,39 @@ "type":"list", "member":{"shape":"Identity"} }, + "MessageAttributeMap":{ + "type":"map", + "key":{"shape":"MessageAttributeName"}, + "value":{"shape":"MessageAttributeValue"} + }, + "MessageAttributeName":{ + "type":"string", + "max":64, + "min":1, + "pattern":"[\\s\\S]*", + "sensitive":true + }, + "MessageAttributeStringValue":{ + "type":"string", + "max":512, + "min":1, + "pattern":"[\\s\\S]*", + "sensitive":true + }, + "MessageAttributeStringValues":{ + "type":"list", + "member":{"shape":"MessageAttributeStringValue"} + }, + "MessageAttributeValue":{ + "type":"structure", + "members":{ + "StringValues":{ + "shape":"MessageAttributeStringValues", + "documentation":"

The strings in a message attribute value.

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

A list of message attribute values.

" + }, "MessageId":{ "type":"string", "max":128, @@ -2894,7 +3040,7 @@ }, "FallbackAction":{ "shape":"FallbackAction", - "documentation":"

Determines whether to continue or stop processing if communication with processor fails. If the last processor in a channel flow sequence has a fallback action of CONTINUE, and communication with the processor fails, the message is considered processed and sent to the recipients in the channel.

" + "documentation":"

Determines whether to continue with message processing or stop it in cases where communication with a processor fails. If a processor has a fallback action of ABORT and communication with it fails, the processor sets the message status to FAILED and does not send the message to any recipients. Note that if the last processor in the channel flow sequence has a fallback action of CONTINUE and communication with the processor fails, then the message is considered processed and sent to recipients of the channel.

" } }, "documentation":"

The information about a processor in a channel flow.

" @@ -2916,6 +3062,112 @@ "max":3, "min":1 }, + "PushNotificationBody":{ + "type":"string", + "max":150, + "min":0, + "pattern":"[\\s\\S]*", + "sensitive":true + }, + "PushNotificationConfiguration":{ + "type":"structure", + "required":[ + "Title", + "Body", + "Type" + ], + "members":{ + "Title":{ + "shape":"PushNotificationTitle", + "documentation":"

The title of the push notification.

" + }, + "Body":{ + "shape":"PushNotificationBody", + "documentation":"

The body of the push notification.

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

Enum value that indicates the type of the push notification for a message. DEFAULT: Normal mobile push notification. VOIP: VOIP mobile push notification.

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

The push notification configuration of the message.

" + }, + "PushNotificationPreferences":{ + "type":"structure", + "required":["AllowNotifications"], + "members":{ + "AllowNotifications":{ + "shape":"AllowNotifications", + "documentation":"

Enum value that indicates which push notifications to send to the requested member of a channel. ALL sends all push notifications, NONE sends no push notifications, FILTERED sends only filtered push notifications.

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

The simple JSON object used to send a subset of a push notification to the requsted member.

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

The channel membership preferences for push notification.

" + }, + "PushNotificationTitle":{ + "type":"string", + "max":50, + "min":0, + "pattern":".*", + "sensitive":true + }, + "PushNotificationType":{ + "type":"string", + "enum":[ + "DEFAULT", + "VOIP" + ] + }, + "PutChannelMembershipPreferencesRequest":{ + "type":"structure", + "required":[ + "ChannelArn", + "MemberArn", + "ChimeBearer", + "Preferences" + ], + "members":{ + "ChannelArn":{ + "shape":"ChimeArn", + "documentation":"

The ARN of the channel.

", + "location":"uri", + "locationName":"channelArn" + }, + "MemberArn":{ + "shape":"ChimeArn", + "documentation":"

The AppInstanceUserArn of the member setting the preferences.

", + "location":"uri", + "locationName":"memberArn" + }, + "ChimeBearer":{ + "shape":"ChimeArn", + "documentation":"

The AppInstanceUserARN of the user making the API call.

", + "location":"header", + "locationName":"x-amz-chime-bearer" + }, + "Preferences":{ + "shape":"ChannelMembershipPreferences", + "documentation":"

The channel membership preferences of an AppInstanceUser .

" + } + } + }, + "PutChannelMembershipPreferencesResponse":{ + "type":"structure", + "members":{ + "ChannelArn":{ + "shape":"ChimeArn", + "documentation":"

The ARN of the channel.

" + }, + "Member":{"shape":"Identity"}, + "Preferences":{ + "shape":"ChannelMembershipPreferences", + "documentation":"

The ARN and metadata of the member being added.

" + } + } + }, "RedactChannelMessageRequest":{ "type":"structure", "required":[ @@ -3017,6 +3269,14 @@ "documentation":"

The AppInstanceUserArn of the user that makes the API call.

", "location":"header", "locationName":"x-amz-chime-bearer" + }, + "PushNotification":{ + "shape":"PushNotificationConfiguration", + "documentation":"

The push notification configuration of the message.

" + }, + "MessageAttributes":{ + "shape":"MessageAttributeMap", + "documentation":"

The attributes for the message, used for message filtering along with a FilterRule defined in the PushNotificationPreferences.

" } } }, diff --git a/services/cloud9/pom.xml b/services/cloud9/pom.xml index a8f6b03adf21..dbb59966af70 100644 --- a/services/cloud9/pom.xml +++ b/services/cloud9/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 cloud9 diff --git a/services/cloudcontrol/pom.xml b/services/cloudcontrol/pom.xml index 8e76a8bddb59..27b56c24324e 100644 --- a/services/cloudcontrol/pom.xml +++ b/services/cloudcontrol/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudcontrol AWS Java SDK :: Services :: Cloud Control diff --git a/services/clouddirectory/pom.xml b/services/clouddirectory/pom.xml index 2461006783d9..cb0b0d44bd10 100644 --- a/services/clouddirectory/pom.xml +++ b/services/clouddirectory/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 clouddirectory AWS Java SDK :: Services :: Amazon CloudDirectory diff --git a/services/cloudformation/pom.xml b/services/cloudformation/pom.xml index acbdc5d5ef1b..e045838c324e 100644 --- a/services/cloudformation/pom.xml +++ b/services/cloudformation/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudformation AWS Java SDK :: Services :: AWS CloudFormation diff --git a/services/cloudfront/pom.xml b/services/cloudfront/pom.xml index 764fe2c42f3e..e6cbf15913c2 100644 --- a/services/cloudfront/pom.xml +++ b/services/cloudfront/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudfront AWS Java SDK :: Services :: Amazon CloudFront diff --git a/services/cloudhsm/pom.xml b/services/cloudhsm/pom.xml index 3a09b843364c..0e7739a1e5fb 100644 --- a/services/cloudhsm/pom.xml +++ b/services/cloudhsm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudhsm AWS Java SDK :: Services :: AWS CloudHSM diff --git a/services/cloudhsmv2/pom.xml b/services/cloudhsmv2/pom.xml index 3c87f2adc032..7aff0fc06bc6 100644 --- a/services/cloudhsmv2/pom.xml +++ b/services/cloudhsmv2/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 cloudhsmv2 diff --git a/services/cloudsearch/pom.xml b/services/cloudsearch/pom.xml index 80e97742a781..9e2529c815f3 100644 --- a/services/cloudsearch/pom.xml +++ b/services/cloudsearch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudsearch AWS Java SDK :: Services :: Amazon CloudSearch diff --git a/services/cloudsearchdomain/pom.xml b/services/cloudsearchdomain/pom.xml index 297e29591723..63ed59263a07 100644 --- a/services/cloudsearchdomain/pom.xml +++ b/services/cloudsearchdomain/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudsearchdomain AWS Java SDK :: Services :: Amazon CloudSearch Domain diff --git a/services/cloudtrail/pom.xml b/services/cloudtrail/pom.xml index 22a75bb62fee..17ea2bbf08c4 100644 --- a/services/cloudtrail/pom.xml +++ b/services/cloudtrail/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudtrail AWS Java SDK :: Services :: AWS CloudTrail diff --git a/services/cloudwatch/pom.xml b/services/cloudwatch/pom.xml index 2ee950551404..d8b84e82b2f3 100644 --- a/services/cloudwatch/pom.xml +++ b/services/cloudwatch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudwatch AWS Java SDK :: Services :: Amazon CloudWatch diff --git a/services/cloudwatchevents/pom.xml b/services/cloudwatchevents/pom.xml index f3a896ef0305..da67ff518ccd 100644 --- a/services/cloudwatchevents/pom.xml +++ b/services/cloudwatchevents/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudwatchevents AWS Java SDK :: Services :: Amazon CloudWatch Events diff --git a/services/cloudwatchlogs/pom.xml b/services/cloudwatchlogs/pom.xml index be665b320cc5..2be4a30ac069 100644 --- a/services/cloudwatchlogs/pom.xml +++ b/services/cloudwatchlogs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cloudwatchlogs AWS Java SDK :: Services :: Amazon CloudWatch Logs diff --git a/services/codeartifact/pom.xml b/services/codeartifact/pom.xml index 2ad8126f4403..5b9bd467baac 100644 --- a/services/codeartifact/pom.xml +++ b/services/codeartifact/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codeartifact AWS Java SDK :: Services :: Codeartifact diff --git a/services/codebuild/pom.xml b/services/codebuild/pom.xml index 22aee193384b..85ecbc1e8631 100644 --- a/services/codebuild/pom.xml +++ b/services/codebuild/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codebuild AWS Java SDK :: Services :: AWS Code Build diff --git a/services/codecommit/pom.xml b/services/codecommit/pom.xml index 7b7e90d850d2..61ff140d8909 100644 --- a/services/codecommit/pom.xml +++ b/services/codecommit/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codecommit AWS Java SDK :: Services :: AWS CodeCommit diff --git a/services/codedeploy/pom.xml b/services/codedeploy/pom.xml index 2e7bb04e2965..b4430701519c 100644 --- a/services/codedeploy/pom.xml +++ b/services/codedeploy/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codedeploy AWS Java SDK :: Services :: AWS CodeDeploy diff --git a/services/codeguruprofiler/pom.xml b/services/codeguruprofiler/pom.xml index f7a19d3e7bcf..36f05e3bfe86 100644 --- a/services/codeguruprofiler/pom.xml +++ b/services/codeguruprofiler/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codeguruprofiler AWS Java SDK :: Services :: CodeGuruProfiler diff --git a/services/codegurureviewer/pom.xml b/services/codegurureviewer/pom.xml index a68ca631b013..aee000779e83 100644 --- a/services/codegurureviewer/pom.xml +++ b/services/codegurureviewer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codegurureviewer AWS Java SDK :: Services :: CodeGuru Reviewer diff --git a/services/codepipeline/pom.xml b/services/codepipeline/pom.xml index 3cc4ee808c0b..2d0fa59119c5 100644 --- a/services/codepipeline/pom.xml +++ b/services/codepipeline/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codepipeline AWS Java SDK :: Services :: AWS CodePipeline diff --git a/services/codestar/pom.xml b/services/codestar/pom.xml index 62b5facdeed5..7b3aa0675f77 100644 --- a/services/codestar/pom.xml +++ b/services/codestar/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codestar AWS Java SDK :: Services :: AWS CodeStar diff --git a/services/codestarconnections/pom.xml b/services/codestarconnections/pom.xml index ff0bb7b5f361..761197e996cc 100644 --- a/services/codestarconnections/pom.xml +++ b/services/codestarconnections/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codestarconnections AWS Java SDK :: Services :: CodeStar connections diff --git a/services/codestarnotifications/pom.xml b/services/codestarnotifications/pom.xml index 31eae1993f7d..f34aa814c009 100644 --- a/services/codestarnotifications/pom.xml +++ b/services/codestarnotifications/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 codestarnotifications AWS Java SDK :: Services :: Codestar Notifications diff --git a/services/cognitoidentity/pom.xml b/services/cognitoidentity/pom.xml index b8cda3970456..8984698811bd 100644 --- a/services/cognitoidentity/pom.xml +++ b/services/cognitoidentity/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cognitoidentity AWS Java SDK :: Services :: Amazon Cognito Identity diff --git a/services/cognitoidentityprovider/pom.xml b/services/cognitoidentityprovider/pom.xml index de0527503498..3f5aaa66adc0 100644 --- a/services/cognitoidentityprovider/pom.xml +++ b/services/cognitoidentityprovider/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cognitoidentityprovider AWS Java SDK :: Services :: Amazon Cognito Identity Provider Service diff --git a/services/cognitosync/pom.xml b/services/cognitosync/pom.xml index ecffab712cae..467ae3ec5f82 100644 --- a/services/cognitosync/pom.xml +++ b/services/cognitosync/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 cognitosync AWS Java SDK :: Services :: Amazon Cognito Sync diff --git a/services/comprehend/pom.xml b/services/comprehend/pom.xml index e264b98724db..eb367e000050 100644 --- a/services/comprehend/pom.xml +++ b/services/comprehend/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 comprehend diff --git a/services/comprehendmedical/pom.xml b/services/comprehendmedical/pom.xml index 29677c89ff62..76015fbf9ab5 100644 --- a/services/comprehendmedical/pom.xml +++ b/services/comprehendmedical/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 comprehendmedical AWS Java SDK :: Services :: ComprehendMedical diff --git a/services/computeoptimizer/pom.xml b/services/computeoptimizer/pom.xml index 1fb893912a8d..7278f2db2c74 100644 --- a/services/computeoptimizer/pom.xml +++ b/services/computeoptimizer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 computeoptimizer AWS Java SDK :: Services :: Compute Optimizer diff --git a/services/config/pom.xml b/services/config/pom.xml index 3b706413417c..dcc034ff309c 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 config AWS Java SDK :: Services :: AWS Config diff --git a/services/connect/pom.xml b/services/connect/pom.xml index 20f21bd3d216..245e267b14bc 100644 --- a/services/connect/pom.xml +++ b/services/connect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 connect AWS Java SDK :: Services :: Connect diff --git a/services/connectcontactlens/pom.xml b/services/connectcontactlens/pom.xml index 6d802a6e6476..792d239cc842 100644 --- a/services/connectcontactlens/pom.xml +++ b/services/connectcontactlens/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 connectcontactlens AWS Java SDK :: Services :: Connect Contact Lens diff --git a/services/connectparticipant/pom.xml b/services/connectparticipant/pom.xml index 7f17329dd156..d7443eee7405 100644 --- a/services/connectparticipant/pom.xml +++ b/services/connectparticipant/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 connectparticipant AWS Java SDK :: Services :: ConnectParticipant diff --git a/services/costandusagereport/pom.xml b/services/costandusagereport/pom.xml index 6ac2e2871287..083e85ef11f9 100644 --- a/services/costandusagereport/pom.xml +++ b/services/costandusagereport/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 costandusagereport AWS Java SDK :: Services :: AWS Cost and Usage Report diff --git a/services/costexplorer/pom.xml b/services/costexplorer/pom.xml index 20eed78023e1..46148fe70d6b 100644 --- a/services/costexplorer/pom.xml +++ b/services/costexplorer/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 costexplorer diff --git a/services/customerprofiles/pom.xml b/services/customerprofiles/pom.xml index ac932dbe13c6..61bb90a060a6 100644 --- a/services/customerprofiles/pom.xml +++ b/services/customerprofiles/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 customerprofiles AWS Java SDK :: Services :: Customer Profiles diff --git a/services/databasemigration/pom.xml b/services/databasemigration/pom.xml index 7fb95ceffb66..0eba26f3e9dc 100644 --- a/services/databasemigration/pom.xml +++ b/services/databasemigration/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 databasemigration AWS Java SDK :: Services :: AWS Database Migration Service diff --git a/services/databrew/pom.xml b/services/databrew/pom.xml index a6273310abcf..ebef9e2a758f 100644 --- a/services/databrew/pom.xml +++ b/services/databrew/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 databrew AWS Java SDK :: Services :: Data Brew diff --git a/services/dataexchange/pom.xml b/services/dataexchange/pom.xml index 86fa9c912700..9eaadd5575d2 100644 --- a/services/dataexchange/pom.xml +++ b/services/dataexchange/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 dataexchange AWS Java SDK :: Services :: DataExchange diff --git a/services/datapipeline/pom.xml b/services/datapipeline/pom.xml index f819ec4e3eaf..f6b6c229f998 100644 --- a/services/datapipeline/pom.xml +++ b/services/datapipeline/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 datapipeline AWS Java SDK :: Services :: AWS Data Pipeline diff --git a/services/datasync/pom.xml b/services/datasync/pom.xml index 0c1752a5d88d..c68bd132e568 100644 --- a/services/datasync/pom.xml +++ b/services/datasync/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 datasync AWS Java SDK :: Services :: DataSync diff --git a/services/dax/pom.xml b/services/dax/pom.xml index 2bd409d42dc2..ab80fd3721a6 100644 --- a/services/dax/pom.xml +++ b/services/dax/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 dax AWS Java SDK :: Services :: Amazon DynamoDB Accelerator (DAX) diff --git a/services/detective/pom.xml b/services/detective/pom.xml index 507584b4b66c..2cc33953de8a 100644 --- a/services/detective/pom.xml +++ b/services/detective/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 detective AWS Java SDK :: Services :: Detective diff --git a/services/devicefarm/pom.xml b/services/devicefarm/pom.xml index 56737acc92ec..867e26e50588 100644 --- a/services/devicefarm/pom.xml +++ b/services/devicefarm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 devicefarm AWS Java SDK :: Services :: AWS Device Farm diff --git a/services/devopsguru/pom.xml b/services/devopsguru/pom.xml index b65ad054b034..e9be15aa48e8 100644 --- a/services/devopsguru/pom.xml +++ b/services/devopsguru/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 devopsguru AWS Java SDK :: Services :: Dev Ops Guru diff --git a/services/directconnect/pom.xml b/services/directconnect/pom.xml index f0297f5a8332..d17df91b5dd6 100644 --- a/services/directconnect/pom.xml +++ b/services/directconnect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 directconnect AWS Java SDK :: Services :: AWS Direct Connect diff --git a/services/directory/pom.xml b/services/directory/pom.xml index 3b63b9a5e71d..180ae10c24d1 100644 --- a/services/directory/pom.xml +++ b/services/directory/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 directory AWS Java SDK :: Services :: AWS Directory Service diff --git a/services/dlm/pom.xml b/services/dlm/pom.xml index 224b9ae5ceba..551ea6215779 100644 --- a/services/dlm/pom.xml +++ b/services/dlm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 dlm AWS Java SDK :: Services :: DLM diff --git a/services/docdb/pom.xml b/services/docdb/pom.xml index 74722eb456e6..d505ae51e1d0 100644 --- a/services/docdb/pom.xml +++ b/services/docdb/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 docdb AWS Java SDK :: Services :: DocDB diff --git a/services/dynamodb/pom.xml b/services/dynamodb/pom.xml index 8f53d1597a7f..6a7590b25f4d 100644 --- a/services/dynamodb/pom.xml +++ b/services/dynamodb/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 dynamodb AWS Java SDK :: Services :: Amazon DynamoDB diff --git a/services/ebs/pom.xml b/services/ebs/pom.xml index badf76ce3cda..19153cc25970 100644 --- a/services/ebs/pom.xml +++ b/services/ebs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ebs AWS Java SDK :: Services :: EBS diff --git a/services/ec2/pom.xml b/services/ec2/pom.xml index 51eb56e38fae..073c3ff2e0c5 100644 --- a/services/ec2/pom.xml +++ b/services/ec2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ec2 AWS Java SDK :: Services :: Amazon EC2 diff --git a/services/ec2instanceconnect/pom.xml b/services/ec2instanceconnect/pom.xml index 2fe87f57b783..576cc861daca 100644 --- a/services/ec2instanceconnect/pom.xml +++ b/services/ec2instanceconnect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ec2instanceconnect AWS Java SDK :: Services :: EC2 Instance Connect diff --git a/services/ecr/pom.xml b/services/ecr/pom.xml index 046a7532ed5e..afd4152bb8da 100644 --- a/services/ecr/pom.xml +++ b/services/ecr/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ecr AWS Java SDK :: Services :: Amazon EC2 Container Registry diff --git a/services/ecrpublic/pom.xml b/services/ecrpublic/pom.xml index c7668ad55fa7..c29ca12073b1 100644 --- a/services/ecrpublic/pom.xml +++ b/services/ecrpublic/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ecrpublic AWS Java SDK :: Services :: ECR PUBLIC diff --git a/services/ecs/pom.xml b/services/ecs/pom.xml index ec8b62ab9c96..12dbcb823f2a 100644 --- a/services/ecs/pom.xml +++ b/services/ecs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ecs AWS Java SDK :: Services :: Amazon EC2 Container Service diff --git a/services/efs/pom.xml b/services/efs/pom.xml index 9456780a2ce6..3511f1527e6d 100644 --- a/services/efs/pom.xml +++ b/services/efs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 efs AWS Java SDK :: Services :: Amazon Elastic File System diff --git a/services/eks/pom.xml b/services/eks/pom.xml index efba9ab29c10..53a60056b6ab 100644 --- a/services/eks/pom.xml +++ b/services/eks/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 eks AWS Java SDK :: Services :: EKS diff --git a/services/elasticache/pom.xml b/services/elasticache/pom.xml index 82e88dd65356..70771ae51b9c 100644 --- a/services/elasticache/pom.xml +++ b/services/elasticache/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 elasticache AWS Java SDK :: Services :: Amazon ElastiCache diff --git a/services/elasticbeanstalk/pom.xml b/services/elasticbeanstalk/pom.xml index b8c7cb70c2a9..de6e2d7c535a 100644 --- a/services/elasticbeanstalk/pom.xml +++ b/services/elasticbeanstalk/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 elasticbeanstalk AWS Java SDK :: Services :: AWS Elastic Beanstalk diff --git a/services/elasticinference/pom.xml b/services/elasticinference/pom.xml index f01a33a7a765..908175f86978 100644 --- a/services/elasticinference/pom.xml +++ b/services/elasticinference/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 elasticinference AWS Java SDK :: Services :: Elastic Inference diff --git a/services/elasticloadbalancing/pom.xml b/services/elasticloadbalancing/pom.xml index 82d5651f17f2..4e247b5fb514 100644 --- a/services/elasticloadbalancing/pom.xml +++ b/services/elasticloadbalancing/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 elasticloadbalancing AWS Java SDK :: Services :: Elastic Load Balancing diff --git a/services/elasticloadbalancingv2/pom.xml b/services/elasticloadbalancingv2/pom.xml index e8f3d8e46b36..d4c678244f8e 100644 --- a/services/elasticloadbalancingv2/pom.xml +++ b/services/elasticloadbalancingv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 elasticloadbalancingv2 AWS Java SDK :: Services :: Elastic Load Balancing V2 diff --git a/services/elasticsearch/pom.xml b/services/elasticsearch/pom.xml index fcb447346dcf..7fd7db71fdd6 100644 --- a/services/elasticsearch/pom.xml +++ b/services/elasticsearch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 elasticsearch AWS Java SDK :: Services :: Amazon Elasticsearch Service diff --git a/services/elastictranscoder/pom.xml b/services/elastictranscoder/pom.xml index eaf3cfdfea73..aabd0e6e88d4 100644 --- a/services/elastictranscoder/pom.xml +++ b/services/elastictranscoder/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 elastictranscoder AWS Java SDK :: Services :: Amazon Elastic Transcoder diff --git a/services/emr/pom.xml b/services/emr/pom.xml index 9f431ac53343..f020a9417118 100644 --- a/services/emr/pom.xml +++ b/services/emr/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 emr AWS Java SDK :: Services :: Amazon EMR diff --git a/services/emrcontainers/pom.xml b/services/emrcontainers/pom.xml index c1234f14e6b2..d80ca0ea6144 100644 --- a/services/emrcontainers/pom.xml +++ b/services/emrcontainers/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 emrcontainers AWS Java SDK :: Services :: EMR Containers diff --git a/services/emrcontainers/src/main/resources/codegen-resources/service-2.json b/services/emrcontainers/src/main/resources/codegen-resources/service-2.json index 5929dab8e4e8..990e55fe60df 100644 --- a/services/emrcontainers/src/main/resources/codegen-resources/service-2.json +++ b/services/emrcontainers/src/main/resources/codegen-resources/service-2.json @@ -239,6 +239,11 @@ "min":44, "pattern":"^arn:(aws[a-zA-Z0-9-]*):acm:.+:(\\d{12}):certificate/.+$" }, + "Base64Encoded":{ + "type":"string", + "max":5000, + "pattern":"^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$" + }, "CancelJobRunRequest":{ "type":"structure", "required":[ @@ -273,6 +278,20 @@ } } }, + "Certificate":{ + "type":"structure", + "members":{ + "certificateArn":{ + "shape":"ACMCertArn", + "documentation":"

The ARN of the certificate generated for managed endpoint.

" + }, + "certificateData":{ + "shape":"Base64Encoded", + "documentation":"

The base64 encoded PEM certificate data generated for managed endpoint.

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

The entity representing certificate data generated for managed endpoint.

" + }, "ClientToken":{ "type":"string", "max":64, @@ -383,7 +402,6 @@ "type", "releaseLabel", "executionRoleArn", - "certificateArn", "clientToken" ], "members":{ @@ -411,7 +429,9 @@ }, "certificateArn":{ "shape":"ACMCertArn", - "documentation":"

The certificate ARN of the managed endpoint.

" + "documentation":"

The certificate ARN provided by users for the managed endpoint. This fiedd is under deprecation and will be removed in future releases.

", + "deprecated":true, + "deprecatedMessage":"Customer provided certificate-arn is deprecated and would be removed in future." }, "configurationOverrides":{ "shape":"ConfigurationOverrides", @@ -680,7 +700,13 @@ }, "certificateArn":{ "shape":"ACMCertArn", - "documentation":"

The certificate ARN of the endpoint.

" + "documentation":"

The certificate ARN of the endpoint. This field is under deprecation and will be removed in future.

", + "deprecated":true, + "deprecatedMessage":"Customer provided certificate-arn is deprecated and would be removed in future." + }, + "certificateAuthority":{ + "shape":"Certificate", + "documentation":"

The certificate generated by emr control plane on customer behalf to secure the managed endpoint.

" }, "configurationOverrides":{ "shape":"ConfigurationOverrides", diff --git a/services/eventbridge/pom.xml b/services/eventbridge/pom.xml index c53a3c51ad67..2c76037c2160 100644 --- a/services/eventbridge/pom.xml +++ b/services/eventbridge/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 eventbridge AWS Java SDK :: Services :: EventBridge diff --git a/services/finspace/pom.xml b/services/finspace/pom.xml index b1274864dfdb..48b3710087a9 100644 --- a/services/finspace/pom.xml +++ b/services/finspace/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 finspace AWS Java SDK :: Services :: Finspace diff --git a/services/finspacedata/pom.xml b/services/finspacedata/pom.xml index e1385dc1dd63..a5bf8ec075f7 100644 --- a/services/finspacedata/pom.xml +++ b/services/finspacedata/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 finspacedata AWS Java SDK :: Services :: Finspace Data diff --git a/services/firehose/pom.xml b/services/firehose/pom.xml index ac8270479168..b010a79dd264 100644 --- a/services/firehose/pom.xml +++ b/services/firehose/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 firehose AWS Java SDK :: Services :: Amazon Kinesis Firehose diff --git a/services/fis/pom.xml b/services/fis/pom.xml index f92e5ce03ffa..09048ab80c6f 100644 --- a/services/fis/pom.xml +++ b/services/fis/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 fis AWS Java SDK :: Services :: Fis diff --git a/services/fms/pom.xml b/services/fms/pom.xml index 3a363886ff9e..725cd7dfd480 100644 --- a/services/fms/pom.xml +++ b/services/fms/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 fms AWS Java SDK :: Services :: FMS diff --git a/services/forecast/pom.xml b/services/forecast/pom.xml index 60a724f7dbbd..ae75bd17662a 100644 --- a/services/forecast/pom.xml +++ b/services/forecast/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 forecast AWS Java SDK :: Services :: Forecast diff --git a/services/forecastquery/pom.xml b/services/forecastquery/pom.xml index bafc8e6b111b..303dda9b8c3e 100644 --- a/services/forecastquery/pom.xml +++ b/services/forecastquery/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 forecastquery AWS Java SDK :: Services :: Forecastquery diff --git a/services/frauddetector/pom.xml b/services/frauddetector/pom.xml index 6f5eb61bbd92..c26cf2882541 100644 --- a/services/frauddetector/pom.xml +++ b/services/frauddetector/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 frauddetector AWS Java SDK :: Services :: FraudDetector diff --git a/services/fsx/pom.xml b/services/fsx/pom.xml index 1ca56034cbd7..38b732e29656 100644 --- a/services/fsx/pom.xml +++ b/services/fsx/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 fsx AWS Java SDK :: Services :: FSx diff --git a/services/gamelift/pom.xml b/services/gamelift/pom.xml index 9825b59f52ee..350b6ba0c778 100644 --- a/services/gamelift/pom.xml +++ b/services/gamelift/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 gamelift AWS Java SDK :: Services :: AWS GameLift diff --git a/services/glacier/pom.xml b/services/glacier/pom.xml index a317e3fe0dab..beef91e304dc 100644 --- a/services/glacier/pom.xml +++ b/services/glacier/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 glacier AWS Java SDK :: Services :: Amazon Glacier diff --git a/services/globalaccelerator/pom.xml b/services/globalaccelerator/pom.xml index 47c119a84ed2..470ea508e8ac 100644 --- a/services/globalaccelerator/pom.xml +++ b/services/globalaccelerator/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 globalaccelerator AWS Java SDK :: Services :: Global Accelerator diff --git a/services/glue/pom.xml b/services/glue/pom.xml index 3a33099c2a87..9ce02ccf675b 100644 --- a/services/glue/pom.xml +++ b/services/glue/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 glue diff --git a/services/grafana/pom.xml b/services/grafana/pom.xml index 46aeffffdd37..6c86a77d02f5 100644 --- a/services/grafana/pom.xml +++ b/services/grafana/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 grafana AWS Java SDK :: Services :: Grafana diff --git a/services/greengrass/pom.xml b/services/greengrass/pom.xml index 25bc1920ab29..d24102ff2328 100644 --- a/services/greengrass/pom.xml +++ b/services/greengrass/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 greengrass AWS Java SDK :: Services :: AWS Greengrass diff --git a/services/greengrassv2/pom.xml b/services/greengrassv2/pom.xml index d3650335d912..ef7f3b37924f 100644 --- a/services/greengrassv2/pom.xml +++ b/services/greengrassv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 greengrassv2 AWS Java SDK :: Services :: Greengrass V2 diff --git a/services/groundstation/pom.xml b/services/groundstation/pom.xml index 838f941bb5c9..9d62b56b3a24 100644 --- a/services/groundstation/pom.xml +++ b/services/groundstation/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 groundstation AWS Java SDK :: Services :: GroundStation diff --git a/services/guardduty/pom.xml b/services/guardduty/pom.xml index 3a42a27f982e..c73b39b6f717 100644 --- a/services/guardduty/pom.xml +++ b/services/guardduty/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 guardduty diff --git a/services/health/pom.xml b/services/health/pom.xml index 76b921ed65da..8991704702f0 100644 --- a/services/health/pom.xml +++ b/services/health/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 health AWS Java SDK :: Services :: AWS Health APIs and Notifications diff --git a/services/healthlake/pom.xml b/services/healthlake/pom.xml index cd0021d3a697..8e2fb6885e87 100644 --- a/services/healthlake/pom.xml +++ b/services/healthlake/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 healthlake AWS Java SDK :: Services :: Health Lake diff --git a/services/honeycode/pom.xml b/services/honeycode/pom.xml index a95f83f388ff..ab1097b16c86 100644 --- a/services/honeycode/pom.xml +++ b/services/honeycode/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 honeycode AWS Java SDK :: Services :: Honeycode diff --git a/services/iam/pom.xml b/services/iam/pom.xml index 2d84f88b24af..8333fa1bb7d7 100644 --- a/services/iam/pom.xml +++ b/services/iam/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iam AWS Java SDK :: Services :: AWS IAM diff --git a/services/identitystore/pom.xml b/services/identitystore/pom.xml index a10a33a94708..b5d5a7b8f617 100644 --- a/services/identitystore/pom.xml +++ b/services/identitystore/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 identitystore AWS Java SDK :: Services :: Identitystore diff --git a/services/imagebuilder/pom.xml b/services/imagebuilder/pom.xml index 8b56f44da809..ac68f9a0540b 100644 --- a/services/imagebuilder/pom.xml +++ b/services/imagebuilder/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 imagebuilder AWS Java SDK :: Services :: Imagebuilder diff --git a/services/inspector/pom.xml b/services/inspector/pom.xml index ff6c1dae44f2..f0ddf52ec2bf 100644 --- a/services/inspector/pom.xml +++ b/services/inspector/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 inspector AWS Java SDK :: Services :: Amazon Inspector Service diff --git a/services/iot/pom.xml b/services/iot/pom.xml index b71cd58d3cad..8d2923db917b 100644 --- a/services/iot/pom.xml +++ b/services/iot/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iot AWS Java SDK :: Services :: AWS IoT diff --git a/services/iot1clickdevices/pom.xml b/services/iot1clickdevices/pom.xml index 28b161cf2467..2ef51af1302f 100644 --- a/services/iot1clickdevices/pom.xml +++ b/services/iot1clickdevices/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iot1clickdevices AWS Java SDK :: Services :: IoT 1Click Devices Service diff --git a/services/iot1clickprojects/pom.xml b/services/iot1clickprojects/pom.xml index 4227076c6b5d..a4a7d0af7d01 100644 --- a/services/iot1clickprojects/pom.xml +++ b/services/iot1clickprojects/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iot1clickprojects AWS Java SDK :: Services :: IoT 1Click Projects diff --git a/services/iotanalytics/pom.xml b/services/iotanalytics/pom.xml index 0c5e10fde370..6e6643ad15f3 100644 --- a/services/iotanalytics/pom.xml +++ b/services/iotanalytics/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotanalytics AWS Java SDK :: Services :: IoTAnalytics diff --git a/services/iotdataplane/pom.xml b/services/iotdataplane/pom.xml index aa2ba3faa9cd..655fdb460f77 100644 --- a/services/iotdataplane/pom.xml +++ b/services/iotdataplane/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotdataplane AWS Java SDK :: Services :: AWS IoT Data Plane diff --git a/services/iotdeviceadvisor/pom.xml b/services/iotdeviceadvisor/pom.xml index d343917e69b2..ce7cd2e09afb 100644 --- a/services/iotdeviceadvisor/pom.xml +++ b/services/iotdeviceadvisor/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotdeviceadvisor AWS Java SDK :: Services :: Iot Device Advisor diff --git a/services/iotevents/pom.xml b/services/iotevents/pom.xml index b5a9abc00de3..15d3efbc6602 100644 --- a/services/iotevents/pom.xml +++ b/services/iotevents/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotevents AWS Java SDK :: Services :: IoT Events diff --git a/services/ioteventsdata/pom.xml b/services/ioteventsdata/pom.xml index 8351eafb7614..c38095bfef08 100644 --- a/services/ioteventsdata/pom.xml +++ b/services/ioteventsdata/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ioteventsdata AWS Java SDK :: Services :: IoT Events Data diff --git a/services/iotfleethub/pom.xml b/services/iotfleethub/pom.xml index 8b801f03d0b8..a3dcc2bcbc61 100644 --- a/services/iotfleethub/pom.xml +++ b/services/iotfleethub/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotfleethub AWS Java SDK :: Services :: Io T Fleet Hub diff --git a/services/iotjobsdataplane/pom.xml b/services/iotjobsdataplane/pom.xml index 91feb8a83df3..ff4475fcfa63 100644 --- a/services/iotjobsdataplane/pom.xml +++ b/services/iotjobsdataplane/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotjobsdataplane AWS Java SDK :: Services :: IoT Jobs Data Plane diff --git a/services/iotsecuretunneling/pom.xml b/services/iotsecuretunneling/pom.xml index 7b6fa817aa2b..38adc0799b49 100644 --- a/services/iotsecuretunneling/pom.xml +++ b/services/iotsecuretunneling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotsecuretunneling AWS Java SDK :: Services :: IoTSecureTunneling diff --git a/services/iotsitewise/pom.xml b/services/iotsitewise/pom.xml index ce30864050cb..4c43ee0ae6b9 100644 --- a/services/iotsitewise/pom.xml +++ b/services/iotsitewise/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotsitewise AWS Java SDK :: Services :: Io T Site Wise diff --git a/services/iotthingsgraph/pom.xml b/services/iotthingsgraph/pom.xml index 700a6e44f073..1894cb98b9b1 100644 --- a/services/iotthingsgraph/pom.xml +++ b/services/iotthingsgraph/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotthingsgraph AWS Java SDK :: Services :: IoTThingsGraph diff --git a/services/iotwireless/pom.xml b/services/iotwireless/pom.xml index 2114e685e0c1..3fb645dc919c 100644 --- a/services/iotwireless/pom.xml +++ b/services/iotwireless/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 iotwireless AWS Java SDK :: Services :: IoT Wireless diff --git a/services/ivs/pom.xml b/services/ivs/pom.xml index 4596a60edb05..160f5b95c668 100644 --- a/services/ivs/pom.xml +++ b/services/ivs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ivs AWS Java SDK :: Services :: Ivs diff --git a/services/kafka/pom.xml b/services/kafka/pom.xml index fdc02ea418e6..f65b1311baac 100644 --- a/services/kafka/pom.xml +++ b/services/kafka/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kafka AWS Java SDK :: Services :: Kafka diff --git a/services/kafkaconnect/pom.xml b/services/kafkaconnect/pom.xml index 382fe26f72ee..1700d3a6ffc6 100644 --- a/services/kafkaconnect/pom.xml +++ b/services/kafkaconnect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kafkaconnect AWS Java SDK :: Services :: Kafka Connect diff --git a/services/kendra/pom.xml b/services/kendra/pom.xml index 67d748e0d2b3..008c5bcdf481 100644 --- a/services/kendra/pom.xml +++ b/services/kendra/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kendra AWS Java SDK :: Services :: Kendra diff --git a/services/kinesis/pom.xml b/services/kinesis/pom.xml index b44938700b05..05b2ee3e25b9 100644 --- a/services/kinesis/pom.xml +++ b/services/kinesis/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kinesis AWS Java SDK :: Services :: Amazon Kinesis diff --git a/services/kinesisanalytics/pom.xml b/services/kinesisanalytics/pom.xml index ff6d09d65c47..8e8b9ab19fb4 100644 --- a/services/kinesisanalytics/pom.xml +++ b/services/kinesisanalytics/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kinesisanalytics AWS Java SDK :: Services :: Amazon Kinesis Analytics diff --git a/services/kinesisanalyticsv2/pom.xml b/services/kinesisanalyticsv2/pom.xml index a7dc7f3efc4c..ff9e74b1476c 100644 --- a/services/kinesisanalyticsv2/pom.xml +++ b/services/kinesisanalyticsv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kinesisanalyticsv2 AWS Java SDK :: Services :: Kinesis Analytics V2 diff --git a/services/kinesisvideo/pom.xml b/services/kinesisvideo/pom.xml index b6413a05102e..3df7f82bc2f3 100644 --- a/services/kinesisvideo/pom.xml +++ b/services/kinesisvideo/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 kinesisvideo diff --git a/services/kinesisvideoarchivedmedia/pom.xml b/services/kinesisvideoarchivedmedia/pom.xml index d4404f0a575c..a3f0e391a725 100644 --- a/services/kinesisvideoarchivedmedia/pom.xml +++ b/services/kinesisvideoarchivedmedia/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kinesisvideoarchivedmedia AWS Java SDK :: Services :: Kinesis Video Archived Media diff --git a/services/kinesisvideomedia/pom.xml b/services/kinesisvideomedia/pom.xml index 228ae076292a..a7dbcb06ec1d 100644 --- a/services/kinesisvideomedia/pom.xml +++ b/services/kinesisvideomedia/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kinesisvideomedia AWS Java SDK :: Services :: Kinesis Video Media diff --git a/services/kinesisvideosignaling/pom.xml b/services/kinesisvideosignaling/pom.xml index f802ff966997..b8d742ad89e9 100644 --- a/services/kinesisvideosignaling/pom.xml +++ b/services/kinesisvideosignaling/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kinesisvideosignaling AWS Java SDK :: Services :: Kinesis Video Signaling diff --git a/services/kms/pom.xml b/services/kms/pom.xml index d3619579d136..d369a7187744 100644 --- a/services/kms/pom.xml +++ b/services/kms/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 kms AWS Java SDK :: Services :: AWS KMS diff --git a/services/lakeformation/pom.xml b/services/lakeformation/pom.xml index c43bf3c26485..c6216f32db3d 100644 --- a/services/lakeformation/pom.xml +++ b/services/lakeformation/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lakeformation AWS Java SDK :: Services :: LakeFormation diff --git a/services/lambda/pom.xml b/services/lambda/pom.xml index e07a7232c030..335ae3b38b12 100644 --- a/services/lambda/pom.xml +++ b/services/lambda/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lambda AWS Java SDK :: Services :: AWS Lambda diff --git a/services/lexmodelbuilding/pom.xml b/services/lexmodelbuilding/pom.xml index b905ef6f0e52..35a3201b49ea 100644 --- a/services/lexmodelbuilding/pom.xml +++ b/services/lexmodelbuilding/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lexmodelbuilding AWS Java SDK :: Services :: Amazon Lex Model Building diff --git a/services/lexmodelsv2/pom.xml b/services/lexmodelsv2/pom.xml index de13a0cb5f2d..100ad82848c7 100644 --- a/services/lexmodelsv2/pom.xml +++ b/services/lexmodelsv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lexmodelsv2 AWS Java SDK :: Services :: Lex Models V2 diff --git a/services/lexruntime/pom.xml b/services/lexruntime/pom.xml index 69bc62895d7d..c2cb5b4bb325 100644 --- a/services/lexruntime/pom.xml +++ b/services/lexruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lexruntime AWS Java SDK :: Services :: Amazon Lex Runtime diff --git a/services/lexruntimev2/pom.xml b/services/lexruntimev2/pom.xml index c30a28cbb78a..8390b5ccd298 100644 --- a/services/lexruntimev2/pom.xml +++ b/services/lexruntimev2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lexruntimev2 AWS Java SDK :: Services :: Lex Runtime V2 diff --git a/services/licensemanager/pom.xml b/services/licensemanager/pom.xml index 91704d136e9e..ecfb5179fdf9 100644 --- a/services/licensemanager/pom.xml +++ b/services/licensemanager/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 licensemanager AWS Java SDK :: Services :: License Manager diff --git a/services/lightsail/pom.xml b/services/lightsail/pom.xml index 886f12c2c29f..b28f67aead5f 100644 --- a/services/lightsail/pom.xml +++ b/services/lightsail/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lightsail AWS Java SDK :: Services :: Amazon Lightsail diff --git a/services/location/pom.xml b/services/location/pom.xml index 75bba1e70a3f..38da14388aef 100644 --- a/services/location/pom.xml +++ b/services/location/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 location AWS Java SDK :: Services :: Location diff --git a/services/lookoutequipment/pom.xml b/services/lookoutequipment/pom.xml index 12f26ebdfdb8..57fcea9ccae3 100644 --- a/services/lookoutequipment/pom.xml +++ b/services/lookoutequipment/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lookoutequipment AWS Java SDK :: Services :: Lookout Equipment diff --git a/services/lookoutmetrics/pom.xml b/services/lookoutmetrics/pom.xml index 9ee6af633f24..0a12e0e00b4e 100644 --- a/services/lookoutmetrics/pom.xml +++ b/services/lookoutmetrics/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lookoutmetrics AWS Java SDK :: Services :: Lookout Metrics diff --git a/services/lookoutvision/pom.xml b/services/lookoutvision/pom.xml index fd5817db895e..2953c09a742a 100644 --- a/services/lookoutvision/pom.xml +++ b/services/lookoutvision/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 lookoutvision AWS Java SDK :: Services :: Lookout Vision diff --git a/services/machinelearning/pom.xml b/services/machinelearning/pom.xml index eb933819458b..79843bd35551 100644 --- a/services/machinelearning/pom.xml +++ b/services/machinelearning/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 machinelearning AWS Java SDK :: Services :: Amazon Machine Learning diff --git a/services/macie/pom.xml b/services/macie/pom.xml index d0fe861bf373..7e5aba9d584c 100644 --- a/services/macie/pom.xml +++ b/services/macie/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 macie AWS Java SDK :: Services :: Macie diff --git a/services/macie2/pom.xml b/services/macie2/pom.xml index 05137726d64c..3d73e9a80c9d 100644 --- a/services/macie2/pom.xml +++ b/services/macie2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 macie2 AWS Java SDK :: Services :: Macie2 diff --git a/services/managedblockchain/pom.xml b/services/managedblockchain/pom.xml index 0012545f480c..ad5fc45e7acf 100644 --- a/services/managedblockchain/pom.xml +++ b/services/managedblockchain/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 managedblockchain AWS Java SDK :: Services :: ManagedBlockchain diff --git a/services/marketplacecatalog/pom.xml b/services/marketplacecatalog/pom.xml index 3aecb8a1d790..b44a278e63dc 100644 --- a/services/marketplacecatalog/pom.xml +++ b/services/marketplacecatalog/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 marketplacecatalog AWS Java SDK :: Services :: Marketplace Catalog diff --git a/services/marketplacecommerceanalytics/pom.xml b/services/marketplacecommerceanalytics/pom.xml index 513546039915..3482aa2b9a1f 100644 --- a/services/marketplacecommerceanalytics/pom.xml +++ b/services/marketplacecommerceanalytics/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 marketplacecommerceanalytics AWS Java SDK :: Services :: AWS Marketplace Commerce Analytics diff --git a/services/marketplaceentitlement/pom.xml b/services/marketplaceentitlement/pom.xml index 34dd25f0d266..efd731c48fef 100644 --- a/services/marketplaceentitlement/pom.xml +++ b/services/marketplaceentitlement/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 marketplaceentitlement AWS Java SDK :: Services :: AWS Marketplace Entitlement diff --git a/services/marketplacemetering/pom.xml b/services/marketplacemetering/pom.xml index 92e3e15e106f..c0f6cf64d850 100644 --- a/services/marketplacemetering/pom.xml +++ b/services/marketplacemetering/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 marketplacemetering AWS Java SDK :: Services :: AWS Marketplace Metering Service diff --git a/services/mediaconnect/pom.xml b/services/mediaconnect/pom.xml index e69075bbc71d..f2af2cfa2281 100644 --- a/services/mediaconnect/pom.xml +++ b/services/mediaconnect/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 mediaconnect AWS Java SDK :: Services :: MediaConnect diff --git a/services/mediaconvert/pom.xml b/services/mediaconvert/pom.xml index c9f7ab0c56bc..820dd1f43382 100644 --- a/services/mediaconvert/pom.xml +++ b/services/mediaconvert/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 mediaconvert diff --git a/services/medialive/pom.xml b/services/medialive/pom.xml index a337987ac776..1e3b0e8b8fc8 100644 --- a/services/medialive/pom.xml +++ b/services/medialive/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 medialive diff --git a/services/mediapackage/pom.xml b/services/mediapackage/pom.xml index f719523bf17e..21a81cb9d45c 100644 --- a/services/mediapackage/pom.xml +++ b/services/mediapackage/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 mediapackage diff --git a/services/mediapackagevod/pom.xml b/services/mediapackagevod/pom.xml index 4a007dce731f..48b6d81b12fc 100644 --- a/services/mediapackagevod/pom.xml +++ b/services/mediapackagevod/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 mediapackagevod AWS Java SDK :: Services :: MediaPackage Vod diff --git a/services/mediastore/pom.xml b/services/mediastore/pom.xml index 118c98425adc..0faa46b26c86 100644 --- a/services/mediastore/pom.xml +++ b/services/mediastore/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 mediastore diff --git a/services/mediastoredata/pom.xml b/services/mediastoredata/pom.xml index 7ea17c1c2af9..913a0c8ca8da 100644 --- a/services/mediastoredata/pom.xml +++ b/services/mediastoredata/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 mediastoredata diff --git a/services/mediatailor/pom.xml b/services/mediatailor/pom.xml index bf81d5dc7624..5c0bd945ef10 100644 --- a/services/mediatailor/pom.xml +++ b/services/mediatailor/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 mediatailor AWS Java SDK :: Services :: MediaTailor diff --git a/services/memorydb/pom.xml b/services/memorydb/pom.xml index 1c76c641931e..3b7803817a67 100644 --- a/services/memorydb/pom.xml +++ b/services/memorydb/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 memorydb AWS Java SDK :: Services :: Memory DB diff --git a/services/mgn/pom.xml b/services/mgn/pom.xml index 19a8dc311a5a..79283828d945 100644 --- a/services/mgn/pom.xml +++ b/services/mgn/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 mgn AWS Java SDK :: Services :: Mgn diff --git a/services/migrationhub/pom.xml b/services/migrationhub/pom.xml index 770ab6fae8bf..5df3e6ef419b 100644 --- a/services/migrationhub/pom.xml +++ b/services/migrationhub/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 migrationhub diff --git a/services/migrationhubconfig/pom.xml b/services/migrationhubconfig/pom.xml index 6bc5c75c3f54..cec569d102e8 100644 --- a/services/migrationhubconfig/pom.xml +++ b/services/migrationhubconfig/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 migrationhubconfig AWS Java SDK :: Services :: MigrationHub Config diff --git a/services/mobile/pom.xml b/services/mobile/pom.xml index 21fbfd6b3317..1d3bf5b4e3e4 100644 --- a/services/mobile/pom.xml +++ b/services/mobile/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 mobile diff --git a/services/mq/pom.xml b/services/mq/pom.xml index a1a61c5d59e9..c8e087c8edf7 100644 --- a/services/mq/pom.xml +++ b/services/mq/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 mq diff --git a/services/mturk/pom.xml b/services/mturk/pom.xml index 8d7c7a0ba524..fe62b3dd8bbb 100644 --- a/services/mturk/pom.xml +++ b/services/mturk/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 mturk AWS Java SDK :: Services :: Amazon Mechanical Turk Requester diff --git a/services/mwaa/pom.xml b/services/mwaa/pom.xml index e9c108cebf01..8a01bf3981b6 100644 --- a/services/mwaa/pom.xml +++ b/services/mwaa/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 mwaa AWS Java SDK :: Services :: MWAA diff --git a/services/neptune/pom.xml b/services/neptune/pom.xml index 842ad062519e..deb8729a98d0 100644 --- a/services/neptune/pom.xml +++ b/services/neptune/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 neptune AWS Java SDK :: Services :: Neptune diff --git a/services/networkfirewall/pom.xml b/services/networkfirewall/pom.xml index 17b4d818c7ce..26bbb26b87eb 100644 --- a/services/networkfirewall/pom.xml +++ b/services/networkfirewall/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 networkfirewall AWS Java SDK :: Services :: Network Firewall diff --git a/services/networkmanager/pom.xml b/services/networkmanager/pom.xml index 845b3aca1859..8ba8f3b46257 100644 --- a/services/networkmanager/pom.xml +++ b/services/networkmanager/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 networkmanager AWS Java SDK :: Services :: NetworkManager diff --git a/services/nimble/pom.xml b/services/nimble/pom.xml index f2aafb01ce4a..0455f4825bdb 100644 --- a/services/nimble/pom.xml +++ b/services/nimble/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 nimble AWS Java SDK :: Services :: Nimble diff --git a/services/opensearch/pom.xml b/services/opensearch/pom.xml index bc9dfec2d801..ef7a2824d1e6 100644 --- a/services/opensearch/pom.xml +++ b/services/opensearch/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 opensearch AWS Java SDK :: Services :: Open Search diff --git a/services/opsworks/pom.xml b/services/opsworks/pom.xml index d81655ca6d17..11b1ac85159b 100644 --- a/services/opsworks/pom.xml +++ b/services/opsworks/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 opsworks AWS Java SDK :: Services :: AWS OpsWorks diff --git a/services/opsworkscm/pom.xml b/services/opsworkscm/pom.xml index 0872626d7dd0..9154762cc385 100644 --- a/services/opsworkscm/pom.xml +++ b/services/opsworkscm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 opsworkscm AWS Java SDK :: Services :: AWS OpsWorks for Chef Automate diff --git a/services/organizations/pom.xml b/services/organizations/pom.xml index c4eb58211136..f7e639fe6a63 100644 --- a/services/organizations/pom.xml +++ b/services/organizations/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 organizations AWS Java SDK :: Services :: AWS Organizations diff --git a/services/outposts/pom.xml b/services/outposts/pom.xml index 8052190f4d50..ab1662e736f4 100644 --- a/services/outposts/pom.xml +++ b/services/outposts/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 outposts AWS Java SDK :: Services :: Outposts diff --git a/services/panorama/pom.xml b/services/panorama/pom.xml index 8586abf13f17..98dd92253894 100644 --- a/services/panorama/pom.xml +++ b/services/panorama/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 panorama AWS Java SDK :: Services :: Panorama diff --git a/services/personalize/pom.xml b/services/personalize/pom.xml index 27ec4c83fc0e..ec32d28d4cd8 100644 --- a/services/personalize/pom.xml +++ b/services/personalize/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 personalize AWS Java SDK :: Services :: Personalize diff --git a/services/personalizeevents/pom.xml b/services/personalizeevents/pom.xml index 15163092b08d..d20730bde626 100644 --- a/services/personalizeevents/pom.xml +++ b/services/personalizeevents/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 personalizeevents AWS Java SDK :: Services :: Personalize Events diff --git a/services/personalizeruntime/pom.xml b/services/personalizeruntime/pom.xml index 904ff5103fcf..484488701d18 100644 --- a/services/personalizeruntime/pom.xml +++ b/services/personalizeruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 personalizeruntime AWS Java SDK :: Services :: Personalize Runtime diff --git a/services/pi/pom.xml b/services/pi/pom.xml index 12566e50f48f..a4e71bb8535a 100644 --- a/services/pi/pom.xml +++ b/services/pi/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 pi AWS Java SDK :: Services :: PI diff --git a/services/pinpoint/pom.xml b/services/pinpoint/pom.xml index bc4cbe29e78a..c715e4ee3d59 100644 --- a/services/pinpoint/pom.xml +++ b/services/pinpoint/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 pinpoint AWS Java SDK :: Services :: Amazon Pinpoint diff --git a/services/pinpointemail/pom.xml b/services/pinpointemail/pom.xml index 8abe63ddea90..15aabaff2e35 100644 --- a/services/pinpointemail/pom.xml +++ b/services/pinpointemail/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 pinpointemail AWS Java SDK :: Services :: Pinpoint Email diff --git a/services/pinpointsmsvoice/pom.xml b/services/pinpointsmsvoice/pom.xml index 613b77992c93..33dd33290c3f 100644 --- a/services/pinpointsmsvoice/pom.xml +++ b/services/pinpointsmsvoice/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 pinpointsmsvoice AWS Java SDK :: Services :: Pinpoint SMS Voice diff --git a/services/polly/pom.xml b/services/polly/pom.xml index 5b03858927fd..4977581d9256 100644 --- a/services/polly/pom.xml +++ b/services/polly/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 polly AWS Java SDK :: Services :: Amazon Polly diff --git a/services/pom.xml b/services/pom.xml index 0bc5a45397e3..d16a50d481dd 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -17,7 +17,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 services AWS Java SDK :: Services diff --git a/services/pricing/pom.xml b/services/pricing/pom.xml index d0535e9a3a99..ca7fc6d0b654 100644 --- a/services/pricing/pom.xml +++ b/services/pricing/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 pricing diff --git a/services/proton/pom.xml b/services/proton/pom.xml index 81ba40f00648..b79234e9e555 100644 --- a/services/proton/pom.xml +++ b/services/proton/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 proton AWS Java SDK :: Services :: Proton diff --git a/services/qldb/pom.xml b/services/qldb/pom.xml index be038e497734..c0d8266fefb9 100644 --- a/services/qldb/pom.xml +++ b/services/qldb/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 qldb AWS Java SDK :: Services :: QLDB diff --git a/services/qldbsession/pom.xml b/services/qldbsession/pom.xml index acd236ef0cbd..673e42d10448 100644 --- a/services/qldbsession/pom.xml +++ b/services/qldbsession/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 qldbsession AWS Java SDK :: Services :: QLDB Session diff --git a/services/quicksight/pom.xml b/services/quicksight/pom.xml index 6c450169657b..0d099011e319 100644 --- a/services/quicksight/pom.xml +++ b/services/quicksight/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 quicksight AWS Java SDK :: Services :: QuickSight diff --git a/services/ram/pom.xml b/services/ram/pom.xml index 59033217a551..b870eea8ccc6 100644 --- a/services/ram/pom.xml +++ b/services/ram/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ram AWS Java SDK :: Services :: RAM diff --git a/services/rds/pom.xml b/services/rds/pom.xml index 7e5ea5a02a59..56a1f7947045 100644 --- a/services/rds/pom.xml +++ b/services/rds/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 rds AWS Java SDK :: Services :: Amazon RDS diff --git a/services/rdsdata/pom.xml b/services/rdsdata/pom.xml index 2fbf4eb60f17..47713de0b376 100644 --- a/services/rdsdata/pom.xml +++ b/services/rdsdata/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 rdsdata AWS Java SDK :: Services :: RDS Data diff --git a/services/redshift/pom.xml b/services/redshift/pom.xml index 6f2cd437888f..b5fb9fcd1248 100644 --- a/services/redshift/pom.xml +++ b/services/redshift/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 redshift AWS Java SDK :: Services :: Amazon Redshift diff --git a/services/redshiftdata/pom.xml b/services/redshiftdata/pom.xml index d39069c9ffa9..dbb30deabd9a 100644 --- a/services/redshiftdata/pom.xml +++ b/services/redshiftdata/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 redshiftdata AWS Java SDK :: Services :: Redshift Data diff --git a/services/rekognition/pom.xml b/services/rekognition/pom.xml index 4e1519f25722..8303498c0df2 100644 --- a/services/rekognition/pom.xml +++ b/services/rekognition/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 rekognition AWS Java SDK :: Services :: Amazon Rekognition diff --git a/services/resourcegroups/pom.xml b/services/resourcegroups/pom.xml index c43e92b9f93e..27639b0ecd9e 100644 --- a/services/resourcegroups/pom.xml +++ b/services/resourcegroups/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 resourcegroups diff --git a/services/resourcegroupstaggingapi/pom.xml b/services/resourcegroupstaggingapi/pom.xml index c93ece1200e4..9aab9f1912b9 100644 --- a/services/resourcegroupstaggingapi/pom.xml +++ b/services/resourcegroupstaggingapi/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 resourcegroupstaggingapi AWS Java SDK :: Services :: AWS Resource Groups Tagging API diff --git a/services/robomaker/pom.xml b/services/robomaker/pom.xml index f92f9b07b1b8..6a013505da00 100644 --- a/services/robomaker/pom.xml +++ b/services/robomaker/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 robomaker AWS Java SDK :: Services :: RoboMaker diff --git a/services/route53/pom.xml b/services/route53/pom.xml index e6cd9a160860..c1b7f97c50d7 100644 --- a/services/route53/pom.xml +++ b/services/route53/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 route53 AWS Java SDK :: Services :: Amazon Route53 diff --git a/services/route53domains/pom.xml b/services/route53domains/pom.xml index 8aa7b1df1989..111df0bedce8 100644 --- a/services/route53domains/pom.xml +++ b/services/route53domains/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 route53domains AWS Java SDK :: Services :: Amazon Route53 Domains diff --git a/services/route53recoverycluster/pom.xml b/services/route53recoverycluster/pom.xml index 0d101f578feb..b407f73aa328 100644 --- a/services/route53recoverycluster/pom.xml +++ b/services/route53recoverycluster/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 route53recoverycluster AWS Java SDK :: Services :: Route53 Recovery Cluster diff --git a/services/route53recoverycontrolconfig/pom.xml b/services/route53recoverycontrolconfig/pom.xml index cbe178c5770a..b85edaac2035 100644 --- a/services/route53recoverycontrolconfig/pom.xml +++ b/services/route53recoverycontrolconfig/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 route53recoverycontrolconfig AWS Java SDK :: Services :: Route53 Recovery Control Config diff --git a/services/route53recoveryreadiness/pom.xml b/services/route53recoveryreadiness/pom.xml index 0748d3944b32..fda49855e415 100644 --- a/services/route53recoveryreadiness/pom.xml +++ b/services/route53recoveryreadiness/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 route53recoveryreadiness AWS Java SDK :: Services :: Route53 Recovery Readiness diff --git a/services/route53resolver/pom.xml b/services/route53resolver/pom.xml index 9fc56c50e47f..972963cfb400 100644 --- a/services/route53resolver/pom.xml +++ b/services/route53resolver/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 route53resolver AWS Java SDK :: Services :: Route53Resolver diff --git a/services/s3/pom.xml b/services/s3/pom.xml index 954f5e09d2a7..365b84bd4696 100644 --- a/services/s3/pom.xml +++ b/services/s3/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 s3 AWS Java SDK :: Services :: Amazon S3 diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java index ff1d7475e1b7..187a5a1a9107 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java @@ -17,20 +17,26 @@ import java.nio.ByteBuffer; import java.util.Optional; +import java.util.concurrent.atomic.AtomicLong; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import software.amazon.awssdk.annotations.SdkInternalApi; import software.amazon.awssdk.core.async.AsyncRequestBody; import software.amazon.awssdk.core.checksums.SdkChecksum; +import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.utils.BinaryUtils; @SdkInternalApi public class ChecksumCalculatingAsyncRequestBody implements AsyncRequestBody { - + private final Long contentLength; private final AsyncRequestBody wrapped; private final SdkChecksum sdkChecksum; - public ChecksumCalculatingAsyncRequestBody(AsyncRequestBody wrapped, SdkChecksum sdkChecksum) { + public ChecksumCalculatingAsyncRequestBody(SdkHttpRequest request, AsyncRequestBody wrapped, SdkChecksum sdkChecksum) { + this.contentLength = request.firstMatchingHeader("Content-Length") + .map(Long::parseLong) + .orElse(wrapped.contentLength() + .orElse(null)); this.wrapped = wrapped; this.sdkChecksum = sdkChecksum; } @@ -48,18 +54,21 @@ public String contentType() { @Override public void subscribe(Subscriber s) { sdkChecksum.reset(); - wrapped.subscribe(new ChecksumCalculatingSubscriber(s, sdkChecksum)); + wrapped.subscribe(new ChecksumCalculatingSubscriber(s, sdkChecksum, contentLength)); } private static final class ChecksumCalculatingSubscriber implements Subscriber { - + private final AtomicLong contentRead = new AtomicLong(0); private final Subscriber wrapped; private final SdkChecksum checksum; + private final Long contentLength; ChecksumCalculatingSubscriber(Subscriber wrapped, - SdkChecksum sdkChecksum) { + SdkChecksum sdkChecksum, + Long contentLength) { this.wrapped = wrapped; this.checksum = sdkChecksum; + this.contentLength = contentLength; } @Override @@ -69,11 +78,34 @@ public void onSubscribe(Subscription s) { @Override public void onNext(ByteBuffer byteBuffer) { - byte[] buf = BinaryUtils.copyBytesFrom(byteBuffer); - checksum.update(buf, 0, buf.length); + int amountToReadFromByteBuffer = getAmountToReadFromByteBuffer(byteBuffer); + + if (amountToReadFromByteBuffer > 0) { + byte[] buf = BinaryUtils.copyBytesFrom(byteBuffer, amountToReadFromByteBuffer); + checksum.update(buf, 0, amountToReadFromByteBuffer); + } + + wrapped.onNext(byteBuffer); } + private int getAmountToReadFromByteBuffer(ByteBuffer byteBuffer) { + // If content length is null, we should include everything in the checksum because the stream is essentially + // unbounded. + if (contentLength == null) { + return byteBuffer.remaining(); + } + + long amountReadSoFar = contentRead.getAndAdd(byteBuffer.remaining()); + long amountRemaining = Math.max(0, contentLength - amountReadSoFar); + + if (amountRemaining > byteBuffer.remaining()) { + return byteBuffer.remaining(); + } else { + return Math.toIntExact(amountRemaining); + } + } + @Override public void onError(Throwable t) { wrapped.onError(t); diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java index 36fff298baf0..d9716e1e269c 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java @@ -20,7 +20,7 @@ import java.util.Arrays; import software.amazon.awssdk.annotations.SdkInternalApi; import software.amazon.awssdk.core.checksums.SdkChecksum; -import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.core.exception.RetryableException; import software.amazon.awssdk.http.Abortable; import software.amazon.awssdk.utils.BinaryUtils; @@ -169,9 +169,10 @@ private void validateAndThrow() { } if (!Arrays.equals(computedChecksum, streamChecksum)) { - throw SdkClientException.builder().message( - String.format("Data read has a different checksum than expected. Was 0x%s, but expected 0x%s", - BinaryUtils.toHex(computedChecksum), BinaryUtils.toHex(streamChecksum))).build(); + throw RetryableException.create( + String.format("Data read has a different checksum than expected. Was 0x%s, but expected 0x%s. " + + "This commonly means that the data was corrupted between the client and " + + "service.", BinaryUtils.toHex(computedChecksum), BinaryUtils.toHex(streamChecksum))); } } diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java index a3310331dd23..858af7a649f3 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java @@ -25,7 +25,7 @@ import software.amazon.awssdk.annotations.SdkInternalApi; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.core.checksums.SdkChecksum; -import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.core.exception.RetryableException; import software.amazon.awssdk.utils.BinaryUtils; @SdkInternalApi @@ -134,8 +134,13 @@ public void onComplete() { if (strippedLength > 0) { byte[] computedChecksum = sdkChecksum.getChecksumBytes(); if (!Arrays.equals(computedChecksum, streamChecksum)) { - onError(SdkClientException.create( - String.format("Data read has a different checksum than expected. Was 0x%s, but expected 0x%s", + onError(RetryableException.create( + String.format("Data read has a different checksum than expected. Was 0x%s, but expected 0x%s. " + + "Common causes: (1) You modified a request ByteBuffer before it could be " + + "written to the service. Please ensure your data source does not modify the " + + " byte buffers after you pass them to the SDK. (2) The data was corrupted between the " + + "client and service. Note: Despite this error, the upload still completed and was " + + "persisted in S3.", BinaryUtils.toHex(computedChecksum), BinaryUtils.toHex(streamChecksum)))); return; // Return after onError and not call onComplete below } diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java index 6c2afec748f0..366a692f034d 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java @@ -27,7 +27,7 @@ import software.amazon.awssdk.core.ClientType; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.checksums.SdkChecksum; -import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.core.exception.RetryableException; import software.amazon.awssdk.core.interceptor.ExecutionAttribute; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute; @@ -144,8 +144,10 @@ public static void validatePutObjectChecksum(PutObjectResponse response, Executi byte[] ssHash = Base16Lower.decode(response.eTag().replace("\"", "")); if (!Arrays.equals(digest, ssHash)) { - throw SdkClientException.create( - String.format("Data read has a different checksum than expected. Was 0x%s, but expected 0x%s", + throw RetryableException.create( + String.format("Data read has a different checksum than expected. Was 0x%s, but expected 0x%s. " + + "This commonly means that the data was corrupted between the client and " + + "service. Note: Despite this error, the upload still completed and was persisted in S3.", BinaryUtils.toHex(digest), BinaryUtils.toHex(ssHash))); } } diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java index af691aae4ee5..4220bb4fd2bf 100644 --- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java +++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java @@ -51,7 +51,9 @@ public Optional modifyAsyncHttpContent(Context.ModifyHttpReque SdkChecksum checksum = new Md5Checksum(); executionAttributes.putAttribute(ASYNC_RECORDING_CHECKSUM, true); executionAttributes.putAttribute(CHECKSUM, checksum); - return Optional.of(new ChecksumCalculatingAsyncRequestBody(context.asyncRequestBody().get(), checksum)); + return Optional.of(new ChecksumCalculatingAsyncRequestBody(context.httpRequest(), + context.asyncRequestBody().get(), + checksum)); } return context.asyncRequestBody(); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java new file mode 100644 index 000000000000..89870fab2758 --- /dev/null +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java @@ -0,0 +1,159 @@ +/* + * 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.services.s3.functionaltests; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.any; +import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; +import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; +import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; +import static com.github.tomakehurst.wiremock.client.WireMock.verify; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import com.github.tomakehurst.wiremock.junit.WireMockRule; +import java.net.URI; +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import org.junit.Rule; +import org.junit.Test; +import org.reactivestreams.Subscriber; +import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; +import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; +import software.amazon.awssdk.core.async.AsyncRequestBody; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.s3.S3AsyncClient; +import software.amazon.awssdk.services.s3.S3AsyncClientBuilder; +import software.amazon.awssdk.services.s3.model.PutObjectResponse; + +public class ContentLengthMismatchTest { + @Rule + public WireMockRule wireMock = new WireMockRule(0); + + private S3AsyncClientBuilder getAsyncClientBuilder() { + return S3AsyncClient.builder() + .region(Region.US_EAST_1) + .endpointOverride(endpoint()) + .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("key", "secret"))); + } + + private URI endpoint() { + return URI.create("http://localhost:" + wireMock.port()); + } + + @Test + public void checksumDoesNotExceedContentLengthHeaderForPuts() { + String bucket = "Example-Bucket"; + String key = "Example-Object"; + String content = "Hello, World!"; + String eTag = "65A8E27D8879283831B664BD8B7F0AD4"; + + stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withHeader("ETag", eTag))); + + S3AsyncClient s3Client = getAsyncClientBuilder().build(); + + PutObjectResponse response = + s3Client.putObject(r -> r.bucket(bucket).key(key).contentLength((long) content.length()), + AsyncRequestBody.fromString(content + " Extra stuff!")) + .join(); + + verify(putRequestedFor(anyUrl()).withRequestBody(equalTo(content))); + assertThat(response.eTag()).isEqualTo(eTag); + } + @Test + public void checksumDoesNotExceedAsyncRequestBodyLengthForPuts() { + String bucket = "Example-Bucket"; + String key = "Example-Object"; + String content = "Hello, World!"; + String eTag = "65A8E27D8879283831B664BD8B7F0AD4"; + + stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withHeader("ETag", eTag))); + + S3AsyncClient s3Client = getAsyncClientBuilder().build(); + + PutObjectResponse response = + s3Client.putObject(r -> r.bucket(bucket).key(key), + new AsyncRequestBody() { + @Override + public Optional contentLength() { + return Optional.of((long) content.length()); + } + + @Override + public void subscribe(Subscriber subscriber) { + AsyncRequestBody.fromString(content + " Extra stuff!").subscribe(subscriber); + } + }) + .join(); + + verify(putRequestedFor(anyUrl()).withRequestBody(equalTo(content))); + assertThat(response.eTag()).isEqualTo(eTag); + } + + @Test + public void contentShorterThanContentLengthHeaderFails() { + String bucket = "Example-Bucket"; + String key = "Example-Object"; + + S3AsyncClient s3Client = getAsyncClientBuilder().build(); + + AsyncRequestBody requestBody = new AsyncRequestBody() { + @Override + public Optional contentLength() { + return Optional.empty(); + } + + @Override + public void subscribe(Subscriber subscriber) { + AsyncRequestBody.fromString("A").subscribe(subscriber); + } + }; + + assertThatThrownBy(() -> s3Client.putObject(r -> r.bucket(bucket).key(key).contentLength(2L), requestBody) + .get(10, TimeUnit.SECONDS)) + .isInstanceOf(ExecutionException.class) + .hasMessageContaining("content-length"); + } + + @Test + public void contentShorterThanRequestBodyLengthFails() { + String bucket = "Example-Bucket"; + String key = "Example-Object"; + + S3AsyncClient s3Client = getAsyncClientBuilder().build(); + + AsyncRequestBody requestBody = new AsyncRequestBody() { + @Override + public Optional contentLength() { + return Optional.of(2L); + } + + @Override + public void subscribe(Subscriber subscriber) { + AsyncRequestBody.fromString("A").subscribe(subscriber); + } + }; + + assertThatThrownBy(() -> s3Client.putObject(r -> r.bucket(bucket).key(key), requestBody) + .get(10, TimeUnit.SECONDS)) + .isInstanceOf(ExecutionException.class) + .hasMessageContaining("content-length"); + } + +} diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml index e51888d4f8d9..be71c96e1783 100644 --- a/services/s3control/pom.xml +++ b/services/s3control/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 s3control AWS Java SDK :: Services :: Amazon S3 Control diff --git a/services/s3outposts/pom.xml b/services/s3outposts/pom.xml index 7ff9af1df985..5c80a1f453fd 100644 --- a/services/s3outposts/pom.xml +++ b/services/s3outposts/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 s3outposts AWS Java SDK :: Services :: S3 Outposts diff --git a/services/sagemaker/pom.xml b/services/sagemaker/pom.xml index 3eaf71d5ec31..0bf9c930b158 100644 --- a/services/sagemaker/pom.xml +++ b/services/sagemaker/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 sagemaker diff --git a/services/sagemakera2iruntime/pom.xml b/services/sagemakera2iruntime/pom.xml index a4f753d18100..7b991af17b6b 100644 --- a/services/sagemakera2iruntime/pom.xml +++ b/services/sagemakera2iruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sagemakera2iruntime AWS Java SDK :: Services :: SageMaker A2I Runtime diff --git a/services/sagemakeredge/pom.xml b/services/sagemakeredge/pom.xml index 926c059cb778..35e7a915de1a 100644 --- a/services/sagemakeredge/pom.xml +++ b/services/sagemakeredge/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sagemakeredge AWS Java SDK :: Services :: Sagemaker Edge diff --git a/services/sagemakerfeaturestoreruntime/pom.xml b/services/sagemakerfeaturestoreruntime/pom.xml index 842ce29603b5..f7ad5359475a 100644 --- a/services/sagemakerfeaturestoreruntime/pom.xml +++ b/services/sagemakerfeaturestoreruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sagemakerfeaturestoreruntime AWS Java SDK :: Services :: Sage Maker Feature Store Runtime diff --git a/services/sagemakerruntime/pom.xml b/services/sagemakerruntime/pom.xml index ee78ec90e178..b9b76c15be5d 100644 --- a/services/sagemakerruntime/pom.xml +++ b/services/sagemakerruntime/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sagemakerruntime AWS Java SDK :: Services :: SageMaker Runtime diff --git a/services/savingsplans/pom.xml b/services/savingsplans/pom.xml index 82df5155369a..0b129a84d897 100644 --- a/services/savingsplans/pom.xml +++ b/services/savingsplans/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 savingsplans AWS Java SDK :: Services :: Savingsplans diff --git a/services/schemas/pom.xml b/services/schemas/pom.xml index eef7fab76ef4..c2d6eb689b81 100644 --- a/services/schemas/pom.xml +++ b/services/schemas/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 schemas AWS Java SDK :: Services :: Schemas diff --git a/services/secretsmanager/pom.xml b/services/secretsmanager/pom.xml index 05e4f3428f15..024f923a00c3 100644 --- a/services/secretsmanager/pom.xml +++ b/services/secretsmanager/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 secretsmanager AWS Java SDK :: Services :: AWS Secrets Manager diff --git a/services/securityhub/pom.xml b/services/securityhub/pom.xml index f78beaa17d65..baef8b7b3e62 100644 --- a/services/securityhub/pom.xml +++ b/services/securityhub/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 securityhub AWS Java SDK :: Services :: SecurityHub diff --git a/services/serverlessapplicationrepository/pom.xml b/services/serverlessapplicationrepository/pom.xml index 76afcf6a4174..1dc55884c769 100644 --- a/services/serverlessapplicationrepository/pom.xml +++ b/services/serverlessapplicationrepository/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 serverlessapplicationrepository diff --git a/services/servicecatalog/pom.xml b/services/servicecatalog/pom.xml index 391d12d0477e..fb8ee337f551 100644 --- a/services/servicecatalog/pom.xml +++ b/services/servicecatalog/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 servicecatalog AWS Java SDK :: Services :: AWS Service Catalog diff --git a/services/servicecatalogappregistry/pom.xml b/services/servicecatalogappregistry/pom.xml index 32484ef1f367..509d733fc307 100644 --- a/services/servicecatalogappregistry/pom.xml +++ b/services/servicecatalogappregistry/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 servicecatalogappregistry AWS Java SDK :: Services :: Service Catalog App Registry diff --git a/services/servicediscovery/pom.xml b/services/servicediscovery/pom.xml index e4aa9da4910d..02a1338534d4 100644 --- a/services/servicediscovery/pom.xml +++ b/services/servicediscovery/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 servicediscovery diff --git a/services/servicequotas/pom.xml b/services/servicequotas/pom.xml index e71b4ba3d698..991684210e29 100644 --- a/services/servicequotas/pom.xml +++ b/services/servicequotas/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 servicequotas AWS Java SDK :: Services :: Service Quotas diff --git a/services/ses/pom.xml b/services/ses/pom.xml index 58c718ce68ea..7a0f1de23cb5 100644 --- a/services/ses/pom.xml +++ b/services/ses/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ses AWS Java SDK :: Services :: Amazon SES diff --git a/services/sesv2/pom.xml b/services/sesv2/pom.xml index 9d6aa7b10c25..5fe824f51172 100644 --- a/services/sesv2/pom.xml +++ b/services/sesv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sesv2 AWS Java SDK :: Services :: SESv2 diff --git a/services/sfn/pom.xml b/services/sfn/pom.xml index ab2f127d4417..7e49540ade31 100644 --- a/services/sfn/pom.xml +++ b/services/sfn/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sfn AWS Java SDK :: Services :: AWS Step Functions diff --git a/services/shield/pom.xml b/services/shield/pom.xml index 25236a1144d3..bca4edaeb071 100644 --- a/services/shield/pom.xml +++ b/services/shield/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 shield AWS Java SDK :: Services :: AWS Shield diff --git a/services/signer/pom.xml b/services/signer/pom.xml index 1cccf04d94e9..d658665f93ff 100644 --- a/services/signer/pom.xml +++ b/services/signer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 signer AWS Java SDK :: Services :: Signer diff --git a/services/sms/pom.xml b/services/sms/pom.xml index df5ea5cba2fe..6df7f7d390dc 100644 --- a/services/sms/pom.xml +++ b/services/sms/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sms AWS Java SDK :: Services :: AWS Server Migration diff --git a/services/snowball/pom.xml b/services/snowball/pom.xml index 73b3b7754532..475414ffa5ce 100644 --- a/services/snowball/pom.xml +++ b/services/snowball/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 snowball AWS Java SDK :: Services :: Amazon Snowball diff --git a/services/snowdevicemanagement/pom.xml b/services/snowdevicemanagement/pom.xml index cd2adb19c905..87aa37ff3852 100644 --- a/services/snowdevicemanagement/pom.xml +++ b/services/snowdevicemanagement/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 snowdevicemanagement AWS Java SDK :: Services :: Snow Device Management diff --git a/services/sns/pom.xml b/services/sns/pom.xml index 61f113c38a77..ac81011cd3e7 100644 --- a/services/sns/pom.xml +++ b/services/sns/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sns AWS Java SDK :: Services :: Amazon SNS diff --git a/services/sqs/pom.xml b/services/sqs/pom.xml index c176e6c980b3..9e36c4e9ae44 100644 --- a/services/sqs/pom.xml +++ b/services/sqs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sqs AWS Java SDK :: Services :: Amazon SQS diff --git a/services/ssm/pom.xml b/services/ssm/pom.xml index 66be938c12fc..040b6a569038 100644 --- a/services/ssm/pom.xml +++ b/services/ssm/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ssm AWS Java SDK :: Services :: AWS Simple Systems Management (SSM) diff --git a/services/ssmcontacts/pom.xml b/services/ssmcontacts/pom.xml index 1681c4b09bab..4da7100454cb 100644 --- a/services/ssmcontacts/pom.xml +++ b/services/ssmcontacts/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ssmcontacts AWS Java SDK :: Services :: SSM Contacts diff --git a/services/ssmincidents/pom.xml b/services/ssmincidents/pom.xml index 49ada30f433c..3de764a84e1f 100644 --- a/services/ssmincidents/pom.xml +++ b/services/ssmincidents/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ssmincidents AWS Java SDK :: Services :: SSM Incidents diff --git a/services/sso/pom.xml b/services/sso/pom.xml index de0bb67ff2d8..42abbb5780bd 100644 --- a/services/sso/pom.xml +++ b/services/sso/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sso AWS Java SDK :: Services :: SSO diff --git a/services/ssoadmin/pom.xml b/services/ssoadmin/pom.xml index ee940a8f1e39..c64a17283fd7 100644 --- a/services/ssoadmin/pom.xml +++ b/services/ssoadmin/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ssoadmin AWS Java SDK :: Services :: SSO Admin diff --git a/services/ssooidc/pom.xml b/services/ssooidc/pom.xml index 93b26c6711d8..51beccd0c1d9 100644 --- a/services/ssooidc/pom.xml +++ b/services/ssooidc/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 ssooidc AWS Java SDK :: Services :: SSO OIDC diff --git a/services/storagegateway/pom.xml b/services/storagegateway/pom.xml index d94888cd977b..c7ca00c824ac 100644 --- a/services/storagegateway/pom.xml +++ b/services/storagegateway/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 storagegateway AWS Java SDK :: Services :: AWS Storage Gateway diff --git a/services/sts/pom.xml b/services/sts/pom.xml index 17c9d7c6bad2..f07c0934a457 100644 --- a/services/sts/pom.xml +++ b/services/sts/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 sts AWS Java SDK :: Services :: AWS STS diff --git a/services/support/pom.xml b/services/support/pom.xml index 507f8570f217..c60e94758a5c 100644 --- a/services/support/pom.xml +++ b/services/support/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 support AWS Java SDK :: Services :: AWS Support diff --git a/services/swf/pom.xml b/services/swf/pom.xml index aadfb4ca40ce..af4fcde451e6 100644 --- a/services/swf/pom.xml +++ b/services/swf/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 swf AWS Java SDK :: Services :: Amazon SWF diff --git a/services/synthetics/pom.xml b/services/synthetics/pom.xml index 3ba8996a04f3..5a4b1fec6b7e 100644 --- a/services/synthetics/pom.xml +++ b/services/synthetics/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 synthetics AWS Java SDK :: Services :: Synthetics diff --git a/services/textract/pom.xml b/services/textract/pom.xml index 84ee98876661..c97d778a0dc0 100644 --- a/services/textract/pom.xml +++ b/services/textract/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 textract AWS Java SDK :: Services :: Textract diff --git a/services/timestreamquery/pom.xml b/services/timestreamquery/pom.xml index 8cbce205e33b..efc60c62029f 100644 --- a/services/timestreamquery/pom.xml +++ b/services/timestreamquery/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 timestreamquery AWS Java SDK :: Services :: Timestream Query diff --git a/services/timestreamwrite/pom.xml b/services/timestreamwrite/pom.xml index b4f72ce47511..21a19e97669a 100644 --- a/services/timestreamwrite/pom.xml +++ b/services/timestreamwrite/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 timestreamwrite AWS Java SDK :: Services :: Timestream Write diff --git a/services/transcribe/pom.xml b/services/transcribe/pom.xml index 178bfb99d344..a6c3be152edb 100644 --- a/services/transcribe/pom.xml +++ b/services/transcribe/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 transcribe AWS Java SDK :: Services :: Transcribe diff --git a/services/transcribestreaming/pom.xml b/services/transcribestreaming/pom.xml index 04d14017b2dc..241d36ab2f1d 100644 --- a/services/transcribestreaming/pom.xml +++ b/services/transcribestreaming/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 transcribestreaming AWS Java SDK :: Services :: AWS Transcribe Streaming diff --git a/services/transfer/pom.xml b/services/transfer/pom.xml index 458bd26315e1..0c69cbafeaaf 100644 --- a/services/transfer/pom.xml +++ b/services/transfer/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 transfer AWS Java SDK :: Services :: Transfer diff --git a/services/translate/pom.xml b/services/translate/pom.xml index 5da6333d2eac..970b686ce471 100644 --- a/services/translate/pom.xml +++ b/services/translate/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 translate diff --git a/services/voiceid/pom.xml b/services/voiceid/pom.xml index 310efe95a7fe..66b06502c073 100644 --- a/services/voiceid/pom.xml +++ b/services/voiceid/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 voiceid AWS Java SDK :: Services :: Voice ID diff --git a/services/waf/pom.xml b/services/waf/pom.xml index d35ae738fb98..5a75311ffb2b 100644 --- a/services/waf/pom.xml +++ b/services/waf/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 waf AWS Java SDK :: Services :: AWS WAF diff --git a/services/wafv2/pom.xml b/services/wafv2/pom.xml index 30f3af6e8c1b..9b2dd03d481b 100644 --- a/services/wafv2/pom.xml +++ b/services/wafv2/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 wafv2 AWS Java SDK :: Services :: WAFV2 diff --git a/services/wellarchitected/pom.xml b/services/wellarchitected/pom.xml index 5aa36a4925af..f1f47298aec8 100644 --- a/services/wellarchitected/pom.xml +++ b/services/wellarchitected/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 wellarchitected AWS Java SDK :: Services :: Well Architected diff --git a/services/wisdom/pom.xml b/services/wisdom/pom.xml index a28917b4165e..97db68638411 100644 --- a/services/wisdom/pom.xml +++ b/services/wisdom/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 wisdom AWS Java SDK :: Services :: Wisdom diff --git a/services/workdocs/pom.xml b/services/workdocs/pom.xml index ef21c4df6f3c..337726684015 100644 --- a/services/workdocs/pom.xml +++ b/services/workdocs/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 workdocs AWS Java SDK :: Services :: Amazon WorkDocs diff --git a/services/worklink/pom.xml b/services/worklink/pom.xml index 0bef01f26de0..287a82e3365f 100644 --- a/services/worklink/pom.xml +++ b/services/worklink/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 worklink AWS Java SDK :: Services :: WorkLink diff --git a/services/workmail/pom.xml b/services/workmail/pom.xml index 7c0390dc6ccd..e89c0696bd3f 100644 --- a/services/workmail/pom.xml +++ b/services/workmail/pom.xml @@ -20,7 +20,7 @@ services software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 workmail diff --git a/services/workmailmessageflow/pom.xml b/services/workmailmessageflow/pom.xml index 083ee3697cec..48141916fcb4 100644 --- a/services/workmailmessageflow/pom.xml +++ b/services/workmailmessageflow/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 workmailmessageflow AWS Java SDK :: Services :: WorkMailMessageFlow diff --git a/services/workspaces/pom.xml b/services/workspaces/pom.xml index 9e74f29430ae..8bbd8ce5c683 100644 --- a/services/workspaces/pom.xml +++ b/services/workspaces/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 workspaces AWS Java SDK :: Services :: Amazon WorkSpaces diff --git a/services/xray/pom.xml b/services/xray/pom.xml index 8bb761346e31..5adb0c30239f 100644 --- a/services/xray/pom.xml +++ b/services/xray/pom.xml @@ -21,7 +21,7 @@ software.amazon.awssdk services - 2.17.67 + 2.17.68 xray AWS Java SDK :: Services :: AWS X-Ray diff --git a/test/auth-sts-testing/pom.xml b/test/auth-sts-testing/pom.xml index b3ef47a19409..b6fd611f226a 100644 --- a/test/auth-sts-testing/pom.xml +++ b/test/auth-sts-testing/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml index 103463248568..4bab68c495a3 100644 --- a/test/codegen-generated-classes-test/pom.xml +++ b/test/codegen-generated-classes-test/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 ../../pom.xml diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java index b2e4a65125fe..0afe6b8f7e7e 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java @@ -223,7 +223,7 @@ public void explicitDocumentOnlyNullPayload() { WithExplicitDocumentPayloadResponse response = jsonClient.withExplicitDocumentPayload(c -> c.myDocument(null).accept(AcceptHeader.IMAGE_JPEG)); String syncRequest = getSyncRequestBody(); - assertThat(syncRequest).isEqualTo("{}"); + assertThat(syncRequest).isEmpty(); SdkHttpRequest sdkHttpRequest = getSyncRequest(); assertThat(sdkHttpRequest.firstMatchingHeader("accept").get()).contains(AcceptHeader.IMAGE_JPEG.toString()); assertThat(response.myDocument()).isNull(); @@ -236,7 +236,7 @@ public void explicitDocumentOnlyEmptyPayload() { WithExplicitDocumentPayloadResponse response = jsonClient.withExplicitDocumentPayload(c -> c.myDocument(null).accept(AcceptHeader.IMAGE_JPEG)); String syncRequest = getSyncRequestBody(); - assertThat(syncRequest).isEqualTo("{}"); + assertThat(syncRequest).isEmpty(); SdkHttpRequest sdkHttpRequest = getSyncRequest(); assertThat(sdkHttpRequest.firstMatchingHeader("accept").get()).contains(AcceptHeader.IMAGE_JPEG.toString()); assertThat(response.myDocument()).isNull(); diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml index b10cfc806b7a..307fd3dbf32c 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.17.67 + 2.17.68 ../../pom.xml http-client-tests diff --git a/test/module-path-tests/pom.xml b/test/module-path-tests/pom.xml index f31fc06515a5..0e43f70fc4da 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.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml index 93e381157b91..c45e1ead8711 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.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-contenttype.json b/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-contenttype.json deleted file mode 100644 index b82b0f70e93b..000000000000 --- a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-contenttype.json +++ /dev/null @@ -1,301 +0,0 @@ -[ - { - "description": "TestBody", - "given": { - "input": { - "testConfig": { - "timeout": 10 - }, - "testId": "t-12345" - } - }, - "when": { - "action": "marshall", - "operation": "TestBody" - }, - "then": { - "serializedAs": { - "uri": "/body", - "method": "POST", - "headers": { - "contains": { - "x-amz-test-id": "t-12345", - "Content-Type": "application/json" - } - }, - "body": { - "jsonEquals": "{\"testConfig\": {\"timeout\": 10}}" - } - } - } -}, -{ - "description": "TestPayloadNoParams", - "given": { - "input":{ - } - }, - "when": { - "action": "marshall", - "operation": "TestPayload" - }, - "then": { - "serializedAs": { - "uri": "/payload", - "method": "POST", - "headers": { - "contains": { - "Content-Type": "application/json" - } - }, - "body": { - "jsonEquals": "{}" - } - } - } -}, -{ - "description": "TestPayload", - "given": { - "input": { - "payloadConfig": { - "data": 25 - }, - "testId": "t-12345" - } - }, - "when": { - "action": "marshall", - "operation": "TestPayload" - }, - "then": { - "serializedAs": { - "uri": "/payload", - "method": "POST", - "headers": { - "contains": { - "x-amz-test-id": "t-12345", - "Content-Type": "application/json" - } - }, - "body": { - "jsonEquals": "{\"data\": 25}" - } - } - } -}, -{ - "description": "TestPayloadNoBody", - "given": { - "input": { - "testId": "t-12345" - } - }, - "when": { - "action":"marshall", - "operation":"TestPayload" - }, - "then": { - "serializedAs": { - "uri": "/payload", - "method": "POST", - "headers": { - "contains": { - "x-amz-test-id": "t-12345", - "Content-Type": "application/json" - } - }, - "body": { - "jsonEquals": "{}" - } - } - } -}, -{ - "description": "TestBlobPayload", - "given": { - "input": { - "data": "1234", - "contentType": "image/jpg" - } - }, - "when": { - "action": "marshall", - "operation": "TestBlobPayload" - }, - "then": { - "serializedAs": { - "uri": "/blob-payload", - "method": "POST", - "headers": { - "contains": { - "Content-Type": "image/jpg" - } - }, - "body": { - "equals": "1234" - } - } - } -}, -{ - "description": "TestBlobPayloadNoParams", - "given": { - "input": { - } - }, - "when": { - "action": "marshall", - "operation": "TestBlobPayload" - }, - "then": { - "serializedAs": { - "uri": "/blob-payload", - "method": "POST", - "headers": { - "doesNotContain": [ - "Content-Type" - ] - }, - "body": { - "equals": "" - } - } - } -}, -{ - "description": "NoPayload", - "given": { - "input": { - } - }, - "when": { - "action": "marshall", - "operation": "NoPayload" - }, - "then": { - "serializedAs": { - "uri": "/no-payload", - "method": "GET", - "headers": { - "doesNotContain": [ - "Content-Type", - "Content-Length" - ] - }, - "body": { - "equals": "" - } - } - } -}, -{ - "description": "NoPayloadWithHeader", - "given": { - "input": { - "testId": "t-12345" - } - }, - "when": { - "action": "marshall", - "operation": "NoPayload" - }, - "then": { - "serializedAs": { - "uri": "/no-payload", - "method": "GET", - "headers": { - "contains": { - "x-amz-test-id": "t-12345" - }, - "doesNotContain": [ - "Content-Type", - "Content-Length" - ] - }, - "body": { - "equals": "" - } - } - } -}, -{ - "description": "NoPayloadGet", - "given": { - "input": { - } - }, - "when": { - "action": "marshall", - "operation": "NoPayloadPost" - }, - "then": { - "serializedAs": { - "uri": "/no-payload", - "method": "POST", - "headers": { - "doesNotContain": [ - "Content-Type" - ] - }, - "body": { - "equals": "" - } - } - } -}, -{ - "description": "NoPayloadGetWithHeader", - "given": { - "input": { - "testId": "t-12345" - } - }, - "when": { - "action": "marshall", - "operation": "NoPayloadPost" - }, - "then": { - "serializedAs": { - "uri": "/no-payload", - "method": "POST", - "headers": { - "contains": { - "x-amz-test-id": "t-12345" - }, - "doesNotContain": [ - "Content-Type" - ] - }, - "body": { - "equals": "" - } - } - } -}, -{ - "description": "TestBodyNoParams", - "given": { - "input": { - } - }, - "when": { - "action": "marshall", - "operation": "TestBody" - }, - "then": { - "serializedAs": { - "uri": "/body", - "method": "POST", - "headers": { - "contains": { - "Content-Type": "application/json" - } - }, - "body": { - "jsonEquals": "{}" - } - } - } -} -] diff --git a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-input.json b/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-input.json index c5046904386e..9bd43b7b9e56 100644 --- a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-input.json +++ b/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-input.json @@ -59,7 +59,7 @@ } }, { - "description": "Explicit payload member and no parameters marshalls into an empty JSON object", + "description": "Explicit payload member and no parameters marshalls into an empty request body", "given": { "input": { } @@ -71,7 +71,7 @@ "then": { "serializedAs": { "body": { - "jsonEquals": "{}" + "equals": "" } } } diff --git a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/restjson-contenttype-suite.json b/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/restjson-contenttype-suite.json deleted file mode 100644 index 3455917a66e3..000000000000 --- a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/restjson-contenttype-suite.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "testCases": [ - "cases/rest-json-contenttype.json" - ] -} \ No newline at end of file diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml index 3201e234fd34..6fd0b8c2e429 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.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/test/protocol-tests/src/main/resources/codegen-resources/restjson/contenttype/service-2.json b/test/protocol-tests/src/main/resources/codegen-resources/restjson/contenttype/service-2.json deleted file mode 100644 index e7770206c97f..000000000000 --- a/test/protocol-tests/src/main/resources/codegen-resources/restjson/contenttype/service-2.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "version":"2.0", - "metadata":{ - "apiVersion":"2021-05-13", - "endpointPrefix":"rest-test", - "protocol":"rest-json", - "serviceAbbreviation":"AmazonProtocolRestJsonContentType", - "serviceFullName":"Content Type Amazon Protocol Rest Json", - "serviceId":"AmazonProtocolRestJsonContentType", - "signatureVersion":"v4", - "timestampFormat":"unixTimestamp", - "uid":"restjson-contenttype-2021-05-13" - }, - "operations":{ - "TestBody":{ - "name":"TestBody", - "http":{ - "method":"POST", - "requestUri":"/body" - }, - "input":{"shape":"TestBodyRequest"} - }, - "TestPayload": { - "name": "TestPayload", - "http": { - "method": "POST", - "requestUri": "/payload" - }, - "input":{"shape": "TestPayloadRequest"} - }, - "TestBlobPayload": { - "name": "TestBlobPayload", - "http": { - "method": "POST", - "requestUri": "/blob-payload" - }, - "input": {"shape": "TestBlobPayloadRequest"} - }, - "NoPayload": { - "name": "NoPayload", - "http": { - "method": "GET", - "requestUri": "no-payload" - }, - "input": {"shape": "NoPayloadRequest"} - }, - "NoPayloadPost": { - "name": "NoPayloadPost", - "http": { - "method": "POST", - "requestUri": "no-payload" - }, - "input": {"shape": "NoPayloadPostRequest"} - } - }, - "shapes":{ - "Integer":{ - "type":"integer" - }, - "String":{"type":"string"}, - "Blob":{"type":"blob"}, - "NoPayloadRequest":{ - "type":"structure", - "required":[], - "members":{ - "testId":{ - "shape":"TestId", - "documentation":"

The unique ID for a test.

", - "location":"header", - "locationName":"x-amz-test-id" - } - }, - "documentation":"

The request structure for a no payload request.

" - }, - "NoPayloadPostRequest":{ - "type":"structure", - "required":[], - "members":{ - "testId":{ - "shape":"TestId", - "documentation":"

The unique ID for a test.

", - "location":"header", - "locationName":"x-amz-test-id" - } - }, - "documentation":"

The request structure for a no payload request.

" - }, - "TestId":{ - "type":"string", - "max":8, - "min":3, - "pattern":"t-[a-z0-9-]+" - }, - "TestConfig":{ - "type":"structure", - "required":[], - "members":{ - "timeout":{ - "shape":"Integer", - "documentation":"

Timeout in seconds

" - } - } - }, - "PayloadConfig":{ - "type":"structure", - "required":[], - "members":{ - "data":{ - "shape":"Integer", - "documentation":"

Numerical data

" - } - } - }, - "TestBodyRequest":{ - "type":"structure", - "required":[], - "members":{ - "testConfig":{ - "shape":"TestConfig", - "documentation":"

Content to post

" - }, - "testId":{ - "shape":"TestId", - "documentation":"

Optional test identifier

", - "location":"header", - "locationName":"x-amz-test-id" - } - }, - "documentation":"

The request structure for a test body request.

" - }, - "TestPayloadRequest":{ - "type":"structure", - "required":[], - "members":{ - "payloadConfig":{ - "shape":"PayloadConfig", - "documentation":"

Payload to post

" - }, - "testId":{ - "shape":"TestId", - "documentation":"

Optional test identifier

", - "location":"header", - "locationName":"x-amz-test-id" - } - }, - "documentation":"

The request structure for a payload request.

", - "payload":"payloadConfig" - }, - "TestBlobPayloadRequest":{ - "type":"structure", - "required":[], - "members":{ - "data":{ - "shape":"Blob", - "documentation":"

Blob payload to post

" - }, - "contentType":{ - "shape":"String", - "documentation":"

Optional content-type header

", - "location":"header", - "locationName":"Content-Type" - } - }, - "documentation":"

The request structure for a blob payload request.

", - "payload":"data" - } - } -} diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonContentTypeProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonContentTypeProtocolTest.java deleted file mode 100644 index fe7191e05ba2..000000000000 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonContentTypeProtocolTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.protocol.tests; - -import java.io.IOException; -import java.util.List; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import software.amazon.awssdk.protocol.ProtocolTestSuiteLoader; -import software.amazon.awssdk.protocol.model.TestCase; -import software.amazon.awssdk.protocol.runners.ProtocolTestRunner; - -@RunWith(Parameterized.class) -public class RestJsonContentTypeProtocolTest extends ProtocolTestBase { - private static final ProtocolTestSuiteLoader testSuiteLoader = new ProtocolTestSuiteLoader(); - private static ProtocolTestRunner testRunner; - - @Parameterized.Parameter - public TestCase testCase; - - @Parameterized.Parameters(name = "{0}") - public static List data() throws IOException { - return testSuiteLoader.load("restjson-contenttype-suite.json"); - } - - @BeforeClass - public static void setupFixture() { - testRunner = new ProtocolTestRunner("/models/rest-test-2021-05-13-intermediate.json"); - } - - @Test - public void runProtocolTest() throws Exception { - testRunner.runTest(testCase); - } -} diff --git a/test/s3-benchmarks/pom.xml b/test/s3-benchmarks/pom.xml index 0d84140848f8..ec9f386c4720 100644 --- a/test/s3-benchmarks/pom.xml +++ b/test/s3-benchmarks/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/test/sdk-benchmarks/pom.xml b/test/sdk-benchmarks/pom.xml index 8601ac6444f3..5bdb4e517de5 100644 --- a/test/sdk-benchmarks/pom.xml +++ b/test/sdk-benchmarks/pom.xml @@ -19,7 +19,7 @@ software.amazon.awssdk aws-sdk-java-pom - 2.17.67 + 2.17.68 ../../pom.xml diff --git a/test/sdk-native-image-test/pom.xml b/test/sdk-native-image-test/pom.xml index e64368b548e0..971560aec84e 100644 --- a/test/sdk-native-image-test/pom.xml +++ b/test/sdk-native-image-test/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml index a3311066312f..ff7004fc06f1 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.17.67 + 2.17.68 ../../pom.xml service-test-utils diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml index f8e98938947a..7f439e103a23 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.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml index 13651ea16e90..3d8e716f28bb 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.17.67 + 2.17.68 ../../pom.xml test-utils diff --git a/test/tests-coverage-reporting/pom.xml b/test/tests-coverage-reporting/pom.xml index df2bd419ee44..63d3974ea811 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.17.67 + 2.17.68 ../../pom.xml 4.0.0 diff --git a/third-party/pom.xml b/third-party/pom.xml index bfc3c3721510..6093c02a1093 100644 --- a/third-party/pom.xml +++ b/third-party/pom.xml @@ -21,7 +21,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 third-party diff --git a/third-party/third-party-jackson-core/pom.xml b/third-party/third-party-jackson-core/pom.xml index 52060a7781e1..76935ae8d7f4 100644 --- a/third-party/third-party-jackson-core/pom.xml +++ b/third-party/third-party-jackson-core/pom.xml @@ -20,7 +20,7 @@ third-party software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/third-party/third-party-jackson-dataformat-cbor/pom.xml b/third-party/third-party-jackson-dataformat-cbor/pom.xml index 2598031b4454..85deebe1bfae 100644 --- a/third-party/third-party-jackson-dataformat-cbor/pom.xml +++ b/third-party/third-party-jackson-dataformat-cbor/pom.xml @@ -20,7 +20,7 @@ third-party software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/utils/pom.xml b/utils/pom.xml index 50bd6044f1c3..370ea304088f 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ aws-sdk-java-pom software.amazon.awssdk - 2.17.67 + 2.17.68 4.0.0 diff --git a/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java index 6724b773be05..e7fd8c015e1d 100644 --- a/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java +++ b/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java @@ -206,4 +206,28 @@ public static byte[] copyBytesFrom(ByteBuffer bb) { return dst; } + /** + * This behaves identically to {@link #copyBytesFrom(ByteBuffer)}, except + * that the readLimit acts as a limit to the number of bytes that should be + * read from the byte buffer. + */ + public static byte[] copyBytesFrom(ByteBuffer bb, int readLimit) { + if (bb == null) { + return null; + } + + int numBytesToRead = Math.min(readLimit, bb.limit() - bb.position()); + + if (bb.hasArray()) { + return Arrays.copyOfRange( + bb.array(), + bb.arrayOffset() + bb.position(), + bb.arrayOffset() + bb.position() + numBytesToRead); + } + + byte[] dst = new byte[numBytesToRead]; + bb.asReadOnlyBuffer().get(dst); + return dst; + } + }