Feature/AppConfig as PropertySource #652

jarpz · 2020-09-07T19:31:29Z

Enable to use of AppConfig as PropertySource supporting Yaml & Json content-types.

Fix AwsSecretsManagerProperties.prefix javadoc

…S can use to create read replicas. Closes spring-atticgh-458

Closes spring-atticgh-558

Fixes spring-atticgh-503

Fixes spring-atticgh-355 Closes spring-atticgh-544

…bab case to enable Spring Boot relaxed binding. Fixes spring-atticgh-406 Closes spring-atticgh-407

Fixes spring-atticgh-406 Closes spring-atticgh-536

Fixes spring-atticgh-389 Closes spring-atticgh-424

Fixes spring-atticgh-349 Closes spring-atticgh-425

Fixes spring-atticgh-553 Fixes spring-atticgh-120 Closes spring-atticgh-559 Closes spring-atticgh-560

Closes spring-atticgh-529 Fixes spring-atticgh-509 Fixes spring-atticgh-527 Co-authored-by: Maciej Walkowiak <walkowiak.maciej@yahoo.com>

… on application startup. Fixes spring-atticgh-556

Fixes spring-atticgh-519 Closes spring-atticgh-561

Fixes spring-atticgh-482

Fixes spring-atticgh-483 Closes spring-atticgh-562

…istener. This commit fixes this issue by delegating exception processing to AbstractMethodMessageHandler only when there is a configured handler. If there is none, exception is logged. Fixes spring-atticgh-394 Closes spring-atticgh-465 Co-authored-by: Maciej Walkowiak <walkowiak.maciej@yahoo.com>

…pertySourceLocator. Fixes spring-atticgh-472 Closes spring-atticgh-473

Spring Boot 2.4 has moved from providing automatic support for JUnit 4. For now we must declare it explicitly and in the future migrate to JUnit 5.

Fixes spring-atticgh-470

Fixes spring-atticgh-402

Fixes spring-atticgh-361 Closes spring-atticgh-565

…ned off. Fixes spring-atticgh-496

Fixes spring-atticgh-567 Closes spring-atticgh-575

jarpz · 2020-09-15T21:36:25Z

just in case there is no need to create another PR. Make sure your new local branch is base on 2.3.x and before to push --force change the base brach in this PR to 2.3.x too

eddumelendez

@jarpz thank you! looks amazing! it is almost done :)

spring-cloud-aws-appconfig/pom.xml

...pringframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigBootstrapConfigurationTest.java

eddumelendez

add few comments in order to improve the code. Also, spring.cloud.aws.appconfig.enabled should be added in spring-cloud-aws-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json. You can take a look into #682

eddumelendez · 2020-09-22T04:32:47Z

spring-cloud-aws-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -9,4 +9,5 @@ org.springframework.cloud.aws.autoconfigure.cache.ElastiCacheAutoConfiguration,\
 org.springframework.cloud.aws.autoconfigure.messaging.SqsAutoConfiguration,\
 org.springframework.cloud.aws.autoconfigure.messaging.SnsAutoConfiguration,\
 org.springframework.cloud.aws.autoconfigure.jdbc.AmazonRdsDatabaseAutoConfiguration,\
-org.springframework.cloud.aws.autoconfigure.metrics.CloudWatchExportAutoConfiguration
+org.springframework.cloud.aws.autoconfigure.metrics.CloudWatchExportAutoConfiguration,\
+org.springframework.cloud.aws.autoconfigure.appconfig.AwsAppConfigBootstrapConfiguration


this one should be in another property

org.springframework.cloud.bootstrap.BootstrapConfiguration=\ org.springframework.cloud.aws.autoconfigure.appconfig.AwsAppConfigBootstrapConfiguration

eddumelendez · 2020-09-22T04:34:31Z

...t/java/org/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigPropertiesTest.java

