Skip to content

NIFI-15766 - Fix flaky ConnectorCrudIT.testSecretReferences #11074

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

Merged
exceptionfactory merged 1 commit into from
Mar 30, 2026
Merged

NIFI-15766 - Fix flaky ConnectorCrudIT.testSecretReferences #11074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions ...mework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectorResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,13 +1500,11 @@ private VerifyConnectorConfigStepRequestEntity createVerifyConnectorConfigStepRe
final String connectorId, final String configurationStepName, final String requestId) {

final VerifyConnectorConfigStepRequestDTO requestDto = asyncRequest.getRequest().getRequest();
final List<ConfigVerificationResultDTO> resultsList = asyncRequest.getResults();

final VerifyConnectorConfigStepRequestDTO dto = new VerifyConnectorConfigStepRequestDTO();
dto.setConnectorId(requestDto.getConnectorId());
dto.setConfigurationStepName(requestDto.getConfigurationStepName());
dto.setConfigurationStep(requestDto.getConfigurationStep());
dto.setResults(resultsList);

dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
Expand All @@ -1515,6 +1513,7 @@ private VerifyConnectorConfigStepRequestEntity createVerifyConnectorConfigStepRe
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("connectors", connectorId, "configuration-steps", configurationStepName, "verify-config", requestId));
dto.setResults(asyncRequest.getResults());

final VerifyConnectorConfigStepRequestEntity entity = new VerifyConnectorConfigStepRequestEntity();
entity.setRequest(dto);
Expand Down
6 changes: 2 additions & 4 deletions ...ework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,12 +1441,10 @@ private VerifyConfigRequestEntity createVerifyFlowAnalysisRuleConfigRequestEntit
final AsynchronousWebRequest<VerifyConfigRequestEntity, List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {

final VerifyConfigRequestDTO requestDto = asyncRequest.getRequest().getRequest();
final List<ConfigVerificationResultDTO> resultsList = asyncRequest.getResults();

final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
dto.setResults(resultsList);

dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
Expand All @@ -1455,6 +1453,7 @@ private VerifyConfigRequestEntity createVerifyFlowAnalysisRuleConfigRequestEntit
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("controller/flow-analysis-rules", requestDto.getComponentId(), "config", "verification-requests", requestId));
dto.setResults(asyncRequest.getResults());

final VerifyConfigRequestEntity entity = new VerifyConfigRequestEntity();
entity.setRequest(dto);
Expand Down Expand Up @@ -1779,13 +1778,11 @@ private VerifyConfigRequestEntity createVerifyRegistryClientConfigRequestEntity(
final AsynchronousWebRequest<VerifyConfigRequestEntity, List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {

final VerifyConfigRequestDTO requestDto = asyncRequest.getRequest().getRequest();
final List<ConfigVerificationResultDTO> resultsList = asyncRequest.getResults();

final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
dto.setAttributes(requestDto.getAttributes());
dto.setResults(resultsList);

dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
Expand All @@ -1794,6 +1791,7 @@ private VerifyConfigRequestEntity createVerifyRegistryClientConfigRequestEntity(
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("controller/registry-clients", requestDto.getComponentId(), "config", "verification-requests", requestId));
dto.setResults(asyncRequest.getResults());

final VerifyConfigRequestEntity entity = new VerifyConfigRequestEntity();
entity.setRequest(dto);
Expand Down
3 changes: 1 addition & 2 deletions ...ifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,12 +1176,10 @@ private VerifyConfigRequestEntity createVerifyControllerServiceConfigRequestEnti
final AsynchronousWebRequest<VerifyConfigRequestEntity, List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {

final VerifyConfigRequestDTO requestDto = asyncRequest.getRequest().getRequest();
final List<ConfigVerificationResultDTO> resultsList = asyncRequest.getResults();

final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
dto.setResults(resultsList);

dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
Expand All @@ -1190,6 +1188,7 @@ private VerifyConfigRequestEntity createVerifyControllerServiceConfigRequestEnti
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("controller-services", requestDto.getComponentId(), "config", "verification-requests", requestId));
dto.setResults(asyncRequest.getResults());

final VerifyConfigRequestEntity entity = new VerifyConfigRequestEntity();
entity.setRequest(dto);
Expand Down
3 changes: 1 addition & 2 deletions ...mework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,12 +1159,10 @@ private VerifyConfigRequestEntity createVerifyProcessorConfigRequestEntity(
final AsynchronousWebRequest<VerifyConfigRequestEntity, List<ConfigVerificationResultDTO>> asyncRequest,
final String requestId) {
final VerifyConfigRequestDTO requestDto = asyncRequest.getRequest().getRequest();
final List<ConfigVerificationResultDTO> resultsList = asyncRequest.getResults();

final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
dto.setResults(resultsList);

dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
Expand All @@ -1173,6 +1171,7 @@ private VerifyConfigRequestEntity createVerifyProcessorConfigRequestEntity(
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("processors", requestDto.getComponentId(), "config", "verification-requests", requestId));
dto.setResults(asyncRequest.getResults());

final VerifyConfigRequestEntity entity = new VerifyConfigRequestEntity();
entity.setRequest(dto);
Expand Down
3 changes: 1 addition & 2 deletions ...rk/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,12 +973,10 @@ private VerifyConfigRequestEntity createVerifyReportingTaskConfigRequestEntity(
final AsynchronousWebRequest<VerifyConfigRequestEntity, List<ConfigVerificationResultDTO>> asyncRequest, final String requestId) {

final VerifyConfigRequestDTO requestDto = asyncRequest.getRequest().getRequest();
final List<ConfigVerificationResultDTO> resultsList = asyncRequest.getResults();

final VerifyConfigRequestDTO dto = new VerifyConfigRequestDTO();
dto.setComponentId(requestDto.getComponentId());
dto.setProperties(requestDto.getProperties());
dto.setResults(resultsList);

dto.setComplete(asyncRequest.isComplete());
dto.setFailureReason(asyncRequest.getFailureReason());
Expand All @@ -987,6 +985,7 @@ private VerifyConfigRequestEntity createVerifyReportingTaskConfigRequestEntity(
dto.setRequestId(requestId);
dto.setState(asyncRequest.getState());
dto.setUri(generateResourceUri("reporting-tasks", requestDto.getComponentId(), "config", "verification-requests", requestId));
dto.setResults(asyncRequest.getResults());

final VerifyConfigRequestEntity entity = new VerifyConfigRequestEntity();
entity.setRequest(dto);
Expand Down
2 changes: 1 addition & 1 deletion ...-api/src/main/java/org/apache/nifi/web/api/concurrent/StandardAsynchronousWebRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public synchronized void markStepComplete(final T results) {
}

currentStepIndex++;
this.complete = currentStepIndex >= updateSteps.size();
this.results = results;
this.complete = currentStepIndex >= updateSteps.size();
this.lastUpdated = new Date();
this.percentComplete = currentStepIndex * 100 / updateSteps.size();
}
Expand Down
Loading