This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 1ab4cf5 NIFI-8419 This closes #4994. Fix issues with contoller
services during parameter context update in a secure instance
1ab4cf5 is described below
commit 1ab4cf5307d3b4aa8bf9bf750613b48acc59ad9c
Author: Bryan Bende <[email protected]>
AuthorDate: Mon Apr 12 16:54:14 2021 -0400
NIFI-8419 This closes #4994. Fix issues with contoller services during
parameter context update in a secure instance
Signed-off-by: Joe Witt <[email protected]>
---
.../src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java | 2 +-
.../apache/nifi/web/util/ClusterReplicationComponentLifecycle.java | 3 ++-
.../main/java/org/apache/nifi/web/util/LocalComponentLifecycle.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
index b816100..aee1245 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
@@ -1158,7 +1158,7 @@ public class ProcessGroupResource extends
FlowUpdateResource<ProcessGroupImportE
URI groupUri;
try {
groupUri = new URI(originalUri.getScheme(),
originalUri.getUserInfo(), originalUri.getHost(),
- originalUri.getPort(), "/nifi-api/flow/process-groups/" +
groupId + "/controller-services",
"includeAncestorGroups=false,includeDescendantGroups=true",
originalUri.getFragment());
+ originalUri.getPort(), "/nifi-api/flow/process-groups/" +
groupId + "/controller-services",
"includeAncestorGroups=false&includeDescendantGroups=true",
originalUri.getFragment());
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
index 8c96336..6794040 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
@@ -454,7 +454,7 @@ public class ClusterReplicationComponentLifecycle
implements ComponentLifecycle
URI groupUri;
try {
groupUri = new URI(originalUri.getScheme(),
originalUri.getUserInfo(), originalUri.getHost(),
- originalUri.getPort(), "/nifi-api/flow/process-groups/" +
groupId + "/controller-services",
"includeAncestorGroups=false,includeDescendantGroups=true",
originalUri.getFragment());
+ originalUri.getPort(), "/nifi-api/flow/process-groups/" +
groupId + "/controller-services",
"includeAncestorGroups=false&includeDescendantGroups=true",
originalUri.getFragment());
} catch (URISyntaxException e) {
throw new RuntimeException(e);
}
@@ -482,6 +482,7 @@ public class ClusterReplicationComponentLifecycle
implements ComponentLifecycle
final Set<ControllerServiceEntity> serviceEntities =
controllerServicesEntity.getControllerServices();
final Map<String, AffectedComponentEntity> affectedServices =
serviceEntities.stream()
+ .filter(s -> serviceIds.contains(s.getId()))
.collect(Collectors.toMap(ControllerServiceEntity::getId,
dtoFactory::createAffectedComponentEntity));
if (isControllerServiceValidationComplete(serviceEntities,
affectedServices)) {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/LocalComponentLifecycle.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/LocalComponentLifecycle.java
index 1a5fc6b..473ede4 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/LocalComponentLifecycle.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/LocalComponentLifecycle.java
@@ -386,11 +386,11 @@ public class LocalComponentLifecycle implements
ComponentLifecycle {
boolean allReachedDesiredState = true;
for (final ControllerServiceEntity serviceEntity :
serviceEntities) {
- final ControllerServiceDTO serviceDto =
serviceEntity.getComponent();
- if (!affectedServices.containsKey(serviceDto.getId())) {
+ if (!affectedServices.containsKey(serviceEntity.getId())) {
continue;
}
+ final ControllerServiceDTO serviceDto =
serviceEntity.getComponent();
final String validationStatus =
serviceDto.getValidationStatus();
if (ControllerServiceDTO.INVALID.equals(validationStatus)) {
switch (invalidComponentAction) {
