Skip to content

CloudMap support for spring aws applications #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 30 commits into from
Closed

CloudMap support for spring aws applications #95

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
eb2355f
Initial commit with cloudmap changes
hariohmprasath Feb 23, 2021
868cc65
Code changes with sample
hariohmprasath Mar 3, 2021
988e322
Code changes with sample code and fixes
hariohmprasath Mar 4, 2021
9a8cabb
Fix to use the existing artifact instead of returning error
hariohmprasath Mar 4, 2021
26226e3
Incorporating code review comments
hariohmprasath Mar 4, 2021
eeb4027
Incorporating code review comments
hariohmprasath Mar 4, 2021
c954ee0
Updated POM dependency for samples
hariohmprasath Mar 4, 2021
91fadef
Incorporating code review comments and adding more java docs, improve…
hariohmprasath Mar 5, 2021
d42734f
Default it to failfast
hariohmprasath Mar 5, 2021
330b5eb
Fixing testcase for default behavior change
hariohmprasath Mar 5, 2021
7740284
Incorporating code review comments
hariohmprasath Mar 9, 2021
7793d05
Fix method name
hariohmprasath Mar 17, 2021
46777f1
Fix for build error
hariohmprasath Mar 17, 2021
76e8d43
Updates to POM file to bump version to 2.3.1-SNAPSHOT
hariohmprasath Mar 17, 2021
5433946
Initial commit with cloudmap changes
hariohmprasath Feb 23, 2021
99d8951
Code changes with sample
hariohmprasath Mar 3, 2021
28c9110
Code changes with sample code and fixes
hariohmprasath Mar 4, 2021
06580db
Fix to use the existing artifact instead of returning error
hariohmprasath Mar 4, 2021
03091f8
Incorporating code review comments
hariohmprasath Mar 4, 2021
1a9c009
Incorporating code review comments
hariohmprasath Mar 4, 2021
f970318
Fix for build error
hariohmprasath Mar 17, 2021
4f07e3c
Incorporating code review comments
hariohmprasath Apr 2, 2021
7939fed
Fixing build failures
hariohmprasath Apr 2, 2021
4339b0a
First draft of Service discovery
hariohmprasath Apr 4, 2022
b34b9fc
Address code review comments and unit tests
hariohmprasath Apr 10, 2022
a492d72
Updates to logger
hariohmprasath Apr 10, 2022
f1fab5b
Checkstyle updates
hariohmprasath Apr 10, 2022
4e20c71
Incorporating code review comments
hariohmprasath Aug 30, 2022
8309f9e
Updates to AWS client and overrides
hariohmprasath Aug 30, 2022
a130ec4
Merge branch 'awspring:2.3.x' into 2.3.x
hariohmprasath Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
<module>spring-cloud-aws-integration-test</module>
<module>docs</module>
<module>spring-cloud-aws-samples</module>
<module>spring-cloud-aws-cloudmap</module>
<module>spring-cloud-starter-aws-cloudmap</module>
</modules>

<dependencyManagement>
Expand Down
2 changes: 2 additions & 0 deletions spring-cloud-aws-autoconfigure/src/main/resources/META-INF/spring.factories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ io.awspring.cloud.autoconfigure.messaging.SnsAutoConfiguration,\
io.awspring.cloud.autoconfigure.jdbc.AmazonRdsDatabaseAutoConfiguration,\
io.awspring.cloud.autoconfigure.metrics.CloudWatchExportAutoConfiguration,\
io.awspring.cloud.autoconfigure.security.CognitoAuthenticationAutoConfiguration
org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be in autoConfigure module if spring-cloud-starter-aws-cloudmap module does autoconfiguration?

org.springframework.cloud.aws.cloudmap.servicediscovery.CloudMapDiscoveryClient
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was not able to see a similar config on spring-cloud-consul. can you point us to it, please?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, this is not required. So I have removed it.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @eddumelendez,
Please find my responses below:

  • starter should only contain a pom & auto-configuration is only managed at spring-cloud-aws-autoconfigure module

I followed spring-cloud-starter-aws-parameter-store-config module implementation to begin with and since we have write a discovery and auto-registration client part of spring-cloud-aws-cloudmap module I am unable to move the autoconfiguration to autoconfigure module.

  • cloudmap module should not have dependency on spring-boot. So far I have identified it depends on ConfigurationProperties

Removed spring-boot dependencies from the module

59 changes: 59 additions & 0 deletions spring-cloud-aws-cloudmap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.awspring.cloud</groupId>
<artifactId>spring-cloud-aws</artifactId>
<version>2.3.1</version>
</parent>

<artifactId>spring-cloud-aws-cloudmap</artifactId>
<name>Spring Cloud Cloud Map</name>
<description>Spring Cloud AWS Cloud Map</description>

<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-servicediscovery</artifactId>
</dependency>

<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-ec2</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>

</dependencies>

</project>
Loading