Skip to content

Commit 6b0fe5a

Browse files
authored
chore(v2): Split parameters module up by parameter provider (#1403)
1 parent 00d04c3 commit 6b0fe5a

File tree

69 files changed

+2363
-1765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2363
-1765
lines changed

docs/utilities/parameters.md

Lines changed: 366 additions & 327 deletions
Large diffs are not rendered by default.

examples/powertools-examples-parameters/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,15 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>software.amazon.lambda</groupId>
24-
<artifactId>powertools-parameters</artifactId>
24+
<artifactId>powertools-parameters-ssm</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>
27+
<dependency>
28+
<groupId>software.amazon.lambda</groupId>
29+
<artifactId>powertools-parameters-secrets</artifactId>
30+
<version>${project.version}</version>
31+
</dependency>
32+
2733
<dependency>
2834
<groupId>com.amazonaws</groupId>
2935
<artifactId>aws-lambda-java-core</artifactId>

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

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,30 @@
3131
import java.util.stream.Collectors;
3232
import org.apache.logging.log4j.LogManager;
3333
import org.apache.logging.log4j.Logger;
34-
import software.amazon.lambda.powertools.parameters.ParamManager;
35-
import software.amazon.lambda.powertools.parameters.SSMProvider;
36-
import software.amazon.lambda.powertools.parameters.SecretsProvider;
34+
import software.amazon.lambda.powertools.parameters.secrets.SecretsParam;
35+
import software.amazon.lambda.powertools.parameters.secrets.SecretsProvider;
36+
import software.amazon.lambda.powertools.parameters.ssm.SSMParam;
37+
import software.amazon.lambda.powertools.parameters.ssm.SSMProvider;
3738

3839
public class ParametersFunction implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
3940
private final static Logger log = LogManager.getLogger(ParametersFunction.class);
4041

41-
SSMProvider ssmProvider = ParamManager.getSsmProvider();
42-
SecretsProvider secretsProvider = ParamManager.getSecretsProvider();
42+
// Annotation-style injection from secrets manager
43+
@SecretsParam(key = "/powertools-java/userpwd")
44+
String secretParamInjected;
4345

44-
String simpleValue = ssmProvider.defaultMaxAge(30, SECONDS).get("/powertools-java/sample/simplekey");
46+
// Annotation-style injection from Systems Manager
47+
@SSMParam(key = "/powertools-java/sample/simplekey")
48+
String ssmParamInjected;
49+
50+
SSMProvider ssmProvider = SSMProvider
51+
.builder()
52+
.build();
53+
SecretsProvider secretsProvider = SecretsProvider
54+
.builder()
55+
.build();
56+
57+
String simpleValue = ssmProvider.withMaxAge(30, SECONDS).get("/powertools-java/sample/simplekey");
4558
String listValue = ssmProvider.withMaxAge(60, SECONDS).get("/powertools-java/sample/keylist");
4659
MyObject jsonObj = ssmProvider.withTransformation(json).get("/powertools-java/sample/keyjson", MyObject.class);
4760
Map<String, String> allValues = ssmProvider.getMultiple("/powertools-java/sample");

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ extra_javascript:
8585

8686
extra:
8787
powertools:
88-
version: 1.18.0 # to update after each release (we do not want snapshot version here)
88+
version: 2.0.0 # to update after each release (we do not want snapshot version here)
8989

9090
repo_url: https://github.com/aws-powertools/powertools-lambda-java
9191
edit_uri: edit/main/docs

pom.xml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
<module>powertools-e2e-tests</module>
5555
<module>powertools-batch</module>
5656
<module>examples</module>
57+
<module>powertools-parameters/powertools-parameters-ssm</module>
58+
<module>powertools-parameters/powertools-parameters-secrets</module>
59+
<module>powertools-parameters/powertools-parameters-dynamodb</module>
60+
<module>powertools-parameters/powertools-parameters-appconfig</module>
61+
<module>powertools-parameters/powertools-parameters-tests</module>
5762
</modules>
5863

5964
<scm>
@@ -600,35 +605,6 @@
600605
</activation>
601606
<build>
602607
<plugins>
603-
<plugin>
604-
<!-- we run checkstyle only on Java 11, no need to run it for all JDK, it's just code style -->
605-
<groupId>org.apache.maven.plugins</groupId>
606-
<artifactId>maven-checkstyle-plugin</artifactId>
607-
<version>3.3.0</version>
608-
<configuration>
609-
<configLocation>checkstyle.xml</configLocation>
610-
<encoding>UTF-8</encoding>
611-
<consoleOutput>true</consoleOutput>
612-
<failsOnError>true</failsOnError>
613-
<linkXRef>false</linkXRef>
614-
</configuration>
615-
<!-- does not work without this dependency -->
616-
<!-- does not work with this dependency on Java 8 -->
617-
<dependencies>
618-
<dependency>
619-
<groupId>com.puppycrawl.tools</groupId>
620-
<artifactId>checkstyle</artifactId>
621-
<version>10.12.3</version>
622-
</dependency>
623-
</dependencies>
624-
<executions>
625-
<execution>
626-
<goals>
627-
<goal>check</goal>
628-
</goals>
629-
</execution>
630-
</executions>
631-
</plugin>
632608
</plugins>
633609
</build>
634610
</profile>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>software.amazon.lambda</groupId>
77
<artifactId>e2e-test-handlers-parent</artifactId>
8-
<version>1.0.0</version>
8+
<version>2.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>e2e-test-handler-batch</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>software.amazon.lambda</groupId>
77
<artifactId>e2e-test-handlers-parent</artifactId>
8-
<version>1.0.0</version>
8+
<version>2.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>e2e-test-handler-idempotency</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>software.amazon.lambda</groupId>
77
<artifactId>e2e-test-handlers-parent</artifactId>
8-
<version>1.0.0</version>
8+
<version>2.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>e2e-test-handler-largemessage</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>software.amazon.lambda</groupId>
77
<artifactId>e2e-test-handlers-parent</artifactId>
8-
<version>1.0.0</version>
8+
<version>2.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>e2e-test-handler-large-msg-idempotent</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>software.amazon.lambda</groupId>
77
<artifactId>e2e-test-handlers-parent</artifactId>
8-
<version>1.0.0</version>
8+
<version>2.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>e2e-test-handler-logging</artifactId>

0 commit comments

Comments
 (0)