Merge pull request #406 from IABTechLab/sch-UID2-4739-credentials-provider-fix

UID2-4739: use DefaultCredentialsProvider for KMS client in JWTTokenProvider

Author: sophia-chen-ttd

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-core</artifactId>
-    <version>2.30.127</version>
+    <version>2.30.128-alpha-186-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -24,7 +24,7 @@
         <vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
         <launcher.class>io.vertx.core.Launcher</launcher.class>
 
-        <uid2-shared.version>11.4.16</uid2-shared.version>
+        <uid2-shared.version>11.6.0</uid2-shared.version>
         <netty.version>4.1.135.Final</netty.version>
         <image.version>${project.version}</image.version>
     </properties>

src/main/java/com/uid2/core/service/JWTTokenProvider.java

@@ -16,7 +16,7 @@
 import java.util.function.Supplier;
 
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.WebIdentityTokenFileCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.regions.Region;
@@ -154,7 +154,7 @@ private static KmsClient getKmsClient(KmsClientBuilder kmsClientBuilder, JsonObj
                 throw e;
             }
         } else {
-            WebIdentityTokenFileCredentialsProvider credentialsProvider = WebIdentityTokenFileCredentialsProvider.create();
+            DefaultCredentialsProvider credentialsProvider = DefaultCredentialsProvider.create();
 
             client = kmsClientBuilder
                     .region(Region.of(region))

src/main/java/com/uid2/core/service/MetadataProvider.java

@@ -8,11 +8,9 @@
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import lombok.Getter;
 
 import static com.uid2.core.util.MetadataHelper.*;
 
-@Getter
 public abstract class MetadataProvider {
     private final ICloudStorage metadataStreamProvider;
     private final ICloudStorage downloadUrlGenerator;