Skip to content
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

Jump to bottom

Add support for spring.config.import with S3 backend #849

Merged
merged 22 commits into from
Dec 9, 2024
Merged

Add support for spring.config.import with S3 backend #849

merged 22 commits into from
Dec 9, 2024

Conversation

kunalvarpe
Copy link
Contributor

@kunalvarpe kunalvarpe commented Jul 17, 2023 •
edited by maciejwalkowiak
Loading

📢 Type of change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring

📜 Description

Added supported classes for config import which is done is AWS parameter source or secret-manager modules

Fixes #161

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

  • I reviewed submitted code
  • I added tests to verify changes
  • I updated reference documentation to reflect the change
  • All tests passing
  • No breaking changes

🔮 Next steps

Note: The PR is still in progress state, need more discussions to procceed further.

@github-actions github-actions bot added the component: s3 S3 integration related issue label Jul 17, 2023
@kunalvarpe kunalvarpe mentioned this pull request Jul 17, 2023
Closed
@MatejNedic
Copy link
Member

Hey @kunalvarpe , thanks for PR.
I had a quick glance. This is only for using S3 Bucket as storage for configuration correct?
Maybe we should think about extending it to download files and store them in resources (or provided by properties).
@maciejwalkowiak what do you think?

@kunalvarpe
Copy link
Contributor Author

kunalvarpe commented Jul 18, 2023 •
edited
Loading

This is only for using S3 Bucket as storage for configuration correct?

Yes, exactly the earlier scope of the ticket was to support the s3 backend. But in later discussion on issue we thought of it should be streamline with spring.config.import. So below things are yet to be explore.

  • S3 backend with support for respecting profiles.
  • spring.config.import with file systems

Here I will need some help understanding and finalising the scope for development of this ticket.

@MatejNedic MatejNedic self-assigned this Oct 19, 2023
@MatejNedic MatejNedic added the status: team-discussion Team has to figure out how to proceed label Nov 1, 2023
@MatejNedic
Copy link
Member

Hey @kunalvarpe thanks on great work, I introduced some refactor since we changed underlying classes.
This will be target for new Spring Cloud AWS release!

@github-actions github-actions bot added the type: dependency-upgrade Dependency version bump label Mar 14, 2024
maciejwalkowiak
maciejwalkowiak requested changes Mar 14, 2024
View reviewed changes
...utoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLoader.java Outdated Show resolved Hide resolved
...re/src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLocationResolver.java Outdated Show resolved Hide resolved
...re/src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLocationResolver.java Outdated Show resolved Hide resolved
...autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3PropertySources.java Outdated Show resolved Hide resolved
...-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/s3/package-info.java Outdated Show resolved Hide resolved
...-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/properties/S3Properties.java Outdated Show resolved Hide resolved
spring-cloud-aws-s3-parent/spring-cloud-aws-s3-config/pom.xml Outdated Show resolved Hide resolved
@maciejwalkowiak maciejwalkowiak removed the status: team-discussion Team has to figure out how to proceed label Mar 15, 2024
@maciejwalkowiak maciejwalkowiak added this to the 3.2.0 M1 milestone Mar 15, 2024
@kunalvarpe
Copy link
Contributor Author

kunalvarpe commented Mar 28, 2024 •
edited
Loading

Hey @kunalvarpe thanks on great work, I introduced some refactor since we changed underlying classes. This will be target for new Spring Cloud AWS release!

@MatejNedic Sorry for the delay in response. Thank you so much for your support.
@maciejwalkowiak I will addressed the review comments and update the PR.

@github-actions github-actions bot added the component: parameter-store Parameter Store integration related issue label Mar 29, 2024
@kunalvarpe
Copy link
Contributor Author

@MatejNedic @maciejwalkowiak

I have addressed the comments on which I have commented. Please review.

@maciejwalkowiak maciejwalkowiak modified the milestones: 3.2.0 M1, 3.2.0 M2 Mar 29, 2024
@maciejwalkowiak maciejwalkowiak removed this from the 3.2.0 M2 milestone Sep 16, 2024
@maciejwalkowiak maciejwalkowiak added this to the 3.3.x milestone Sep 16, 2024
@MatejNedic
Merge branch 'main' into awspringgh-161
7a4b2b5 
# Conflicts:
#	spring-cloud-aws-dependencies/pom.xml
#	spring-cloud-aws-modulith/pom.xml
#	spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/main/java/io/awspring/cloud/s3/crossregion/AbstractCrossRegionS3Client.java
@MatejNedic
Polish
1bd967c
@github-actions github-actions bot added the type: documentation Documentation or Samples related issue label Sep 23, 2024
@MatejNedic
Polish
6876c2d
@MatejNedic
Merge branch 'main' into awspringgh-161
8480d92 
# Conflicts:
#	docs/src/main/asciidoc/s3.adoc
#	spring-cloud-aws-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@MatejNedic
Merge branch 'main' into awspringgh-161
ac3d192 
# Conflicts:
#	spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/properties/S3Properties.java
@MatejNedic
Align to other integrations
d036399
@github-actions github-actions bot removed the component: parameter-store Parameter Store integration related issue label Dec 8, 2024
@MatejNedic
Merge branch 'main' into awspringgh-161
11e76cb 
# Conflicts:
#	spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/s3/properties/S3Properties.java
@MatejNedic
Copy link
Member

@maciejwalkowiak I think we are good now can you please review?

maciejwalkowiak
maciejwalkowiak reviewed Dec 9, 2024
View reviewed changes
docs/src/main/asciidoc/s3.adoc Outdated

@Override
public void initialize(BootstrapRegistry registry) {
registry.register(AwsS3ClientCustomizer.class,
Copy link
Contributor

Choose a reason for hiding this comment

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

AwsS3ClientCustomizer is deprecated. Instead we should show in examples usages of S3ClientCustomizer

@maciejwalkowiak maciejwalkowiak modified the milestones: 3.3.x, 3.3.0 M2 Dec 9, 2024
@maciejwalkowiak maciejwalkowiak changed the title Add support for spring.config.import with S3 backend Add support for spring.config.import with S3 backend Dec 9, 2024
@MatejNedic MatejNedic merged commit 98a7863 into awspring:main Dec 9, 2024
4 checks passed
@MatejNedic
Copy link
Member

After long time feels nice to merge this. Thanks @kunalvarpe on PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maciejwalkowiak maciejwalkowiak maciejwalkowiak approved these changes

@MatejNedic MatejNedic MatejNedic approved these changes

@tomazfernandes tomazfernandes Awaiting requested review from tomazfernandes tomazfernandes is a code owner

Assignees

@MatejNedic MatejNedic

Labels
component: s3 S3 integration related issue type: dependency-upgrade Dependency version bump type: documentation Documentation or Samples related issue
Projects
None yet
Milestone
3.3.0 RC1
Development

Successfully merging this pull request may close these issues.

Add support for spring.config.import with S3 backend
3 participants
@kunalvarpe @MatejNedic @maciejwalkowiak