Skip to content

Commit 61745f1

Browse files
authored
remove jackson-databind dep from secretsmanager (#2032)
1 parent df9cf31 commit 61745f1

File tree

4 files changed

+27
-12
lines changed

4 files changed

+27
-12
lines changed

aws-secretsmanager/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ dependencies {
66
api(projects.micronautAwsSdkV2)
77
api(projects.micronautAwsDistributedConfiguration)
88
api(libs.awssdk.secretsmanager)
9-
implementation(mn.micronaut.jackson.databind)
9+
1010
}

aws-secretsmanager/src/main/java/io/micronaut/aws/secretsmanager/SecretsManagerGroupNameAwareKeyValueFetcher.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
*/
1616
package io.micronaut.aws.secretsmanager;
1717

18-
import com.fasterxml.jackson.core.JsonProcessingException;
19-
import com.fasterxml.jackson.databind.ObjectMapper;
2018
import io.micronaut.context.annotation.BootstrapContextCompatible;
2119
import io.micronaut.context.annotation.Replaces;
2220
import io.micronaut.context.annotation.Requires;
2321
import io.micronaut.core.annotation.Experimental;
2422
import io.micronaut.core.annotation.NonNull;
23+
import io.micronaut.json.JsonMapper;
2524
import jakarta.inject.Singleton;
2625
import org.slf4j.Logger;
2726
import org.slf4j.LoggerFactory;
2827
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
2928
import software.amazon.awssdk.services.secretsmanager.model.SecretListEntry;
3029

30+
import java.io.IOException;
3131
import java.util.HashMap;
3232
import java.util.Map;
3333
import java.util.Optional;
@@ -51,7 +51,7 @@ public class SecretsManagerGroupNameAwareKeyValueFetcher extends SecretsManagerK
5151
* @param objectMapper Object Mapper
5252
*/
5353
public SecretsManagerGroupNameAwareKeyValueFetcher(SecretsManagerClient secretsClient,
54-
ObjectMapper objectMapper) {
54+
JsonMapper objectMapper) {
5555
super(secretsClient, objectMapper);
5656
}
5757

@@ -64,7 +64,7 @@ protected void addSecretDetailsToResults(SecretListEntry secret, Map result) {
6464
try {
6565
keyValues.putAll(objectMapper.readValue(secretValueOptional.get(), Map.class));
6666
result.put(secret.name(), keyValues);
67-
} catch (JsonProcessingException e) {
67+
} catch (IOException e) {
6868
if (LOG.isWarnEnabled()) {
6969
LOG.warn("could not read secret ({}) value from JSON to Map", secret.name());
7070
}

aws-secretsmanager/src/main/java/io/micronaut/aws/secretsmanager/SecretsManagerKeyValueFetcher.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
*/
1616
package io.micronaut.aws.secretsmanager;
1717

18-
import com.fasterxml.jackson.core.JsonProcessingException;
19-
import com.fasterxml.jackson.databind.ObjectMapper;
2018
import io.micronaut.context.annotation.BootstrapContextCompatible;
2119
import io.micronaut.context.annotation.Requires;
2220
import io.micronaut.core.annotation.Experimental;
2321
import io.micronaut.core.annotation.NonNull;
22+
import io.micronaut.json.JsonMapper;
2423
import org.slf4j.Logger;
2524
import org.slf4j.LoggerFactory;
2625
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
@@ -38,6 +37,8 @@
3837
import software.amazon.awssdk.services.secretsmanager.model.SecretListEntry;
3938
import software.amazon.awssdk.services.secretsmanager.model.SecretsManagerException;
4039
import jakarta.inject.Singleton;
40+
41+
import java.io.IOException;
4142
import java.util.Base64;
4243
import java.util.HashMap;
4344
import java.util.List;
@@ -58,15 +59,15 @@ public class SecretsManagerKeyValueFetcher implements SecretsKeyValueFetcher {
5859
private static final Logger LOG = LoggerFactory.getLogger(SecretsManagerKeyValueFetcher.class);
5960

6061
protected final SecretsManagerClient secretsClient;
61-
protected final ObjectMapper objectMapper;
62+
protected final JsonMapper objectMapper;
6263

6364
/**
6465
*
6566
* @param secretsClient Secrets Client
6667
* @param objectMapper Object Mapper
6768
*/
6869
public SecretsManagerKeyValueFetcher(SecretsManagerClient secretsClient,
69-
ObjectMapper objectMapper) {
70+
JsonMapper objectMapper) {
7071
this.secretsClient = secretsClient;
7172
this.objectMapper = objectMapper;
7273
}
@@ -124,12 +125,12 @@ public Optional<Map> keyValuesByPrefix(@NonNull String prefix) {
124125
* @param result a map that collects the results
125126
*/
126127
@NonNull
127-
protected void addSecretDetailsToResults(SecretListEntry secret, Map result) {
128+
protected void addSecretDetailsToResults(SecretListEntry secret, Map result) {
128129
Optional<String> secretValueOptional = fetchSecretValue(secretsClient, secret.name());
129130
if (secretValueOptional.isPresent()) {
130131
try {
131132
result.putAll(objectMapper.readValue(secretValueOptional.get(), Map.class));
132-
} catch (JsonProcessingException e) {
133+
} catch (IOException e) {
133134
if (LOG.isWarnEnabled()) {
134135
LOG.warn("could not read secret ({}) value from JSON to Map", secret.name());
135136
}

config/accepted-api-changes.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,20 @@
15591559
"type": "io.micronaut.aws.lambda.events.serde.$KinesisAnalyticsStreamsInputPreprocessingEventSerde$IntrospectionRef3",
15601560
"member": "Implemented interface io.micronaut.core.beans.BeanIntrospectionReference",
15611561
"reason": "Introspection Changes"
1562+
},
1563+
{
1564+
"type": "io.micronaut.aws.secretsmanager.SecretsManagerGroupNameAwareKeyValueFetcher",
1565+
"member": "Constructor io.micronaut.aws.secretsmanager.SecretsManagerGroupNameAwareKeyValueFetcher(software.amazon.awssdk.services.secretsmanager.SecretsManagerClient,com.fasterxml.jackson.databind.ObjectMapper)",
1566+
"reason": "Use JsonMapper instead. It is an experimental class"
1567+
},
1568+
{
1569+
"type": "io.micronaut.aws.secretsmanager.SecretsManagerKeyValueFetcher",
1570+
"member": "Field objectMapper",
1571+
"reason": "Use JsonMapper instead. It is an experimental class"
1572+
},
1573+
{
1574+
"type": "io.micronaut.aws.secretsmanager.SecretsManagerKeyValueFetcher",
1575+
"member": "Constructor io.micronaut.aws.secretsmanager.SecretsManagerKeyValueFetcher(software.amazon.awssdk.services.secretsmanager.SecretsManagerClient,com.fasterxml.jackson.databind.ObjectMapper)",
1576+
"reason": "Use JsonMapper instead. It is an experimental class"
15621577
}
1563-
15641578
]

0 commit comments

Comments
 (0)