merge v2 into logging

Author: jeromevdl

docs/utilities/parameters.md

@@ -21,9 +21,15 @@
         </dependency>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
-            <artifactId>powertools-parameters</artifactId>
+            <artifactId>powertools-parameters-ssm</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.lambda</groupId>
+            <artifactId>powertools-parameters-secrets</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-core</artifactId>

examples/powertools-examples-parameters/pom.xml

@@ -31,17 +31,30 @@
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.lambda.powertools.parameters.ParamManager;
-import software.amazon.lambda.powertools.parameters.SSMProvider;
-import software.amazon.lambda.powertools.parameters.SecretsProvider;
+import software.amazon.lambda.powertools.parameters.secrets.SecretsParam;
+import software.amazon.lambda.powertools.parameters.secrets.SecretsProvider;
+import software.amazon.lambda.powertools.parameters.ssm.SSMParam;
+import software.amazon.lambda.powertools.parameters.ssm.SSMProvider;
 
 public class ParametersFunction implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
     private static final Logger log = LoggerFactory.getLogger(ParametersFunction.class);
 
-    SSMProvider ssmProvider = ParamManager.getSsmProvider();
-    SecretsProvider secretsProvider = ParamManager.getSecretsProvider();
+    // Annotation-style injection from secrets manager
+    @SecretsParam(key = "/powertools-java/userpwd")
+    String secretParamInjected;
 
-    String simpleValue = ssmProvider.defaultMaxAge(30, SECONDS).get("/powertools-java/sample/simplekey");
+    // Annotation-style injection from Systems Manager
+    @SSMParam(key = "/powertools-java/sample/simplekey")
+    String ssmParamInjected;
+
+    SSMProvider ssmProvider = SSMProvider
+            .builder()
+            .build();
+    SecretsProvider secretsProvider = SecretsProvider
+            .builder()
+            .build();
+
+    String simpleValue = ssmProvider.withMaxAge(30, SECONDS).get("/powertools-java/sample/simplekey");
     String listValue = ssmProvider.withMaxAge(60, SECONDS).get("/powertools-java/sample/keylist");
     MyObject jsonObj = ssmProvider.withTransformation(json).get("/powertools-java/sample/keyjson", MyObject.class);
     Map<String, String> allValues = ssmProvider.getMultiple("/powertools-java/sample");

examples/powertools-examples-parameters/src/main/java/org/demo/parameters/ParametersFunction.java

@@ -56,6 +56,11 @@
         <module>powertools-e2e-tests</module>
         <module>powertools-batch</module>
         <module>examples</module>
+        <module>powertools-parameters/powertools-parameters-ssm</module>
+        <module>powertools-parameters/powertools-parameters-secrets</module>
+        <module>powertools-parameters/powertools-parameters-dynamodb</module>
+        <module>powertools-parameters/powertools-parameters-appconfig</module>
+        <module>powertools-parameters/powertools-parameters-tests</module>
     </modules>
 
     <scm>

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>e2e-test-handlers-parent</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>e2e-test-handler-batch</artifactId>

powertools-e2e-tests/handlers/batch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>e2e-test-handlers-parent</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>e2e-test-handler-idempotency</artifactId>

powertools-e2e-tests/handlers/idempotency/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>e2e-test-handlers-parent</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>e2e-test-handler-largemessage</artifactId>

powertools-e2e-tests/handlers/largemessage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>e2e-test-handlers-parent</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>e2e-test-handler-large-msg-idempotent</artifactId>

powertools-e2e-tests/handlers/largemessage_idempotent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>e2e-test-handlers-parent</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>e2e-test-handler-logging</artifactId>

powertools-e2e-tests/handlers/logging/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>software.amazon.lambda</groupId>
         <artifactId>e2e-test-handlers-parent</artifactId>
-        <version>1.0.0</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>e2e-test-handler-metrics</artifactId>
     <packaging>jar</packaging>
-    <name>A Lambda function using Powertools for AWS Lambda (Java) Parameters</name>
+    <name>A Lambda function using Powertools for AWS Lambda (Java) Metrics</name>
 
     <dependencies>
         <dependency>