Merge pull request #3249 from aws/staging/d6dc3160-bbb0-4a8d-aefb-c77…

…155347496 Pull request: release <- staging/d6dc3160-bbb0-4a8d-aefb-c77155347496
aws · Sep 13, 2024 · 9f9a94a · 9f9a94a
2 parents c8a6734 + 6026637
commit 9f9a94a
Show file tree

Hide file tree

Showing 549 changed files with 2,949 additions and 1,150 deletions.
diff --git a/.changes/2.28.1.json b/.changes/2.28.1.json
@@ -0,0 +1,48 @@
+{
+    "version": "2.28.1",
+    "date": "2024-09-13",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "contributor": "",
+            "description": "Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3 Control",
+            "contributor": "",
+            "description": "Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Amplify",
+            "contributor": "",
+            "description": "Doc only update to Amplify to explain platform setting for Next.js 14 SSG only applications"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Add support for specifying endpoint overrides using environment variables, system properties or profile files. More information about this feature is available here: https://docs.aws.amazon.com/sdkref/latest/guide/feature-ss-endpoints.html"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Interactive Video Service",
+            "contributor": "",
+            "description": "Updates to all tags descriptions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Interactive Video Service Chat",
+            "contributor": "",
+            "description": "Updates to all tags descriptions."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,30 @@
  #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._
+# __2.28.1__ __2024-09-13__
+## __AWS Amplify__
+  - ### Features
+    - Doc only update to Amplify to explain platform setting for Next.js 14 SSG only applications
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Add support for specifying endpoint overrides using environment variables, system properties or profile files. More information about this feature is available here: https://docs.aws.amazon.com/sdkref/latest/guide/feature-ss-endpoints.html
+    - Updated endpoint and partition metadata.
+
+## __Amazon Interactive Video Service__
+  - ### Features
+    - Updates to all tags descriptions.
+
+## __Amazon Interactive Video Service Chat__
+  - ### Features
+    - Updates to all tags descriptions.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time.
+
+## __Amazon S3 Control__
+  - ### Bugfixes
+    - Fix issue where the `AWS_USE_DUALSTACK_ENDPOINT` environment variable and `aws.useDualstackEndpoint` system property are not resolved during client creation time.
+
 # __2.28.0__ __2024-09-12__
 ## __AWS Elemental MediaConvert__
   - ### Features

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -99,10 +99,9 @@ Please keep the following in mind when considering a code contribution:
   be assigned to it.
 
   If you are thinking about adding entirely new functionality, open a [Feature
-  Request](#feature-requests) or [ping][gitter] the maintainers to ask for
-  feedback first before beginning work; again this is to make sure that no one
-  else is already working on it, and also that it makes sense to be included in
-  the SDK.
+  Request](#feature-requests) to ask for feedback first before beginning work;
+  again this is to make sure that no one else is already working on it, and
+  also that it makes sense to be included in the SDK.
 * All code contributions must be accompanied with new or modified tests that
   verify that the code works as expected; i.e. that the issue has been fixed or
   that the functionality works as intended.
@@ -162,6 +161,5 @@ when contributing to the SDK.
 [label-doc-issue]: https://github.com/aws/aws-sdk-java-v2/labels/documentation
 [label-feature-request]: https://github.com/aws/aws-sdk-java-v2/labels/feature-request
 [git-rewriting-history]: https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
-[gitter]: https://gitter.im/aws/aws-sdk-java-v2
 [bug-report]: https://github.com/aws/aws-sdk-java-v2/issues/new?assignees=&labels=bug%2Cneeds-triage&template=bug-report.yml&title=%28short+issue+description%29
 [feature-request]: https://github.com/aws/aws-sdk-java-v2/issues/new?assignees=&labels=feature-request%2Cneeds-triage&template=feature-request.yml&title=%28short+issue+description%29
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # AWS SDK for Java 2.0
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiTFJSRXBBN1hkU1ZEQzZ4M1hoaWlFUExuNER3WjNpVllSQ09Qam1YdFlTSDNTd3RpZzNia3F0VkJRUTBwZlQwR1BEelpSV2dWVnp4YTBCOFZKRzRUR004PSIsIml2UGFyYW1ldGVyU3BlYyI6ImdHdEp1UHhKckpDRmhmQU4iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
 [![Maven](https://img.shields.io/maven-central/v/software.amazon.awssdk/s3.svg?label=Maven)](https://search.maven.org/search?q=g:%22software.amazon.awssdk%22%20AND%20a:%22s3%22)
-[![Gitter](https://badges.gitter.im/aws/aws-sdk-java-v2.svg)](https://gitter.im/aws/aws-sdk-java-v2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) 
 [![codecov](https://codecov.io/gh/aws/aws-sdk-java-v2/branch/master/graph/badge.svg)](https://codecov.io/gh/aws/aws-sdk-java-v2)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-111-orange.svg?style=flat-square)](#contributors-)
@@ -52,7 +51,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.28.0</version>
+      <version>2.28.1</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +85,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.28.0</version>
+  <version>2.28.1</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.28.0</version>
+  <version>2.28.1</version>
 </dependency>
 ```
 
@@ -103,7 +102,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.28.0</version>
+  <version>2.28.1</version>
 </dependency>
 ```
 
@@ -173,7 +172,6 @@ We need your help in making this SDK great. Please participate in the community
 [sdk-website]: http://aws.amazon.com/sdkforjava
 [aws-java-sdk-bom]: https://github.com/aws/aws-sdk-java-v2/tree/master/bom
 [stack-overflow]: http://stackoverflow.com/questions/tagged/aws-java-sdk
-[gitter]: https://gitter.im/aws/aws-sdk-java-v2
 [features]: https://github.com/aws/aws-sdk-java-v2/issues?q=is%3Aopen+is%3Aissue+label%3A%22feature-request%22
 [support-center]: https://console.aws.amazon.com/support/
 [console]: https://console.aws.amazon.com

diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

diff --git a/bundle-logging-bridge/pom.xml b/bundle-logging-bridge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <artifactId>bundle-logging-bridge</artifactId>
     <packaging>jar</packaging>

diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <artifactId>bundle-sdk</artifactId>
     <packaging>jar</packaging>

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.28.0</version>
+        <version>2.28.1</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java
@@ -16,6 +16,7 @@
 package software.amazon.awssdk.codegen.internal;
 
 import static java.util.stream.Collectors.toList;
+import static software.amazon.awssdk.utils.StringUtils.lowerCase;
 
 import java.io.Closeable;
 import java.io.File;
@@ -133,7 +134,7 @@ public static String removeLeading(String str, String toRemove) {
         if (str == null) {
             return null;
         }
-        if (str.startsWith(toRemove)) {
+        if (lowerCase(str).startsWith(lowerCase(toRemove))) {
             return str.substring(toRemove.length());
         }
         return str;
@@ -143,7 +144,7 @@ public static String removeTrailing(String str, String toRemove) {
         if (str == null) {
             return null;
         }
-        if (str.endsWith(toRemove)) {
+        if (lowerCase(str).endsWith(lowerCase(toRemove))) {
             return str.substring(0, str.length() - toRemove.length());
         }
         return str;

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java
@@ -114,19 +114,42 @@ private static boolean isJavaKeyword(String word) {
 
     @Override
     public String getServiceName() {
-        String baseName = Stream.of(serviceModel.getMetadata().getServiceId())
-                                .filter(Objects::nonNull)
-                                .filter(s -> !s.trim().isEmpty())
-                                .findFirst()
-                                .orElseThrow(() -> new IllegalStateException("ServiceId is missing in the c2j model."));
-
+        String baseName = serviceId();
         baseName = pascalCase(baseName);
+        baseName = removeRedundantPrefixesAndSuffixes(baseName);
+        return baseName;
+    }
 
-        // Special cases
-        baseName = Utils.removeLeading(baseName, "Amazon");
-        baseName = Utils.removeLeading(baseName, "Aws");
-        baseName = Utils.removeTrailing(baseName, "Service");
+    @Override
+    public String getServiceNameForEnvironmentVariables() {
+        String baseName = serviceId();
+        baseName = baseName.replace(' ', '_');
+        baseName = StringUtils.upperCase(baseName);
+        return baseName;
+    }
+
+    @Override
+    public String getServiceNameForSystemProperties() {
+        return getServiceName();
+    }
+
+    @Override
+    public String getServiceNameForProfileFile() {
+        return StringUtils.lowerCase(getServiceNameForEnvironmentVariables());
+    }
+
+    private String serviceId() {
+        return Stream.of(serviceModel.getMetadata().getServiceId())
+                     .filter(Objects::nonNull)
+                     .filter(s -> !s.trim().isEmpty())
+                     .findFirst()
+                     .orElseThrow(() -> new IllegalStateException("ServiceId is missing in the c2j model."));
+    }
 
+    private static String removeRedundantPrefixesAndSuffixes(String baseName) {
+        baseName = Utils.removeLeading(baseName, "amazon");
+        baseName = Utils.removeLeading(baseName, "aws");
+        baseName = Utils.removeTrailing(baseName, "service");
         return baseName;
     }
 

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java
@@ -29,6 +29,21 @@ public interface NamingStrategy {
      */
     String getServiceName();
 
+    /**
+     * Retrieve the service name that should be used for environment variables.
+     */
+    String getServiceNameForEnvironmentVariables();
+
+    /**
+     * Retrieve the service name that should be used for system properties.
+     */
+    String getServiceNameForSystemProperties();
+
+    /**
+     * Retrieve the service name that should be used for profile properties.
+     */
+    String getServiceNameForProfileFile();
+
     /**
      * Retrieve the client package name that should be used based on the service name.
      */