Skip to content

Commit 0d009fc

Browse files
authored
Merge pull request #424 from ludovic-boutros/fix-421-validate-endpoint-failure
Fix: Disable mandatory field validation if validation is disabled
2 parents ba29847 + 8f16817 commit 0d009fc

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

Diff for: src/main/java/com/splunk/kafka/connect/SplunkSinkConnector.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
*/
1616
package com.splunk.kafka.connect;
1717

18-
import static com.splunk.kafka.connect.SplunkSinkConnectorConfig.KERBEROS_KEYTAB_PATH_CONF;
19-
import static com.splunk.kafka.connect.SplunkSinkConnectorConfig.KERBEROS_USER_PRINCIPAL_CONF;
20-
2118
import java.util.function.Function;
2219
import java.util.stream.Collectors;
2320

@@ -53,6 +50,8 @@
5350
import com.splunk.hecclient.JsonEvent;
5451
import com.splunk.hecclient.JsonEventBatch;
5552

53+
import static com.splunk.kafka.connect.SplunkSinkConnectorConfig.*;
54+
5655
public final class SplunkSinkConnector extends SinkConnector {
5756
private static final Logger log = LoggerFactory.getLogger(SplunkSinkConnector.class);
5857
private Map<String, String> taskConfig;
@@ -147,10 +146,10 @@ private static String[] split(String data, String sep) {
147146

148147

149148
private void validateSplunkConfigurations(final Map<String, String> configs) throws ConfigException {
150-
SplunkSinkConnectorConfig connectorConfig = new SplunkSinkConnectorConfig(configs);
151-
if (connectorConfig.disableValidation) {
149+
if (configs.containsKey(DISABLE_VALIDATION) && Boolean.parseBoolean(configs.get(DISABLE_VALIDATION))) {
152150
return;
153151
}
152+
SplunkSinkConnectorConfig connectorConfig = new SplunkSinkConnectorConfig(configs);
154153
String[] indexes = split(connectorConfig.indexes, ",");
155154
if(indexes == null || indexes.length == 0) {
156155
preparePayloadAndExecuteRequest(connectorConfig, "");

Diff for: src/test/java/com/splunk/kafka/connect/SplunkSinkConnecterTest.java

+11
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,17 @@ public void testInvalidSplunkConfigurationsWithValidationDisabled() {
248248
Assertions.assertDoesNotThrow(()->connector.validate(configs));
249249
}
250250

251+
@Test
252+
public void testInvalidSplunkConfigurationWithMandatoryFieldMissingWithValidationDisabled() {
253+
final Map<String, String> configs = new HashMap<>();
254+
SplunkSinkConnector connector = new SplunkSinkConnector();
255+
configs.put("splunk.validation.disable", "true");
256+
configs.put("topics", "b");
257+
MockHecClientWrapper clientInstance = new MockHecClientWrapper();
258+
clientInstance.client.setResponse(CloseableHttpClientMock.EXCEPTION);
259+
Assertions.assertDoesNotThrow(()->connector.validate(configs));
260+
}
261+
251262
@Test
252263
public void testInvalidSplunkConfigurationsWithValidationEnabled() {
253264
final Map<String, String> configs = new HashMap<>();

0 commit comments

Comments
 (0)