+		assertThat(errors.getAllErrors()).isEmpty();
+	}
+
+	private static class AwsAppConfigPropertiesBuilder {


builder is not needed, objects can be created inside of invalidProperties

eddumelendez · 2020-09-22T04:36:16Z

...pringframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigBootstrapConfigurationTest.java

+			"aws.appconfig.environment=dev" };
+
+	@Test
+	void testWithStaticRegion() {


should be like this

@Test void testWithStaticRegion() { this.contextRunner .withPropertyValues("spring.cloud.aws.parameterstore.region:us-east-1") .run(context -> { AWSSimpleSystemsManagementClient client = context .getBean(AWSSimpleSystemsManagementClient.class); Object region = ReflectionTestUtils.getField(client, "signingRegion"); assertThat(region).isEqualTo("us-east-1"); }); }

eddumelendez · 2020-09-22T04:37:32Z

...rg/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigBootstrapConfiguration.java

+@ConditionalOnClass({ AmazonAppConfigAsync.class,
+		AwsAppConfigPropertySourceLocator.class })
+@ConditionalOnProperty(prefix = "aws.appconfig", name = "enabled", matchIfMissing = true)
+public class AwsAppConfigBootstrapConfiguration {


Let's add a constructor, similar to this one

public AwsParameterStoreBootstrapConfiguration(ParameterStoreProperties properties, ObjectProvider<RegionProvider> regionProvider) { this.regionProvider = properties.getRegion() == null ? regionProvider.getIfAvailable() : new StaticRegionProvider(properties.getRegion()); this.properties = properties; }

eddumelendez · 2020-09-22T04:38:46Z

...rg/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigBootstrapConfiguration.java

+
+	@Bean
+	@ConditionalOnMissingBean
+	public AmazonAppConfig appConfigClient(


client should look like this

@Bean @ConditionalOnMissingBean public AmazonWebserviceClientFactoryBean<AWSSimpleSystemsManagementClient> ssmClient() { return new AmazonWebserviceClientFactoryBean<>( AWSSimpleSystemsManagementClient.class, null, this.regionProvider); }

eddumelendez · 2020-09-22T04:38:58Z

.../main/java/org/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigProperties.java

+	/**
+	 * Configuration prefix.
+	 */
+	public static final String CONFIG_PREFIX = "aws.appconfig";


let's remove this

eddumelendez · 2020-09-22T04:39:37Z

.../main/java/org/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigProperties.java

+/**
+ * @author jarpz
+ */
+@ConfigurationProperties(AwsAppConfigProperties.CONFIG_PREFIX)


@ConfigurationProperties(prefix = "spring.cloud.aws.appconfig")

eddumelendez · 2020-09-22T04:40:12Z

...rg/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigBootstrapConfiguration.java

+@EnableConfigurationProperties(AwsAppConfigProperties.class)
+@ConditionalOnClass({ AmazonAppConfigAsync.class,
+		AwsAppConfigPropertySourceLocator.class })
+@ConditionalOnProperty(prefix = "aws.appconfig", name = "enabled", matchIfMissing = true)


@ConditionalOnProperty(prefix = ""spring.cloud.aws.appconfig"", name = "enabled", matchIfMissing = true)

… change spring.factories BootstrapConfiguration + improve tests

jarpz · 2020-10-04T14:06:35Z

add few comments in order to improve the code. Also, spring.cloud.aws.appconfig.enabled should be added in spring-cloud-aws-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json. You can take a look into #682

Hi @eddumelendez , I applied last comments you made. Have you seen them?

eddumelendez · 2020-10-19T04:28:23Z

@jarpz sorry for the delay and thanks for your patience. The code looks good to me but unfortunately we are still figuring out few things. there are also some prs in progress for new modules related to parameter store and secrets manager and since this is a new one we want to make it right.

The issue is this

jarpz · 2020-10-19T17:04:16Z

@jarpz sorry for the delay and thanks for your patience. The code looks good to me but unfortunately we are still figuring out few things. there are also some prs in progress for new modules related to parameter store and secrets manager and since this is a new one we want to make it right.

The issue is this

I understand. It's ok.

Anything else can I help with?

Regards

eddumelendez · 2020-11-25T04:59:49Z

I would like to see this one for 2.3 since it has many sources such as s3, ssm document, ssm parameter. The only missing part is adding the support for the new Config Data API with prefix aws-appconfig: from spring-boot 2.4 which is already in progress for Parameter Store #723 and Secrets Manager #721. I can work on this the next days because @jarpz has already done many things already fixing all the comments submitted previously. We can add the module as an experimental module. @maciejwalkowiak wdyt?

eddumelendez

just left questions to understand more now that I have read some docs. Changes are not needed.

eddumelendez · 2020-11-25T07:58:15Z

.../main/java/org/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigProperties.java

+@ConfigurationProperties(prefix = "spring.cloud.aws.appconfig")
+public class AwsAppConfigProperties implements Validator {
+
+	private String accountId;


this is the client-id right? By reading the docs this would be each instance? Saying that because says unique. So, if I have two VMs then client-id for one should be my-app-1 and the other one my-app-2. Is that right @jarpz ?

I don't think so it would be like that but let me know if I am wrong. I think that here we should use the spring.application.name or application

Hi, well accountId do reference to the was account subscription id, this value es required by aws-sdk. The "application" you means yes is "configurationProfile", We could have 2 VM with same accountId and differents "configurationProfile" names which make reference by the spring.application.name

If you check the class: AwsAppConfigPropertySourceLocator we check for null configurationProfile and use spring.application.name in that case

I found this example and it is using random uuid https://github.com/aws-samples/aws-appconfig-java-sample/blob/main/src/main/java/com/amazonaws/samples/appconfig/movies/MoviesController.java#L65

Sorry, I misunderstand.. "clientId" could be any value.. You are right- but is a required field. I'm gonna to change it

Sorry, you are right.. we can use a random value for "clientId".. but is required, I'm gonna change it

eddumelendez · 2020-11-25T07:59:33Z

.../main/java/org/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigProperties.java

+
+	private String accountId;
+
+	private String application;


this can be by default the spring.application.name or if the previous one is not defined just application

eddumelendez · 2020-11-25T08:00:01Z

.../main/java/org/springframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigProperties.java

+
+	private String environment;
+
+	private String configurationProfile;


this is not using in the request to the api, why do we need it?

to create the GetConfigurationRequest we use:

new GetConfigurationRequest() .withClientId(accountId) // aws client Id is required.. we can use a random value .withApplication(application) // appConfig ApplicationName .withConfiguration(name) // configurationProfile or "spring.application.name" when is null * .withClientConfigurationVersion(configurationVersion) //last version if null .withEnvironment(environment); //environment

I tried to use the same names which aws app-config use.

Regards

…dom clientId + use first profile name as environment if it is null

cmboult · 2021-11-05T15:36:36Z

Hi, any idea on when this will get released? Have been waiting for something like this for a while!

…to feature/app-config

khanhcd92 · 2021-12-16T19:37:34Z

Hi, this will get released? Have been waiting for something like this for a while!

sixcorners and others added 30 commits August 20, 2019 10:56

Fix AwsSecretsManagerProperties.prefix javadoc

a6e7c73

Bumping versions

d52dae1

Bumping versions

33e1535

Updated docs

328b130

Merge branch '2.2.x'

9294f1c

Bumps versions to 3.0.0-SNAPHOT

5ac4cdb

Merge pull request spring-attic#484 from sixcorners/patch-1

6d84666

Fix AwsSecretsManagerProperties.prefix javadoc

Update of documentation regarding supported DB engines that Amazon RD…

e540b7c

…S can use to create read replicas. Closes spring-atticgh-458

Fix "Sending a message" reference documentation code samples.

37b1251

Closes spring-atticgh-558

Fixes SNS auto configuration when Spring WebMvc is not on the classpath.

c935e72

Fixes spring-atticgh-503

Remove the misleading property in documentation of spring-cloud-aws-rds.

5f5d8bc

Fixes spring-atticgh-355 Closes spring-atticgh-544

Rename config properties in ContextCredentialsAutoConfiguration to ke…

e805878

…bab case to enable Spring Boot relaxed binding. Fixes spring-atticgh-406 Closes spring-atticgh-407

Add tests for relaxed binding support in "cloud.aws.credentials".

4c11014

Fixes spring-atticgh-406 Closes spring-atticgh-536

Allow ConditionalOnAwsCloudEnvironment to be used on method level.

6e3f32d

Fixes spring-atticgh-389 Closes spring-atticgh-424

Set CloudWatchProperties default batch size to API max.

e72a3d2

Fixes spring-atticgh-349 Closes spring-atticgh-425

Add option to use default AWS region provider chain.

159200b

Fixes spring-atticgh-553 Fixes spring-atticgh-120 Closes spring-atticgh-559 Closes spring-atticgh-560

Add logging to AWSParameterStorePropertySource.

f6100dd

Closes spring-atticgh-529 Fixes spring-atticgh-509 Fixes spring-atticgh-527 Co-authored-by: Maciej Walkowiak <walkowiak.maciej@yahoo.com>

Update documentation on how to hide warning message logged by AWS SDK…

6da9925

… on application startup. Fixes spring-atticgh-556

Fix typo in the exception text

8caf811

Fixes spring-atticgh-519 Closes spring-atticgh-561

Bump AWS Java SDK dependency version to 1.11.792.

7a052a5

Fixes spring-atticgh-482

Update reference documentation on how to upgrade AWS SDK dependency.

f2ab807

Fix S3 object key encoding in SimpleStorageResource.getURL.

58e636d

Fixes spring-atticgh-483 Closes spring-atticgh-562

Allow to specify PropertySource name returned by AwsSecretsManagerPro…

76df24c

…pertySourceLocator. Fixes spring-atticgh-472 Closes spring-atticgh-473

Add a dependency to JUnit 4.

eb4d65a

Spring Boot 2.4 has moved from providing automatic support for JUnit 4. For now we must declare it explicitly and in the future migrate to JUnit 5.

Document default credentials chain for auto-configuration.

f61178d

Fixes spring-atticgh-470

Add CloudWatch integration documentation to the reference.

211990c

Fixes spring-atticgh-402

Add a method to get S3 URI from a SimpleStorageResource.

2a59abf

Fixes spring-atticgh-361 Closes spring-atticgh-565

Fix StackResourceRegistry creation when CloudFormation support is tur…

647375b

…ned off. Fixes spring-atticgh-496

Drop XML support in all modules and integration tests.

38c7e6a

Fixes spring-atticgh-567 Closes spring-atticgh-575

jarpz closed this Sep 15, 2020

jarpz reopened this Sep 15, 2020

eddumelendez reviewed Sep 15, 2020

View reviewed changes

spring-cloud-aws-appconfig/pom.xml Outdated Show resolved Hide resolved

spring-cloud-aws-appconfig/pom.xml Outdated Show resolved Hide resolved

...pringframework/cloud/aws/autoconfigure/appconfig/AwsAppConfigBootstrapConfigurationTest.java Outdated Show resolved Hide resolved

jarpz added 2 commits September 16, 2020 11:45

feat(aws-appconfig): remove unused dependencies

ebd950e

test(aws-appconfig): change tests to use ApplicationContextRunner

c373eec

jarpz requested a review from maciejwalkowiak as a code owner September 17, 2020 00:39

eddumelendez added this to the 2.3 milestone Sep 22, 2020

eddumelendez suggested changes Sep 22, 2020

View reviewed changes

jarpz added 2 commits September 22, 2020 17:01

feat(aws-appconfig): change properties prefix to spring.cloud.aws.* +…

fd58ab1

… change spring.factories BootstrapConfiguration + improve tests

feat(aws-appconfig): use assert when appName is empty or null

2cbf279

jarpz requested a review from eddumelendez September 29, 2020 16:04

maciejwalkowiak modified the milestones: 2.3, 2.4 Nov 25, 2020

eddumelendez reviewed Nov 25, 2020

View reviewed changes

feat(aws-appconfig): rename accountId as clientId + allow default ran…

33d96f5

…dom clientId + use first profile name as environment if it is null

jarpz added 2 commits November 5, 2021 11:44

Merge branch 'master' of https://github.com/jarpz/spring-cloud-aws in…

b2cad8d

…to feature/app-config

feat: Align code with master branch & fix code style

e3cfc4d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/AppConfig as PropertySource #652

Feature/AppConfig as PropertySource #652

jarpz commented Sep 7, 2020

jarpz commented Sep 15, 2020

eddumelendez left a comment

eddumelendez left a comment

eddumelendez Sep 22, 2020

eddumelendez Sep 22, 2020

eddumelendez Sep 22, 2020

eddumelendez Sep 22, 2020

eddumelendez Sep 22, 2020

eddumelendez Sep 22, 2020

eddumelendez Sep 22, 2020

eddumelendez Sep 22, 2020

jarpz commented Oct 4, 2020

eddumelendez commented Oct 19, 2020

jarpz commented Oct 19, 2020

eddumelendez commented Nov 25, 2020

eddumelendez left a comment

eddumelendez Nov 25, 2020 •

edited

Loading

jarpz Nov 26, 2020

eddumelendez Nov 26, 2020

jarpz Nov 30, 2020

jarpz Nov 30, 2020 •

edited

Loading

eddumelendez Nov 25, 2020

eddumelendez Nov 25, 2020

jarpz Nov 26, 2020 •

edited

Loading

cmboult commented Nov 5, 2021

khanhcd92 commented Dec 16, 2021


		private String environment;

		private String configurationProfile;

Feature/AppConfig as PropertySource #652

Are you sure you want to change the base?

Feature/AppConfig as PropertySource #652

Conversation

jarpz commented Sep 7, 2020

jarpz commented Sep 15, 2020

eddumelendez left a comment

Choose a reason for hiding this comment

eddumelendez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jarpz commented Oct 4, 2020

eddumelendez commented Oct 19, 2020

jarpz commented Oct 19, 2020

eddumelendez commented Nov 25, 2020

eddumelendez left a comment

Choose a reason for hiding this comment

eddumelendez Nov 25, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jarpz Nov 30, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jarpz Nov 26, 2020 • edited Loading

Choose a reason for hiding this comment

cmboult commented Nov 5, 2021

khanhcd92 commented Dec 16, 2021

eddumelendez Nov 25, 2020 •

edited

Loading

jarpz Nov 30, 2020 •

edited

Loading

jarpz Nov 26, 2020 •

edited

Loading