8000 fix(v2): Fix params builder to provide default transformation manager by ritigupt · Pull Request #1549 · aws-powertools/powertools-lambda-java · GitHub
[go: up one dir, main page]
Skip to content

fix(v2): Fix params builder to provide default transformation manager #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 24, 2024
Merged

fix(v2): Fix params builder to provide default transformation manager #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab5a2e9
Add default transformation manager in builders and add unit tests
ritigupt Jan 5, 2024
5c17d86
undo the pom change
ritigupt Jan 5, 2024
be838e4
undo the pom change
ritigupt Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...java/software/amazon/lambda/powertools/parameters/appconfig/AppConfigProviderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ public AppConfigProvider build() {
if (application == null) {
throw new IllegalStateException("No application provided; please provide one");
}

if (transformationManager == null) {
transformationManager = new TransformationManager();
}
// Create a AppConfigDataClient if we haven't been given one
if (client == null) {
client = AppConfigDataClient.builder()
Expand Down
13 changes: 13 additions & 0 deletions ...st/java/software/amazon/lambda/powertools/parameters/appconfig/AppConfigProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatRuntimeException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.MockitoAnnotations.openMocks;
import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -216,4 +218,15 @@ public void testAppConfigProviderBuilderMissingApplication_throwsException() {
.build())
.withMessage("No application provided; please provide one");
}
@Test
public void testAppConfigProvider_withoutParameter_shouldHaveDefaultTransformationManager() {

// Act
AppConfigProvider appConfigProvider = AppConfigProvider.builder()
.withEnvironment("test")
.withApplication("app")
.build();
// Assert
assertDoesNotThrow(()->appConfigProvider.withTransformation(json));
}
}
3 changes: 3 additions & 0 deletions ...n/java/software/amazon/lambda/powertools/parameters/dynamodb/DynamoDbProviderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ public DynamoDbProvider build() {
if (client == null) {
client = createClient();
}
if (transformationManager == null) {
transformationManager = new TransformationManager();
}
provider = new DynamoDbProvider(cacheManager, transformationManager, client, table);

return provider;
Expand Down
11 changes: 11 additions & 0 deletions ...test/java/software/amazon/lambda/powertools/parameters/dynamodb/DynamoDbProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.MockitoAnnotations.openMocks;
import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;

import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -225,5 +227,14 @@ public void testDynamoDBBuilderMissingTable_throwsException() {
.withCacheManager(new CacheManager())
.build());
}
@Test
public void testDynamoDBBuilder_withoutParameter_shouldHaveDefaultTransformationManager() {

// Act
DynamoDbProvider dynamoDbProvider = DynamoDbProvider.builder().withTable("test-table")
.build();
// Assert
assertDoesNotThrow(()->dynamoDbProvider.withTransformation(json));
}

}
4 changes: 3 additions & 1 deletion ...ain/java/software/amazon/lambda/powertools/parameters/secrets/SecretsProviderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ public SecretsProvider build() {
if (client == null) {
client = createClient();
}

if(transformationManager == null){
transformationManager = new TransformationManager();
}
provider = new SecretsProvider(cacheManager, transformationManager, client);

return provider;
Expand Down
13 changes: 13 additions & 0 deletions ...c/test/java/software/amazon/lambda/powertools/parameters/secrets/SecretsProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatRuntimeException;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;

import java.time.temporal.ChronoUnit;
import java.util.Base64;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
Expand Down Expand Up @@ -105,4 +108,14 @@ public void testGetSecretsProvider_withoutParameter_shouldCreateDefaultClient()
assertNotNull(secretsProvider);
assertNotNull(secretsProvider.getClient());
}

@Test
public void testGetSecretsProvider_withoutParameter_shouldHaveDefaultTransformationManager() {

// Act
SecretsProvider secretsProvider = SecretsProvider.builder()
.build();
// Assert
assertDoesNotThrow(()->secretsProvider.withTransformation(json));
}
}
3 changes: 3 additions & 0 deletions ...sm/src/main/java/software/amazon/lambda/powertools/parameters/ssm/SSMProviderBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ public SSMProvider build() {
client = createClient();
}

if(transformationManager == null){
transformationManager = new TransformationManager();
}
provider = new SSMProvider(cacheManager, transformationManager, client);

return provider;
Expand Down
12 changes: 12 additions & 0 deletions ...s-ssm/src/test/java/software/amazon/lambda/powertools/parameters/ssm/SSMProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static software.amazon.lambda.powertools.parameters.transform.Transformer.json;

import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
Expand Down Expand Up @@ -194,6 +196,16 @@ public void getMultipleWithNextToken() {
assertThat(request2.nextToken()).isEqualTo("123abc");
}

@Test
public void testSSMProvider_withoutParameter_shouldHaveDefaultTransformationManager() {

// Act
SSMProvider ssmProvider = SSMProvider.builder()
.build();
// Assert
assertDoesNotThrow(()->ssmProvider.withTransformation(json));
}

private void initMock(String expectedValue) {
Parameter parameter = Parameter.builder().value(expectedValue).build();
GetParameterResponse result = GetParameterResponse.builder().parameter(parameter).build();
Expand Down
0