Skip to content

Commit 795b359

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2432 from aws/staging/1571600f-97a5-4adb-af70-d90db84ef326
Pull request: release <- staging/1571600f-97a5-4adb-af70-d90db84ef326
2 parents dad9ac5 + d3f44e7 commit 795b359

File tree

446 files changed

+3519
-2538
lines changed

Some content is hidden

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

446 files changed

+3519
-2538
lines changed

‎.changes/2.20.34.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.20.34",
3+
"date": "2023-03-28",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "AWS SDK for Java v2",
8+
"contributor": "",
9+
"description": "A binary attribute value must be encoded in base64 format for its String representation in EnhancedDocument.toJson() API"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS IoT Data Plane",
14+
"contributor": "",
15+
"description": "Add endpoint ruleset support for cn-north-1."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Systems Manager Incident Manager",
20+
"contributor": "",
21+
"description": "Increased maximum length of \"TriggerDetails.rawData\" to 10K characters and \"IncidentSummary\" to 8K characters."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS Systems Manager Incident Manager Contacts",
26+
"contributor": "",
27+
"description": "This release adds 12 new APIs as part of Oncall Schedule feature release, adds support for a new contact type: ONCALL_SCHEDULE. Check public documentation for AWS ssm-contacts for more information"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS SDK for Java v2",
32+
"contributor": "",
33+
"description": "Updated endpoint and partition metadata."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# __2.20.34__ __2023-03-28__
2+
## __AWS IoT Data Plane__
3+
- ### Features
4+
- Add endpoint ruleset support for cn-north-1.
5+
6+
## __AWS SDK for Java v2__
7+
- ### Features
8+
- Updated endpoint and partition metadata.
9+
10+
- ### Bugfixes
11+
- A binary attribute value must be encoded in base64 format for its String representation in EnhancedDocument.toJson() API
12+
13+
## __AWS Systems Manager Incident Manager__
14+
- ### Features
15+
- Increased maximum length of "TriggerDetails.rawData" to 10K characters and "IncidentSummary" to 8K characters.
16+
17+
## __AWS Systems Manager Incident Manager Contacts__
18+
- ### Features
19+
- This release adds 12 new APIs as part of Oncall Schedule feature release, adds support for a new contact type: ONCALL_SCHEDULE. Check public documentation for AWS ssm-contacts for more information
20+
121
# __2.20.33__ __2023-03-27__
222
## __AWS Elemental MediaLive__
323
- ### Features

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
5252
<dependency>
5353
<groupId>software.amazon.awssdk</groupId>
5454
<artifactId>bom</artifactId>
55-
<version>2.20.33</version>
55+
<version>2.20.34</version>
5656
<type>pom</type>
5757
<scope>import</scope>
5858
</dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
8686
<dependency>
8787
<groupId>software.amazon.awssdk</groupId>
8888
<artifactId>ec2</artifactId>
89-
<version>2.20.33</version>
89+
<version>2.20.34</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.20.33</version>
94+
<version>2.20.34</version>
9595
</dependency>
9696
```
9797

@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
103103
<dependency>
104104
<groupId>software.amazon.awssdk</groupId>
105105
<artifactId>aws-sdk-java</artifactId>
106-
<version>2.20.33</version>
106+
<version>2.20.34</version>
107107
</dependency>
108108
```
109109

‎archetypes/archetype-app-quickstart/README.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ a dependency of [AWS Java SDK 2.x][aws-java-sdk-v2].
88

99
The generated application has the following features:
1010

11-
- Uses [Bill of Materials](BOM) to manage SDK dependencies
11+
- Uses [Bill of Materials][BOM] to manage SDK dependencies
1212
- Contains the code to create the SDK client
1313
- Out-of-box support of GraalVM Native Image when `nativeImage` is enabled
1414

