Skip to content

Commit 4420f0e

Browse files
Merge pull request #3097 from aws/staging/85a84ec3-e69a-4519-80d3-af5e28b83882
Pull request: release <- staging/85a84ec3-e69a-4519-80d3-af5e28b83882
2 parents b6a812f + fcd2223 commit 4420f0e

File tree

479 files changed

+874
-660
lines changed

Some content is hidden

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

479 files changed

+874
-660
lines changed

.changes/2.26.16.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.26.16",
3+
"date": "2024-07-05",
4+
"entries": [
5+
{
6+
"type": "feature",
7+
"category": "AWS Certificate Manager",
8+
"contributor": "",
9+
"description": "Documentation updates, including fixes for xml formatting, broken links, and ListCertificates description."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS SDK for Java v2",
14+
"contributor": "",
15+
"description": "Add implicit global region to internal endpoint resolution metadata"
16+
},
17+
{
18+
"type": "feature",
19+
"category": "Amazon EC2 Container Registry",
20+
"contributor": "",
21+
"description": "This release for Amazon ECR makes change to bring the SDK into sync with the API."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Payment Cryptography Data Plane",
26+
"contributor": "",
27+
"description": "Added further restrictions on logging of potentially sensitive inputs and outputs."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "QBusiness",
32+
"contributor": "",
33+
"description": "Add personalization to Q Applications. Customers can enable or disable personalization when creating or updating a Q application with the personalization configuration."
34+
},
35+
{
36+
"type": "feature",
37+
"category": "AWS SDK for Java v2",
38+
"contributor": "",
39+
"description": "Updated endpoint and partition metadata."
40+
}
41+
]
42+
}

CHANGELOG.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
11
#### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
2+
# __2.26.16__ __2024-07-05__
3+
## __AWS Certificate Manager__
4+
- ### Features
5+
- Documentation updates, including fixes for xml formatting, broken links, and ListCertificates description.
6+
7+
## __AWS SDK for Java v2__
8+
- ### Features
9+
- Add implicit global region to internal endpoint resolution metadata
10+
- Updated endpoint and partition metadata.
11+
12+
## __Amazon EC2 Container Registry__
13+
- ### Features
14+
- This release for Amazon ECR makes change to bring the SDK into sync with the API.
15+
16+
## __Payment Cryptography Data Plane__
17+
- ### Features
18+
- Added further restrictions on logging of potentially sensitive inputs and outputs.
19+
20+
## __QBusiness__
21+
- ### Features
22+
- Add personalization to Q Applications. Customers can enable or disable personalization when creating or updating a Q application with the personalization configuration.
23+
224
# __2.26.15__ __2024-07-03__
325
## __AWS Direct Connect__
426
- ### Features
@@ -219,7 +241,7 @@
219241
## __Contributors__
220242
Special thanks to the following contributors to this release:
221243

