Skip to content

KAFKA-20693: Fix NPE in AbstractHerder config-validation error handling #22592

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
wilmerdooley wants to merge 1 commit into
base: trunk
Choose a base branch
from
+38 −0
Open

KAFKA-20693: Fix NPE in AbstractHerder config-validation error handling #22592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 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,6 +1074,9 @@ protected final boolean maybeAddConfigErrors(
messages.append("Connector configuration is invalid and contains the following ")
.append(errors).append(" error(s):");
for (ConfigInfo configInfo : configInfos.configs()) {
if (configInfo == null || configInfo.configValue() == null) {
continue;
}
for (String msg : configInfo.configValue().errors()) {
messages.append('\n').append(msg);
}
Expand Down
35 changes: 35 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 @@ -1061,6 +1061,41 @@ public void testGenerateResultWithConfigValuesWithNoConfigKeysAndWithSomeErrors(
assertInfoValue(infos, "config.extra2", "value.extra2", "error extra2");
}

@Test
public void testMaybeAddConfigErrorsWithNullConfigInfoAndNullConfigValue() throws Exception {
AbstractHerder herder = testHerder();
Map<String, ConfigDef.ConfigKey> keys = new HashMap<>();
addConfigKey(keys, "config.a1", null);
addConfigKey(keys, "config.b1", "group B");

List<ConfigValue> values = new ArrayList<>();
addValue(values, "config.b1", "value.b1", "error b1");

ConfigInfos infos = AbstractHerder.generateResult(
"com.acme.connector.MyConnector", keys, values, List.of("group B"));
infos.configs().add(null);

FutureCallback<Herder.Created<ConnectorInfo>> callback = new FutureCallback<>();
assertTrue(herder.maybeAddConfigErrors(infos, callback));
ExecutionException e = assertThrows(ExecutionException.class, callback::get);
assertTrue(e.getCause() instanceof BadRequestException);
}

@Test
public void testMaybeAddConfigErrorsWithNullConfigValueAndNoErrors() {
AbstractHerder herder = testHerder();
Map<String, ConfigDef.ConfigKey> keys = new HashMap<>();
addConfigKey(keys, "config.a1", null);
addConfigKey(keys, "config.b1", "group B");

List<ConfigValue> values = new ArrayList<>();
addValue(values, "config.b1", "value.b1");

ConfigInfos infos = AbstractHerder.generateResult(
"com.acme.connector.MyConnector", keys, values, List.of("group B"));
assertFalse(herder.maybeAddConfigErrors(infos, new FutureCallback<>()));
}

@Test
public void testSinkConnectorPluginConfig() throws ClassNotFoundException {
testConnectorPluginConfig(
Expand Down