Rm DbMigration Controller (#20213)

airbytehq · Dec 8, 2022 · 020b95a · 020b95a
1 parent d64c9b6
commit 020b95a
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 397 deletions.
diff --git a/airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java b/airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java
@@ -7,7 +7,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import io.airbyte.api.client.generated.AttemptApi;
 import io.airbyte.api.client.generated.ConnectionApi;
-import io.airbyte.api.client.generated.DbMigrationApi;
 import io.airbyte.api.client.generated.DestinationApi;
 import io.airbyte.api.client.generated.DestinationDefinitionApi;
 import io.airbyte.api.client.generated.DestinationDefinitionSpecificationApi;
@@ -58,7 +57,6 @@ public class AirbyteApiClient {
   private final SourceDefinitionSpecificationApi sourceDefinitionSpecificationApi;
   private final WorkspaceApi workspaceApi;
   private final HealthApi healthApi;
-  private final DbMigrationApi dbMigrationApi;
   private final AttemptApi attemptApi;
   private final StateApi stateApi;
 
@@ -75,7 +73,6 @@ public AirbyteApiClient(final ApiClient apiClient) {
     sourceDefinitionSpecificationApi = new SourceDefinitionSpecificationApi(apiClient);
     workspaceApi = new WorkspaceApi(apiClient);
     healthApi = new HealthApi(apiClient);
-    dbMigrationApi = new DbMigrationApi(apiClient);
     attemptApi = new AttemptApi(apiClient);
     stateApi = new StateApi(apiClient);
   }
@@ -128,10 +125,6 @@ public HealthApi getHealthApi() {
     return healthApi;
   }
 
-  public DbMigrationApi getDbMigrationApi() {
-    return dbMigrationApi;
-  }
-
   public AttemptApi getAttemptApi() {
     return attemptApi;
   }

diff --git a/airbyte-api/src/main/openapi/config.yaml b/airbyte-api/src/main/openapi/config.yaml
@@ -48,8 +48,6 @@ tags:
     description: Source OAuth related resources to delegate access from user.
   - name: source_oauth
     description: Source OAuth related resources to delegate access from user.
-  - name: db_migration
-    description: Database migration related resources.
   - name: web_backend
     description: |
       Endpoints for the Airbyte web application. Those APIs should not be called outside the web application implementation and are not
@@ -1612,52 +1610,6 @@ paths:
                 $ref: "#/components/schemas/CheckConnectionRead"
         "422":
           $ref: "#/components/responses/InvalidInputResponse"
-  /v1/db_migrations/list:
-    post:
-      tags:
-        - db_migration
-      summary: List all database migrations
-      operationId: listMigrations
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/DbMigrationRequestBody"
-        required: true
-      responses:
-        "200":
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/DbMigrationReadList"
-        "404":
-          $ref: "#/components/responses/NotFoundResponse"
-        "422":
-          $ref: "#/components/responses/InvalidInputResponse"
-  /v1/db_migrations/migrate:
-    post:
-      tags:
-        - db_migration
-      summary: Migrate the database to the latest version
-      operationId: executeMigrations
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/DbMigrationRequestBody"
-        required: true
-      responses:
-        "200":
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/DbMigrationExecutionRead"
-        "404":
-          $ref: "#/components/responses/NotFoundResponse"
-        "422":
-          $ref: "#/components/responses/InvalidInputResponse"
   /v1/source_oauths/oauth_params/create:
     post:
       tags:

diff --git a/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java b/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java
@@ -51,7 +51,6 @@
 import io.airbyte.server.errors.UncaughtExceptionMapper;
 import io.airbyte.server.handlers.AttemptHandler;
 import io.airbyte.server.handlers.ConnectionsHandler;
-import io.airbyte.server.handlers.DbMigrationHandler;
 import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
 import io.airbyte.server.handlers.HealthCheckHandler;
@@ -292,8 +291,6 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         connectionsHandler,
         envVariableFeatureFlags);
 
-    final DbMigrationHandler dbMigrationHandler = new DbMigrationHandler(configsDatabase, configsFlyway, jobsDatabase, jobsFlyway);
-
     final DestinationDefinitionsHandler destinationDefinitionsHandler = new DestinationDefinitionsHandler(configRepository, syncSchedulerClient,
         destinationHandler);
 
@@ -371,7 +368,6 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
         jobsFlyway,
         attemptHandler,
         connectionsHandler,
-        dbMigrationHandler,
         destinationDefinitionsHandler,
         destinationHandler,
         healthCheckHandler,
@@ -406,9 +402,9 @@ public static void main(final String[] args) {
         // Ensure that the database resources are closed on application shutdown
         CloseableShutdownHook.registerRuntimeShutdownHook(configsDataSource, jobsDataSource, configsDslContext, jobsDslContext);
 
-        final Flyway configsFlyway = FlywayFactory.create(configsDataSource, DbMigrationHandler.class.getSimpleName(),
+        final Flyway configsFlyway = FlywayFactory.create(configsDataSource, ServerApp.class.getSimpleName(),
             ConfigsDatabaseMigrator.DB_IDENTIFIER, ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
-        final Flyway jobsFlyway = FlywayFactory.create(jobsDataSource, DbMigrationHandler.class.getSimpleName(), JobsDatabaseMigrator.DB_IDENTIFIER,
+        final Flyway jobsFlyway = FlywayFactory.create(jobsDataSource, ServerApp.class.getSimpleName(), JobsDatabaseMigrator.DB_IDENTIFIER,
             JobsDatabaseMigrator.MIGRATION_FILE_LOCATION);
 
         getServer(new ServerFactory.Api(), configs, configsDslContext, configsFlyway, jobsDslContext, jobsFlyway).start();

diff --git a/airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java b/airbyte-server/src/main/java/io/airbyte/server/ServerFactory.java
@@ -15,7 +15,6 @@
 import io.airbyte.persistence.job.JobPersistence;
 import io.airbyte.server.apis.AttemptApiController;
 import io.airbyte.server.apis.ConnectionApiController;
-import io.airbyte.server.apis.DbMigrationApiController;
 import io.airbyte.server.apis.DestinationApiController;
 import io.airbyte.server.apis.DestinationDefinitionApiController;
 import io.airbyte.server.apis.DestinationDefinitionSpecificationApiController;
@@ -36,7 +35,6 @@
 import io.airbyte.server.apis.WorkspaceApiController;
 import io.airbyte.server.apis.binders.AttemptApiBinder;
 import io.airbyte.server.apis.binders.ConnectionApiBinder;
-import io.airbyte.server.apis.binders.DbMigrationBinder;
 import io.airbyte.server.apis.binders.DestinationApiBinder;
 import io.airbyte.server.apis.binders.DestinationDefinitionApiBinder;
 import io.airbyte.server.apis.binders.DestinationDefinitionSpecificationApiBinder;
@@ -57,7 +55,6 @@
 import io.airbyte.server.apis.binders.WorkspaceApiBinder;
 import io.airbyte.server.apis.factories.AttemptApiFactory;
 import io.airbyte.server.apis.factories.ConnectionApiFactory;
-import io.airbyte.server.apis.factories.DbMigrationApiFactory;
 import io.airbyte.server.apis.factories.DestinationApiFactory;
 import io.airbyte.server.apis.factories.DestinationDefinitionApiFactory;
 import io.airbyte.server.apis.factories.DestinationDefinitionSpecificationApiFactory;
@@ -78,7 +75,6 @@
 import io.airbyte.server.apis.factories.WorkspaceApiFactory;
 import io.airbyte.server.handlers.AttemptHandler;
 import io.airbyte.server.handlers.ConnectionsHandler;
-import io.airbyte.server.handlers.DbMigrationHandler;
 import io.airbyte.server.handlers.DestinationDefinitionsHandler;
 import io.airbyte.server.handlers.DestinationHandler;
 import io.airbyte.server.handlers.HealthCheckHandler;
@@ -123,7 +119,6 @@ ServerRunnable create(final SynchronousSchedulerClient synchronousSchedulerClien
                         final Flyway jobsFlyway,
                         final AttemptHandler attemptHandler,
                         final ConnectionsHandler connectionsHandler,
-                        final DbMigrationHandler dbMigrationHandler,
                         final DestinationDefinitionsHandler destinationDefinitionsHandler,
                         final DestinationHandler destinationApiHandler,
                         final HealthCheckHandler healthCheckHandler,
@@ -161,7 +156,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
                                  final Flyway jobsFlyway,
                                  final AttemptHandler attemptHandler,
                                  final ConnectionsHandler connectionsHandler,
-                                 final DbMigrationHandler dbMigrationHandler,
                                  final DestinationDefinitionsHandler destinationDefinitionsHandler,
                                  final DestinationHandler destinationApiHandler,
                                  final HealthCheckHandler healthCheckHandler,
@@ -187,8 +181,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           schedulerHandler,
           mdc);
 
-      DbMigrationApiFactory.setValues(dbMigrationHandler, mdc);
-
       DestinationApiFactory.setValues(destinationApiHandler, schedulerHandler, mdc);
 
       DestinationDefinitionApiFactory.setValues(destinationDefinitionsHandler);
@@ -229,7 +221,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
       final Set<Class<?>> componentClasses = Set.of(
           AttemptApiController.class,
           ConnectionApiController.class,
-          DbMigrationApiController.class,
           DestinationApiController.class,
           DestinationDefinitionApiController.class,
           DestinationDefinitionSpecificationApiController.class,
@@ -253,7 +244,6 @@ public ServerRunnable create(final SynchronousSchedulerClient synchronousSchedul
           new CorsFilter(),
           new AttemptApiBinder(),
           new ConnectionApiBinder(),
-          new DbMigrationBinder(),
           new DestinationApiBinder(),
           new DestinationDefinitionApiBinder(),
           new DestinationDefinitionSpecificationApiBinder(),

diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/DbMigrationApiController.java b/airbyte-server/src/main/java/io/airbyte/server/apis/DbMigrationApiController.java
diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/binders/DbMigrationBinder.java b/airbyte-server/src/main/java/io/airbyte/server/apis/binders/DbMigrationBinder.java
diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/factories/DbMigrationApiFactory.java b/airbyte-server/src/main/java/io/airbyte/server/apis/factories/DbMigrationApiFactory.java
diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/DbMigrationHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/DbMigrationHandler.java