Skip to content

Commit 3c5d635

Browse files
aws-sdk-java-automationaws-sdk-java-automation
authored
Merge pull request #3104 from aws/staging/b2d46ea1-5295-4f99-9a0d-a4379ffc60be
Pull request: release <- staging/b2d46ea1-5295-4f99-9a0d-a4379ffc60be
2 parents b035b3d + 68bc95c commit 3c5d635

File tree

602 files changed

+6897
-1516
lines changed

Some content is hidden

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

602 files changed

+6897
-1516
lines changed

‎.changes/2.26.19.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"version": "2.26.19",
3+
"date": "2024-07-10",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS Batch",
8+
"contributor": "",
9+
"description": "This feature allows AWS Batch Jobs with EKS container orchestration type to be run as Multi-Node Parallel Jobs."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS Glue",
14+
"contributor": "",
15+
"description": "Add recipe step support for recipe node"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS Ground Station",
20+
"contributor": "",
21+
"description": "Documentation update specifying OEM ephemeris units of measurement"
22+
},
23+
{
24+
"type": "feature",
25+
"category": "AWS License Manager Linux Subscriptions",
26+
"contributor": "",
27+
"description": "Add support for third party subscription providers, starting with RHEL subscriptions through Red Hat Subscription Manager (RHSM). Additionally, add support for tagging subscription provider resources, and detect when an instance has more than one Linux subscription and notify the customer."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "AWS MediaConnect",
32+
"contributor": "",
33+
"description": "AWS Elemental MediaConnect introduces the ability to disable outputs. Disabling an output allows you to keep the output attached to the flow, but stop streaming to the output destination. A disabled output does not incur data transfer costs."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Agents for Amazon Bedrock",
38+
"contributor": "",
39+
"description": "Introduces new data sources and chunking strategies for Knowledge bases, advanced parsing logic using FMs, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Agents for Amazon Bedrock Runtime",
44+
"contributor": "",
45+
"description": "Introduces query decomposition, enhanced Agents integration with Knowledge bases, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources for end-to-end solutions."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon Bedrock",
50+
"contributor": "",
51+
"description": "Add support for contextual grounding check for Guardrails for Amazon Bedrock."
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Amazon Bedrock Runtime",
56+
"contributor": "",
57+
"description": "Add support for contextual grounding check and ApplyGuardrail API for Guardrails for Amazon Bedrock."
58+
},
59+
{
60+
"type": "feature",
61+
"category": "Amazon Elastic Compute Cloud",
62+
"contributor": "",
63+
"description": "Add parameters to enable provisioning IPAM BYOIPv4 space at a Local Zone Network Border Group level"
64+
},
65+
{
66+
"type": "feature",
67+
"category": "AWS SDK for Java v2",
68+
"contributor": "",
69+
"description": "Updated endpoint and partition metadata."
70+
}
71+
]
72+
}

