Add some E2E testing

Author: scottgerring

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

@@ -20,8 +20,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
         );
@@ -42,8 +42,14 @@ protected String getValue(String key) {
                 .attributesToGet("val")
                 .build());
 
-        // TODO
-        return resp.item().values().stream().findFirst().get().s();
+        // If we have an item at the key, we should be able to get a 'val' out of it. If not it's
+        // exceptional.
+        // If we don't have an item at the key, we should return null.
+        if (resp.hasItem() && !resp.item().values().isEmpty()) {
+            return resp.item().values().stream().findFirst().get().s();
+        }
+
+        return null;
     }
 
     @Override
@@ -52,8 +58,7 @@ protected Map<String, String> getMultipleValues(String path) {
         QueryResponse resp = client.query(QueryRequest.builder()
                 .tableName(tableName)
                 .keyConditionExpression("id = :v_id")
-                .expressionAttributeValues(Collections.singletonMap("v_id", AttributeValue.fromS(path)))
-                .attributesToGet("sk", "value")
+                .expressionAttributeValues(Collections.singletonMap(":v_id", AttributeValue.fromS(path)))
                 .build());
 
         return resp

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

@@ -0,0 +1,89 @@
+package software.amazon.lambda.powertools.parameters;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
+import software.amazon.lambda.powertools.parameters.cache.CacheManager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * This class provides simple end-to-end style testing of the DynamoDBProvider class.
+ * It is ignored, for now, as it requires AWS access and that's not yet run as part
+ * of our unit test suite in the cloud.
+ *
+ * The test is kept here for 1/ local development and 2/ in preparation for future
+ * E2E tests running in the cloud CI.
+ */
+@Disabled
+public class DynamoDBProviderE2ETest {
+
+    final String ParamsTestTable = "ddb-params-test";
+    final String MultiparamsTestTable = "ddb-multiparams-test";
+    private DynamoDbClient ddbClient;
+
+    public DynamoDBProviderE2ETest() {
+        // Create a DDB client to inject test data into our test tables
+        ddbClient = DynamoDbClient.builder()
+                .httpClientBuilder(UrlConnectionHttpClient.builder())
+                .build();
+    }
+
+    @Test
+    public void TestGetValue() {
+
+        // Arrange
+        HashMap<String, AttributeValue> testItem = new HashMap<String, AttributeValue>();
+        testItem.put("id", AttributeValue.fromS("test_param"));
+        testItem.put("val", AttributeValue.fromS("the_value_is_hello!"));
+        ddbClient.putItem(PutItemRequest.builder()
+                        .tableName(ParamsTestTable)
+                        .item(testItem)
+                .build());
+
+        // Act
+        DynamoDBProvider provider = new DynamoDBProvider(new CacheManager(), ParamsTestTable);
+
+        // Assert
+        String value = provider.getValue("test_param");
+        assertThat(value).isEqualTo("the_value_is_hello!");
+    }
+
+    @Test
+    public void TestGetValues() {
+
+        // Arrange
+        HashMap<String, AttributeValue> testItem = new HashMap<String, AttributeValue>();
+        testItem.put("id", AttributeValue.fromS("test_param"));
+        testItem.put("sk", AttributeValue.fromS("test_param_part_1"));
+        testItem.put("val", AttributeValue.fromS("the_value_is_hello!"));
+        ddbClient.putItem(PutItemRequest.builder()
+                .tableName(MultiparamsTestTable)
+                .item(testItem)
+                .build());
+
+        HashMap<String, AttributeValue> testItem2 = new HashMap<String, AttributeValue>();
+        testItem2.put("id", AttributeValue.fromS("test_param"));
+        testItem2.put("sk", AttributeValue.fromS("test_param_part_2"));
+        testItem2.put("val", AttributeValue.fromS("the_value_is_still_hello!"));
+        ddbClient.putItem(PutItemRequest.builder()
+                .tableName(MultiparamsTestTable)
+                .item(testItem2)
+                .build());
+
+        // Act
+        DynamoDBProvider provider = new DynamoDBProvider(new CacheManager(), 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!");
+    }
+}