Skip to content

Commit f489405

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #514 from aws/staging/5bb3afde-a0fc-4c13-ae4d-85da0ada760e
Pull request: release <- staging/5bb3afde-a0fc-4c13-ae4d-85da0ada760e
2 parents 32d391c + 9c630a2 commit f489405

File tree

233 files changed

+4928
-751
lines changed

Some content is hidden

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

233 files changed

+4928
-751
lines changed

‎.changes/2.5.54.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"date": "2019-05-30",
3+
"version": "2.5.54",
4+
"entries": [
5+
{
6+
"category": "AWS CodeCommit",
7+
"type": "feature",
8+
"description": "This release adds APIs that allow adding and removing tags to a repository, and viewing tags for a repository. It also enables adding tags when creating a repository."
9+
},
10+
{
11+
"category": "AWS RDS DataService",
12+
"type": "feature",
13+
"description": "The RDS Data API is generally available for the MySQL-compatible edition of Amazon Aurora Serverless in the US East (N. Virginia and Ohio), US West (Oregon), EU (Ireland), and Asia Pacific (Tokyo) regions. This service enables you to easily access Aurora Serverless clusters with web services-based applications including AWS Lambda and AWS AppSync. The new APIs included in this SDK release are ExecuteStatement, BatchExecuteStatement, BeginTransaction, CommitTransaction, and RollbackTransaction. The ExecuteSql API is deprecated; instead use ExecuteStatement which provides additional functionality including transaction support."
14+
},
15+
{
16+
"category": "AWS Service Catalog",
17+
"type": "feature",
18+
"description": "Service Catalog ListStackInstancesForProvisionedProduct API enables customers to get details of a provisioned product with type \"CFN_STACKSET\". By passing the provisioned product id, the API will list account, region and status of each stack instances that are associated with this provisioned product."
19+
},
20+
{
21+
"category": "AWS SDK for Java v2",
22+
"type": "bugfix",
23+
"description": "Improved exception messages in credential providers to exclude detailed parse errors that may contain sensitive information."
24+
},
25+
{
26+
"category": "Managed Streaming for Kafka",
27+
"type": "feature",
28+
"description": "Updated APIs for Amazon MSK to enable new features such as encryption in transit, client authentication, and scaling storage."
29+
},
30+
{
31+
"category": "AWS IoT Events",
32+
"type": "feature",
33+
"description": "The AWS IoT Events service allows customers to monitor their IoT devices and sensors to detect failures or changes in operation and to trigger actions when these events occur"
34+
},
35+
{
36+
"category": "Amazon Pinpoint Email Service",
37+
"type": "feature",
38+
"description": "You can now specify whether the Amazon Pinpoint Email service must deliver email over a connection that is encrypted using Transport Layer Security (TLS)."
39+
},
40+
{
41+
"category": "AWS IoT Events Data",
42+
"type": "feature",
43+
"description": "The AWS IoT Events service allows customers to monitor their IoT devices and sensors to detect failures or changes in operation and to trigger actions when these events occur"
44+
},
45+
{
46+
"category": "Amazon Relational Database Service",
47+
"type": "feature",
48+
"description": "This release adds support for Activity Streams for database clusters."
49+
},
50+
{
51+
"category": "AWS IoT Analytics",
52+
"type": "feature",
53+
"description": "IoT Analytics adds the option to use your own S3 bucket to store channel and data store resources. Previously, only service-managed storage was used."
54+
}
55+
]
56+
}