‎CHANGELOG.md

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,49 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.26.19__ __2024-07-10__
3+
## __AWS Batch__
4+
- ### Features
5+
- This feature allows AWS Batch Jobs with EKS container orchestration type to be run as Multi-Node Parallel Jobs.
6+
7+
## __AWS Glue__
8+
- ### Features
9+
- Add recipe step support for recipe node
10+
11+
## __AWS Ground Station__
12+
- ### Features
13+
- Documentation update specifying OEM ephemeris units of measurement
14+
15+
## __AWS License Manager Linux Subscriptions__
16+
- ### Features
17+
- Add support for third party subscription providers, starting with RHEL subscriptions through Red Hat Subscription Manager (RHSM). Additionally, add support for tagging subscription provider resources, and detect when an instance has more than one Linux subscription and notify the customer.
18+
19+
## __AWS MediaConnect__
20+
- ### Features
21+
- AWS Elemental MediaConnect introduces the ability to disable outputs. Disabling an output allows you to keep the output attached to the flow, but stop streaming to the output destination. A disabled output does not incur data transfer costs.
22+
23+
## __AWS SDK for Java v2__
24+
- ### Features
25+
- Updated endpoint and partition metadata.
26+
27+
## __Agents for Amazon Bedrock__
28+
- ### Features
29+
- Introduces new data sources and chunking strategies for Knowledge bases, advanced parsing logic using FMs, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources.
30+
31+
## __Agents for Amazon Bedrock Runtime__
32+
- ### Features
33+
- Introduces query decomposition, enhanced Agents integration with Knowledge bases, session summary generation, and code interpretation (preview) for Claude V3 Sonnet and Haiku models. Also introduces Prompt Flows (preview) to link prompts, foundational models, and resources for end-to-end solutions.
34+
35+
## __Amazon Bedrock__
36+
- ### Features
37+
- Add support for contextual grounding check for Guardrails for Amazon Bedrock.
38+
39+
## __Amazon Bedrock Runtime__
40+
- ### Features
41+
- Add support for contextual grounding check and ApplyGuardrail API for Guardrails for Amazon Bedrock.
42+
43+
## __Amazon Elastic Compute Cloud__
44+
- ### Features
45+
- Add parameters to enable provisioning IPAM BYOIPv4 space at a Local Zone Network Border Group level
46+
247
# __2.26.18__ __2024-07-09__
348
## __AWS SDK for Java v2__
449
- ### Features
@@ -310,7 +355,7 @@
310355
## __Contributors__
311356
Special thanks to the following contributors to this release:
312357

313-
[@sullis](https://github.com/sullis), [@shetsa-amzn](https://github.com/shetsa-amzn)
358+
[@shetsa-amzn](https://github.com/shetsa-amzn), [@sullis](https://github.com/sullis)
314359
# __2.26.9__ __2024-06-25__
315360
## __AWS Network Manager__
316361
- ### 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.26.18</version>
55+
<version>2.26.19</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.26.18</version>
89+
<version>2.26.19</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.26.18</version>
94+
<version>2.26.19</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.26.18</version>
106+
<version>2.26.19</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.26.18</version>
23+
<version>2.26.19</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.26.18</version>
23+
<version>2.26.19</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.26.18</version>
23+
<version>2.26.19</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.26.18</version>
23+
<version>2.26.19</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.26.18</version>
20+
<version>2.26.19</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.26.18</version>
23+
<version>2.26.19</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.26.18</version>
20+
<version>2.26.19</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

‎build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/NonJavaBaseModuleCheck.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,9 @@ private boolean isLegalImport(String importText) {
183183
return true;
184184
}
185185

186-
if (additionalLegalPackagesBySdkPackage.entrySet()
187-
.stream()
188-
.anyMatch(e -> currentSdkPackage.startsWith(e.getKey()) &&
189-
e.getValue().contains(importPackage))) {
190-
return true;
191-
}
192-
193-
return false;
186+
return additionalLegalPackagesBySdkPackage.entrySet()
187+
.stream()
188+
.anyMatch(e -> currentSdkPackage.startsWith(e.getKey()) &&
189+
e.getValue().contains(importPackage));
194190
}
195191
}

‎build-tools/src/main/java/software/amazon/awssdk/buildtools/findbugs/DisallowMethodCall.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ public void sawOpcode(int code) {
5757
case Const.INVOKESPECIAL:
5858
case Const.INVOKESTATIC:
5959
case Const.INVOKEINTERFACE:
60-
handleMethodCall(code);
60+
handleMethodCall();
6161
return;
6262
default:
6363
// Ignore - not a method call.
6464
}
6565
}
6666

