From f16b1eb3d3952aa07307daad4565c0e450b62315 Mon Sep 17 00:00:00 2001 From: Jimmy Ma Date: Tue, 27 Sep 2022 11:48:16 -0700 Subject: [PATCH] Fix legacy reset behavior (#17270) * Fix how we force an old version of a connector in the tests * Fix endpoint behavior, State NOT_SET should be same as LEGACY --- .../server/handlers/WebBackendConnectionsHandler.java | 2 +- .../io/airbyte/test/acceptance/BasicAcceptanceTests.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java index 40f002438116..27bd3e9b4de3 100644 --- a/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java +++ b/airbyte-server/src/main/java/io/airbyte/server/handlers/WebBackendConnectionsHandler.java @@ -385,7 +385,7 @@ private ConnectionRead resetStreamsIfNeeded(final WebBackendConnectionUpdate web final ConnectionIdRequestBody connectionIdRequestBody = new ConnectionIdRequestBody().connectionId(connectionId); final ConnectionStateType stateType = getStateType(connectionIdRequestBody); - if (stateType == ConnectionStateType.LEGACY) { + if (stateType == ConnectionStateType.LEGACY || stateType == ConnectionStateType.NOT_SET) { streamsToReset = configRepository.getAllStreamsForConnection(connectionId); } ManualOperationResult manualOperationResult = eventRunner.synchronousResetConnection( diff --git a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/BasicAcceptanceTests.java b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/BasicAcceptanceTests.java index 68b7a9c64f42..8dcb24e7064a 100644 --- a/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/BasicAcceptanceTests.java +++ b/airbyte-tests/src/acceptanceTests/java/io/airbyte/test/acceptance/BasicAcceptanceTests.java @@ -1023,10 +1023,6 @@ void testResetAllWhenSchemaIsModifiedForLegacySource() throws Exception { final SourceRead source = testHarness.createPostgresSource(true); final UUID sourceId = source.getSourceId(); final UUID sourceDefinitionId = source.getSourceDefinitionId(); - final AirbyteCatalog catalog = testHarness.discoverSourceSchema(sourceId); - final UUID destinationId = testHarness.createPostgresDestination(true).getDestinationId(); - final OperationRead operation = testHarness.createOperation(); - final String name = "test_reset_when_schema_is_modified_" + UUID.randomUUID(); // Fetch the current/most recent source definition version final SourceDefinitionRead sourceDefinitionRead = @@ -1039,6 +1035,11 @@ void testResetAllWhenSchemaIsModifiedForLegacySource() throws Exception { AirbyteAcceptanceTestHarness.POSTGRES_SOURCE_LEGACY_CONNECTOR_VERSION); testHarness.updateSourceDefinitionVersion(sourceDefinitionId, AirbyteAcceptanceTestHarness.POSTGRES_SOURCE_LEGACY_CONNECTOR_VERSION); + final AirbyteCatalog catalog = testHarness.discoverSourceSchema(sourceId); + final UUID destinationId = testHarness.createPostgresDestination(true).getDestinationId(); + final OperationRead operation = testHarness.createOperation(); + final String name = "test_reset_when_schema_is_modified_" + UUID.randomUUID(); + LOGGER.info("Discovered catalog: {}", catalog); final ConnectionRead connection =