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

NIFI-11255 Allowable value for 'Use s3.region Attribute' #7051

Closed
wants to merge 2 commits into from
Closed

NIFI-11255 Allowable value for 'Use s3.region Attribute' #7051

wants to merge 2 commits into from

Conversation

krisztina-zsihovszki
Copy link
Contributor

Summary

NIFI-11255

Tracking

Please complete the following tracking steps prior to pull request creation.

Issue Tracking

Pull Request Tracking

  • Pull Request title starts with Apache NiFi Jira issue number, such as NIFI-00000
  • Pull Request commit message starts with Apache NiFi Jira issue number, as such NIFI-00000

Pull Request Formatting

  • Pull Request based on current revision of the main branch
  • Pull Request refers to a feature branch with one commit containing changes

Verification

Please indicate the verification steps performed prior to pull request creation.

Build

  • Build completed using mvn clean install -P contrib-check
    • JDK 11
    • JDK 17

Licensing

  • New dependencies are compatible with the Apache License 2.0 according to the License Policy
  • New dependencies are documented in applicable LICENSE and NOTICE files

Documentation

  • Documentation formatting appears as expected in rendered files

Lehel44
Lehel44 requested changes Mar 20, 2023
View reviewed changes
Copy link
Contributor

@Lehel44 Lehel44 left a comment

Choose a reason for hiding this comment

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

Thanks @krisztina-zsihovszki for the contribution. I checked if overloading methods that is supposed to be overriden can be avoided but doesn't seem like an option here. I left a few comments.

...s-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java Outdated Show resolved Hide resolved
...abstract-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java Outdated Show resolved Hide resolved
...abstract-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java Outdated Show resolved Hide resolved
...abstract-processors/src/main/java/org/apache/nifi/processors/aws/s3/AbstractS3Processor.java Outdated
Comment on lines 244 to 248
String regionValue = context.getProperty(S3_CUSTOM_REGION).getValue();

if (ATTRIBUTE_DRIVEN_REGION.getValue().equals(regionValue)) {
regionValue = attributes.get(S3_REGION_ATTRIBUTE);
Region region = parseRegionValue(regionValue);
Copy link
Contributor

Choose a reason for hiding this comment

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

I think resolveRegion should be called here.

turcsanyip
turcsanyip requested changes Apr 4, 2023
View reviewed changes
Copy link
Contributor

@turcsanyip turcsanyip left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@krisztina-zsihovszki Thanks for adding the caching!

I have a few notes regarding the cache key (AwsClientDetails class):

  • it does not contain the ClientType so clients with different type but same credentials, region, etc. would be mapped to the same key
  • AwsClientDetails contains the common config from AbstractAWSProcessor only but some processor implementations add some extra config (like signer in S3) which may affect the shared clients (these should be reflected in the key in order to create distinct clients)
  • AwsClientDetails needs to be created by the caller and kept consistent with the other parameters which is not straightforward

Just an idea but it may solve all the problems above: add new method AwsClientProvider.getClientCacheKey() with the same parameters as createClient()

  • => the processor implementations are responsible for providing the right key
  • => different key types mean different client types
  • => the implementation is local to the client type and it is based on the same parameters the client will be built from

...i-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AwsClientFactory.java Outdated Show resolved Hide resolved
...i-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AwsClientFactory.java Outdated Show resolved Hide resolved
...i-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AwsClientFactory.java Outdated Show resolved Hide resolved
turcsanyip
turcsanyip requested changes Apr 17, 2023
View reviewed changes
Copy link
Contributor

@turcsanyip turcsanyip left a comment

Choose a reason for hiding this comment

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

@krisztina-zsihovszki Thanks for the changes! The concept and code look good to me now.
I found 2 bugs but I think they could be fixed easily.
The other 2 comments are nice to have but very small changes.

...ifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AwsClientCache.java Show resolved Hide resolved
...s-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java Outdated Show resolved Hide resolved
...s-abstract-processors/src/main/java/org/apache/nifi/processors/aws/AbstractAWSProcessor.java Outdated Show resolved Hide resolved
...dle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/TestAwsClientCache.java Outdated Show resolved Hide resolved
turcsanyip
turcsanyip approved these changes Apr 18, 2023
View reviewed changes
Copy link
Contributor

@turcsanyip turcsanyip left a comment

Choose a reason for hiding this comment

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

@krisztina-zsihovszki Thanks for adding this new feature and for all the review changes!
@Lehel44 Thanks for your review!

+1 LGTM
Merging to main and 1.x.

@asfgit asfgit closed this in 9a002d9 Apr 18, 2023
asfgit pushed a commit that referenced this pull request Apr 18, 2023
@krisztina-zsihovszki @turcsanyip
NIFI-11255 Allowable value for 'Use s3.region Attribute'
bfa66de 
This closes #7051.

Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lehel44 Lehel44 Lehel44 requested changes

@turcsanyip turcsanyip turcsanyip approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@krisztina-zsihovszki @Lehel44 @turcsanyip