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

Do not hide unexpected errors in the check connection #13903

Merged
merged 2 commits into from
Jun 17, 2022
Merged

Do not hide unexpected errors in the check connection #13903

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
bf79bf6
Do not hide unexpected errors in the check connection
benmoriceau Jun 17, 2022
8c73612
Fix test
benmoriceau Jun 17, 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: 6 additions & 6 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 @@ -14,7 +14,9 @@
import io.airbyte.protocol.models.AirbyteConnectionStatus;
import io.airbyte.protocol.models.AirbyteMessage;
import io.airbyte.protocol.models.AirbyteMessage.Type;
import io.airbyte.workers.*;
import io.airbyte.workers.WorkerConfigs;
import io.airbyte.workers.WorkerConstants;
import io.airbyte.workers.WorkerUtils;
import io.airbyte.workers.exception.WorkerException;
import io.airbyte.workers.internal.AirbyteStreamFactory;
import io.airbyte.workers.internal.DefaultAirbyteStreamFactory;
Expand Down Expand Up @@ -79,7 +81,7 @@ public StandardCheckConnectionOutput run(final StandardCheckConnectionInput inpu
LOGGER.debug("Check connection job received output: {}", output);
return output;
} else {
String message = String.format("Error checking connection, status: %s, exit code: %d", status, exitCode);
final String message = String.format("Error checking connection, status: %s, exit code: %d", status, exitCode);

LOGGER.error(message);
return new StandardCheckConnectionOutput()
Expand All @@ -88,10 +90,8 @@ public StandardCheckConnectionOutput run(final StandardCheckConnectionInput inpu
}

} catch (final Exception e) {
LOGGER.error("Error while checking connection: ", e);
return new StandardCheckConnectionOutput()
.withStatus(Status.FAILED)
.withMessage("Error while getting checking connection, because of: " + e.getMessage());
LOGGER.error("Unexpected error while checking connection: ", e);
throw new WorkerException("Unexpected error while getting checking connection.", e);
gosusnp marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
4 changes: 2 additions & 2 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,6 +6,7 @@

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 @@ -114,9 +115,8 @@ 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);
final StandardCheckConnectionOutput output = worker.run(input, jobRoot);

assertEquals(Status.FAILED, output.getStatus());
assertThrows(WorkerException.class, () -> worker.run(input, jobRoot));
}

@Test
Expand Down