Skip to content

Commit 4f0d285

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #715 from aws/staging/9fa3e9e6-243c-4c84-8427-abd274297dd0
Pull request: release <- staging/9fa3e9e6-243c-4c84-8427-abd274297dd0
2 parents 25df2f3 + bd29e6b commit 4f0d285

File tree

289 files changed

+3634
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+3634
-688
lines changed

‎.changes/2.10.47.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"version": "2.10.47",
3+
"date": "2020-01-10",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Relational Database Service",
8+
"description": "This release adds an operation that enables users to override the system-default SSL/TLS certificate for new Amazon RDS DB instances temporarily, or remove the customer override."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon Elastic Compute Cloud",
13+
"description": "This release introduces the ability to tag egress only internet gateways, local gateways, local gateway route tables, local gateway virtual interfaces, local gateway virtual interface groups, local gateway route table VPC association and local gateway route table virtual interface group association. You can use tags to organize and identify your resources for cost allocation."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Amazon WorkSpaces",
18+
"description": "Added the migrate feature to Amazon WorkSpaces."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "AWS SDK for Java v2",
23+
"description": "Updated service endpoint metadata."
24+
},
25+
{
26+
"type": "feature",
27+
"category": "Amazon Chime",
28+
"description": "Add shared profile support to new and existing users"
29+
},
30+
{
31+
"type": "feature",
32+
"category": "AWS Transfer for SFTP",
33+
"description": "This release introduces a new endpoint type that allows you to attach Elastic IP addresses from your AWS account with your server's endpoint directly and whitelist access to your server by client's internet IP address(es) using VPC Security Groups."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS SDK for Java v2",
38+
"description": "Updated service endpoints and added global endpoints for iso and iso-b."
39+
},
40+
{
41+
"type": "bugfix",
42+
"category": "Amazon S3",
43+
"description": "Fix an issue where s3#listObjects incorrectly decoded marker field. See [#1574](https://github.com/aws/aws-sdk-java-v2/issues/1574)."
44+
},
45+
{
46+
"type": "feature",
47+
"category": "Amazon SageMaker Service",
48+
"description": "SageMaker ListTrialComponents API filter by TrialName and ExperimentName."
49+
}
50+
]
51+
}

‎CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
# __2.10.47__ __2020-01-10__
2+
## __AWS SDK for Java v2__
3+
- ### Features
4+
- Updated service endpoint metadata.
5+
- Updated service endpoints and added global endpoints for iso and iso-b.
6+
7+
## __AWS Transfer for SFTP__
8+
- ### Features
9+
- This release introduces a new endpoint type that allows you to attach Elastic IP addresses from your AWS account with your server's endpoint directly and whitelist access to your server by client's internet IP address(es) using VPC Security Groups.
10+
11+
## __Amazon Chime__
12+
- ### Features
13+
- Add shared profile support to new and existing users
14+
15+
## __Amazon Elastic Compute Cloud__
16+
- ### Features
17+
- This release introduces the ability to tag egress only internet gateways, local gateways, local gateway route tables, local gateway virtual interfaces, local gateway virtual interface groups, local gateway route table VPC association and local gateway route table virtual interface group association. You can use tags to organize and identify your resources for cost allocation.
18+
19+
## __Amazon Relational Database Service__
20+
- ### Features
21+
- This release adds an operation that enables users to override the system-default SSL/TLS certificate for new Amazon RDS DB instances temporarily, or remove the customer override.
22+
23+
## __Amazon S3__
24+
- ### Bugfixes
25+
- Fix an issue where s3#listObjects incorrectly decoded marker field. See [#1574](https://github.com/aws/aws-sdk-java-v2/issues/1574).
26+
27+
## __Amazon SageMaker Service__
28+
- ### Features
29+
- SageMaker ListTrialComponents API filter by TrialName and ExperimentName.
30+
31+
## __Amazon WorkSpaces__
32+
- ### Features
33+
- Added the migrate feature to Amazon WorkSpaces.
34+
135
# __2.10.46__ __2020-01-09__
236
## __AWS SDK for Java v2__
337
- ### Bugfixes

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
4848
<dependency>
4949
<groupId>software.amazon.awssdk</groupId>
5050
<artifactId>bom</artifactId>
51-
<version>2.10.46</version>
51+
<version>2.10.47</version>
5252
<type>pom</type>
5353
<scope>import</scope>
5454
</dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
8282
<dependency>
8383
<groupId>software.amazon.awssdk</groupId>
8484
<artifactId>ec2</artifactId>
85-
<version>2.10.46</version>
85+
<version>2.10.47</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>software.amazon.awssdk</groupId>
8989
<artifactId>s3</artifactId>
90-
<version>2.10.46</version>
90+
<version>2.10.47</version>
9191
</dependency>
9292
```
9393

@@ -99,7 +99,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
9999
<dependency>
100100
<groupId>software.amazon.awssdk</groupId>
101101
<artifactId>aws-sdk-java</artifactId>
102-
<version>2.10.46</version>
102+
<version>2.10.47</version>
103103
</dependency>
104104
```
105105

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>software.amazon.awssdk</groupId>
2121
<artifactId>aws-sdk-java-pom</artifactId>
22-
<version>2.10.46</version>
22+
<version>2.10.47</version>
2323
<relativePath>../pom.xml</relativePath>
2424
</parent>
2525
<artifactId>aws-sdk-java</artifactId>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>aws-sdk-java-pom</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.10.46</version>
23+
<version>2.10.47</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>software.amazon.awssdk</groupId>
2121
<artifactId>aws-sdk-java-pom</artifactId>
22-
<version>2.10.46</version>
22+
<version>2.10.47</version>
2323
<relativePath>../pom.xml</relativePath>
2424
</parent>
2525
<artifactId>bom</artifactId>

