Skip to content

Commit 4ab713c

Browse files
sigurjonviktorssonsigurjonviktorsson
authored
Merge branch 'master' into sigurjonviktorsson-handle-null-channel
2 parents bb534d5 + b54488a commit 4ab713c

File tree

429 files changed

+2100
-1719
lines changed

Some content is hidden

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

429 files changed

+2100
-1719
lines changed

‎.changes/2.18.41.json

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"version": "2.18.41",
3+
"date": "2022-12-16",
4+
"entries": [
5+
{
6+
"type": "bugfix",
7+
"category": "Amazon S3",
8+
"contributor": "",
9+
"description": "Do not prefix copy-source with / when using the sourceBucket and sourceKey APIs."
10+
},
11+
{
12+
"type": "feature",
13+
"category": "AWS DataSync",
14+
"contributor": "",
15+
"description": "AWS DataSync now supports the use of tags with task executions. With this new feature, you can apply tags each time you execute a task, giving you greater control and management over your task executions."
16+
},
17+
{
18+
"type": "feature",
19+
"category": "AWS IoT FleetWise",
20+
"contributor": "",
21+
"description": "Updated error handling for empty resource names in \"UpdateSignalCatalog\" and \"GetModelManifest\" operations."
22+
},
23+
{
24+
"type": "feature",
25+
"category": "Amazon Appflow",
26+
"contributor": "",
27+
"description": "This release updates the ListConnectorEntities API action so that it returns paginated responses that customers can retrieve with next tokens."
28+
},
29+
{
30+
"type": "feature",
31+
"category": "Amazon CloudFront",
32+
"contributor": "",
33+
"description": "Updated documentation for CloudFront"
34+
},
35+
{
36+
"type": "feature",
37+
"category": "Amazon Elastic File System",
38+
"contributor": "",
39+
"description": "General documentation updates for EFS."
40+
},
41+
{
42+
"type": "feature",
43+
"category": "Amazon GuardDuty",
44+
"contributor": "",
45+
"description": "This release provides the valid characters for the Description and Name field."
46+
},
47+
{
48+
"type": "feature",
49+
"category": "Amazon S3 Transfer Manager",
50+
"contributor": "",
51+
"description": "Change default `targetThroughputInGbps` from 5 to 10"
52+
},
53+
{
54+
"type": "feature",
55+
"category": "Amazon SageMaker Service",
56+
"contributor": "",
57+
"description": "AWS sagemaker - Features: This release adds support for random seed, it's an integer value used to initialize a pseudo-random number generator. Setting a random seed will allow the hyperparameter tuning search strategies to produce more consistent configurations for the same tuning job."
58+
},
59+
{
60+
"type": "feature",
61+
"category": "AWS SDK for Java v2",
62+
"contributor": "",
63+
"description": "Updated endpoint and partition metadata."
64+
}
65+
]
66+
}

‎.changes/next-release/bugfix-AWSSDKforJavav2-96d5a14.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "bugfix",
3+
"category": "AWS SDK for Java v2",
4+
"contributor": "",
5+
"description": "Include the raw `partitions.json` data as a string within `DefaultPartitionDataProvider` so it doesn't need to be loaded at runtime as a classpath resource."
6+
}

