Skip to content

Commit

Permalink
convert SchedulerApiController to Micronaut (#20337)
Browse files Browse the repository at this point in the history 
* wip; SchedulerApiController

* remove @nAmed

* remove @singleton

* add back todo message
  • Loading branch information
@colesnodgrass
colesnodgrass authored Dec 12, 2022
1 parent ae5fad3 commit f801280
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 71 deletions.
6 changes: 4 additions & 2 deletions airbyte-commons/src/main/java/io/airbyte/commons/features/EnvVariableFeatureFlags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
package io.airbyte.commons.features;

import java.util.function.Function;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Slf4j
public class EnvVariableFeatureFlags implements FeatureFlags {

private static final Logger log = LoggerFactory.getLogger(EnvVariableFeatureFlags.class);

public static final String USE_STREAM_CAPABLE_STATE = "USE_STREAM_CAPABLE_STATE";
public static final String AUTO_DETECT_SCHEMA = "AUTO_DETECT_SCHEMA";
public static final String LOG_CONNECTOR_MESSAGES = "LOG_CONNECTOR_MESSAGES";
Expand Down
4 changes: 2 additions & 2 deletions airbyte-proxy/nginx-auth.conf.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ http {
}
}

location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|operations|sources|source_definitions|state)/.* {
location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|operations|scheduler|sources|source_definitions|state)/.* {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
Expand Down Expand Up @@ -104,7 +104,7 @@ http {
}

location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|operations
|source_definitions|sources|state)/.* {
|scheduler|source_definitions|sources|state)/.* {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
Expand Down
4 changes: 2 additions & 2 deletions airbyte-proxy/nginx-no-auth.conf.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ http {
proxy_pass "${PROXY_PASS_MICRONAUT_API}";
}

location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|operations|sources|source_definitions|state)/.* {
location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|operations|scheduler|sources|source_definitions|state)/.* {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
Expand Down Expand Up @@ -58,7 +58,7 @@ http {
proxy_pass "${PROXY_PASS_MICRONAUT_API}";
}

location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|operations|sources|source_definitions|state)/.* {
location ~ ^/api/v1/(connections|destinations|destination_definitions|destination_definition_specifications|destination_oauths|operations|scheduler|sources|source_definitions|state)/.* {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
Expand Down
13 changes: 2 additions & 11 deletions airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@
import io.airbyte.config.persistence.SecretsRepositoryWriter;
import io.airbyte.db.Database;
import io.airbyte.persistence.job.JobPersistence;
import io.airbyte.server.apis.DestinationDefinitionSpecificationApiController;
import io.airbyte.server.apis.JobsApiController;
import io.airbyte.server.apis.LogsApiController;
import io.airbyte.server.apis.NotificationsApiController;
import io.airbyte.server.apis.OpenapiApiController;
import io.airbyte.server.apis.OperationApiController;
import io.airbyte.server.apis.SchedulerApiController;
import io.airbyte.server.apis.SourceApiController;
import io.airbyte.server.apis.SourceDefinitionApiController;
import io.airbyte.server.apis.SourceDefinitionSpecificationApiController;
Expand All @@ -30,15 +28,13 @@
import io.airbyte.server.apis.binders.JobsApiBinder;
import io.airbyte.server.apis.binders.LogsApiBinder;
import io.airbyte.server.apis.binders.NotificationApiBinder;
import io.airbyte.server.apis.binders.SchedulerApiBinder;
import io.airbyte.server.apis.binders.SourceDefinitionSpecificationApiBinder;
import io.airbyte.server.apis.binders.SourceOauthApiBinder;
import io.airbyte.server.apis.binders.WebBackendApiBinder;
import io.airbyte.server.apis.binders.WorkspaceApiBinder;
import io.airbyte.server.apis.factories.JobsApiFactory;
import io.airbyte.server.apis.factories.LogsApiFactory;
import io.airbyte.server.apis.factories.NotificationsApiFactory;
import io.airbyte.server.apis.factories.SchedulerApiFactory;
import io.airbyte.server.apis.factories.SourceDefinitionSpecificationApiFactory;
import io.airbyte.server.apis.factories.SourceOauthApiFactory;
import io.airbyte.server.apis.factories.WebBackendApiFactory;
Expand All @@ -63,10 +59,8 @@
import io.airbyte.server.scheduler.SynchronousSchedulerClient;
import java.net.http.HttpClient;
import java.nio.file.Path;
import java.util.Map;
import java.util.Set;
import org.flywaydb.core.Flyway;
import org.slf4j.MDC;

public interface ServerFactory {

Expand Down Expand Up @@ -138,7 +132,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
final WebBackendConnectionsHandler webBackendConnectionsHandler,
final WebBackendGeographiesHandler webBackendGeographiesHandler,
final WebBackendCheckUpdatesHandler webBackendCheckUpdatesHandler) {
final Map<String, String> mdc = MDC.getCopyOfContextMap();

SourceOauthApiFactory.setValues(oAuthHandler);

Expand All @@ -148,8 +141,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul

NotificationsApiFactory.setValues(workspacesHandler);

SchedulerApiFactory.setValues(schedulerHandler);

SourceDefinitionSpecificationApiFactory.setValues(schedulerHandler);

WebBackendApiFactory.setValues(webBackendConnectionsHandler, webBackendGeographiesHandler, webBackendCheckUpdatesHandler);
Expand All @@ -163,7 +154,8 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
NotificationsApiController.class,
OpenapiApiController.class,
OperationApiController.class,
SchedulerApiController.class,
SourceApiController.class,
SourceDefinitionApiController.class,
SourceDefinitionSpecificationApiController.class,
SourceOauthApiController.class,
StateApiController.class,
Expand All @@ -174,7 +166,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
new JobsApiBinder(),
new LogsApiBinder(),
new NotificationApiBinder(),
new SchedulerApiBinder(),
new SourceDefinitionSpecificationApiBinder(),
new SourceOauthApiBinder(),
new WebBackendApiBinder(),
Expand Down
12 changes: 10 additions & 2 deletions airbyte-server/src/main/java/io/airbyte/server/apis/SchedulerApiController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,31 @@
import io.airbyte.api.model.generated.SourceCoreConfig;
import io.airbyte.api.model.generated.SourceDiscoverSchemaRead;
import io.airbyte.server.handlers.SchedulerHandler;
import lombok.AllArgsConstructor;
import io.micronaut.http.annotation.Controller;
import io.micronaut.http.annotation.Post;

@AllArgsConstructor
@Controller("/api/v1/scheduler")
public class SchedulerApiController implements SchedulerApi {

private final SchedulerHandler schedulerHandler;

public SchedulerApiController(final SchedulerHandler schedulerHandler) {
this.schedulerHandler = schedulerHandler;
}

@Post("/destinations/check_connection")
@Override
public CheckConnectionRead executeDestinationCheckConnection(final DestinationCoreConfig destinationCoreConfig) {
return ApiHelper.execute(() -> schedulerHandler.checkDestinationConnectionFromDestinationCreate(destinationCoreConfig));
}

@Post("/sources/check_connection")
@Override
public CheckConnectionRead executeSourceCheckConnection(final SourceCoreConfig sourceCoreConfig) {
return ApiHelper.execute(() -> schedulerHandler.checkSourceConnectionFromSourceCreate(sourceCoreConfig));
}

@Post("/sources/discover_schema")
@Override
public SourceDiscoverSchemaRead executeSourceDiscoverSchema(final SourceCoreConfig sourceCoreConfig) {
return ApiHelper.execute(() -> schedulerHandler.discoverSchemaForSourceFromSourceCreate(sourceCoreConfig));
Expand Down
21 changes: 0 additions & 21 deletions airbyte-server/src/main/java/io/airbyte/server/apis/binders/SchedulerApiBinder.java
View file

This file was deleted.

29 changes: 0 additions & 29 deletions airbyte-server/src/main/java/io/airbyte/server/apis/factories/SchedulerApiFactory.java
View file

This file was deleted.

2 changes: 0 additions & 2 deletions airbyte-server/src/main/java/io/airbyte/server/handlers/SchedulerHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@
import java.util.Optional;
import java.util.UUID;
import javax.validation.constraints.NotNull;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@Singleton
public class SchedulerHandler {

Expand Down

0 comments on commit f801280

Please sign in to comment.