Introduce Localstack tests

awspring · Nov 13, 2023 · 80b6486 · 80b6486
1 parent 53445ca
commit 80b6486
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 111 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 		<spotless.version>2.31.0</spotless.version>
 		<jacoco.version>0.8.8</jacoco.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-		<testcontainers.version>1.18.0</testcontainers.version>
+		<testcontainers.version>1.19.1</testcontainers.version>
 	</properties>
 
 	<modules>

diff --git a/...oud-aws-app-config/src/main/java/io/awspring/cloud/appconfig/AppConfigPropertySource.java b/...oud-aws-app-config/src/main/java/io/awspring/cloud/appconfig/AppConfigPropertySource.java
@@ -41,6 +41,7 @@ public class AppConfigPropertySource extends AwsPropertySource<AppConfigProperty
 	private static final Log LOG = LogFactory.getLog(AppConfigPropertySource.class);
 
 	private static final String YAML_TYPE = "application/x-yaml";
+	private static final String YAML_TYPE_ALTERNATIVE = "text/yaml";
 	private static final String TEXT_TYPE = "text/plain";
 	private static final String JSON_TYPE = "application/json";
 
@@ -70,7 +71,7 @@ public void init() {
 		if (sessionToken == null) {
 			StartConfigurationSessionRequest sessionRequest = StartConfigurationSessionRequest.builder()
 					.environmentIdentifier(this.environmentIdentifier).applicationIdentifier(this.applicationIdentifier)
-					.configurationProfileIdentifier(this.configurationProfileIdentifier).build();
+					.configurationProfileIdentifier(this.configurationProfileIdentifier).requiredMinimumPollIntervalInSeconds(1000).build();
 			StartConfigurationSessionResponse response = this.source.startConfigurationSession(sessionRequest);
 			sessionToken = response.initialConfigurationToken();
 		}
@@ -103,7 +104,7 @@ public Object getProperty(String name) {
 	}
 
 	private void getParameters(GetLatestConfigurationResponse response) throws IOException {
-		if (response.contentType().equals(YAML_TYPE) || response.contentType().equals(JSON_TYPE)) {
+		if (response.contentType().equals(YAML_TYPE) || response.contentType().equals(YAML_TYPE_ALTERNATIVE) || response.contentType().equals(JSON_TYPE)) {
 			resolveYamlOrJson(response);
 		}
 		else if (response.contentType().equals(TEXT_TYPE)) {

diff --git a/spring-cloud-aws-autoconfigure/pom.xml b/spring-cloud-aws-autoconfigure/pom.xml
@@ -130,6 +130,11 @@
 			<artifactId>localstack</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>software.amazon.awssdk</groupId>
+			<artifactId>appconfig</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>junit-jupiter</artifactId>