Skip to content

Conversation

@dan-s1
Copy link
Contributor

@dan-s1 dan-s1 commented Mar 10, 2025

Summary

NIFI-14343
This PR removes the two property descriptors Config File and Config Body and replaces it with a single property descriptor which uses identifiesExternalResource which thereby allows a single property descriptor to support a configuration body, configuration file path or a configuration specified by a URL. In addition validation was added to ensure if a custom configuration is replacing the defaults or being merged with the defaults that it is indeed a valid configuration. This PR no longer supports expression language for this new property descriptor since if if a file path is specified in an attribute, it will be treated as a configuration body and not a file path.

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 21

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

@dan-s1 dan-s1 force-pushed the NIFI-14343 branch 2 times, most recently from 01ec6f9 to 19f40a4 Compare March 17, 2025 21:18
@dan-s1 dan-s1 force-pushed the NIFI-14343 branch 2 times, most recently from 8672c03 to 98f5d1f Compare March 24, 2025 14:47
@mosermw
Copy link
Member

mosermw commented Mar 25, 2025

Can you update the AllowableValues for REPLACE and MERGE to include the words "custom MIME configurations" to make it more clear?

@dan-s1 dan-s1 force-pushed the NIFI-14343 branch 2 times, most recently from 5262598 to 338b7e9 Compare March 28, 2025 13:42
dan-s1 added 4 commits March 31, 2025 19:16
… and Config Body with one property descriptor using identifiesExternalResource.
…or reuse in setup and customValidate methods.
@mosermw
Copy link
Member

mosermw commented Apr 1, 2025

Thanks for the changes @dan-s1, this looks good now. I tested a bunch of scenarios and the migration worked in each.
+1 will merge.

@asfgit asfgit closed this in 4d0696a Apr 1, 2025
TomaszK-stack pushed a commit to TomaszK-stack/nifi that referenced this pull request May 5, 2025
… and Config Body with one property descriptor using identifiesExternalResource.

Signed-off-by: Mike Moser <mosermw@apache.org>

Closes apache#9793
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants