Skip to content

Commit b42c327

Browse files
dagnirdagnir
authored
Merge branch 'master' into patch-1
2 parents 266324b + 704a6c8 commit b42c327

File tree

302 files changed

+1489
-493
lines changed

Some content is hidden

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

302 files changed

+1489
-493
lines changed

‎.changes/2.13.23.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"version": "2.13.23",
3+
"date": "2020-05-22",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS SDK for Java v2",
8+
"description": "Updated service endpoint metadata."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "AWS IoT SiteWise",
13+
"description": "This release adds support for the standard deviation auto-computed aggregate and improved support for portal logo images in SiteWise."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Auto Scaling",
18+
"description": "Documentation updates for Amazon EC2 Auto Scaling"
19+
}
20+
]
21+
}

‎.changes/2.13.24.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "2.13.24",
3+
"date": "2020-05-26",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon Elastic Compute Cloud",
8+
"description": "ebsOptimizedInfo, efaSupported and supportedVirtualizationTypes added to DescribeInstanceTypes API"
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon Data Lifecycle Manager",
13+
"description": "Allowing cron expression in the DLM policy creation schedule."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "Amazon Macie",
18+
"description": "This is a documentation-only update to the Amazon Macie Classic API. This update corrects out-of-date references to the service name."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "Amazon ElastiCache",
23+
"description": "Amazon ElastiCache now allows you to use resource based policies to manage access to operations performed on ElastiCache resources. Also, Amazon ElastiCache now exposes ARN (Amazon Resource Names) for ElastiCache resources such as Cache Clusters and Parameter Groups. ARNs can be used to apply IAM policies to ElastiCache resources."
24+
},
25+
{
26+
"type": "feature",
27+
"category": "AWS SDK for Java v2",
28+
"description": "Updated service endpoint metadata."
29+
},
30+
{
31+
"type": "feature",
32+
"category": "Amazon QuickSight",
33+
"description": "Add DataSetArns to QuickSight DescribeDashboard API response."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Simple Systems Manager (SSM)",
38+
"description": "The AWS Systems Manager GetOpsSummary API action now supports multiple OpsResultAttributes in the request. Currently, this feature only supports OpsResultAttributes with the following TypeNames: [AWS:EC2InstanceComputeOptimizer] or [AWS:EC2InstanceInformation, AWS:EC2InstanceComputeOptimizer]. These TypeNames can be used along with either or both of the following: [AWS:EC2InstanceRecommendation, AWS:RecommendationSource]"
39+
}
40+
]
41+
}

‎.changes/2.13.25.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "2.13.25",
3+
"date": "2020-05-27",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Amazon S3",
8+
"description": "Check the `x-amz-content-range` header for `GetObject` responses when the `Content-Range` header is not returned by the service. Fixes [#1209](https://github.com/aws/aws-sdk-java-v2/issues/1209)."
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Elastic Load Balancing",
13+
"description": "This release added support for HTTP/2 ALPN preference lists for Network Load Balancers"
14+
},
15+
{
16+
"type": "feature",
17+
"category": "AWS SDK for Java v2",
18+
"description": "Updated service endpoint metadata."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "Amazon GuardDuty",
23+
"description": "Documentation updates for GuardDuty"
24+
}
25+
]
26+
}

‎.changes/2.13.26.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "2.13.26",
3+
"date": "2020-05-28",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "Amazon QLDB Session",
8+
"description": "Documentation updates for Amazon QLDB Session"
9+
},
10+
{
11+
"type": "feature",
12+
"category": "Amazon WorkMail",
13+
"description": "This release adds support for Amazon WorkMail organization-level retention policies."
14+
},
15+
{
16+
"type": "feature",
17+
"category": "AWS Marketplace Catalog Service",
18+
"description": "AWS Marketplace Catalog now supports accessing initial change payloads with DescribeChangeSet operation."
19+
},
20+
{
21+
"type": "feature",
22+
"category": "Managed Streaming for Kafka",
23+
"description": "New APIs for upgrading the Apache Kafka version of a cluster and to find out compatible upgrade paths"
24+
}
25+
]
26+
}

‎.changes/next-release/feature-AWSMavenLambdaArchetype-6cb01fa.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"category": "AWS Maven Lambda Archetype",
3+
"type": "feature",
4+
"description": "Updated the `archetype-lambda` to generate SDK client that uses region from environment variable."
5+
}

