Merge pull request #130 from ebean-orm/feature/add-kmsclient

LocalStack - Add built in support for KmsClient

Author: rob-bygrave

pom.xml

@@ -76,6 +76,13 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>kms</artifactId>
+      <version>2.20.154</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>com.amazonaws</groupId>

src/main/java/io/ebean/test/containers/AwsSDKv2.java

@@ -5,10 +5,14 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.kinesis.KinesisClient;
+import software.amazon.awssdk.services.kms.KmsAsyncClient;
+import software.amazon.awssdk.services.kms.KmsClient;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.sns.SnsClient;
 import software.amazon.awssdk.services.sqs.SqsClient;
 
+import java.net.URI;
+
 /**
  * AWS SDK v1 compatible helper API to provide clients like
  * DynamoDbClient, SnsClient, SqsClient, KinesisClient.
@@ -17,6 +21,11 @@
  */
 public interface AwsSDKv2 {
 
+  /**
+   * Return the endpoint URI for this container.
+   */
+  URI endpoint();
+
   /**
    * Return the DynamoDbClient (V2 SDK) that can be used for this container.
    * <p>
@@ -46,6 +55,16 @@ public interface AwsSDKv2 {
    */
   S3Client s3Client();
 
+  /**
+   * Return the KmsClient (V2 SDK) for this container.
+   */
+  KmsClient kmsClient();
+
+  /**
+   * Return the KmsAsyncClient (V2 SDK) for this container.
+   */
+  KmsAsyncClient kmsAsyncClient();
+
   /**
    * Return SDK 2 Region.
    */

src/main/java/io/ebean/test/containers/LocalstackSdkV2.java

@@ -5,6 +5,8 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.kinesis.KinesisClient;
+import software.amazon.awssdk.services.kms.KmsAsyncClient;
+import software.amazon.awssdk.services.kms.KmsClient;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.sns.SnsClient;
 import software.amazon.awssdk.services.sqs.SqsClient;
@@ -68,6 +70,29 @@ public S3Client s3Client() {
       .build();
   }
 
+  @Override
+  public URI endpoint() {
+    return endpoint;
+  }
+
+  @Override
+  public KmsClient kmsClient() {
+    return KmsClient.builder()
+      .credentialsProvider(credentialsProvider())
+      .endpointOverride(endpoint)
+      .region(region())
+      .build();
+  }
+
+  @Override
+  public KmsAsyncClient kmsAsyncClient() {
+    return KmsAsyncClient.builder()
+      .credentialsProvider(credentialsProvider())
+      .endpointOverride(endpoint)
+      .region(region())
+      .build();
+  }
+
   @Override
   public Region region() {
     return awsRegion == null ? null : Region.of(awsRegion);

src/test/java/io/ebean/test/containers/LocalstackContainerV2Test.java

@@ -6,6 +6,7 @@
 import software.amazon.awssdk.services.dynamodb.model.*;
 import software.amazon.awssdk.services.kinesis.KinesisClient;
 import software.amazon.awssdk.services.kinesis.model.CreateStreamRequest;
+import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.Bucket;
 import software.amazon.awssdk.services.s3.model.CreateBucketResponse;
@@ -29,8 +30,7 @@ class LocalstackContainerV2Test {
   void start_viaBuilder() {
     Localstack2Container container = Localstack2Container.builder("4.0.3")
       .awsRegion("ap-southeast-2")
-      .services("dynamodb,kinesis,sns,sqs,s3")
-      //.port(4567)
+      .services("dynamodb,kinesis,sns,sqs,s3,kms")
       .containerName("ut_localstack_dkss2")
       .image("localstack/localstack:4.0.3")
       .port(4577)
@@ -40,6 +40,14 @@ void start_viaBuilder() {
     container.startMaybe();
 
     AwsSDKv2 sdk = container.sdk2();
+
+    assertThat(sdk.endpoint()).isNotNull();
+    assertThat(sdk.kmsClient()).isNotNull();
+    assertThat(sdk.kmsAsyncClient()).isNotNull();
+
+    CreateKeyResponse key = sdk.kmsClient().createKey();
+    assertThat(key.keyMetadata().keyId()).isNotNull();
+
     var amazonDynamoDB = sdk.dynamoDBClient();
     createTable(amazonDynamoDB);
 
@@ -166,7 +174,7 @@ void randomPort() {
   @Test
   void start() {
 
-    Localstack2Container container = Localstack2Container.builder("0.14.4")
+    Localstack2Container container = Localstack2Container.builder("4.0.3")
       //.setShutdownMode(StopMode.None)
       .build();
     container.startMaybe();