bejancsaba commented on code in PR #6149:
URL: https://github.com/apache/nifi/pull/6149#discussion_r906717150
##########
c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/UpdateConfigurationOperationHandler.java:
##########
@@ -36,8 +38,9 @@
public class UpdateConfigurationOperationHandler implements C2OperationHandler
{
private static final Logger logger =
LoggerFactory.getLogger(UpdateConfigurationOperationHandler.class);
+ private static final Pattern FLOW_ID_PATTERN =
Pattern.compile("/.*/.*/.*/(.*)/?.*");
Review Comment:
Unfortunately it is not enforced anywhere for the flow id to be a guid also
in the current setup there could be multiple guids on the path so I went with
your enhanced matching proposal. thanks.
##########
c2/c2-client-bundle/c2-client-service/src/test/java/org/apache/nifi/c2/client/service/C2HeartbeatFactoryTest.java:
##########
@@ -0,0 +1,103 @@
+/*
+ * 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.c2.client.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.nifi.c2.client.C2ClientConfig;
+import org.apache.nifi.c2.client.service.model.RuntimeInfoWrapper;
+import org.apache.nifi.c2.protocol.api.AgentRepositories;
+import org.apache.nifi.c2.protocol.api.C2Heartbeat;
+import org.apache.nifi.c2.protocol.api.FlowQueueStatus;
+import org.apache.nifi.c2.protocol.component.api.RuntimeManifest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class C2HeartbeatFactoryTest {
+
+ private static final String AGENT_CLASS = "agentClass";
+ private static final String FLOW_ID = "flowId";
+
+ @Mock
+ private C2ClientConfig clientConfig;
+
+ @Mock
+ private FlowIdHolder flowIdHolder;
+
+ @InjectMocks
+ private C2HeartbeatFactory c2HeartbeatFactory;
+
+ @TempDir
+ private File tempDir;
+
+ @BeforeEach
+ public void setup() {
+
when(clientConfig.getConfDirectory()).thenReturn(tempDir.getAbsolutePath());
+ }
+
+ @Test
+ void testCreateHeartbeat() {
+ when(flowIdHolder.getFlowId()).thenReturn(FLOW_ID);
+ when(clientConfig.getAgentClass()).thenReturn(AGENT_CLASS);
+
+ C2Heartbeat heartbeat =
c2HeartbeatFactory.create(mock(RuntimeInfoWrapper.class));
+
+ assertEquals(FLOW_ID, heartbeat.getFlowId());
+ assertEquals(AGENT_CLASS, heartbeat.getAgentClass());
+ }
+
+ @Test
+ void testCreateGeneratesAgentAndDeviceIdIfNotPresent() {
+ C2Heartbeat heartbeat =
c2HeartbeatFactory.create(mock(RuntimeInfoWrapper.class));
+
+ assertNotNull(heartbeat.getAgentId());
+ assertNotNull(heartbeat.getDeviceId());
+ }
+
+ @Test
+ void testCreatePopulatesFromRuntimeInfoWrapper() {
+ AgentRepositories repos = new AgentRepositories();
+ RuntimeManifest manifest = new RuntimeManifest();
+ Map<String, FlowQueueStatus> queueStatus = new HashMap<>();
+
+ C2Heartbeat heartbeat = c2HeartbeatFactory.create(new
RuntimeInfoWrapper(repos, manifest, queueStatus));
+
+ assertEquals(repos,
heartbeat.getAgentInfo().getStatus().getRepositories());
+ assertEquals(manifest, heartbeat.getAgentInfo().getAgentManifest());
+ assertEquals(queueStatus, heartbeat.getFlowInfo().getQueues());
+ }
+
+ @Test
+ void testCreateThrowsExceptionWhenConfDirNotSet() {
+ when(clientConfig.getConfDirectory()).thenReturn("dummy");
Review Comment:
applied
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@nifi.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
