More testing

Author: scottgerring

powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/DynamoDBProvider.java

@@ -12,6 +12,13 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/**
+ * Implements a {@link ParamProvider} on top of DynamoDB. The schema of the table
+ * is described in the Python powertools documentation.
+ *
+ * @see <a href="https://awslabs.github.io/aws-lambda-powertools-python/latest/utilities/parameters/#dynamodbprovider">Python DynamoDB provider</a>
+ *
+ */
 public class DynamoDBProvider extends BaseProvider {
 
     private final DynamoDbClient client;
@@ -20,8 +27,8 @@ public class DynamoDBProvider extends BaseProvider {
     public DynamoDBProvider(CacheManager cacheManager, String tableName) {
         this(cacheManager, DynamoDbClient.builder()
                 .httpClientBuilder(UrlConnectionHttpClient.builder())
-                //.credentialsProvider(EnvironmentVariableCredentialsProvider.create())
-                //.region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
+                .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                .region(Region.of(System.getenv(SdkSystemSetting.AWS_REGION.environmentVariable())))
                 .build(),
                 tableName
         );
@@ -34,6 +41,12 @@ public DynamoDBProvider(CacheManager cacheManager, String tableName) {
         this.tableName = tableName;
     }
 
+    /**
+     * Return a single value from the DynamoDB parameter provider.
+     *
+     * @param key key of the parameter
+     * @return The value, if it exists, null if it doesn't. Throws if the row exists but doesn't match the schema.
+     */
     @Override
     protected String getValue(String key) {
         GetItemResponse resp = client.getItem(GetItemRequest.builder()
@@ -52,6 +65,12 @@ protected String getValue(String key) {
         return null;
     }
 
+    /**
+     * Returns multiple values from the DynamoDB parameter provider.
+     *
+     * @param path Parameter store path
+     * @return All values matching the given path, and an empty map if none do. Throws if any records exist that don't match the schema.
+     */
     @Override
     protected Map<String, String> getMultipleValues(String path) {
 

powertools-parameters/src/test/java/software/amazon/lambda/powertools/parameters/DynamoDBProviderE2ETest.java

@@ -26,13 +26,15 @@ public class DynamoDBProviderE2ETest {
 
     final String ParamsTestTable = "ddb-params-test";
     final String MultiparamsTestTable = "ddb-multiparams-test";
-    private DynamoDbClient ddbClient;
+    private final DynamoDbClient ddbClient;
 
     public DynamoDBProviderE2ETest() {
         // Create a DDB client to inject test data into our test tables
         ddbClient = DynamoDbClient.builder()
                 .httpClientBuilder(UrlConnectionHttpClient.builder())
                 .build();
+
+
     }
 
     @Test
@@ -48,10 +50,10 @@ public void TestGetValue() {
                 .build());
 
         // Act
-        DynamoDBProvider provider = new DynamoDBProvider(new CacheManager(), ParamsTestTable);
+        DynamoDBProvider provider = makeProvider(ParamsTestTable);
+        String value = provider.getValue("test_param");
 
         // Assert
-        String value = provider.getValue("test_param");
         assertThat(value).isEqualTo("the_value_is_hello!");
     }
 
@@ -78,12 +80,19 @@ public void TestGetValues() {
                 .build());
 
         // Act
-        DynamoDBProvider provider = new DynamoDBProvider(new CacheManager(), MultiparamsTestTable);
+        DynamoDBProvider provider = makeProvider(MultiparamsTestTable);
         Map<String, String> values = provider.getMultipleValues("test_param");
 
         // Assert
         assertThat(values.size()).isEqualTo(2);
         assertThat(values.get("test_param_part_1")).isEqualTo("the_value_is_hello!");
         assertThat(values.get("test_param_part_2")).isEqualTo("the_value_is_still_hello!");
     }
+
+    private DynamoDBProvider makeProvider(String tableName) {
+        return new DynamoDBProvider(new CacheManager(), DynamoDbClient.builder()
+                .httpClientBuilder(UrlConnectionHttpClient.builder()).build(),
+                tableName);
+    }
+
 }

powertools-parameters/src/test/java/software/amazon/lambda/powertools/parameters/DynamoDBProviderTest.java

@@ -13,6 +13,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.MockitoAnnotations.openMocks;
@@ -95,7 +96,7 @@ public void getValueWithMalformedRowThrows() {
     }
 
 
-        @Test
+    @Test
     public void getValues() {
 
         // Arrange
@@ -128,4 +129,39 @@ public void getValues() {
         assertThat(queryRequestCaptor.getValue().keyConditionExpression()).isEqualTo("id = :v_id");
         assertThat(queryRequestCaptor.getValue().expressionAttributeValues().get(":v_id").s()).isEqualTo(key);
     }
+
+    @Test
+    public void getValuesWithoutResultsReturnsNull() {
+        // Arrange
+        Mockito.when(client.query(queryRequestCaptor.capture())).thenReturn(
+                QueryResponse.builder().items().build());
+
+        // Act
+        Map<String, String> values = provider.getMultipleValues(UUID.randomUUID().toString());
+
+        // Assert
+        assertThat(values.size()).isEqualTo(0);
+    }
+
+    @Test
+    public void getValuesWithMalformedRowThrows() {
+        // Arrange
+        String key = "Key1";
+        HashMap<String, AttributeValue> item1 = new HashMap<String, AttributeValue>();
+        item1.put("id", AttributeValue.fromS(key));
+        item1.put("sk", AttributeValue.fromS("some-subkey"));
+        item1.put("notVal", AttributeValue.fromS("somevalue"));
+        QueryResponse response = QueryResponse.builder()
+                .items(item1)
+                .build();
+        Mockito.when(client.query(queryRequestCaptor.capture())).thenReturn(response);
+
+        // Assert
+        Assertions.assertThrows(NullPointerException.class, () -> {
+            // Act
+            Map<String, String> values = provider.getMultipleValues(key);
+        });
+    }
+
+
 }