Skip to content

NIFI-16235 - Support rebasing locally added Controller Services in versioned Process Groups - #11571

Open
pvillard31 wants to merge 2 commits into
apache:mainfrom
pvillard31:NIFI-16235
Open

pvillard31 wants to merge 2 commits into
apache:mainfrom
pvillard31:NIFI-16235

Conversation

@pvillard31

Copy link
Copy Markdown
Contributor

Summary

NIFI-16235 - Support rebasing locally added Controller Services in versioned Process Groups

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 contains commits signed with a registered key indicating Verified status

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 ./mvnw clean install -P contrib-check
    • JDK 21
    • JDK 25

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

@exceptionfactory exceptionfactory left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for this addition @pvillard31. The basic approach looks good, I noted a handful of mostly test-related recommendations

@exceptionfactory exceptionfactory left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the updates @pvillard31, I noted one more implementation question, and one other test-related recommendation, then this should be ready to go.

.formatted(collidingComponent.getClass().getSimpleName(), controllerService.getIdentifier()));
}

controllerService.setGroupIdentifier(parentGroup.getIdentifier());

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this intentional? It appears to change the value of the provided Controller Service, rather than just classifying the changes

final ControllerServiceEntity serviceY = util.createControllerService(CONTROLLER_SERVICE_TYPE, originalGroup.getId());
util.updateProcessorProperties(fakeProcessor, Map.of(CONTROLLER_SERVICE_PROPERTY, serviceY.getId()));

final RebaseAnalysisEntity analysis = util.getRebaseAnalysis(originalGroup.getId(), "2");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This 2 value is repeated in a handful of places in this test, so it would be helpful to promote as a static variable

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.

2 participants