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

Fix connection read object building #13568

Merged
merged 1 commit into from
Jun 13, 2022
Merged

Fix connection read object building #13568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion airbyte-server/src/main/java/io/airbyte/server/converters/ApiPojoConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ public static ConnectionRead internalToConnectionRead(final StandardSync standar
.namespaceDefinition(Enums.convertTo(standardSync.getNamespaceDefinition(), io.airbyte.api.model.generated.NamespaceDefinitionType.class))
.namespaceFormat(standardSync.getNamespaceFormat())
.prefix(standardSync.getPrefix())
.syncCatalog(CatalogConverter.toApi(standardSync.getCatalog()));
.syncCatalog(CatalogConverter.toApi(standardSync.getCatalog()))
.sourceCatalogId(standardSync.getSourceCatalogId());

if (standardSync.getResourceRequirements() != null) {
connectionRead.resourceRequirements(resourceRequirementsToApi(standardSync.getResourceRequirements()));
Expand Down
1 change: 1 addition & 0 deletions airbyte-server/src/main/java/io/airbyte/server/handlers/helpers/ConnectionMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public ConnectionRead match(final ConnectionRead query) {
fromSearch.resourceRequirements(query.getResourceRequirements());
fromSearch.syncCatalog(query.getSyncCatalog());
fromSearch.operationIds(query.getOperationIds());
fromSearch.sourceCatalogId(query.getSourceCatalogId());

return fromSearch;
}
Expand Down
9 changes: 6 additions & 3 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 @@ -115,7 +115,8 @@ void setUp() throws IOException, JsonValidationException, ConfigNotFoundExceptio
.withOperationIds(List.of(operationId))
.withManual(false)
.withSchedule(ConnectionHelpers.generateBasicSchedule())
.withResourceRequirements(ConnectionHelpers.TESTING_RESOURCE_REQUIREMENTS);
.withResourceRequirements(ConnectionHelpers.TESTING_RESOURCE_REQUIREMENTS)
.withSourceCatalogId(UUID.randomUUID());
standardSyncDeleted = new StandardSync()
.withConnectionId(connectionId)
.withName("presto to hudi2")
Expand Down Expand Up @@ -194,7 +195,8 @@ void testCreateConnection() throws JsonValidationException, ConfigNotFoundExcept
.cpuRequest(standardSync.getResourceRequirements().getCpuRequest())
.cpuLimit(standardSync.getResourceRequirements().getCpuLimit())
.memoryRequest(standardSync.getResourceRequirements().getMemoryRequest())
.memoryLimit(standardSync.getResourceRequirements().getMemoryLimit()));
.memoryLimit(standardSync.getResourceRequirements().getMemoryLimit()))
.sourceCatalogId(standardSync.getSourceCatalogId());

final ConnectionRead actualConnectionRead = connectionsHandler.createConnection(connectionCreate);

Expand Down Expand Up @@ -343,7 +345,8 @@ void testUpdateConnection() throws JsonValidationException, ConfigNotFoundExcept
standardSync.getConnectionId(),
standardSync.getSourceId(),
standardSync.getDestinationId(),
standardSync.getOperationIds())
standardSync.getOperationIds(),
newSourceCatalogId)
.schedule(null)
.syncCatalog(catalog)
.status(ConnectionStatus.INACTIVE);
Expand Down
12 changes: 8 additions & 4 deletions airbyte-server/src/test/java/io/airbyte/server/helpers/ConnectionHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ public static Schedule generateBasicSchedule() {
public static ConnectionRead generateExpectedConnectionRead(final UUID connectionId,
final UUID sourceId,
final UUID destinationId,
final List<UUID> operationIds) {
final List<UUID> operationIds,
final UUID sourceCatalogId) {

return new ConnectionRead()
.connectionId(connectionId)
Expand All @@ -117,15 +118,17 @@ public static ConnectionRead generateExpectedConnectionRead(final UUID connectio
.cpuRequest(TESTING_RESOURCE_REQUIREMENTS.getCpuRequest())
.cpuLimit(TESTING_RESOURCE_REQUIREMENTS.getCpuLimit())
.memoryRequest(TESTING_RESOURCE_REQUIREMENTS.getMemoryRequest())
.memoryLimit(TESTING_RESOURCE_REQUIREMENTS.getMemoryLimit()));
.memoryLimit(TESTING_RESOURCE_REQUIREMENTS.getMemoryLimit()))
.sourceCatalogId(sourceCatalogId);
}

public static ConnectionRead generateExpectedConnectionRead(final StandardSync standardSync) {
final ConnectionRead connectionRead = generateExpectedConnectionRead(
standardSync.getConnectionId(),
standardSync.getSourceId(),
standardSync.getDestinationId(),
standardSync.getOperationIds());
standardSync.getOperationIds(),
standardSync.getSourceCatalogId());

if (standardSync.getSchedule() == null) {
connectionRead.schedule(null);
Expand All @@ -147,7 +150,8 @@ public static ConnectionRead connectionReadFromStandardSync(final StandardSync s
.operationIds(standardSync.getOperationIds())
.name(standardSync.getName())
.namespaceFormat(standardSync.getNamespaceFormat())
.prefix(standardSync.getPrefix());
.prefix(standardSync.getPrefix())
.sourceCatalogId(standardSync.getSourceCatalogId());

if (standardSync.getNamespaceDefinition() != null) {
connectionRead
Expand Down