spring-attic · jarpz · Aug 20, 2019 · Jan 20, 2020 · Jan 21, 2020 · Apr 1, 2020
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -22,10 +22,10 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-aws</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-aws-docs</artifactId>
-	<packaging>pom</packaging>
+	<packaging>jar</packaging>
 	<name>Spring Cloud AWS Docs</name>
 	<description>Spring Cloud AWS Docs</description>
 	<properties>
@@ -86,6 +86,10 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+					</plugin>
 					<plugin>
 						<artifactId>maven-deploy-plugin</artifactId>
 					</plugin>

diff --git a/pom.xml b/pom.xml
@@ -22,12 +22,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.2.BUILD-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/><!-- lookup parent from repository -->
 	</parent>
 
 	<artifactId>spring-cloud-aws</artifactId>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud AWS</name>
 	<description>Spring Cloud AWS</description>
@@ -59,11 +59,13 @@
 		<module>spring-cloud-aws-messaging</module>
 		<module>spring-cloud-aws-autoconfigure</module>
 		<module>spring-cloud-aws-parameter-store-config</module>
+		<module>spring-cloud-aws-appconfig</module>
 		<module>spring-cloud-aws-secrets-manager-config</module>
 		<module>spring-cloud-starter-aws</module>
 		<module>spring-cloud-starter-aws-jdbc</module>
 		<module>spring-cloud-starter-aws-messaging</module>
 		<module>spring-cloud-starter-aws-parameter-store-config</module>
+		<module>spring-cloud-starter-aws-appconfig</module>
 		<module>spring-cloud-starter-aws-secrets-manager-config</module>
 		<module>spring-cloud-aws-integration-test</module>
 		<module>docs</module>