‎CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
# __2.5.54__ __2019-05-30__
2+
## __AWS CodeCommit__
3+
- ### Features
4+
- This release adds APIs that allow adding and removing tags to a repository, and viewing tags for a repository. It also enables adding tags when creating a repository.
5+
6+
## __AWS IoT Analytics__
7+
- ### Features
8+
- IoT Analytics adds the option to use your own S3 bucket to store channel and data store resources. Previously, only service-managed storage was used.
9+
10+
## __AWS IoT Events__
11+
- ### Features
12+
- The AWS IoT Events service allows customers to monitor their IoT devices and sensors to detect failures or changes in operation and to trigger actions when these events occur
13+
14+
## __AWS IoT Events Data__
15+
- ### Features
16+
- The AWS IoT Events service allows customers to monitor their IoT devices and sensors to detect failures or changes in operation and to trigger actions when these events occur
17+
18+
## __AWS RDS DataService__
19+
- ### Features
20+
- The RDS Data API is generally available for the MySQL-compatible edition of Amazon Aurora Serverless in the US East (N. Virginia and Ohio), US West (Oregon), EU (Ireland), and Asia Pacific (Tokyo) regions. This service enables you to easily access Aurora Serverless clusters with web services-based applications including AWS Lambda and AWS AppSync. The new APIs included in this SDK release are ExecuteStatement, BatchExecuteStatement, BeginTransaction, CommitTransaction, and RollbackTransaction. The ExecuteSql API is deprecated; instead use ExecuteStatement which provides additional functionality including transaction support.
21+
22+
## __AWS SDK for Java v2__
23+
- ### Bugfixes
24+
- Improved exception messages in credential providers to exclude detailed parse errors that may contain sensitive information.
25+
26+
## __AWS Service Catalog__
27+
- ### Features
28+
- Service Catalog ListStackInstancesForProvisionedProduct API enables customers to get details of a provisioned product with type "CFN_STACKSET". By passing the provisioned product id, the API will list account, region and status of each stack instances that are associated with this provisioned product.
29+
30+
## __Amazon Pinpoint Email Service__
31+
- ### Features
32+
- You can now specify whether the Amazon Pinpoint Email service must deliver email over a connection that is encrypted using Transport Layer Security (TLS).
33+
34+
## __Amazon Relational Database Service__
35+
- ### Features
36+
- This release adds support for Activity Streams for database clusters.
37+
38+
## __Managed Streaming for Kafka__
39+
- ### Features
40+
- Updated APIs for Amazon MSK to enable new features such as encryption in transit, client authentication, and scaling storage.
41+
142
# __2.5.53__ __2019-05-29__
243
## __AWS IoT Things Graph__
344
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ You can import the whole SDK into your project (includes all services) as follow
4646
<dependency>
4747
<groupId>software.amazon.awssdk</groupId>
4848
<artifactId>aws-sdk-java</artifactId>
49-
<version>2.5.53</version>
49+
<version>2.5.54</version>
5050
</dependency>
5151
```
5252

@@ -58,12 +58,12 @@ Alternatively you can add dependencies for the specific services you use only:
5858
<dependency>
5959
<groupId>software.amazon.awssdk</groupId>
6060
<artifactId>ec2</artifactId>
61-
<version>2.5.53</version>
61+
<version>2.5.54</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>software.amazon.awssdk</groupId>
6565
<artifactId>s3</artifactId>
66-
<version>2.5.53</version>
66+
<version>2.5.54</version>
6767
</dependency>
6868
```
6969

@@ -77,7 +77,7 @@ To automatically manage module versions (currently all modules have the same ver
7777
<dependency>
7878
<groupId>software.amazon.awssdk</groupId>
7979
<artifactId>bom</artifactId>
80-
<version>2.5.53</version>
80+
<version>2.5.54</version>
8181
<type>pom</type>
8282
<scope>import</scope>
8383
</dependency>

‎aws-sdk-java/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.53</version>
7+
<version>2.5.54</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>aws-sdk-java</artifactId>
@@ -875,6 +875,16 @@ Amazon AutoScaling, etc).</description>
875875
<artifactId>iotthingsgraph</artifactId>
876876
<version>${awsjavasdk.version}</version>
877877
</dependency>
878+
<dependency>
879+
<groupId>software.amazon.awssdk</groupId>
880+
<artifactId>iotevents</artifactId>
881+
<version>${awsjavasdk.version}</version>
882+
</dependency>
883+
<dependency>
884+
<groupId>software.amazon.awssdk</groupId>
885+
<artifactId>ioteventsdata</artifactId>
886+
<version>${awsjavasdk.version}</version>
887+
</dependency>
878888
</dependencies>
879889
<build>
880890
<finalName>${project.artifactId}-${project.version}</finalName>

‎bom-internal/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>aws-sdk-java-pom</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.53</version>
8+
<version>2.5.54</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎bom/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>software.amazon.awssdk</groupId>
66
<artifactId>aws-sdk-java-pom</artifactId>
7-
<version>2.5.53</version>
7+
<version>2.5.54</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>bom</artifactId>
@@ -985,6 +985,16 @@
985985
<artifactId>iotthingsgraph</artifactId>
986986
<version>${awsjavasdk.version}</version>
987987
</dependency>
988+
<dependency>
989+
<groupId>software.amazon.awssdk</groupId>
990+
<artifactId>iotevents</artifactId>
991+
<version>${awsjavasdk.version}</version>
992+
</dependency>
993+
<dependency>
994+
<groupId>software.amazon.awssdk</groupId>
995+
<artifactId>ioteventsdata</artifactId>
996+
<version>${awsjavasdk.version}</version>
997+
</dependency>
988998
</dependencies>
989999
</dependencyManagement>
9901000
</project>

‎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.5.53</version>
24+
<version>2.5.54</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
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>aws-sdk-java-pom</artifactId>
10-
<version>2.5.53</version>
10+
<version>2.5.54</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313
<artifactId>codegen-lite-maven-plugin</artifactId>

‎codegen-lite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>software.amazon.awssdk</groupId>
88
<artifactId>aws-sdk-java-pom</artifactId>
9-
<version>2.5.53</version>
9+
<version>2.5.54</version>
1010
</parent>
1111
<artifactId>codegen-lite</artifactId>
1212
<name>AWS Java SDK :: Code Generator Lite</name>

‎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.5.53</version>
25+
<version>2.5.54</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.5.53</version>
24+
<version>2.5.54</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>

‎core/annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>core</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.53</version>
8+
<version>2.5.54</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎core/auth/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.53</version>
10+
<version>2.5.54</version>
1111
</parent>
1212

