Skip to content
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

Jump to bottom

Fail the connection state instead of throwing an exception #13728

Merged
merged 4 commits into from
Jun 13, 2022
Merged

Fail the connection state instead of throwing an exception #13728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7903a30
Fail the connection state instead of throwin exception
benmoriceau Jun 13, 2022
158ac15
Fix test
benmoriceau Jun 13, 2022
a85d162
rm import
benmoriceau Jun 13, 2022
633febc
Update airbyte-workers/src/main/java/io/airbyte/workers/general/Defau…
benmoriceau Jun 13, 2022
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
12 changes: 10 additions & 2 deletions airbyte-workers/src/main/java/io/airbyte/workers/general/DefaultCheckConnectionWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,19 @@ public StandardCheckConnectionOutput run(final StandardCheckConnectionInput inpu
LOGGER.debug("Check connection job received output: {}", output);
return output;
} else {
throw new WorkerException(String.format("Error checking connection, status: %s, exit code: %d", status, exitCode));
String message = String.format("Error checking connection, status: %s, exit code: %d", status, exitCode);

LOGGER.error(message);
return new StandardCheckConnectionOutput()
.withStatus(Status.FAILED)
.withMessage(message);
}

} catch (final Exception e) {
throw new WorkerException("Error while getting checking connection.", e);
LOGGER.error("Error while checking connection: ", e);
return new StandardCheckConnectionOutput()
.withStatus(Status.FAILED)
.withMessage("Error while getting checking connection, because of: " + e.getMessage());
}
}

Expand Down
11 changes: 7 additions & 4 deletions ...te-workers/src/test/java/io/airbyte/workers/general/DefaultCheckConnectionWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -101,19 +100,23 @@ public void testFailedConnection() throws WorkerException {
}

@Test
public void testProcessFail() {
public void testProcessFail() throws WorkerException {
when(process.exitValue()).thenReturn(1);

final DefaultCheckConnectionWorker worker = new DefaultCheckConnectionWorker(workerConfigs, integrationLauncher, failureStreamFactory);
assertThrows(WorkerException.class, () -> worker.run(input, jobRoot));
final StandardCheckConnectionOutput output = worker.run(input, jobRoot);

assertEquals(Status.FAILED, output.getStatus());
}

@Test
public void testExceptionThrownInRun() throws WorkerException {
doThrow(new RuntimeException()).when(integrationLauncher).check(jobRoot, WorkerConstants.SOURCE_CONFIG_JSON_FILENAME, Jsons.serialize(CREDS));

final DefaultCheckConnectionWorker worker = new DefaultCheckConnectionWorker(workerConfigs, integrationLauncher, failureStreamFactory);
assertThrows(WorkerException.class, () -> worker.run(input, jobRoot));
final StandardCheckConnectionOutput output = worker.run(input, jobRoot);

assertEquals(Status.FAILED, output.getStatus());
}

@Test
Expand Down