[fix] Allow setting sourceType in config file #19836
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicoloboschi
requested changes
Mar 16, 2023
| @@ -449,6 +449,8 @@ void processArguments() throws Exception { | |||
|
|
|||
| if (sourceType != null) { | |||
| sourceConfig.setArchive(validateSourceType(sourceType)); | |||
| } else if (sourceConfig.getSourceType() != null) { | |||
| sourceConfig.setArchive(validateSourceType(sourceType)); | |||
There was a problem hiding this comment.
Suggested change
| sourceConfig.setArchive(validateSourceType(sourceType)); | |
| sourceConfig.setArchive(validateSourceType(sourceConfig.getSourceType())); |
| @@ -412,6 +412,15 @@ public void testBatchSourceConfigMissingDiscoveryTriggererClassName() throws Exc | |||
| expectedSourceConfig.setBatchSourceConfig(batchSourceConfig); | |||
| testCmdSourceConfigFile(testSourceConfig, expectedSourceConfig); | |||
| } | |||
|
|
|||
| @Test(expectedExceptions = ParameterException.class, expectedExceptionsMessageRegExp = "Invalid source type 'foo' " + | |||
There was a problem hiding this comment.
could you add a happy path test ?
There was a problem hiding this comment.
I tried it:
@Test
public void testCmdSourceConfigFileSourceType() throws Exception {
ConnectorDefinition mockDefinition = new ConnectorDefinition();
mockDefinition.setName("builtin");
when(source.getBuiltInSources()).thenReturn(List.of(mockDefinition));
SourceConfig sourceConfig = getSourceConfig();
sourceConfig.setSourceType("builtin");
SourceConfig exceptedConfig = getSourceConfig();
exceptedConfig.setSourceType("builtin");
exceptedConfig.setArchive("builtin://builtin");
testCmdSourceConfigFile(sourceConfig, exceptedConfig);
}
... while due to some dirty code inherit local run from cmd source the tests are hard to tune. That said, validateSourceType is inherited by LocalSourceRunner with total different manner.
|
The pr had no activity for 30 days, mark with Stale label. |
Signed-off-by: tison <wander4096@gmail.com>
tisonkun
approved these changes
Jun 30, 2023
| @@ -449,6 +449,8 @@ void processArguments() throws Exception { | |||
|
|
|||
| if (sourceType != null) { | |||
| sourceConfig.setArchive(validateSourceType(sourceType)); | |||
| } else if (sourceConfig.getSourceType() != null) { | |||
| sourceConfig.setArchive(validateSourceType(sourceType)); | |||
| @@ -412,6 +412,15 @@ public void testBatchSourceConfigMissingDiscoveryTriggererClassName() throws Exc | |||
| expectedSourceConfig.setBatchSourceConfig(batchSourceConfig); | |||
| testCmdSourceConfigFile(testSourceConfig, expectedSourceConfig); | |||
| } | |||
|
|
|||
| @Test(expectedExceptions = ParameterException.class, expectedExceptionsMessageRegExp = "Invalid source type 'foo' " + | |||
There was a problem hiding this comment.
I tried it:
@Test
public void testCmdSourceConfigFileSourceType() throws Exception {
ConnectorDefinition mockDefinition = new ConnectorDefinition();
mockDefinition.setName("builtin");
when(source.getBuiltInSources()).thenReturn(List.of(mockDefinition));
SourceConfig sourceConfig = getSourceConfig();
sourceConfig.setSourceType("builtin");
SourceConfig exceptedConfig = getSourceConfig();
exceptedConfig.setSourceType("builtin");
exceptedConfig.setArchive("builtin://builtin");
testCmdSourceConfigFile(sourceConfig, exceptedConfig);
}
... while due to some dirty code inherit local run from cmd source the tests are hard to tune. That said, validateSourceType is inherited by LocalSourceRunner with total different manner.
|
/pulsarbot run-failure-checks |
|
/pulsarbot run-failure-checks |
|
The pr had no activity for 30 days, mark with Stale label. |
|
Merge the latest master and rerun... |
|
Merging... Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Currently, there is an inconsistency between sinks and sources. Sinks can be created by passing the whole config in the sinkConfig file:
But Sources cannot. If we do the equivalent:
To make it work, we currently have to explicitly pass in the type parameter:
Modifications
Add the
sourceTypetoSourceConfigso it can be passed through the config file too.Verifying this change
This change added tests and can be verified as follows:
TestCmdSourcesDoes this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Documentation
docdoc-requireddoc-not-neededdoc-completeMatching PR in forked repository
PR in forked repository: alpreu#9