diff --git a/spring-cloud-aws-appconfig/pom.xml b/spring-cloud-aws-appconfig/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013-2020 the original author or authors.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-aws</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>spring-cloud-aws-appconfig</artifactId>
+
+	<name>Spring Cloud AWS AppConfig Configuration</name>
+	<description>Spring Cloud AWS AppConfig Configuration</description>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-context</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-java-sdk-appconfig</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/...fig/src/main/java/org/springframework/cloud/aws/appconfig/AwsAppConfigPropertySource.java b/...fig/src/main/java/org/springframework/cloud/aws/appconfig/AwsAppConfigPropertySource.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.aws.appconfig;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Set;
+
+import com.amazonaws.services.appconfig.AmazonAppConfig;
+import com.amazonaws.services.appconfig.model.GetConfigurationRequest;
+import com.amazonaws.services.appconfig.model.GetConfigurationResult;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * @author jarpz
+ */
+public class AwsAppConfigPropertySource extends EnumerablePropertySource<AmazonAppConfig> {
+
+	private static final String SUPPORTED_TYPE_JSON = "application/json";
+
+	private static final String SUPPORTED_TYPE_YAML = "application/x-yaml";
+
+	private final String clientId;
+
+	private final String application;
+
+	private final String configurationVersion;
+
+	private final String environment;
+
+	private Properties properties;
+
+	public AwsAppConfigPropertySource(String name, String clientId, String application, String environment,
+			String configurationVersion, AmazonAppConfig appConfigClient) {
+		super(name, appConfigClient);
+		this.clientId = clientId;
+		this.application = application;
+		this.configurationVersion = configurationVersion;
+		this.environment = environment;
+	}
+
+	public void init() {
+		GetConfigurationRequest request = new GetConfigurationRequest().withClientId(clientId)
+				.withApplication(application).withConfiguration(name)
+				.withClientConfigurationVersion(configurationVersion).withEnvironment(environment);
+
+		getAppConfig(request);
+	}
+
+	@Override
+	public String[] getPropertyNames() {
+		Set<String> strings = properties.stringPropertyNames();
+		return strings.toArray(new String[0]);
+	}
+
+	@Override
+	public Object getProperty(String name) {
+		return properties.get(name);
+	}
+
+	private void getAppConfig(GetConfigurationRequest request) {
+		GetConfigurationResult result = this.source.getConfiguration(request);
+
+		logger.trace(String.format("loading file: %s/%s/%s/%s", application, name, environment,
+				result.getConfigurationVersion()));
+
+		switch (result.getContentType()) {
+		case SUPPORTED_TYPE_YAML:
+			processYamlContent(result.getContent());
+			break;
+		case SUPPORTED_TYPE_JSON:
+			processJsonContent(result.getContent());
+			break;
+		default:
+			throw new IllegalStateException(String.format("Unsupported content type: %s", result.getContentType()));
+		}
+	}
+
+	private void processYamlContent(ByteBuffer byteBuffer) {
+		YamlPropertiesFactoryBean bean = new YamlPropertiesFactoryBean();
+
+		bean.setResources(new ByteArrayResource(byteBuffer.array()));
+
+		properties = bean.getObject();
+	}
+
+	private void processJsonContent(ByteBuffer byteBuffer) {
+		try {
+			Map<String, Object> map = new ObjectMapper().readValue(byteBuffer.array(),
+					new TypeReference<Map<String, Object>>() {
+					});
+
+			Map<String, Object> result = new LinkedHashMap<>();
+			this.flatten(null, result, map);
+
+			properties = new Properties();
+			properties.putAll(result);
+		}
+		catch (IOException ex) {
+			ReflectionUtils.rethrowRuntimeException(ex);
+		}
+	}
+
+	/**
+	 * flatten json structure.
+	 */
+	private void flatten(String prefix, Map<String, Object> result, Map<String, Object> map) {
+		String namePrefix = Objects.nonNull(prefix) ? prefix + "." : "";
+
+		map.forEach((key, value) -> this.extract(namePrefix + key, result, value));
+	}
+
+	private void extract(String name, Map<String, Object> result, Object value) {
+		if (value instanceof Map) {
+			this.flatten(name, result, (Map) value);
+		}
+		else if (value instanceof Collection) {
+			int index = 0;
+
+			for (Iterator it = ((Collection) value).iterator(); it.hasNext(); ++index) {
+				Object object = it.next();
+				this.extract(name + "[" + index + "]", result, object);
+			}
+		}
+		else {
+			result.put(name, value);
+		}
+	}
+
+}
diff --git a/.../main/java/org/springframework/cloud/aws/appconfig/AwsAppConfigPropertySourceLocator.java b/.../main/java/org/springframework/cloud/aws/appconfig/AwsAppConfigPropertySourceLocator.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2013-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.aws.appconfig;
+
+import java.util.Arrays;
+
+import com.amazonaws.services.appconfig.AmazonAppConfig;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
+import org.springframework.core.env.CompositePropertySource;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.PropertySource;
+import org.springframework.util.ReflectionUtils;
+
+import static java.util.Objects.isNull;
+import static org.springframework.util.Assert.hasText;
+
+/**
+ * @author jarpz
+ */
+public class AwsAppConfigPropertySourceLocator implements PropertySourceLocator {
+
+	private final AmazonAppConfig appConfigClient;
+
+	private final String clientId;
+
+	private final String application;
+
+	private final String configurationProfile;
+
+	private final String environment;
+
+	private final String configurationVersion;
+
+	private final boolean failFast;
+
+	private static final Log logger = LogFactory.getLog(AwsAppConfigPropertySourceLocator.class);
+
+	public AwsAppConfigPropertySourceLocator(AmazonAppConfig appConfigClient, String clientId, String application,
+			String configurationProfile, String environment, String configurationVersion, boolean failFast) {
+		this.appConfigClient = appConfigClient;
+		this.clientId = clientId;
+		this.application = application;
+		this.configurationProfile = configurationProfile;
+		this.environment = environment;
+		this.configurationVersion = configurationVersion;
+		this.failFast = failFast;
+	}
+
+	@Override
+	public PropertySource<?> locate(Environment environment) {
+		if (!(environment instanceof ConfigurableEnvironment)) {
+			return null;
+		}
+
+		ConfigurableEnvironment env = (ConfigurableEnvironment) environment;
+
+		String appName = configurationProfile;
+		if (isNull(appName)) {
+			appName = env.getProperty("spring.application.name");
+		}
+		String profile = this.environment;
+		if (isNull(profile)) {
+			profile = Arrays.stream(env.getActiveProfiles()).findFirst().orElse("default");
+		}
+
+		hasText(appName, "configurationProfile or spring.application.name should not be empty or null.");
+		hasText(profile, "environment or profiles should not be empty or null ");
+
+		CompositePropertySource composite = new CompositePropertySource("aws-app-config");
+
+		try {
+			composite.addPropertySource(create(appName, profile));
+		}
+		catch (Exception ex) {
+			if (failFast) {
+				logger.error("Fail fast is set and there was an error reading configuration from AWS AppConfig: {}",
+						ex);
+				ReflectionUtils.rethrowRuntimeException(ex);
+			}
+			else {
+				logger.warn("Unable to load AWS AppConfig from " + appName, ex);
+			}
+		}
+
+		return composite;
+	}
+
+	private AwsAppConfigPropertySource create(String appName, String profile) {
+		AwsAppConfigPropertySource propertySource = new AwsAppConfigPropertySource(appName, clientId, application,
+				profile, configurationVersion, appConfigClient);
+		propertySource.init();
+
+		return propertySource;
+	}
+
+}