Skip to content

Commit 01903ff

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #2600 from aws/staging/58d2d599-b02e-45d4-989e-0d9da8d712df
Pull request: release <- staging/58d2d599-b02e-45d4-989e-0d9da8d712df
2 parents 918968d + 76f5071 commit 01903ff

File tree

422 files changed

+1819
-2105
lines changed

Some content is hidden

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

422 files changed

+1819
-2105
lines changed

‎.changes/2.20.91.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"version": "2.20.91",
3+
"date": "2023-06-22",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Maven config",
8+
"contributor": "jensim",
9+
"description": "Fix the scm.url in the maven project"
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWSKendraFrontendService",
14+
"contributor": "",
15+
"description": "Introducing Amazon Kendra Retrieve API that can be used to retrieve relevant passages or text excerpts given an input query."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Step Functions",
20+
"contributor": "",
21+
"description": "Adds support for Versions and Aliases. Adds 8 operations: PublishStateMachineVersion, DeleteStateMachineVersion, ListStateMachineVersions, CreateStateMachineAlias, DescribeStateMachineAlias, UpdateStateMachineAlias, DeleteStateMachineAlias, ListStateMachineAliases"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Chime SDK Identity",
26+
"contributor": "",
27+
"description": "AppInstanceBots can be configured to be invoked or not using the Target or the CHIME.mentions attribute for ChannelMessages"
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon Chime SDK Messaging",
32+
"contributor": "",
33+
"description": "ChannelMessages can be made visible to sender and intended recipient rather than all channel members with the target attribute. For example, a user can send messages to a bot and receive messages back in a group channel without other members seeing them."
34+
}
35+
]
36+
}

