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

Validate source/destination definition ids before create connection - issue 144 #4115

Merged
merged 2 commits into from
Jun 18, 2021
Merged

Validate source/destination definition ids before create connection - issue 144 #4115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd6a05
ConnectionsHandler checks that sourceDefinitionId and destinationDefi…
jennybrown8 Jun 14, 2021
d755721
Whitespace fixes
airbyte-jenny Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...nfig/persistence/src/main/java/io/airbyte/config/persistence/ConfigNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

import io.airbyte.config.ConfigSchema;

import java.util.UUID;

public class ConfigNotFoundException extends Exception {

private ConfigSchema type;
Expand All @@ -36,6 +38,9 @@ public ConfigNotFoundException(ConfigSchema type, String configId) {
this.type = type;
this.configId = configId;
}
public ConfigNotFoundException(ConfigSchema type, UUID uuid) {
this(type, uuid.toString());
}

public ConfigSchema getType() {
return type;
Expand Down
4 changes: 4 additions & 0 deletions airbyte-server/src/main/java/io/airbyte/server/handlers/ConnectionsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ public ConnectionRead createConnection(ConnectionCreate connectionCreate) throws
standardSync.withManual(true);
}

// Validate source and destination
configRepository.getSourceConnection(connectionCreate.getSourceId());
configRepository.getDestinationConnection(connectionCreate.getDestinationId());

configRepository.writeStandardSync(standardSync);

trackNewConnection(standardSync);
Expand Down
62 changes: 54 additions & 8 deletions airbyte-server/src/test/java/io/airbyte/server/handlers/ConnectionsHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@

package io.airbyte.server.handlers;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
Expand All @@ -45,12 +44,7 @@
import io.airbyte.api.model.SyncMode;
import io.airbyte.api.model.WorkspaceIdRequestBody;
import io.airbyte.commons.enums.Enums;
import io.airbyte.config.DataType;
import io.airbyte.config.Schedule;
import io.airbyte.config.SourceConnection;
import io.airbyte.config.StandardDestinationDefinition;
import io.airbyte.config.StandardSourceDefinition;
import io.airbyte.config.StandardSync;
import io.airbyte.config.*;
import io.airbyte.config.persistence.ConfigNotFoundException;
import io.airbyte.config.persistence.ConfigRepository;
import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
Expand Down Expand Up @@ -120,6 +114,58 @@ void testCreateConnection() throws JsonValidationException, ConfigNotFoundExcept
verify(configRepository).writeStandardSync(standardSync);
}


@Test
void testCreateConnectionWithBadDefinitionIds() throws JsonValidationException, ConfigNotFoundException, IOException {
when(uuidGenerator.get()).thenReturn(standardSync.getConnectionId());
UUID sourceDefinitionIdBad = UUID.randomUUID();
UUID destinationDefinitionIdBad = UUID.randomUUID();

final StandardSourceDefinition sourceDefinition = new StandardSourceDefinition()
.withName("source-test")
.withSourceDefinitionId(UUID.randomUUID());
final StandardDestinationDefinition destinationDefinition = new StandardDestinationDefinition()
.withName("destination-test")
.withDestinationDefinitionId(UUID.randomUUID());
when(configRepository.getStandardSync(standardSync.getConnectionId())).thenReturn(standardSync);
when(configRepository.getSourceDefinitionFromConnection(standardSync.getConnectionId())).thenReturn(sourceDefinition);
when(configRepository.getDestinationDefinitionFromConnection(standardSync.getConnectionId())).thenReturn(destinationDefinition);

when(configRepository.getSourceConnection(sourceDefinitionIdBad)).thenThrow(new ConfigNotFoundException(ConfigSchema.SOURCE_CONNECTION, sourceDefinitionIdBad));
when(configRepository.getDestinationConnection(destinationDefinitionIdBad)).thenThrow(new ConfigNotFoundException(ConfigSchema.DESTINATION_CONNECTION, destinationDefinitionIdBad));

final AirbyteCatalog catalog = ConnectionHelpers.generateBasicApiCatalog();

final ConnectionCreate connectionCreateBadSource = new ConnectionCreate()
.sourceId(sourceDefinitionIdBad)
.destinationId(standardSync.getDestinationId())
.operationIds(standardSync.getOperationIds())
.name("presto to hudi")
.namespaceDefinition(NamespaceDefinitionType.SOURCE)
.namespaceFormat(null)
.prefix("presto_to_hudi")
.status(ConnectionStatus.ACTIVE)
.schedule(ConnectionHelpers.generateBasicConnectionSchedule())
.syncCatalog(catalog);

assertThrows(ConfigNotFoundException.class, () -> connectionsHandler.createConnection(connectionCreateBadSource));

final ConnectionCreate connectionCreateBadDestination = new ConnectionCreate()
.sourceId(standardSync.getSourceId())
.destinationId(destinationDefinitionIdBad)
.operationIds(standardSync.getOperationIds())
.name("presto to hudi")
.namespaceDefinition(NamespaceDefinitionType.SOURCE)
.namespaceFormat(null)
.prefix("presto_to_hudi")
.status(ConnectionStatus.ACTIVE)
.schedule(ConnectionHelpers.generateBasicConnectionSchedule())
.syncCatalog(catalog);

assertThrows(ConfigNotFoundException.class, () -> connectionsHandler.createConnection(connectionCreateBadDestination));

}

@Test
void testUpdateConnection() throws JsonValidationException, ConfigNotFoundException, IOException {
final AirbyteCatalog catalog = ConnectionHelpers.generateBasicApiCatalog();
Expand Down