Skip to content

KAFKA-20693: fix npe in abstract herder when no config value #22588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gaetancollaud wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

KAFKA-20693: fix npe in abstract herder when no config value #22588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b524e15
reproducer
gaetancollaud Jun 16, 2026
89f61bc
fix npe
gaetancollaud Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions connect/runtime/src/main/java/org/apache/kafka/connect/runtime/AbstractHerder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,8 +1074,10 @@ protected final boolean maybeAddConfigErrors(
messages.append("Connector configuration is invalid and contains the following ")
.append(errors).append(" error(s):");
for (ConfigInfo configInfo : configInfos.configs()) {
for (String msg : configInfo.configValue().errors()) {
messages.append('\n').append(msg);
if (configInfo.configValue() != null) {
for (String msg : configInfo.configValue().errors()) {
messages.append('\n').append(msg);
}
}
}
callback.onCompletion(
Expand Down
24 changes: 24 additions & 0 deletions connect/runtime/src/test/java/org/apache/kafka/connect/runtime/AbstractHerderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutionException;
Expand All @@ -95,6 +96,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
Expand Down Expand Up @@ -905,6 +907,7 @@ public void testReverseTransformConfigs() {
private void assertErrorForKey(ConfigInfos configInfos, String testKey) {
final List<String> errorsForKey = configInfos.configs().stream()
.map(ConfigInfo::configValue)
.filter(Objects::nonNull)
.filter(configValue -> configValue.name().equals(testKey))
.map(ConfigValueInfo::errors)
.flatMap(Collection::stream)
Expand Down Expand Up @@ -1298,6 +1301,27 @@ public void testTaskConfigsChangedWhenAppliedConnectorConfigDiffers() {
assertTrue(AbstractHerder.taskConfigsChanged(snapshotWithDifferentAppliedConfig, CONN1, TASK_CONFIGS));
}

@Test
public void testDifferenceInConfigDefAndValidation() {
AbstractHerder herder = createConfigValidationHerder(SampleSourceConnector.class, noneConnectorClientConfigOverridePolicy);

Map<String, String> config = new HashMap<>();
config.put(ConnectorConfig.CONNECTOR_CLASS_CONFIG, SampleSourceConnector.class.getName());
config.put("name", "somename");
config.put("required", "value");
config.put("testKey", null);

final ConfigInfos configInfos = herder.validateConnectorConfig(config, s -> null, false);

herder.maybeAddConfigErrors(configInfos, (error, result) -> {
assertNotNull(error);
assertInstanceOf(BadRequestException.class, error);
assertTrue(error.getMessage().contains("Connector configuration is invalid"));
});

verifyValidationIsolation();
}

protected void addConfigKey(Map<String, ConfigDef.ConfigKey> keys, String name, String group) {
ConfigDef configDef = new ConfigDef().define(name, ConfigDef.Type.STRING, null, null,
ConfigDef.Importance.HIGH, "doc", group, 10,
Expand Down
12 changes: 12 additions & 0 deletions connect/runtime/src/test/java/org/apache/kafka/connect/runtime/SampleSourceConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
*/
package org.apache.kafka.connect.runtime;

import org.apache.kafka.common.config.Config;
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.common.config.ConfigValue;
import org.apache.kafka.connect.connector.Task;
import org.apache.kafka.connect.source.SourceConnector;
import org.apache.kafka.connect.source.SourceRecord;
Expand Down Expand Up @@ -67,6 +69,16 @@ public ConfigDef configWithCommon() {
.define("optional", ConfigDef.Type.STRING, "defaultVal", ConfigDef.Importance.HIGH, "optional docs");
}

@Override
public Config validate(Map<String, String> connectorConfigs) {
// do not validate "optional" on purpose
ConfigDef configDef = new ConfigDef()
.define("required", ConfigDef.Type.STRING, ConfigDef.Importance.HIGH, "required docs");
List<ConfigValue> configValues = configDef
.validate(connectorConfigs);
return new Config(configValues);
}

public static class SampleSourceTask extends SourceTask {

@Override
Expand Down