‎bundle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.10.46</version>
24+
<version>2.10.47</version>
2525
</parent>
2626
<artifactId>bundle</artifactId>
2727
<packaging>jar</packaging>

‎codegen-lite-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.10.46</version>
25+
<version>2.10.47</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.10.46</version>
24+
<version>2.10.47</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<name>AWS Java SDK :: Code Generator Lite</name>

‎codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerator.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,12 @@ private void regions(TypeSpec.Builder builder) {
109109

110110
addGlobalRegions(builder);
111111

112-
regionsArray.add(regionsCodeBlock + ", ").add("AWS_GLOBAL, ").add("AWS_CN_GLOBAL, ").add("AWS_US_GOV_GLOBAL");
112+
regionsArray.add(regionsCodeBlock + ", ")
113+
.add("AWS_GLOBAL, ")
114+
.add("AWS_CN_GLOBAL, ")
115+
.add("AWS_US_GOV_GLOBAL, ")
116+
.add("AWS_ISO_GLOBAL, ")
117+
.add("AWS_ISO_B_GLOBAL");
113118
regionsArray.add("))");
114119

115120
TypeName listOfRegions = ParameterizedTypeName.get(ClassName.get(List.class), className());
@@ -130,6 +135,14 @@ private void addGlobalRegions(TypeSpec.Builder builder) {
130135
.addField(FieldSpec.builder(className(), "AWS_US_GOV_GLOBAL")
131136
.addModifiers(PUBLIC, STATIC, FINAL)
132137
.initializer("$T.of($S, true)", className(), "aws-us-gov-global")
138+
.build())
139+
.addField(FieldSpec.builder(className(), "AWS_ISO_GLOBAL")
140+
.addModifiers(PUBLIC, STATIC, FINAL)
141+
.initializer("$T.of($S, true)", className(), "aws-iso-global")
142+
.build())
143+
.addField(FieldSpec.builder(className(), "AWS_ISO_B_GLOBAL")
144+
.addModifiers(PUBLIC, STATIC, FINAL)
145+
.initializer("$T.of($S, true)", className(), "aws-iso-b-global")
133146
.build());
134147
}
135148

‎codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public class RegionGenerationTest {
2828

29-
private static final String ENDPOINTS = "/software/amazon/awssdk/codegen/lite/endpoints.json";
29+
private static final String ENDPOINTS = "/software/amazon/awssdk/codegen/lite/test-endpoints.json";
3030
private static final String SERVICE_METADATA_BASE = "software.amazon.awssdk.regions.servicemetadata";
3131
private static final String REGION_METADATA_BASE = "software.amazon.awssdk.regions.regionmetadata";
3232
private static final String PARTITION_METADATA_BASE = "software.amazon.awssdk.regions.partitionmetadata";

‎codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/regions.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,14 @@ public final class Region {
8080

8181
public static final Region AWS_US_GOV_GLOBAL = Region.of("aws-us-gov-global", true);
8282

83+
public static final Region AWS_ISO_GLOBAL = Region.of("aws-iso-global", true);
84+
85+
public static final Region AWS_ISO_B_GLOBAL = Region.of("aws-iso-b-global", true);
86+
8387
private static final List<Region> REGIONS = Collections.unmodifiableList(Arrays.asList(AP_SOUTH_1, EU_WEST_3, EU_WEST_2,
84-
EU_WEST_1, AP_NORTHEAST_3, AP_NORTHEAST_2, AP_NORTHEAST_1, CA_CENTRAL_1, SA_EAST_1, CN_NORTH_1, US_GOV_WEST_1,
85-
AP_SOUTHEAST_1, AP_SOUTHEAST_2, EU_CENTRAL_1, US_EAST_1, US_EAST_2, US_WEST_1, CN_NORTHWEST_1, US_WEST_2, AWS_GLOBAL,
86-
AWS_CN_GLOBAL, AWS_US_GOV_GLOBAL));
88+
EU_WEST_1, AP_NORTHEAST_3, AP_NORTHEAST_2, AP_NORTHEAST_1, CA_CENTRAL_1, SA_EAST_1, CN_NORTH_1, US_GOV_WEST_1,
89+
AP_SOUTHEAST_1, AP_SOUTHEAST_2, EU_CENTRAL_1, US_EAST_1, US_EAST_2, US_WEST_1, CN_NORTHWEST_1, US_WEST_2, AWS_GLOBAL,
90+
AWS_CN_GLOBAL, AWS_US_GOV_GLOBAL, AWS_ISO_GLOBAL, AWS_ISO_B_GLOBAL));
8791

8892
private final boolean isGlobalRegion;
8993

‎codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/endpoints.json renamed to ‎codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/test-endpoints.json

File renamed without changes.

‎codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>aws-sdk-java-pom</artifactId>
25-
<version>2.10.46</version>
25+
<version>2.10.47</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>software.amazon.awssdk</groupId>
2323
<artifactId>aws-sdk-java-pom</artifactId>
24-
<version>2.10.46</version>
24+
<version>2.10.47</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,11 @@ public boolean isXmlProtocol() {
519519
protocol == Protocol.REST_XML;
520520
}
521521

522+
public boolean isQueryProtocol() {
523+
return protocol == Protocol.EC2 ||
524+
protocol == Protocol.QUERY;
525+
}
526+
522527
/**
523528
* @return True for RESTful protocols. False for all other protocols (RPC, Query, etc).
524529
*/

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@
2424
import com.squareup.javapoet.CodeBlock;
2525
import com.squareup.javapoet.FieldSpec;
2626
import com.squareup.javapoet.MethodSpec;
27+
import com.squareup.javapoet.ParameterizedTypeName;
28+
import com.squareup.javapoet.TypeName;
2729
import com.squareup.javapoet.TypeSpec;
2830
import com.squareup.javapoet.TypeVariableName;
31+
32+
import java.util.Collections;
2933
import java.util.List;
3034
import javax.lang.model.element.Modifier;
3135
import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -46,6 +50,7 @@
4650
import software.amazon.awssdk.core.signer.Signer;
4751
import software.amazon.awssdk.http.Protocol;
4852
import software.amazon.awssdk.http.SdkHttpConfigurationOption;
53+
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
4954
import software.amazon.awssdk.utils.AttributeMap;
5055
import software.amazon.awssdk.utils.CollectionUtils;
5156
import software.amazon.awssdk.utils.StringUtils;
@@ -177,6 +182,16 @@ private MethodSpec finalizeServiceConfigurationMethod() {
177182
.addCode("interceptors = $T.mergeLists(interceptors, config.option($T.EXECUTION_INTERCEPTORS));\n",
178183
CollectionUtils.class, SdkClientOption.class);
179184

185+
if (model.getMetadata().isQueryProtocol()) {
186+
TypeName listType = ParameterizedTypeName.get(List.class, ExecutionInterceptor.class);
187+
builder.addStatement("$T protocolInterceptors = $T.singletonList(new $T())",
188+
listType,
189+
Collections.class,
190+
QueryParametersToBodyInterceptor.class);
191+
builder.addStatement("interceptors = $T.mergeLists(interceptors, protocolInterceptors)",
192+
CollectionUtils.class);
193+
}
194+
180195
if (model.getEndpointOperation().isPresent()) {
181196
builder.beginControlFlow("if (!endpointDiscoveryEnabled)")
182197
.addStatement("endpointDiscoveryEnabled = CHAIN.resolveEndpointDiscovery()")

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.10.46</version>
23+
<version>2.10.47</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/arns/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.10.46</version>
23+
<version>2.10.47</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.10.46</version>
25+
<version>2.10.47</version>
2626
</parent>
2727

2828
<artifactId>auth</artifactId>

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.10.46</version>
25+
<version>2.10.47</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>aws-sdk-java-pom</artifactId>
2323
<groupId>software.amazon.awssdk</groupId>
24-
<version>2.10.46</version>
24+
<version>2.10.47</version>
2525
</parent>
2626

2727
<artifactId>core</artifactId>

‎core/profiles/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>software.amazon.awssdk</groupId>
2424
<artifactId>core</artifactId>
25-
<version>2.10.46</version>
25+
<version>2.10.47</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/protocols/aws-cbor-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.10.46</version>
23+
<version>2.10.47</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-ion-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.10.46</version>
23+
<version>2.10.47</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-json-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.10.46</version>
23+
<version>2.10.47</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/protocols/aws-query-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>protocols</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.10.46</version>
23+
<version>2.10.47</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

0 commit comments

Comments
 (0)