1313
<artifactId>auth</artifactId>
@@ -86,6 +86,11 @@
8686
<artifactId>commons-io</artifactId>
8787
<scope>test</scope>
8888
</dependency>
89+
<dependency>
90+
<groupId>commons-lang</groupId>
91+
<artifactId>commons-lang</artifactId>
92+
<scope>test</scope>
93+
</dependency>
8994
<dependency>
9095
<groupId>org.assertj</groupId>
9196
<artifactId>assertj-core</artifactId>

‎core/auth/src/main/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private RefreshResult<AwsCredentials> refreshCredentials() {
7373
try {
7474
String credentialsResponse = HttpResourcesUtils.instance().readResource(getCredentialsEndpointProvider());
7575

76-
JsonNode node = JacksonUtils.jsonNodeOf(credentialsResponse);
76+
JsonNode node = JacksonUtils.sensitiveJsonNodeOf(credentialsResponse);
7777
JsonNode accessKey = node.get("AccessKeyId");
7878
JsonNode secretKey = node.get("SecretAccessKey");
7979
JsonNode token = node.get("Token");

‎core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProviderTest.java

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
2222
import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
2323
import static org.assertj.core.api.Assertions.assertThat;
24+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2425
import static software.amazon.awssdk.core.SdkSystemSetting.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI;
2526
import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
2627

2728
import com.github.tomakehurst.wiremock.junit.WireMockRule;
2829
import java.net.URI;
30+
import org.apache.commons.lang.exception.ExceptionUtils;
2931
import org.junit.AfterClass;
3032
import org.junit.Before;
3133
import org.junit.ClassRule;
@@ -92,18 +94,47 @@ public void testGetCredentialsReturnsValidResponseFromEcsEndpoint() {
9294
assertThat(credentials.sessionToken()).isEqualTo(TOKEN);
9395
}
9496

97+
/**
98+
* Tests that the getCredentials won't leak credentials data if the response from ECS is corrupted.
99+
*/
100+
@Test
101+
public void getCredentialsWithCorruptResponseDoesNotIncludeCredentialsInExceptionMessage() {
102+
helper.set(AWS_CONTAINER_CREDENTIALS_RELATIVE_URI, "");
103+
104+
stubForCorruptedSuccessResponse();
105+
106+
assertThatThrownBy(credentialsProvider::resolveCredentials).satisfies(t -> {
107+
String stackTrace = ExceptionUtils.getStackTrace(t);
108+
assertThat(stackTrace).doesNotContain("ACCESS_KEY_ID");
109+
assertThat(stackTrace).doesNotContain("SECRET_ACCESS_KEY");
110+
assertThat(stackTrace).doesNotContain("TOKEN_TOKEN_TOKEN");
111+
});
112+
}
113+
95114
private void stubForSuccessResponse() {
96-
stubFor(
97-
get(urlPathEqualTo(CREDENTIALS_PATH))
98-
.withHeader("User-Agent", equalTo(UserAgentUtils.getUserAgent()))
99-
.willReturn(aResponse()
100-
.withStatus(200)
101-
.withHeader("Content-Type", "application/json")
102-
.withHeader("charset", "utf-8")
103-
.withBody("{\"AccessKeyId\":\"ACCESS_KEY_ID\"," +
104-
"\"SecretAccessKey\":\"SECRET_ACCESS_KEY\"," +
105-
"\"Token\":\"TOKEN_TOKEN_TOKEN\"," +
106-
"\"Expiration\":\"3000-05-03T04:55:54Z\"}")));
115+
stubFor200Response(getSuccessfulBody());
116+
}
117+
118+
private void stubForCorruptedSuccessResponse() {
119+
String body = getSuccessfulBody();
120+
stubFor200Response(body.substring(0, body.length() - 2));
121+
}
122+
123+
private void stubFor200Response(String body) {
124+
stubFor(get(urlPathEqualTo(CREDENTIALS_PATH))
125+
.withHeader("User-Agent", equalTo(UserAgentUtils.getUserAgent()))
126+
.willReturn(aResponse()
127+
.withStatus(200)
128+
.withHeader("Content-Type", "application/json")
129+
.withHeader("charset", "utf-8")
130+
.withBody(body)));
131+
}
132+
133+
private String getSuccessfulBody() {
134+
return "{\"AccessKeyId\":\"ACCESS_KEY_ID\"," +
135+
"\"SecretAccessKey\":\"SECRET_ACCESS_KEY\"," +
136+
"\"Token\":\"TOKEN_TOKEN_TOKEN\"," +
137+
"\"Expiration\":\"3000-05-03T04:55:54Z\"}";
107138
}
108139

109140
/**

‎core/aws-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>software.amazon.awssdk</groupId>
99
<artifactId>core</artifactId>
10-
<version>2.5.53</version>
10+
<version>2.5.54</version>
1111
</parent>
1212

1313
<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.5.53</version>
24+
<version>2.5.54</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.5.53</version>
25+
<version>2.5.54</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
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.53</version>
8+
<version>2.5.54</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>protocols</artifactId>
77
<groupId>software.amazon.awssdk</groupId>
8-
<version>2.5.53</version>
8+
<version>2.5.54</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)