‎.changes/next-release/bugfix-AmazonS3-cd8c17d.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.changes/next-release/feature-AmazonS3TransferManager-4cd146b.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
# __2.18.41__ __2022-12-16__
2+
## __AWS DataSync__
3+
- ### Features
4+
- AWS DataSync now supports the use of tags with task executions. With this new feature, you can apply tags each time you execute a task, giving you greater control and management over your task executions.
5+
6+
## __AWS IoT FleetWise__
7+
- ### Features
8+
- Updated error handling for empty resource names in "UpdateSignalCatalog" and "GetModelManifest" operations.
9+
10+
## __AWS SDK for Java v2__
11+
- ### Features
12+
- Updated endpoint and partition metadata.
13+
14+
## __Amazon Appflow__
15+
- ### Features
16+
- This release updates the ListConnectorEntities API action so that it returns paginated responses that customers can retrieve with next tokens.
17+
18+
## __Amazon CloudFront__
19+
- ### Features
20+
- Updated documentation for CloudFront
21+
22+
## __Amazon Elastic File System__
23+
- ### Features
24+
- General documentation updates for EFS.
25+
26+
## __Amazon GuardDuty__
27+
- ### Features
28+
- This release provides the valid characters for the Description and Name field.
29+
30+
## __Amazon S3__
31+
- ### Bugfixes
32+
- Do not prefix copy-source with / when using the sourceBucket and sourceKey APIs.
33+
34+
## __Amazon S3 Transfer Manager__
35+
- ### Features
36+
- Change default `targetThroughputInGbps` from 5 to 10
37+
38+
## __Amazon SageMaker Service__
39+
- ### Features
40+
- AWS sagemaker - Features: This release adds support for random seed, it's an integer value used to initialize a pseudo-random number generator. Setting a random seed will allow the hyperparameter tuning search strategies to produce more consistent configurations for the same tuning job.
41+
142
# __2.18.40__ __2022-12-15__
243
## __AWS Backup Gateway__
344
- ### 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.18.40</version>
55+
<version>2.18.41</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.18.40</version>
89+
<version>2.18.41</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>software.amazon.awssdk</groupId>
9393
<artifactId>s3</artifactId>
94-
<version>2.18.40</version>
94+
<version>2.18.41</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.18.40</version>
106+
<version>2.18.41</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.18.41-SNAPSHOT</version>
23+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
23+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
23+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
23+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
20+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
23+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
20+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
24+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
25+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
24+
<version>2.18.42-SNAPSHOT</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.18.41-SNAPSHOT</version>
25+
<version>2.18.42-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828
<artifactId>codegen-maven-plugin</artifactId>

‎codegen/pom.xml

Lines changed: 6 additions & 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.18.41-SNAPSHOT</version>
24+
<version>2.18.42-SNAPSHOT</version>
2525
</parent>
2626
<artifactId>codegen</artifactId>
2727
<name>AWS Java SDK :: Code Generator</name>
@@ -127,6 +127,11 @@
127127
<artifactId>ruleset-testing-core</artifactId>
128128
<version>${awsjavasdk.version}</version>
129129
</dependency>
130+
<dependency>
131+
<groupId>software.amazon.awssdk</groupId>
132+
<artifactId>json-utils</artifactId>
133+
<version>${awsjavasdk.version}</version>
134+
</dependency>
130135

131136
<dependency>
132137
<artifactId>org.eclipse.jdt.core</artifactId>

‎codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/EndpointProviderTasks.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
2727
import software.amazon.awssdk.codegen.model.service.ClientContextParam;
2828
import software.amazon.awssdk.codegen.poet.rules.ClientContextParamsClassSpec;
29+
import software.amazon.awssdk.codegen.poet.rules.DefaultPartitionDataProviderSpec;
2930
import software.amazon.awssdk.codegen.poet.rules.EndpointAuthSchemeInterceptorClassSpec;
3031
import software.amazon.awssdk.codegen.poet.rules.EndpointParametersClassSpec;
3132
import software.amazon.awssdk.codegen.poet.rules.EndpointProviderInterfaceSpec;
@@ -58,6 +59,7 @@ protected List<GeneratorTask> createTasks() throws Exception {
5859
tasks.add(generateClientContextParams());
5960
}
6061
tasks.add(new RulesEngineRuntimeGeneratorTask(generatorTaskParams));
62+
tasks.add(generateDefaultPartitionsProvider());
6163
return tasks;
6264
}
6365

@@ -73,6 +75,11 @@ private GeneratorTask generateDefaultProvider() {
7375
return new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new EndpointProviderSpec(model));
7476
}
7577