67-
private void handleMethodCall(int code) {
67+
private void handleMethodCall() {
6868
MethodDescriptor method = getMethodDescriptorOperand();
6969
SignatureParser signature = new SignatureParser(method.getSignature());
7070
Entry<String, String> calledMethod = new SimpleEntry<>(method.getSlashedClassName(), method.getName());

‎bundle-logging-bridge/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.26.18</version>
24+
<version>2.26.19</version>
2525
</parent>
2626
<artifactId>bundle-logging-bridge</artifactId>
2727
<packaging>jar</packaging>

‎bundle-sdk/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.26.18</version>
24+
<version>2.26.19</version>
2525
</parent>
2626
<artifactId>bundle-sdk</artifactId>
2727
<packaging>jar</packaging>

‎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.26.18</version>
24+
<version>2.26.19</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.26.18</version>
25+
<version>2.26.19</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.26.18</version>
24+
<version>2.26.19</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/Utils.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ public static File createDirectory(String path) {
4646
}
4747

4848
public static void createDirectory(File dir) {
49-
if (!(dir.exists())) {
50-
if (!dir.mkdirs()) {
51-
throw new RuntimeException("Not able to create directory. "
52-
+ dir.getAbsolutePath());
53-
}
49+
if (!dir.exists() && !dir.mkdirs()) {
50+
throw new RuntimeException("Not able to create directory. "
51+
+ dir.getAbsolutePath());
5452
}
5553
}
5654

@@ -65,11 +63,8 @@ public static File createFile(String dir, String fileName) throws IOException {
6563

6664
File file = new File(dir, fileName);
6765

68-
if (!(file.exists())) {
69-
if (!(file.createNewFile())) {
70-
throw new RuntimeException("Not able to create file . "
71-
+ file.getAbsolutePath());
72-
}
66+
if (!file.exists() && !file.createNewFile()) {
67+
throw new RuntimeException("Not able to create file . " + file.getAbsolutePath());
7368
}
7469

7570
return file;

‎codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/JavaCodeFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public JavaCodeFormatter() {
7878
* @param overrideOptions user provided options to apply on top of defaults
7979
*/
8080
public JavaCodeFormatter(final Map<String, Object> overrideOptions) {
81-
Map formatterOptions = new HashMap<>(DEFAULT_FORMATTER_OPTIONS);
81+
Map<String, Object> formatterOptions = new HashMap<>(DEFAULT_FORMATTER_OPTIONS);
8282
if (overrideOptions != null) {
8383
formatterOptions.putAll(overrideOptions);
8484
}

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

‎codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
153153
Shape shape = allC2jShapes.get(c2jShapeName);
154154
String variableName = getNamingStrategy().getVariableName(c2jMemberName);
155155
String variableType = getTypeUtils().getJavaDataType(allC2jShapes, c2jShapeName);
156-
String variableDeclarationType = getTypeUtils()
157-
.getJavaDataType(allC2jShapes, c2jShapeName, getCustomizationConfig());
156+
String variableDeclarationType = getTypeUtils().getJavaDataType(allC2jShapes, c2jShapeName);
158157

159158
//If member is idempotent, then it should be of string type
160159
//Else throw IllegalArgumentException.

‎codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,14 @@ private void writeIntermediateModel(IntermediateModel model) throws IOException
9696
PrintWriter writer = null;
9797
try {
9898
File outDir = new File(sourcesDirectory);
99-
if (!outDir.exists()) {
100-
if (!outDir.mkdirs()) {
101-
throw new RuntimeException("Failed to create "
102-
+ outDir.getAbsolutePath());
103-
}
99+
if (!outDir.exists() && !outDir.mkdirs()) {
100+
throw new RuntimeException("Failed to create " + outDir.getAbsolutePath());
104101
}
105102

106103
File outputFile = new File(modelDir, fileNamePrefix + "-intermediate.json");
107104

108-
if (!outputFile.exists()) {
109-
if (!outputFile.createNewFile()) {
110-
throw new RuntimeException("Error creating file "
111-
+ outputFile.getAbsolutePath());
112-
}
105+
if (!outputFile.exists() && !outputFile.createNewFile()) {
106+
throw new RuntimeException("Error creating file " + outputFile.getAbsolutePath());
113107
}
114108

115109
writer = new PrintWriter(outputFile, "UTF-8");

0 commit comments

Comments
 (0)