Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-03-03 07:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-11436 Fix NPE during updateFlow when called from a replace request for a PG that is not under version control (#7167)

Browse Source
This commit is contained in:
Bryan Bende 2023-04-12 19:24:22 -04:00 committed by GitHub
parent 3322ad7a20
commit ba93f60731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 104 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowUpdateResource.java
View File

@ -377,8 +377,9 @@ public abstract class FlowUpdateResource<T extends ProcessGroupDescriptorEntity,
asyncRequest.markStepComplete();
// Get the Original Flow Snapshot in case we fail to update and need to rollback
// This only applies to flows that were under version control, update may be called without version control
final VersionControlInformationEntity vciEntity = serviceFacade.getVersionControlInformation(groupId);
final RegisteredFlowSnapshot originalFlowSnapshot = serviceFacade.getVersionedFlowSnapshot(vciEntity.getVersionControlInformation(), true);
final RegisteredFlowSnapshot originalFlowSnapshot = vciEntity == null ? null : serviceFacade.getVersionedFlowSnapshot(vciEntity.getVersionControlInformation(), true);
try {
if (replicateRequest) {

102
nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/ReplaceProcessGroupIT.java Normal file
View File

@ -0,0 +1,102 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.tests.system.pg;
import org.apache.nifi.flow.Position;
import org.apache.nifi.flow.VersionedLabel;
import org.apache.nifi.flow.VersionedProcessGroup;
import org.apache.nifi.registry.flow.RegisteredFlowSnapshot;
import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.flow.ProcessGroupFlowDTO;
import org.apache.nifi.web.api.entity.LabelEntity;
import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ProcessGroupFlowEntity;
import org.apache.nifi.web.api.entity.ProcessGroupImportEntity;
import org.apache.nifi.web.api.entity.ProcessGroupReplaceRequestEntity;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
public class ReplaceProcessGroupIT extends NiFiSystemIT {
@Test
public void testReplaceProcessGroup() throws NiFiClientException, IOException, InterruptedException {
final ProcessGroupEntity emptyProcessGroup = getClientUtil().createProcessGroup("My Group", "root");
final VersionedLabel versionedLabel = new VersionedLabel();
versionedLabel.setIdentifier(UUID.randomUUID().toString());
versionedLabel.setLabel("New Label");
versionedLabel.setPosition(new Position(0, 0));
versionedLabel.setWidth(100.00);
versionedLabel.setHeight(100.00);
final VersionedProcessGroup versionedProcessGroup = new VersionedProcessGroup();
versionedProcessGroup.getLabels().add(versionedLabel);
final RegisteredFlowSnapshot snapshot = new RegisteredFlowSnapshot();
snapshot.setFlowContents(versionedProcessGroup);
final ProcessGroupImportEntity importEntity = new ProcessGroupImportEntity();
importEntity.setVersionedFlowSnapshot(snapshot);
importEntity.setProcessGroupRevision(emptyProcessGroup.getRevision());
final String pgId = emptyProcessGroup.getId();
final ProcessGroupReplaceRequestEntity createdReplaceRequestEntity =
getNifiClient().getProcessGroupClient().replaceProcessGroup(pgId, importEntity);
final String requestId = createdReplaceRequestEntity.getRequest().getRequestId();
waitForReplaceRequest(pgId, requestId);
final ProcessGroupReplaceRequestEntity replaceRequest = getNifiClient().getProcessGroupClient().getProcessGroupReplaceRequest(pgId, requestId);
assertNull(replaceRequest.getRequest().getFailureReason());
final ProcessGroupFlowEntity replacedPgFlowEntity = getNifiClient().getFlowClient().getProcessGroup(pgId);
assertNotNull(replacedPgFlowEntity);
final ProcessGroupFlowDTO replacedPgFlowDTO = replacedPgFlowEntity.getProcessGroupFlow();
assertNotNull(replacedPgFlowDTO);
assertNotNull(replacedPgFlowDTO.getFlow());
assertNotNull(replacedPgFlowDTO.getFlow().getLabels());
assertEquals(1, replacedPgFlowDTO.getFlow().getLabels().size());
final LabelEntity labelEntity = replacedPgFlowDTO.getFlow().getLabels().stream().findFirst().orElse(null);
assertNotNull(labelEntity);
assertNotNull(labelEntity.getComponent());
assertEquals(versionedLabel.getLabel(), labelEntity.getComponent().getLabel());
}
private void waitForReplaceRequest(final String pgId, final String requestId) throws InterruptedException {
waitFor(() -> {
try {
final ProcessGroupReplaceRequestEntity replaceRequest =
getNifiClient().getProcessGroupClient().getProcessGroupReplaceRequest(pgId, requestId);
if (replaceRequest == null) {
return false;
}
return replaceRequest.getRequest().isComplete();
} catch (final Exception e) {
return false;
}
});
}
}