Keeping the existing values in the secret. Just updating an existing key

Signed-off-by: Santhosh Gandhe <[email protected]>
opensearch-project · Jan 14, 2025 · a384d85 · a384d85
1 parent 4df4fba
commit a384d85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/...n/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsSecretManagerConfiguration.java b/...n/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsSecretManagerConfiguration.java
@@ -79,11 +79,10 @@ public GetSecretValueRequest createGetSecretValueRequest() {
                 .build();
     }
 
-    public PutSecretValueRequest putSecretValueRequest(String keyToUpdate, Object newValue) {
-        String updatedSecretString = String.format("{\"%s\": \"%s\"}", keyToUpdate, newValue);
+    public PutSecretValueRequest putSecretValueRequest(String secretKeyValueMapAsString) {
         return PutSecretValueRequest.builder()
                 .secretId(awsSecretId)
-                .secretString(updatedSecretString)
+                .secretString(secretKeyValueMapAsString)
                 .build();
     }
 

diff --git a/...s/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsSecretsSupplier.java b/...s/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsSecretsSupplier.java
@@ -131,9 +131,12 @@ private Object retrieveSecretsFromSecretManager(final AwsSecretManagerConfigurat
 
     @Override
     public String updateValue(String secretId, String keyToUpdate, Object newValue) {
+        final Map<String, Object> keyValuePairs = (Map<String, Object>) secretIdToValue.get(secretId);
+        keyValuePairs.put(keyToUpdate, newValue);
+        String secretKeyValueMapAsString = (String) retrieveValue(secretId);
         AwsSecretManagerConfiguration awsSecretManagerConfiguration = awsSecretManagerConfigurationMap.get(secretId);
         PutSecretValueRequest putSecretValueRequest =
-                awsSecretManagerConfiguration.putSecretValueRequest(keyToUpdate, newValue);
+                awsSecretManagerConfiguration.putSecretValueRequest(secretKeyValueMapAsString);
         SecretsManagerClient secretsManagerClient = secretsManagerClientMap.get(secretId);
 
         try {

diff --git a/...c/test/java/org/opensearch/dataprepper/plugins/aws/AwsSecretManagerConfigurationTest.java b/...c/test/java/org/opensearch/dataprepper/plugins/aws/AwsSecretManagerConfigurationTest.java
@@ -151,7 +151,7 @@ void testCreatePutSecretValueRequest() throws IOException {
                      mockStatic(PutSecretValueRequest.class)) {
             putSecretValueRequestMockedStatic.when(PutSecretValueRequest::builder).thenReturn(
                     putSecretValueRequestBuilder);
-            assertThat(awsSecretManagerConfiguration.putSecretValueRequest("keyToUpdate", "newValue"), is(putSecretValueRequest));
+            assertThat(awsSecretManagerConfiguration.putSecretValueRequest("{\"keyToUpdate\", \"newValue\"}"), is(putSecretValueRequest));
         }
         verify(putSecretValueRequestBuilder).secretId("test-secret");
     }

diff --git a/...s-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsSecretsSupplierTest.java b/...s-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsSecretsSupplierTest.java
@@ -175,7 +175,7 @@ void testRefreshSecretsWithoutKey() {
 
     @Test
     void testUpdateValue() {
-        when(awsSecretManagerConfiguration.putSecretValueRequest(any(), any())).thenReturn(putSecretValueRequest);
+        when(awsSecretManagerConfiguration.putSecretValueRequest(any())).thenReturn(putSecretValueRequest);
         when(secretsManagerClient.putSecretValue(eq(putSecretValueRequest))).thenReturn(putSecretValueResponse);
         final String testValue = "{\"key\":\"oldValue\"}";
         when(secretValueDecoder.decode(eq(getSecretValueResponse))).thenReturn(testValue);
@@ -188,7 +188,7 @@ void testUpdateValue() {
 
     @Test
     void testUpdateValueFailed() {
-        when(awsSecretManagerConfiguration.putSecretValueRequest(any(), any())).thenReturn(putSecretValueRequest);
+        when(awsSecretManagerConfiguration.putSecretValueRequest(any())).thenReturn(putSecretValueRequest);
         when(secretsManagerClient.putSecretValue(eq(putSecretValueRequest))).thenReturn(putSecretValueResponse);
         final String testValue = "{\"key\":\"oldValue\"}";
         when(secretValueDecoder.decode(eq(getSecretValueResponse))).thenReturn(testValue);