‎CHANGELOG.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,79 @@
1+
# __2.13.26__ __2020-05-28__
2+
## __AWS Marketplace Catalog Service__
3+
- ### Features
4+
- AWS Marketplace Catalog now supports accessing initial change payloads with DescribeChangeSet operation.
5+
6+
## __Amazon QLDB Session__
7+
- ### Features
8+
- Documentation updates for Amazon QLDB Session
9+
10+
## __Amazon WorkMail__
11+
- ### Features
12+
- This release adds support for Amazon WorkMail organization-level retention policies.
13+
14+
## __Managed Streaming for Kafka__
15+
- ### Features
16+
- New APIs for upgrading the Apache Kafka version of a cluster and to find out compatible upgrade paths
17+
18+
# __2.13.25__ __2020-05-27__
19+
## __AWS SDK for Java v2__
20+
- ### Features
21+
- Updated service endpoint metadata.
22+
23+
## __Amazon GuardDuty__
24+
- ### Features
25+
- Documentation updates for GuardDuty
26+
27+
## __Amazon S3__
28+
- ### Bugfixes
29+
- Check the `x-amz-content-range` header for `GetObject` responses when the `Content-Range` header is not returned by the service. Fixes [#1209](https://github.com/aws/aws-sdk-java-v2/issues/1209).
30+
31+
## __Elastic Load Balancing__
32+
- ### Features
33+
- This release added support for HTTP/2 ALPN preference lists for Network Load Balancers
34+
35+
# __2.13.24__ __2020-05-26__
36+
## __AWS SDK for Java v2__
37+
- ### Features
38+
- Updated service endpoint metadata.
39+
40+
## __Amazon Data Lifecycle Manager__
41+
- ### Features
42+
- Allowing cron expression in the DLM policy creation schedule.
43+
44+
## __Amazon ElastiCache__
45+
- ### Features
46+
- Amazon ElastiCache now allows you to use resource based policies to manage access to operations performed on ElastiCache resources. Also, Amazon ElastiCache now exposes ARN (Amazon Resource Names) for ElastiCache resources such as Cache Clusters and Parameter Groups. ARNs can be used to apply IAM policies to ElastiCache resources.
47+
48+
## __Amazon Elastic Compute Cloud__
49+
- ### Features
50+
- ebsOptimizedInfo, efaSupported and supportedVirtualizationTypes added to DescribeInstanceTypes API
51+
52+
## __Amazon Macie__
53+
- ### Features
54+
- This is a documentation-only update to the Amazon Macie Classic API. This update corrects out-of-date references to the service name.
55+
56+
## __Amazon QuickSight__
57+
- ### Features
58+
- Add DataSetArns to QuickSight DescribeDashboard API response.
59+
60+
## __Amazon Simple Systems Manager (SSM)__
61+
- ### Features
62+
- The AWS Systems Manager GetOpsSummary API action now supports multiple OpsResultAttributes in the request. Currently, this feature only supports OpsResultAttributes with the following TypeNames: [AWS:EC2InstanceComputeOptimizer] or [AWS:EC2InstanceInformation, AWS:EC2InstanceComputeOptimizer]. These TypeNames can be used along with either or both of the following: [AWS:EC2InstanceRecommendation, AWS:RecommendationSource]
63+
64+
# __2.13.23__ __2020-05-22__
65+
## __AWS IoT SiteWise__
66+
- ### Features
67+
- This release adds support for the standard deviation auto-computed aggregate and improved support for portal logo images in SiteWise.
68+
69+
## __AWS SDK for Java v2__
70+
- ### Features
71+
- Updated service endpoint metadata.
72+
73+
## __Auto Scaling__
74+
- ### Features
75+
- Documentation updates for Amazon EC2 Auto Scaling
76+
177
# __2.13.22__ __2020-05-21__
278
## __AWS CodeBuild__
379
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
4949
<dependency>
5050
<groupId>software.amazon.awssdk</groupId>
5151
<artifactId>bom</artifactId>
52-
<version>2.13.22</version>
52+
<version>2.13.26</version>
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>
@@ -83,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only:
8383
<dependency>
8484
<groupId>software.amazon.awssdk</groupId>
8585
<artifactId>ec2</artifactId>
86-
<version>2.13.22</version>
86+
<version>2.13.26</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>software.amazon.awssdk</groupId>
9090
<artifactId>s3</artifactId>
91-
<version>2.13.22</version>
91+
<version>2.13.26</version>
9292
</dependency>
9393
```
9494

@@ -100,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
100100
<dependency>
101101
<groupId>software.amazon.awssdk</groupId>
102102
<artifactId>aws-sdk-java</artifactId>
103-
<version>2.13.22</version>
103+
<version>2.13.26</version>
104104
</dependency>
105105
```
106106

‎archetypes/archetype-lambda/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You can use `mvn archetype:generate` to generate a project using this archetype.
1414
mvn archetype:generate \
1515
-DarchetypeGroupId=software.amazon.awssdk \
1616
-DarchetypeArtifactId=archetype-lambda \
17-
-DarchetypeVersion=2.x\
17+
-DarchetypeVersion=2.x
1818
```
1919

2020
- Batch mode
@@ -23,22 +23,21 @@ mvn archetype:generate \
2323
mvn archetype:generate \
2424
-DarchetypeGroupId=software.amazon.awssdk \
2525
-DarchetypeArtifactId=archetype-lambda \
26-
-DarchetypeVersion=2.x\
26+
-DarchetypeVersion=2.x \
2727
-DgroupId=com.test \
2828
-DartifactId=sample-project \
2929
-Dservice=s3 \
30-
-Dregion=us-west-2 \
31-
-DinteractiveMode=false \
30+
-DinteractiveMode=false
3231
```
3332

3433
### Parameters
3534
3635
Parameter Name | Default Value | Description
3736
---|---|---
3837
`service` (required) | n/a | Specifies the service client to be used in the lambda function, eg: s3, dynamodb. You can find available services [here][java-sdk-v2-services].
39-
`region` (required) | n/a | Specifies the region to be set for the SDK client in the application
4038
`groupId`(required) | n/a | Specifies the group ID of the project
4139
`artifactId`(required) | n/a | Specifies the artifact ID of the project
40+
`region` | n/a | Specifies the region to be set for the SDK client in the application
4241
`httpClient` | url-connection-client | Specifies the http client to be used by the SDK client. Available options are `url-connection-client` (sync), `apache-client` (sync), `netty-nio-client` (async). See [http clients][sdk-http-clients]
4342
`handlerClassName` | `"App"`| Specifies the class name of the handler, which will be used as the lambda function name. It should be camel case.
4443
`javaSdkVersion` | Same version as the archetype version | Specifies the version of the AWS Java SDK 2.x to be used

‎archetypes/archetype-lambda/pom.xml

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

‎archetypes/archetype-lambda/src/main/resources/META-INF/maven/archetype-metadata.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<validationRegex>(url-connection-client|apache-client|netty-nio-client)</validationRegex>
4040
</requiredProperty>
4141
<requiredProperty key="region">
42+
<defaultValue>null</defaultValue>
4243
<validationRegex>^\w+-(\w+-)+\d+$</validationRegex>
4344
</requiredProperty>
4445
<!-- Required to pass the netty-open-ssl-version property from parent pom to velocity-->

‎archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<maven.compiler.source>1.8</maven.compiler.source>
1313
<maven.compiler.target>1.8</maven.compiler.target>
14-
<maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
14+
<maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
1515
<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
1616
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
1717
<aws.java.sdk.version>${javaSdkVersion}</aws.java.sdk.version>
@@ -93,6 +93,15 @@
9393
<configuration>
9494
<createDependencyReducedPom>false</createDependencyReducedPom>
9595
<finalName>${artifactId}</finalName>
96+
<filters>
97+
<filter>
98+
<artifact>*:*</artifact>
99+
<excludes>
100+
<!-- Suppress module-info.class warning-->
101+
<exclude>module-info.class</exclude>
102+
</excludes>
103+
</filter>
104+
</filters>
96105
</configuration>
97106
<executions>
98107
<execution>

‎archetypes/archetype-lambda/src/main/resources/archetype-resources/src/main/java/DependencyFactory.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
package ${package};
44

55
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
6+
#if ($region == 'null')
7+
import software.amazon.awssdk.core.SdkSystemSetting;
8+
#end
69
import software.amazon.awssdk.http.${httpClientPackageName};
710
import software.amazon.awssdk.regions.Region;
811
import software.amazon.awssdk.services.${servicePackage}.${serviceClientClassName};
@@ -20,7 +23,11 @@ private DependencyFactory() {}
2023
public static ${serviceClientClassName} ${serviceClientVariable}Client() {
2124
return ${serviceClientClassName}.builder()
2225
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
26+
#if ($region == 'null')
27+
.region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
28+
#else
2329
.region(Region.${regionEnum})
30+
#end
2431
.httpClientBuilder(${httpClientClassName}.builder())
2532
.build();
2633
}

‎archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/archetype.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ package=software.amazonaws.test
55
service=dynamodb
66
httpClient=apache-client
77
handlerClassName=MyApacheFunction
8-
region=ap-southeast-1
8+
region=null
99
javaSdkVersion=2.11.0
1010
nettyOpenSslVersion=2.0.29.Final

‎archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<maven.compiler.source>1.8</maven.compiler.source>
1212
<maven.compiler.target>1.8</maven.compiler.target>
13-
<maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
13+
<maven.shade.plugin.version>3.2.1</maven.shade.plugin.version>
1414
<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
1515
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
1616
<aws.java.sdk.version>2.11.0</aws.java.sdk.version>
@@ -80,6 +80,15 @@
8080
<configuration>
8181
<createDependencyReducedPom>false</createDependencyReducedPom>
8282
<finalName>test-apache-artifact</finalName>
83+
<filters>
84+
<filter>
85+
<artifact>*:*</artifact>
86+
<excludes>
87+
<!-- Suppress module-info.class warning-->
88+
<exclude>module-info.class</exclude>
89+
</excludes>
90+
</filter>
91+
</filters>
8392
</configuration>
8493
<executions>
8594
<execution>

‎archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package software.amazonaws.test;
33

44
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
5+
import software.amazon.awssdk.core.SdkSystemSetting;
56
import software.amazon.awssdk.http.apache.ApacheHttpClient;
67
import software.amazon.awssdk.regions.Region;
78
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
@@ -19,7 +20,7 @@ private DependencyFactory() {}
1920
public static DynamoDbClient dynamoDbClient() {
2021
return DynamoDbClient.builder()
2122
.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
22-
.region(Region.AP_SOUTHEAST_1)
23+
.region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
2324
.httpClientBuilder(ApacheHttpClient.builder())
2425
.build();
2526
}

0 commit comments

Comments
 (0)