78+
private GeneratorTask generateDefaultPartitionsProvider() {
79+
return new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(),
80+
new DefaultPartitionDataProviderSpec(model));
81+
}
82+
7683
private Collection<GeneratorTask> generateInterceptors() {
7784
return Arrays.asList(
7885
new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new EndpointResolverInterceptorSpec(model)),

‎codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/RulesEngineRuntimeGeneratorTask.java

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@
1818
import java.io.IOException;
1919
import java.io.InputStream;
2020
import java.io.UncheckedIOException;
21-
import java.net.URL;
2221
import java.util.ArrayList;
2322
import java.util.Collection;
2423
import java.util.List;
25-
import java.util.jar.JarFile;
2624
import java.util.stream.Collectors;
27-
import java.util.zip.ZipEntry;
2825
import software.amazon.awssdk.codegen.emitters.GeneratorTask;
2926
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3027
import software.amazon.awssdk.codegen.emitters.SimpleGeneratorTask;
28+
import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
3129
import software.amazon.awssdk.utils.IoUtils;
3230
import software.amazon.awssdk.utils.StringUtils;
3331
import software.amazon.awssdk.utils.Validate;
@@ -39,20 +37,22 @@ public final class RulesEngineRuntimeGeneratorTask extends BaseGeneratorTasks {
3937
private final String engineInternalResourcesDir;
4038
private final String engineInternalPackageName;
4139
private final String fileHeader;
40+
private final EndpointRulesSpecUtils endpointRulesSpecUtils;
4241

4342
public RulesEngineRuntimeGeneratorTask(GeneratorTaskParams generatorTaskParams) {
4443
super(generatorTaskParams);
4544
this.engineInternalClassDir = generatorTaskParams.getPathProvider().getEndpointRulesInternalDirectory();
4645
this.engineInternalResourcesDir = generatorTaskParams.getPathProvider().getEndpointRulesInternalResourcesDirectory();
4746
this.engineInternalPackageName = generatorTaskParams.getModel().getMetadata().getFullInternalEndpointRulesPackageName();
4847
this.fileHeader = generatorTaskParams.getModel().getFileHeader();
48+
this.endpointRulesSpecUtils = new EndpointRulesSpecUtils(generatorTaskParams.getModel());
4949
}
5050

5151
@Override
5252
protected List<GeneratorTask> createTasks() throws Exception {
5353
List<GeneratorTask> copyTasks = new ArrayList<>();
5454

55-
List<String> rulesEngineFiles = rulesEngineResourceFiles();
55+
List<String> rulesEngineFiles = endpointRulesSpecUtils.rulesEngineResourceFiles();
5656

5757
for (String path : rulesEngineJavaFilePaths(rulesEngineFiles)) {
5858
String newFileName = computeNewName(path);
@@ -62,15 +62,6 @@ protected List<GeneratorTask> createTasks() throws Exception {
6262
() -> rulesEngineFileContent("/" + path)));
6363
}
6464

65-
for (String path : rulesEngineJsonFilePaths(rulesEngineFiles)) {
66-
String newFileName = computeNewName(path);
67-
copyTasks.add(new SimpleGeneratorTask(engineInternalResourcesDir,
68-
newFileName,
69-
".json",
70-
"",
71-
() -> loadResourceAsString("/" + path)));
72-
}
73-
7465
return copyTasks;
7566
}
7667

@@ -80,23 +71,6 @@ private List<String> rulesEngineJavaFilePaths(Collection<String> runtimeEngineFi
8071
.collect(Collectors.toList());
8172
}
8273

83-
private List<String> rulesEngineJsonFilePaths(Collection<String> runtimeEngineFiles) {
84-
return runtimeEngineFiles.stream()
85-
.filter(e -> e.endsWith(".json.resource"))
86-
.collect(Collectors.toList());
87-
}
88-
89-
private List<String> rulesEngineResourceFiles() {
90-
URL currentJarUrl = RulesEngineRuntimeGeneratorTask.class.getProtectionDomain().getCodeSource().getLocation();
91-
try (JarFile jarFile = new JarFile(currentJarUrl.getFile())) {
92-
return jarFile.stream()
93-
.map(ZipEntry::getName)
94-
.filter(e -> e.startsWith("software/amazon/awssdk/codegen/rules"))
95-
.collect(Collectors.toList());
96-
} catch (IOException e) {
97-
throw new UncheckedIOException(e);
98-
}
99-
}
10074

10175
private String rulesEngineFileContent(String path) {
10276
return "package " + engineInternalPackageName + ";\n" +

0 commit comments

Comments
 (0)