Merge pull request #2381 from aws/staging/2c89a16c-1121-46ad-a419-1c268db4d69a

Pull request: release <- staging/2c89a16c-1121-46ad-a419-1c268db4d69a

Author: aws-sdk-java-automation

.changes/2.20.3.json

@@ -0,0 +1,36 @@
+{
+    "version": "2.20.3",
+    "date": "2023-02-13",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Keep precedence of options when passed to ProfileFileSupplier.aggregate"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Account",
+            "contributor": "",
+            "description": "This release of the Account Management API enables customers to view and manage whether AWS Opt-In Regions are enabled or disabled for their Account. For more information, see https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-regions.html"
+        },
+        {
+            "type": "feature",
+            "category": "AWS AppConfig Data",
+            "contributor": "",
+            "description": "AWS AppConfig now offers the option to set a version label on hosted configuration versions. If a labeled hosted configuration version is deployed, its version label is available in the GetLatestConfiguration response."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Import/Export Snowball",
+            "contributor": "",
+            "description": "Adds support for EKS Anywhere on Snowball. AWS Snow Family customers can now install EKS Anywhere service on Snowball Edge Compute Optimized devices."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated endpoint and partition metadata."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,23 @@
+# __2.20.3__ __2023-02-13__
+## __AWS Account__
+  - ### Features
+    - This release of the Account Management API enables customers to view and manage whether AWS Opt-In Regions are enabled or disabled for their Account. For more information, see https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-regions.html
+
+## __AWS AppConfig Data__
+  - ### Features
+    - AWS AppConfig now offers the option to set a version label on hosted configuration versions. If a labeled hosted configuration version is deployed, its version label is available in the GetLatestConfiguration response.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated endpoint and partition metadata.
+
+  - ### Bugfixes
+    - Keep precedence of options when passed to ProfileFileSupplier.aggregate
+
+## __Amazon Import/Export Snowball__
+  - ### Features
+    - Adds support for EKS Anywhere on Snowball. AWS Snow Family customers can now install EKS Anywhere service on Snowball Edge Compute Optimized devices.
+
 # __2.20.2__ __2023-02-10__
 ## __AWS SDK for Java v2__
   - ### Features

README.md

@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.20.2</version>
+      <version>2.20.3</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.20.2</version>
+  <version>2.20.3</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.20.2</version>
+  <version>2.20.3</version>
 </dependency>
 ```
 
@@ -103,7 +103,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.20.2</version>
+  <version>2.20.3</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

core/annotations/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/arns/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/auth-crt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
 
     <artifactId>auth-crt</artifactId>

core/auth/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
 
     <artifactId>auth</artifactId>

core/aws-core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

core/endpoints-spi/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/imds/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>imds</artifactId>

core/json-utils/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/metrics-spi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
 
     <artifactId>core</artifactId>

core/profiles/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
 
     <artifactId>profiles</artifactId>

core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSupplier.java

@@ -16,9 +16,11 @@
 package software.amazon.awssdk.profiles;
 
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkPublicApi;
@@ -119,7 +121,8 @@ static ProfileFileSupplier aggregate(ProfileFileSupplier... suppliers) {
         return new ProfileFileSupplier() {
 
             final AtomicReference<ProfileFile> currentAggregateProfileFile = new AtomicReference<>();
-            final ConcurrentHashMap<Supplier<ProfileFile>, ProfileFile> currentValuesBySupplier = new ConcurrentHashMap<>();
+            final Map<Supplier<ProfileFile>, ProfileFile> currentValuesBySupplier
+                = Collections.synchronizedMap(new LinkedHashMap<>());
 
             @Override
             public ProfileFile get() {

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

@@ -410,6 +410,56 @@ void aggregate_supplierReturnsSameInstanceMultipleTimesAggregatingProfileFileSup
         assertThat(suppliedProfileFiles).isEqualTo(distinctAggregateProfileFiles);
     }
 
+    @Test
+    void aggregate_duplicateOptionsGivenFixedProfileFirst_preservesPrecedence() {
+        ProfileFile configFile1 = configFile("profile default", Pair.of("aws_access_key_id", "config-key"));
+        Path credentialsFilePath = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");
+
+        ProfileFileSupplier supplier = ProfileFileSupplier.aggregate(
+            ProfileFileSupplier.fixedProfileFile(configFile1),
+            ProfileFileSupplier.reloadWhenModified(credentialsFilePath, ProfileFile.Type.CREDENTIALS));
+
+        ProfileFile profileFile = supplier.get();
+        String accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+        assertThat(accessKeyId).isEqualTo("config-key");
+
+        generateTestCredentialsFile("defaultAccessKey2", "defaultSecretAccessKey2");
+
+        profileFile = supplier.get();
+        accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+        assertThat(accessKeyId).isEqualTo("config-key");
+    }
+
+    @Test
+    void aggregate_duplicateOptionsGivenReloadingProfileFirst_preservesPrecedence() {
+        AdjustableClock clock = new AdjustableClock();
+
+        ProfileFile configFile1 = configFile("profile default", Pair.of("aws_access_key_id", "config-key"));
+        Path credentialsFilePath = generateTestCredentialsFile("defaultAccessKey", "defaultSecretAccessKey");
+
+        ProfileFileSupplier supplier = ProfileFileSupplier.aggregate(
+            builderWithClock(clock)
+                .reloadWhenModified(credentialsFilePath, ProfileFile.Type.CREDENTIALS)
+                .build(),
+            ProfileFileSupplier.fixedProfileFile(configFile1));
+
+        ProfileFile profileFile = supplier.get();
+        String accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+        assertThat(accessKeyId).isEqualTo("defaultAccessKey");
+
+        generateTestCredentialsFile("defaultAccessKey2", "defaultSecretAccessKey2");
+
+        clock.tickForward(Duration.ofMillis(1_000));
+
+        profileFile = supplier.get();
+        accessKeyId = profileFile.profile("default").get().property("aws_access_key_id").get();
+
+        assertThat(accessKeyId).isEqualTo("defaultAccessKey2");
+    }
+
     @Test
     void fixedProfileFile_nullProfileFile_returnsNonNullSupplier() {
         ProfileFile file = null;

core/protocols/aws-cbor-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-json-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.20.2</version>
+        <version>2.20.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>