Add plain text secret support in Secrets Manager integration (#338)

Co-authored-by: Maciej Walkowiak <walkowiak.maciej@yahoo.com>

Author: anthony-foulfoin

spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java

@@ -142,7 +142,7 @@ void outputsDebugLogs(CapturedOutput output) {
 		try (ConfigurableApplicationContext context = runApplication(application,
 				"aws-secretsmanager:/config/spring;/config/second")) {
 			context.getEnvironment().getProperty("message");
-			assertThat(output.getAll()).contains("Populating property retrieved from AWS Parameter Store: message");
+			assertThat(output.getAll()).contains("Populating property retrieved from AWS Secrets Manager: message");
 		}
 	}
 

spring-cloud-aws-secrets-manager/src/main/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySource.java

@@ -15,6 +15,7 @@
  */
 package io.awspring.cloud.secretsmanager;
 
+import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -75,17 +76,22 @@ public Object getProperty(String name) {
 	}
 
 	private void readSecretValue(GetSecretValueRequest secretValueRequest) {
+		GetSecretValueResponse secretValueResponse = source.getSecretValue(secretValueRequest);
 		try {
-			GetSecretValueResponse secretValueResponse = source.getSecretValue(secretValueRequest);
 			Map<String, Object> secretMap = jsonMapper.readValue(secretValueResponse.secretString(),
 					new TypeReference<Map<String, Object>>() {
 					});
 
 			for (Map.Entry<String, Object> secretEntry : secretMap.entrySet()) {
-				LOG.debug("Populating property retrieved from AWS Parameter Store: " + secretEntry.getKey());
+				LOG.debug("Populating property retrieved from AWS Secrets Manager: " + secretEntry.getKey());
 				properties.put(secretEntry.getKey(), secretEntry.getValue());
 			}
 		}
+		catch (JsonParseException e) {
+			// If the secret is not a JSON string, then it is a simple "plain text" string
+			LOG.debug("Populating property retrieved from AWS Secrets Manager: " + secretValueResponse.name());
+			properties.put(secretValueResponse.name(), secretValueResponse.secretString());
+		}
 		catch (JsonProcessingException e) {
 			throw new RuntimeException(e);
 		}

spring-cloud-aws-secrets-manager/src/test/java/io/awspring/cloud/secretsmanager/SecretsManagerPropertySourceTest.java

@@ -52,6 +52,19 @@ void shouldParseSecretValue() {
 		assertThat(propertySource.getProperty("key2")).isEqualTo("value2");
 	}
 
+	@Test
+	void shouldParsePlainTextSecretValue() {
+		GetSecretValueResponse secretValueResult = GetSecretValueResponse.builder().secretString("my secret")
+				.name("secret name").build();
+
+		when(client.getSecretValue(any(GetSecretValueRequest.class))).thenReturn(secretValueResult);
+
+		propertySource.init();
+
+		assertThat(propertySource.getPropertyNames()).containsExactly("secret name");
+		assertThat(propertySource.getProperty("secret name")).isEqualTo("my secret");
+	}
+
 	@Test
 	void throwsExceptionWhenSecretNotFound() {
 		when(client.getSecretValue(any(GetSecretValueRequest.class)))