222-
[@sullis](https://github.com/sullis), [@shetsa-amzn](https://github.com/shetsa-amzn)
244+
[@shetsa-amzn](https://github.com/shetsa-amzn), [@sullis](https://github.com/sullis)
223245
# __2.26.9__ __2024-06-25__
224246
## __AWS Network Manager__
225247
- ### 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.15</version>
55+
<version>2.26.16</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.15</version>
89+
<version>2.26.16</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.26.15</version>
94+
<version>2.26.16</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.15</version>
106+
<version>2.26.16</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.15</version>
23+
<version>2.26.16</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.15</version>
23+
<version>2.26.16</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.15</version>
23+
<version>2.26.16</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.15</version>
23+
<version>2.26.16</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.15</version>
20+
<version>2.26.16</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.15</version>
23+
<version>2.26.16</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.15</version>
20+
<version>2.26.16</version>
2121
<relativePath>../pom.xml</relativePath>
2222
</parent>
2323
<artifactId>bom</artifactId>

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

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/DefaultPartitionDataProviderSpec.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public class DefaultPartitionDataProviderSpec implements ClassSpec {
4747
private static final String DUAL_STACK_DNS_SUFFIX = "dualStackDnsSuffix";
4848
private static final String SUPPORTS_FIPS = "supportsFIPS";
4949
private static final String SUPPORTS_DUAL_STACK = "supportsDualStack";
50+
private static final String IMPLICIT_GLOBAL_REGION = "implicitGlobalRegion";
5051

5152
private final IntermediateModel model;
5253
private final EndpointRulesSpecUtils endpointRulesSpecUtils;
@@ -225,6 +226,13 @@ private void codegenOutputs(CodeBlock.Builder builder, JsonNode node) {
225226
builder.add("$L", supportsDualStack.asBoolean());
226227
builder.add(")");
227228
}
229+
230+
JsonNode implicitGlobalRegion = objNode.get(IMPLICIT_GLOBAL_REGION);
231+
if (implicitGlobalRegion != null) {
232+
builder.add(".implicitGlobalRegion(");
233+
builder.add("$S", implicitGlobalRegion.asString());
234+
builder.add(")");
235+
}
228236
builder.add(".build()");
229237
}
230238
}

codegen/src/main/resources/software/amazon/awssdk/codegen/rules/Outputs.java.resource

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@ public class Outputs {
88
private static final String DUAL_STACK_DNS_SUFFIX = "dualStackDnsSuffix";
99
private static final String SUPPORTS_FIPS = "supportsFIPS";
1010
private static final String SUPPORTS_DUAL_STACK = "supportsDualStack";
11+
private static final String IMPLICIT_GLOBAL_REGION = "implicitGlobalRegion";
1112

1213
private final String dnsSuffix;
1314
private final String dualStackDnsSuffix;
1415
private final boolean supportsFips;
1516
private final boolean supportsDualStack;
17+
private final String implicitGlobalRegion;
1618

1719
private Outputs(Builder builder) {
1820
this.dnsSuffix = builder.dnsSuffix;
1921
this.dualStackDnsSuffix = builder.dualStackDnsSuffix;
2022
this.supportsFips = builder.supportsFips;
2123
this.supportsDualStack = builder.supportsDualStack;
24+
this.implicitGlobalRegion = builder.implicitGlobalRegion;
2225
}
2326

2427
public String dnsSuffix() {
@@ -37,6 +40,10 @@ public class Outputs {
3740
return supportsDualStack;
3841
}
3942

43+
public String implicitGlobalRegion() {
44+
return implicitGlobalRegion;
45+
}
46+
4047
@Override
4148
public boolean equals(Object o) {
4249
if (this == o) {
@@ -54,7 +61,12 @@ public class Outputs {
5461
if (supportsDualStack != outputs.supportsDualStack) {
5562
return false;
5663
}
57-
if (dnsSuffix != null ? !dnsSuffix.equals(outputs.dnsSuffix) : outputs.dnsSuffix != null) {
64+
if ((dnsSuffix != null && !dnsSuffix.equals(outputs.dnsSuffix)) ||
65+
(dnsSuffix == null && outputs.dnsSuffix != null)) {
66+
return false;
67+
}
68+
if ((implicitGlobalRegion != null && !implicitGlobalRegion.equals(outputs.implicitGlobalRegion)) ||
69+
(implicitGlobalRegion == null && outputs.implicitGlobalRegion != null)) {
5870
return false;
5971
}
6072
return dualStackDnsSuffix != null ? dualStackDnsSuffix.equals(outputs.dualStackDnsSuffix)
@@ -67,6 +79,7 @@ public class Outputs {
6779
result = 31 * result + (dualStackDnsSuffix != null ? dualStackDnsSuffix.hashCode() : 0);
6880
result = 31 * result + (supportsFips ? 1 : 0);
6981
result = 31 * result + (supportsDualStack ? 1 : 0);
82+
result = 31 * result + (implicitGlobalRegion != null ? implicitGlobalRegion.hashCode() : 0);
7083
return result;
7184
}
7285

@@ -77,6 +90,7 @@ public class Outputs {
7790
", dualStackDnsSuffix='" + dualStackDnsSuffix + '\'' +
7891
", supportsFips=" + supportsFips +
7992
", supportsDualStack=" + supportsDualStack +
93+
", implicitGlobalRegion=" + implicitGlobalRegion +
8094
'}';
8195
}
8296

@@ -109,6 +123,11 @@ public class Outputs {
109123
b.supportsDualStack(supportsDualStack.asBoolean());
110124
}
111125

126+
JsonNode implicitGlobalRegion = objNode.get(IMPLICIT_GLOBAL_REGION);
127+
if (implicitGlobalRegion != null) {
128+
b.implicitGlobalRegion(implicitGlobalRegion.asString());
129+
}
130+
112131
return b.build();
113132
}
114133

@@ -117,6 +136,7 @@ public class Outputs {
117136
private String dualStackDnsSuffix;
118137
private boolean supportsFips;
119138
private boolean supportsDualStack;
139+
private String implicitGlobalRegion;
120140

121141
public Builder dnsSuffix(String dnsSuffix) {
122142
this.dnsSuffix = dnsSuffix;
@@ -138,6 +158,11 @@ public class Outputs {
138158
return this;
139159
}
140160

161+
public Builder implicitGlobalRegion(String implicitGlobalRegion) {
162+
this.implicitGlobalRegion = implicitGlobalRegion;
163+
return this;
164+
}
165+
141166
public Outputs build() {
142167
return new Outputs(this);
143168
}

codegen/src/main/resources/software/amazon/awssdk/codegen/rules/PartitionFn.java.resource

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class PartitionFn extends SingleArgFn {
1616
public static final Identifier DUAL_STACK_DNS_SUFFIX = Identifier.of("dualStackDnsSuffix");
1717
public static final Identifier SUPPORTS_FIPS = Identifier.of("supportsFIPS");
1818
public static final Identifier SUPPORTS_DUAL_STACK = Identifier.of("supportsDualStack");
19+
public static final Identifier IMPLICIT_GLOBAL_REGION = Identifier.of("implicitGlobalRegion");
1920
public static final Identifier INFERRED = Identifier.of("inferred");
2021

2122
private final LazyValue<PartitionData> partitionData = LazyValue.<PartitionData>builder()
@@ -78,6 +79,7 @@ public class PartitionFn extends SingleArgFn {
7879
DUAL_STACK_DNS_SUFFIX, Value.fromStr(matchedOutputs.dualStackDnsSuffix()),
7980
SUPPORTS_FIPS, Value.fromBool(matchedOutputs.supportsFips()),
8081
SUPPORTS_DUAL_STACK, Value.fromBool(matchedOutputs.supportsDualStack()),
82+
IMPLICIT_GLOBAL_REGION, Value.fromStr(matchedOutputs.implicitGlobalRegion()),
8183
INFERRED, Value.fromBool(inferred)));
8284
}
8385

0 commit comments

Comments
 (0)