‎CHANGELOG.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
# __2.20.91__ __2023-06-22__
2+
## __AWS Step Functions__
3+
- ### Features
4+
- Adds support for Versions and Aliases. Adds 8 operations: PublishStateMachineVersion, DeleteStateMachineVersion, ListStateMachineVersions, CreateStateMachineAlias, DescribeStateMachineAlias, UpdateStateMachineAlias, DeleteStateMachineAlias, ListStateMachineAliases
5+
6+
## __AWSKendraFrontendService__
7+
- ### Features
8+
- Introducing Amazon Kendra Retrieve API that can be used to retrieve relevant passages or text excerpts given an input query.
9+
10+
## __Amazon Chime SDK Identity__
11+
- ### Features
12+
- AppInstanceBots can be configured to be invoked or not using the Target or the CHIME.mentions attribute for ChannelMessages
13+
14+
## __Amazon Chime SDK Messaging__
15+
- ### Features
16+
- ChannelMessages can be made visible to sender and intended recipient rather than all channel members with the target attribute. For example, a user can send messages to a bot and receive messages back in a group channel without other members seeing them.
17+
18+
## __Maven config__
19+
- ### Bugfixes
20+
- Fix the scm.url in the maven project
21+
- Contributed by: [@jensim](https://github.com/jensim)
22+
23+
## __Contributors__
24+
Special thanks to the following contributors to this release:
25+
26+
[@jensim](https://github.com/jensim)
127
# __2.20.90__ __2023-06-21__
228
## __AWS Elemental MediaConvert__
329
- ### Features
@@ -158,7 +184,7 @@ Special thanks to the following contributors to this release:
158184
## __Contributors__
159185
Special thanks to the following contributors to this release:
160186

161-
[@bmaizels](https://github.com/bmaizels), [@breader124](https://github.com/breader124)
187+
[@breader124](https://github.com/breader124), [@bmaizels](https://github.com/bmaizels)
162188
# __2.20.85__ __2023-06-13__
163189
## __AWS CloudTrail__
164190
- ### 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.90</version>
55+
<version>2.20.91</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.90</version>
89+
<version>2.20.91</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.20.90</version>
94+
<version>2.20.91</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.90</version>
106+
<version>2.20.91</version>
107107
</dependency>
108108
```
109109

‎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.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎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.20.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetype-lambda</artifactId>

‎archetypes/archetype-tools/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.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎archetypes/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.20.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>archetypes</artifactId>

‎aws-sdk-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.20.90</version>
20+
<version>2.20.91</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<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.20.90</version>
23+
<version>2.20.91</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
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>software.amazon.awssdk</groupId>
1919
<artifactId>aws-sdk-java-pom</artifactId>
20-
<version>2.20.90</version>
20+
<version>2.20.91</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<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.20.90</version>
24+
<version>2.20.91</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.20.90</version>
25+
<version>2.20.91</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.20.90</version>
24+
<version>2.20.91</version>
2525
</parent>
2626
<artifactId>codegen-lite</artifactId>
2727
<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.20.90</version>
25+
<version>2.20.91</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.20.90</version>
24+
<version>2.20.91</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
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>core</artifactId>
2222
<groupId>software.amazon.awssdk</groupId>
23-
<version>2.20.90</version>
23+
<version>2.20.91</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.20.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/auth-crt/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.20.90</version>
25+
<version>2.20.91</version>
2626
</parent>
2727

2828
<artifactId>auth-crt</artifactId>

‎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.20.90</version>
25+
<version>2.20.91</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.20.90</version>
25+
<version>2.20.91</version>
2626
</parent>
2727

2828
<artifactId>aws-core</artifactId>

‎core/crt-core/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>core</artifactId>
24-
<version>2.20.90</version>
24+
<version>2.20.91</version>
2525
</parent>
2626

2727
<artifactId>crt-core</artifactId>

‎core/endpoints-spi/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.20.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/imds/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.20.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626
<artifactId>imds</artifactId>

‎core/json-utils/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.20.90</version>
23+
<version>2.20.91</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

‎core/metrics-spi/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.20.90</version>
8+
<version>2.20.91</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎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.20.90</version>
24+
<version>2.20.91</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.20.90</version>
25+
<version>2.20.91</version>
2626
</parent>
2727

2828
<artifactId>profiles</artifactId>

‎core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileSupplierTest.java

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,9 @@ void aggregate_duplicateOptionsGivenFixedProfileFirst_preservesPrecedence() {
433433
}
434434

435435
@Test
436-
void aggregate_duplicateOptionsGivenReloadingProfileFirst_preservesPrecedence() {
437-
AdjustableClock clock = new AdjustableClock();
436+
void aggregate_duplicateOptionsGivenReloadingProfileFirst_preservesPrecedence() throws IOException {
437+
Instant startTime = Instant.now();
438+
AdjustableClock clock = new AdjustableClock(startTime);
438439

439440
ProfileFile configFile1 = configFile("profile default", Pair.of("aws_access_key_id", "config-key"));
440441
Path credentialsFilePath = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");
@@ -452,7 +453,14 @@ void aggregate_duplicateOptionsGivenReloadingProfileFirst_preservesPrecedence()
452453

453454
generateTestCredentialsFile("defaultAccessKey2", "defaultSecretAccessKey2");
454455

455-
clock.tickForward(Duration.ofMillis(1_000));
456+
Duration tick = Duration.ofMillis(1_000);
457+
458+
// The refresh logic uses the last modified attribute of the profile file to determine if it's changed and should be
459+
// reloaded; unfortunately that means that if things happen quickly enough, the last modified time of the first version
460+
// of the file, and the new version will be the same. Ensure that there is a change in the last modified time for the
461+
// test file.
462+
Files.setLastModifiedTime(getTestCredentialsFilePath(), FileTime.from(startTime.plus(tick)));
463+
clock.tickForward(tick);
456464

457465
profileFile = supplier.get();
458466
accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
@@ -505,10 +513,10 @@ void get_givenOnLoadAction_callsActionOncePerNewProfileFile() {
505513
assertThat(blockCount.get()).isEqualTo(actualProfilesCount);
506514
}
507515

508-
private Path generateTestFile(String contents, String filename) {
516+
private Path writeTestFile(String contents, Path path) {
509517
try {
510518
Files.createDirectories(testDirectory);
511-
return Files.write(testDirectory.resolve(filename), contents.getBytes(StandardCharsets.UTF_8));
519+
return Files.write(path, contents.getBytes(StandardCharsets.UTF_8));
512520
} catch (IOException e) {
513521
throw new RuntimeException(e);
514522
}
@@ -517,7 +525,11 @@ private Path generateTestFile(String contents, String filename) {
517525
private Path generateTestCredentialsFile(String accessKeyId, String secretAccessKey) {
518526
String contents = String.format("[default]\naws_access_key_id = %s\naws_secret_access_key = %s\n",
519527
accessKeyId, secretAccessKey);
520-
return generateTestFile(contents, "credentials.txt");
528+
return writeTestFile(contents, getTestCredentialsFilePath());
529+
}
530+
531+
private Path getTestCredentialsFilePath() {
532+
return testDirectory.resolve("credentials.txt");
521533
}
522534

523535
private Path generateTestConfigFile(Pair<Object, Object>... pairs) {
@@ -526,7 +538,7 @@ private Path generateTestConfigFile(Pair<Object, Object>... pairs) {
526538
.collect(Collectors.joining(System.lineSeparator()));
527539
String contents = String.format("[default]\n%s", values);
528540

529-
return generateTestFile(contents, "config.txt");
541+
return writeTestFile(contents, testDirectory.resolve("config.txt"));
530542
}
531543

532544
private void updateModificationTime(Path path, Instant instant) {
@@ -597,6 +609,10 @@ private AdjustableClock() {
597609
this.time = Instant.now();
598610
}
599611

612+
private AdjustableClock(Instant time) {
613+
this.time = time;
614+
}
615+
600616
@Override
601617
public ZoneId getZone() {
602618
return ZoneOffset.UTC;

0 commit comments

Comments
 (0)