aws-powertools · scottgerring · Dec 11, 2023 · Aug 29, 2023 · Aug 29, 2023 · Aug 29, 2023
diff --git a/docs/utilities/parameters.md b/docs/utilities/parameters.md
diff --git a/examples/powertools-examples-parameters/pom.xml b/examples/powertools-examples-parameters/pom.xml
@@ -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>

diff --git a/.../powertools-examples-parameters/src/main/java/org/demo/parameters/ParametersFunction.java b/.../powertools-examples-parameters/src/main/java/org/demo/parameters/ParametersFunction.java
@@ -31,17 +31,30 @@
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-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 final static Logger log = LogManager.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");

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -85,7 +85,7 @@ extra_javascript:
 
 extra:
   powertools:
-    version: 1.18.0 # to update after each release (we do not want snapshot version here)
+    version: 2.0.0 # to update after each release (we do not want snapshot version here)
 
 repo_url: https://github.com/aws-powertools/powertools-lambda-java
 edit_uri: edit/main/docs
diff --git a/pom.xml b/pom.xml
@@ -54,6 +54,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>
@@ -600,35 +605,6 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
-                        <!-- we run checkstyle only on Java 11, no need to run it for all JDK, it's just code style -->
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.3.0</version>
-                        <configuration>
-                            <configLocation>checkstyle.xml</configLocation>
-                            <encoding>UTF-8</encoding>
-                            <consoleOutput>true</consoleOutput>
-                            <failsOnError>true</failsOnError>
-                            <linkXRef>false</linkXRef>
-                        </configuration>
-                        <!-- does not work without this dependency -->
-                        <!-- does not work with this dependency on Java 8 -->
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.puppycrawl.tools</groupId>
-                                <artifactId>checkstyle</artifactId>
-                                <version>10.12.3</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

diff --git a/powertools-e2e-tests/handlers/batch/pom.xml b/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-batch</artifactId>

diff --git a/powertools-e2e-tests/handlers/idempotency/pom.xml b/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-idempotency</artifactId>

diff --git a/powertools-e2e-tests/handlers/largemessage/pom.xml b/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-largemessage</artifactId>

diff --git a/powertools-e2e-tests/handlers/largemessage_idempotent/pom.xml b/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-large-msg-idempotent</artifactId>

diff --git a/powertools-e2e-tests/handlers/logging/pom.xml b/powertools-e2e-tests/handlers/logging/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>

diff --git a/powertools-e2e-tests/handlers/metrics/pom.xml b/powertools-e2e-tests/handlers/metrics/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>

diff --git a/powertools-e2e-tests/handlers/parameters/pom.xml b/powertools-e2e-tests/handlers/parameters/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-parameters</artifactId>
     <packaging>jar</packaging>
-    <name>A Lambda function using powertools logging</name>
+    <name>A Lambda function using powertools parameters</name>
 
     <dependencies>
         <dependency>
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
-            <artifactId>powertools-parameters</artifactId>
+            <artifactId>powertools-parameters-appconfig</artifactId>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>

diff --git a/...sts/handlers/parameters/src/main/java/software/amazon/lambda/powertools/e2e/Function.java b/...sts/handlers/parameters/src/main/java/software/amazon/lambda/powertools/e2e/Function.java
@@ -17,14 +17,18 @@
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import software.amazon.lambda.powertools.logging.Logging;
-import software.amazon.lambda.powertools.parameters.AppConfigProvider;
-import software.amazon.lambda.powertools.parameters.ParamManager;
+import software.amazon.lambda.powertools.parameters.appconfig.AppConfigProvider;
 
 public class Function implements RequestHandler<Input, String> {
 
     @Logging
     public String handleRequest(Input input, Context context) {
-        AppConfigProvider provider = ParamManager.getAppConfigProvider(input.getEnvironment(), input.getApp());
+        AppConfigProvider provider = AppConfigProvider.builder()
+                .withApplication(input.getApp())
+                .withEnvironment(input.getEnvironment())
+                .build();
+
+        //(input.getEnvironment(), input.getApp());
         return provider.get(input.getKey());
 
     }

diff --git a/powertools-e2e-tests/handlers/pom.xml b/powertools-e2e-tests/handlers/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>software.amazon.lambda</groupId>
     <artifactId>e2e-test-handlers-parent</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Handlers for End-to-End tests</name>
     <description>Fake handlers that use Powertools for AWS Lambda (Java).</description>
@@ -27,12 +27,16 @@
     </properties>
 
     <modules>
+        <module>batch</module>
+        <module>largemessage</module>
+        <module>largemessage_idempotent</module>
         <module>logging</module>
         <module>tracing</module>
         <module>metrics</module>
         <module>idempotency</module>
         <module>parameters</module>
-        <module>validation</module>
+        <module>validation-alb-event</module>
+        <module>validation-apigw-event</module>
     </modules>
 
     <dependencyManagement>
@@ -71,7 +75,7 @@
             </dependency>
             <dependency>
                 <groupId>software.amazon.lambda</groupId>
-                <artifactId>powertools-parameters</artifactId>
+                <artifactId>powertools-parameters-appconfig</artifactId>
                 <version>${lambda.powertools.version}</version>
             </dependency>
             <dependency>

diff --git a/powertools-e2e-tests/handlers/tracing/pom.xml b/powertools-e2e-tests/handlers/tracing/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-tracing</artifactId>

diff --git a/powertools-e2e-tests/handlers/validation-alb-event/pom.xml b/powertools-e2e-tests/handlers/validation-alb-event/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-validation-alb-event</artifactId>

diff --git a/powertools-e2e-tests/handlers/validation-apigw-event/pom.xml b/powertools-e2e-tests/handlers/validation-apigw-event/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-validation-apigw-event</artifactId>

diff --git a/powertools-parameters/pom.xml b/powertools-parameters/pom.xml
@@ -28,77 +28,17 @@
 
     <name>Powertools for AWS Lambda (Java) library Parameters</name>
 
-    <description>
-        Set of utilities to retrieve parameters from Secrets Manager or SSM Parameter Store
-    </description>
-    <url>https://aws.amazon.com/lambda/</url>
-    <issueManagement>
-        <system>GitHub Issues</system>
-        <url>https://github.com/aws-powertools/powertools-lambda-java/issues</url>
-    </issueManagement>
-    <scm>
-        <url>https://github.com/aws-powertools/powertools-lambda-java.git</url>
-    </scm>
-    <developers>
-        <developer>
-            <name>Powertools for AWS Lambda team</name>
-            <organization>Amazon Web Services</organization>
-            <organizationUrl>https://aws.amazon.com/</organizationUrl>
-        </developer>
-    </developers>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://aws.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
+    <description>Set of utilities to retrieve parameters - common interface</description>
 
     <dependencies>
         <dependency>
             <groupId>software.amazon.lambda</groupId>
             <artifactId>powertools-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>ssm</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>apache-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>netty-nio-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>secretsmanager</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>apache-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>netty-nio-client</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>url-connection-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>dynamodb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>appconfigdata</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>