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.

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

allow scheduling getspec workers #523

Merged
merged 2 commits into from
Oct 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://github.com/airbytehq/airbyte/blob/master/airbyte-config/models/src/main/resources/types/StandardDiscoverSchemaOutput.yaml",
"title": "StandardDiscoverSchemaOutput",
"description": "information required for connection.",
"type": "object",
"required": ["connectionConfiguration"],
"additionalProperties": false,
"properties":
{
"connectionConfiguration":
{
"description": "Integration specific blob. Must be a valid JSON string.",
"type": "object",
"existingJavaType": "com.fasterxml.jackson.databind.JsonNode",
},
},
}
---
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated to the PR but noticed that this was json not yaml so i fixed it

"$schema": http://json-schema.org/draft-07/schema#
"$id": https://github.com/airbytehq/airbyte/blob/master/airbyte-config/models/src/main/resources/types/StandardDiscoverSchemaOutput.yaml
title: StandardDiscoverSchemaOutput
description: information required for connection.
type: object
required:
- connectionConfiguration
additionalProperties: false
properties:
connectionConfiguration:
description: Integration specific blob. Must be a valid JSON string.
type: object
existingJavaType: com.fasterxml.jackson.databind.JsonNode
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@

import io.airbyte.config.JobCheckConnectionConfig;
import io.airbyte.config.JobDiscoverSchemaConfig;
import io.airbyte.config.JobGetSpecConfig;
import io.airbyte.config.JobOutput;
import io.airbyte.config.JobSyncConfig;
import io.airbyte.config.StandardCheckConnectionInput;
import io.airbyte.config.StandardDiscoverSchemaInput;
import io.airbyte.config.StandardSyncInput;
import io.airbyte.workers.DefaultGetSpecWorker;
import io.airbyte.workers.GetSpecWorker;
import io.airbyte.workers.Worker;
import io.airbyte.workers.process.ProcessBuilderFactory;
import io.airbyte.workers.protocols.singer.DefaultSingerTap;
Expand All @@ -40,6 +43,7 @@
import io.airbyte.workers.protocols.singer.SingerSyncWorker;
import io.airbyte.workers.wrappers.JobOutputCheckConnectionWorker;
import io.airbyte.workers.wrappers.JobOutputDiscoverSchemaWorker;
import io.airbyte.workers.wrappers.JobOutputGetSpecWorker;
import io.airbyte.workers.wrappers.JobOutputSyncWorker;
import java.nio.file.Path;
import org.slf4j.Logger;
Expand Down Expand Up @@ -78,22 +82,23 @@ public WorkerRun create(final Job job) {
LOGGER.info("job root: {}", jobRoot);

switch (job.getConfig().getConfigType()) {
case CHECK_CONNECTION_SOURCE:
case CHECK_CONNECTION_DESTINATION:
case CHECK_CONNECTION_SOURCE, CHECK_CONNECTION_DESTINATION -> {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using jdk14 switch

final StandardCheckConnectionInput checkConnectionInput = getCheckConnectionInput(job.getConfig().getCheckConnection());
return creator.create(
jobRoot,
checkConnectionInput,
new JobOutputCheckConnectionWorker(
new SingerCheckConnectionWorker(new SingerDiscoverSchemaWorker(job.getConfig().getCheckConnection().getDockerImage(), pbf))));
case DISCOVER_SCHEMA:
}
case DISCOVER_SCHEMA -> {
final StandardDiscoverSchemaInput discoverSchemaInput = getDiscoverSchemaInput(job.getConfig().getDiscoverSchema());
return creator.create(
jobRoot,
discoverSchemaInput,
new JobOutputDiscoverSchemaWorker(
new SingerDiscoverSchemaWorker(job.getConfig().getDiscoverSchema().getDockerImage(), pbf)));
case SYNC:
}
case SYNC -> {
final StandardSyncInput syncInput = getSyncInput(job.getConfig().getSync());
final SingerDiscoverSchemaWorker discoverSchemaWorker = new SingerDiscoverSchemaWorker(job.getConfig().getSync().getSourceDockerImage(), pbf);
return creator.create(
Expand All @@ -107,8 +112,17 @@ public WorkerRun create(final Job job) {
new SingerSyncWorker(
new DefaultSingerTap(job.getConfig().getSync().getSourceDockerImage(), pbf, discoverSchemaWorker),
new DefaultSingerTarget(job.getConfig().getSync().getDestinationDockerImage(), pbf))));
default:
throw new RuntimeException("Unexpected config type: " + job.getConfig().getConfigType());
}
case GET_SPEC -> {
final JobGetSpecConfig getSpecInput = job.getConfig().getGetSpec();
final GetSpecWorker worker = new DefaultGetSpecWorker(pbf);
return creator.create(
jobRoot,
getSpecInput,
new JobOutputGetSpecWorker(worker)
);
}
default -> throw new RuntimeException("Unexpected config type: " + job.getConfig().getConfigType());
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,17 @@
import com.fasterxml.jackson.databind.JsonNode;
import io.airbyte.commons.json.Jsons;
import io.airbyte.config.JobConfig;
import io.airbyte.config.JobGetSpecConfig;
import io.airbyte.config.JobOutput;
import io.airbyte.config.StandardCheckConnectionInput;
import io.airbyte.config.StandardDiscoverSchemaInput;
import io.airbyte.config.StandardGetSpecOutput;
import io.airbyte.config.StandardSyncInput;
import io.airbyte.workers.Worker;
import io.airbyte.workers.process.ProcessBuilderFactory;
import io.airbyte.workers.wrappers.JobOutputCheckConnectionWorker;
import io.airbyte.workers.wrappers.JobOutputDiscoverSchemaWorker;
import io.airbyte.workers.wrappers.JobOutputGetSpecWorker;
import io.airbyte.workers.wrappers.JobOutputSyncWorker;
import java.io.IOException;
import java.nio.file.Files;
Expand Down Expand Up @@ -121,4 +124,18 @@ void testSync() {
Assertions.assertTrue(argument.getValue() instanceof JobOutputSyncWorker);
}

@SuppressWarnings("unchecked")
@Test
void testGetSpec(){
when(job.getConfig().getConfigType()).thenReturn(JobConfig.ConfigType.GET_SPEC);
JobGetSpecConfig expectedConfig = new JobGetSpecConfig().withDockerImage("notarealimage");
when(job.getConfig().getGetSpec()).thenReturn(expectedConfig);

factory.create(job);

ArgumentCaptor<Worker<JobGetSpecConfig, JobOutput>> argument = ArgumentCaptor.forClass(Worker.class);
verify(creator).create(eq(rootPath.resolve("1").resolve("2")), eq(expectedConfig), argument.capture());
Assertions.assertTrue(argument.getValue() instanceof JobOutputGetSpecWorker);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package io.airbyte.workers.wrappers;

import io.airbyte.config.JobGetSpecConfig;
import io.airbyte.config.JobOutput;
import io.airbyte.config.StandardGetSpecOutput;
import io.airbyte.workers.GetSpecWorker;

public class JobOutputGetSpecWorker extends OutputConvertingWorker<JobGetSpecConfig, StandardGetSpecOutput, JobOutput> {

public JobOutputGetSpecWorker(GetSpecWorker innerWorker) {
super(
innerWorker,
standardGetSpecOutput -> new JobOutput().withOutputType(JobOutput.OutputType.GET_SPEC).withGetSpec(standardGetSpecOutput)
);
}
}