@@ -37,25 +37,27 @@ mvn archetype:generate \
3737
-DhttpClient=apache-client \
3838
-DartifactId=sample-project \
3939
-Dservice=s3 \
40-
-DinteractiveMode=false
40+
-DinteractiveMode=false \
41+
-DcredentialProvider=default
4142
```
4243

4344
### Parameters
4445
45-
Parameter Name | Default Value | Description
46-
---|---|---
47-
`service` (required) | n/a | Specifies the service client to be used in the application, eg: s3, dynamodb. Only one service should be provided. You can find available services [here][java-sdk-v2-services].
48-
`groupId`(required) | n/a | Specifies the group ID of the project
49-
`artifactId`(required) | n/a | Specifies the artifact ID of the project
50-
`nativeImage`(required) | n/a | Specifies whether GraalVM Native Image configuration should be included
51-
`httpClient`(required) | n/a | 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]
52-
`javaSdkVersion` | Same version as the archetype version | Specifies the version of the AWS Java SDK 2.x to be used
53-
`version` | 1.0-SNAPSHOT | Specifies the version of the project
54-
`package` | ${groupId} | Specifies the package name for the classes
55-
46+
| Parameter Name | Default Value | Description |
47+
|-------------------------|---------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
48+
| `service` (required) | n/a | Specifies the service client to be used in the application, eg: s3, dynamodb. Only one service should be provided. You can find available services [here][java-sdk-v2-services]. |
49+
| `groupId`(required) | n/a | Specifies the group ID of the project |
50+
| `artifactId`(required) | n/a | Specifies the artifact ID of the project |
51+
| `nativeImage`(required) | n/a | Specifies whether GraalVM Native Image configuration should be included |
52+
| `httpClient`(required) | n/a | 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] |
53+
| `credentialProvider` | default | Specify the credential-provider to be used by the SDK client and imports relevant dependencies. Available options are `default` which uses the [default credential provider chain](https://docs.aws.amazon.com/sdkref/latest/guide/standardized-credentials.html), or `identity-center` whi uses [IAM Identity Center](https://docs.aws.amazon.com/sdkref/latest/guide/feature-sso-credentials.html) |
54+
| `javaSdkVersion` | Same version as the archetype version | Specifies the version of the AWS Java SDK 2.x to be used |
55+
| `version` | 1.0-SNAPSHOT | Specifies the version of the project |
56+
| `package` | ${groupId} | Specifies the package name for the classes |
5657

5758
[aws-java-sdk-v2]: https://github.com/aws/aws-sdk-java-v2
5859
[java-sdk-v2-services]: https://github.com/aws/aws-sdk-java-v2/tree/master/services
5960
[sdk-http-clients]: https://github.com/aws/aws-sdk-java-v2/tree/master/http-clients
6061
[maven-archetype-usage]: https://maven.apache.org/archetype/maven-archetype-plugin/usage.html
6162
[graalvm]: https://www.graalvm.org/docs/getting-started/#native-images
63+
[bom]: https://github.com/aws/aws-sdk-java-v2/blob/master/bom

‎archetypes/archetype-app-quickstart/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.20.33</version>
23+
<version>2.20.34</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,8 @@
4242
<requiredProperty key="nativeImage">
4343
<validationRegex>(true|false)</validationRegex>
4444
</requiredProperty>
45+
<requiredProperty key="credentialProvider">
46+
<validationRegex>(default|identity-center)</validationRegex>
47+
</requiredProperty>
4548
</requiredProperties>
4649
</archetype-descriptor>

‎archetypes/archetype-app-quickstart/src/main/resources/archetype-resources/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,18 @@
5050
</exclusions>
5151
</dependency>
5252

53+
#if( $credentialProvider == 'identity-center')
54+
<dependency>
55+
<groupId>software.amazon.awssdk</groupId>
56+
<artifactId>sso</artifactId>
57+
</dependency>
58+
59+
<dependency>
60+
<groupId>software.amazon.awssdk</groupId>
61+
<artifactId>ssooidc</artifactId>
62+
</dependency>
63+
64+
#end
5365
<dependency>
5466
<groupId>software.amazon.awssdk</groupId>
5567
<artifactId>${httpClient}</artifactId>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ package=software.amazonaws.test
55
service=s3
66
httpClient=apache-client
77
javaSdkVersion=2.11.0
8-
nativeImage=true
8+
nativeImage=true
9+
credentialProvider=default

‎archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclientwithoutnativeimage/archetype.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ package=software.amazonaws.test
55
service=s3
66
httpClient=apache-client
77
javaSdkVersion=2.11.0
8-
nativeImage=false
8+
nativeImage=false
9+
credentialProvider=default

‎archetypes/archetype-app-quickstart/src/test/resources/projects/identitycenter/archetype.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
groupId=software.amazonaws.test
2+
artifactId=test-apache-artifact
3+
version=1.0-SNAPSHOT
4+
package=software.amazonaws.test
5+
service=s3
6+
httpClient=apache-client
7+
javaSdkVersion=2.11.0
8+
nativeImage=true
9+
credentialProvider=identity-center

‎archetypes/archetype-app-quickstart/src/test/resources/projects/identitycenter/goal.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
verify

‎archetypes/archetype-app-quickstart/src/test/resources/projects/identitycenter/reference/README.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# App
2+
3+
This project contains a maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
4+
5+
## Prerequisites
6+
- Java 1.8+
7+
- Apache Maven
8+
- GraalVM Native Image (optional)
9+
10+
## Development
11+
12+
Below is the structure of the generated project.
13+
14+
```
15+
├── src
16+
│   ├── main
17+
│   │   ├── java
18+
│   │   │   └── package
19+
│   │   │   ├── App.java
20+
│   │   │   ├── DependencyFactory.java
21+
│   │   │   └── Handler.java
22+
│   │   └── resources
23+
│   │   └── simplelogger.properties
24+
│   └── test
25+
│   └── java
26+
│   └── package
27+
│   └── HandlerTest.java
28+
```
29+
30+
- `App.java`: main entry of the application
31+
- `DependencyFactory.java`: creates the SDK client
32+
- `Handler.java`: you can invoke the api calls using the SDK client here.
33+
34+
#### Building the project
35+
```
36+
mvn clean package
37+
```
38+
39+
#### Building the native image
40+
41+
Note that it requires `native-image` installed in your environment
42+
43+
```
44+
mvn clean package -P native-image
45+
```
46+
After it finishes, you can find the generated native image in the `target
47+
` folder.
48+
49+
You can run the following command to execute it.
50+
51+
```
52+
target/test-apache-artifact
53+
```

0 commit comments

Comments
 (0)