ferencerdei commented on code in PR #6160:
URL: https://github.com/apache/nifi/pull/6160#discussion_r911779208
##########
minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestor.java:
##########
@@ -234,8 +218,9 @@ public void run() {
.build();
final Request.Builder requestBuilder = new Request.Builder()
- .get()
- .url(url);
+ .get()
+ .cacheControl(CacheControl.FORCE_NETWORK)
Review Comment:
no, removed it.
##########
minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java:
##########
@@ -750,6 +756,72 @@ protected static void addTextElement(final Element
element, final String name, f
element.appendChild(toAdd);
}
+ public static ByteBuffer overrideNonFlowSectionsFromOriginalSchema(byte[]
newSchema, ByteBuffer currentConfigScheme, Properties bootstrapProperties)
+ throws IOException, InvalidConfigurationException,
SchemaLoaderException {
+ try {
+ boolean overrideCoreProperties =
ConfigTransformer.overrideCoreProperties(bootstrapProperties);
+ boolean overrideSecurityProperties =
ConfigTransformer.overrideSecurityProperties(bootstrapProperties);
+ if (overrideCoreProperties && overrideSecurityProperties) {
+ return ByteBuffer.wrap(newSchema);
+ } else {
+ ConvertableSchema<ConfigSchema> schemaNew = ConfigTransformer
+
.throwIfInvalid(SchemaLoader.loadConvertableSchemaFromYaml(new
ByteArrayInputStream(newSchema)));
+ ConfigSchema configSchemaNew =
ConfigTransformer.throwIfInvalid(schemaNew.convert());
+ ConvertableSchema<ConfigSchema> schemaOld = ConfigTransformer
+
.throwIfInvalid(SchemaLoader.loadConvertableSchemaFromYaml(new
ByteBufferInputStream(currentConfigScheme)));
+ ConfigSchema configSchemaOld =
ConfigTransformer.throwIfInvalid(schemaOld.convert());
+
+
configSchemaNew.setNifiPropertiesOverrides(configSchemaOld.getNifiPropertiesOverrides());
+
+ if (!overrideCoreProperties) {
+ logger.debug("Preserving previous core properties...");
+
configSchemaNew.setCoreProperties(configSchemaOld.getCoreProperties());
+ }
+
+ if (!overrideSecurityProperties) {
+ logger.debug("Preserving previous security properties...");
+
configSchemaNew.setSecurityProperties(configSchemaOld.getSecurityProperties());
+ }
+
+ StringWriter writer = new StringWriter();
+ SchemaLoader.toYaml(configSchemaNew, writer);
+ return
ByteBuffer.wrap(writer.toString().getBytes()).asReadOnlyBuffer();
+ }
+ } catch (Exception e) {
+ logger.error("Loading the old and the new schema for merging was
not successful", e);
+ throw e;
Review Comment:
Wrapped it now.
##########
minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/command/CommandRunnerFactoryTest.java:
##########
@@ -0,0 +1,155 @@
+/*
+ * 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.minifi.bootstrap.command;
+
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.DUMP;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.ENV;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.FLOWSTATUS;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.RESTART;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.RUN;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.START;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.STATUS;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.STOP;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.UNKNOWN;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import java.io.File;
+import org.apache.nifi.minifi.bootstrap.MiNiFiParameters;
+import org.apache.nifi.minifi.bootstrap.RunMiNiFi;
+import org.apache.nifi.minifi.bootstrap.service.BootstrapFileProvider;
+import org.apache.nifi.minifi.bootstrap.service.CurrentPortProvider;
+import
org.apache.nifi.minifi.bootstrap.service.GracefulShutdownParameterProvider;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiCommandSender;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiExecCommandProvider;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiStatusProvider;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiStdLogHandler;
+import org.apache.nifi.minifi.bootstrap.service.PeriodicStatusReporterManager;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class CommandRunnerFactoryTest {
+
+ @Mock
+ private MiNiFiCommandSender miNiFiCommandSender;
+ @Mock
+ private CurrentPortProvider currentPortProvider;
+ @Mock
+ private MiNiFiParameters miNiFiParameters;
+ @Mock
+ private MiNiFiStatusProvider miNiFiStatusProvider;
+ @Mock
+ private PeriodicStatusReporterManager periodicStatusReporterManager;
+ @Mock
+ private BootstrapFileProvider bootstrapFileProvider;
+ @Mock
+ private MiNiFiStdLogHandler miNiFiStdLogHandler;
+ @Mock
+ private File bootstrapConfigFile;
+ @Mock
+ private RunMiNiFi runMiNiFi;
+ @Mock
+ private GracefulShutdownParameterProvider
gracefulShutdownParameterProvider;
+ @Mock
+ private MiNiFiExecCommandProvider miNiFiExecCommandProvider;
+
+ @InjectMocks
+ private CommandRunnerFactory commandRunnerFactory;
+
+ @Test
+ void testRunCommandShouldStartCommandReturnStartRunner() {
+ CommandRunner runner = commandRunnerFactory.getRunner(START);
+
+ assertTrue(runner instanceof StartRunner);
Review Comment:
Thanks, changed it.
##########
minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/command/CommandRunnerFactoryTest.java:
##########
@@ -0,0 +1,155 @@
+/*
+ * 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.minifi.bootstrap.command;
+
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.DUMP;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.ENV;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.FLOWSTATUS;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.RESTART;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.RUN;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.START;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.STATUS;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.STOP;
+import static org.apache.nifi.minifi.bootstrap.BootstrapCommand.UNKNOWN;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import java.io.File;
+import org.apache.nifi.minifi.bootstrap.MiNiFiParameters;
+import org.apache.nifi.minifi.bootstrap.RunMiNiFi;
+import org.apache.nifi.minifi.bootstrap.service.BootstrapFileProvider;
+import org.apache.nifi.minifi.bootstrap.service.CurrentPortProvider;
+import
org.apache.nifi.minifi.bootstrap.service.GracefulShutdownParameterProvider;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiCommandSender;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiExecCommandProvider;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiStatusProvider;
+import org.apache.nifi.minifi.bootstrap.service.MiNiFiStdLogHandler;
+import org.apache.nifi.minifi.bootstrap.service.PeriodicStatusReporterManager;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class CommandRunnerFactoryTest {
+
+ @Mock
+ private MiNiFiCommandSender miNiFiCommandSender;
+ @Mock
+ private CurrentPortProvider currentPortProvider;
+ @Mock
+ private MiNiFiParameters miNiFiParameters;
+ @Mock
+ private MiNiFiStatusProvider miNiFiStatusProvider;
+ @Mock
+ private PeriodicStatusReporterManager periodicStatusReporterManager;
+ @Mock
+ private BootstrapFileProvider bootstrapFileProvider;
+ @Mock
+ private MiNiFiStdLogHandler miNiFiStdLogHandler;
+ @Mock
+ private File bootstrapConfigFile;
+ @Mock
+ private RunMiNiFi runMiNiFi;
+ @Mock
+ private GracefulShutdownParameterProvider
gracefulShutdownParameterProvider;
+ @Mock
+ private MiNiFiExecCommandProvider miNiFiExecCommandProvider;
+
+ @InjectMocks
+ private CommandRunnerFactory commandRunnerFactory;
+
+ @Test
+ void testRunCommandShouldStartCommandReturnStartRunner() {
+ CommandRunner runner = commandRunnerFactory.getRunner(START);
+
+ assertTrue(runner instanceof StartRunner);
+ verifyNoInteractions(miNiFiCommandSender, currentPortProvider,
miNiFiParameters, miNiFiStatusProvider, periodicStatusReporterManager,
bootstrapFileProvider,
+ miNiFiStdLogHandler, bootstrapConfigFile, runMiNiFi,
gracefulShutdownParameterProvider, miNiFiExecCommandProvider);
+ }
+
+ @Test
+ void testRunCommandShouldRunCommandReturnStartRunner() {
+ CommandRunner runner = commandRunnerFactory.getRunner(RUN);
+
+ assertTrue(runner instanceof StartRunner);
+ verifyNoInteractions(miNiFiCommandSender, currentPortProvider,
miNiFiParameters, miNiFiStatusProvider, periodicStatusReporterManager,
bootstrapFileProvider,
Review Comment:
Wanted to make sure no side effect happens with those services inside the
factory, that's why I made this strict assertion
##########
minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/command/CompositeCommandRunnerTest.java:
##########
@@ -0,0 +1,75 @@
+/*
+ * 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.minifi.bootstrap.command;
+
+import static org.apache.nifi.minifi.bootstrap.Status.ERROR;
+import static org.apache.nifi.minifi.bootstrap.Status.OK;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+import java.util.Arrays;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class CompositeCommandRunnerTest {
+
+ private CommandRunner startRunner;
+ private CommandRunner stopRunner;
+ private CompositeCommandRunner compositeCommandRunner;
+
+ @BeforeEach
+ void setup() {
+ startRunner = mock(StartRunner.class);
+ stopRunner = mock(StopRunner.class);
Review Comment:
Changed.
##########
minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorSSLTest.java:
##########
@@ -76,10 +84,22 @@ public void pullHttpChangeIngestorInit(Properties
properties) {
properties.put(PullHttpChangeIngestor.PORT_KEY, String.valueOf(port));
properties.put(PullHttpChangeIngestor.HOST_KEY, "localhost");
properties.put(PullHttpChangeIngestor.OVERRIDE_SECURITY, "true");
+ properties.put(PULL_HTTP_BASE_KEY + ".override.core", "true");
+ ConfigurationFileHolder configurationFileHolder =
Mockito.mock(ConfigurationFileHolder.class);
+
+ try {
+ ConfigSchema configSchema =
+
SchemaLoader.loadConfigSchemaFromYaml(PullHttpChangeIngestorSSLTest.class.getClassLoader().getResourceAsStream("config.yml"));
+ StringWriter writer = new StringWriter();
+ SchemaLoader.toYaml(configSchema, writer);
+
when(configurationFileHolder.getConfigFileReference()).thenReturn(new
AtomicReference<>(ByteBuffer.wrap(writer.toString().getBytes())));
+ } catch (Exception e) {
+ fail("Failed to read test config file", e);
+ }
Review Comment:
My idea here was to fail with a more user friendly message if needed, but
ok, I can change, so the test will be simpler.
##########
minifi/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/configuration/ingestors/PullHttpChangeIngestorTest.java:
##########
@@ -55,9 +63,21 @@ public void pullHttpChangeIngestorInit(Properties
properties) {
properties.put(PullHttpChangeIngestor.PORT_KEY, String.valueOf(port));
properties.put(PullHttpChangeIngestor.HOST_KEY, "localhost");
properties.put(PullHttpChangeIngestor.PULL_HTTP_POLLING_PERIOD_KEY,
"30000");
+ properties.put(PULL_HTTP_BASE_KEY + ".override.core", "true");
+ ConfigurationFileHolder configurationFileHolder =
Mockito.mock(ConfigurationFileHolder.class);
+
+ try {
+ ConfigSchema configSchema =
+
SchemaLoader.loadConfigSchemaFromYaml(PullHttpChangeIngestorTest.class.getClassLoader().getResourceAsStream("config.yml"));
+ StringWriter writer = new StringWriter();
+ SchemaLoader.toYaml(configSchema, writer);
+
when(configurationFileHolder.getConfigFileReference()).thenReturn(new
AtomicReference<>(ByteBuffer.wrap(writer.toString().getBytes())));
+ } catch (Exception e) {
+ fail("Failed to read test config file", e);
+ }
Review Comment:
done
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
