chore: merge billing service with cloud-cron (#16854)

Author: abuchanan-airbyte

airbyte-api/server-api/src/main/openapi/config.yaml

@@ -232,27 +232,6 @@ paths:
                 $ref: "#/components/schemas/WorkspaceReadList"
         "404":
           $ref: "#/components/responses/NotFoundResponse"
-  /v1/workspaces/list_active_workspaces_by_most_recently_running_jobs:
-    post:
-      summary: Lists workspaces with the most recently running jobs within the given time window
-      tags:
-        - workspace
-      operationId: listActiveWorkspacesByMostRecentlyRunningJobs
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/TimeWindowRequestBody"
-        required: false
-      responses:
-        "200":
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/WorkspaceIdList"
-        "422":
-          $ref: "#/components/responses/InvalidInputResponse"
   /v1/workspaces/get_available_dbt_jobs:
     post:
       tags:

airbyte-commons-server/src/main/java/io/airbyte/commons/server/handlers/WorkspacesHandler.java

@@ -23,12 +23,10 @@
 import io.airbyte.api.model.generated.NotificationsConfig;
 import io.airbyte.api.model.generated.SlugRequestBody;
 import io.airbyte.api.model.generated.SourceRead;
-import io.airbyte.api.model.generated.TimeWindowRequestBody;
 import io.airbyte.api.model.generated.WebhookNotificationConfig;
 import io.airbyte.api.model.generated.WorkspaceCreate;
 import io.airbyte.api.model.generated.WorkspaceCreateWithId;
 import io.airbyte.api.model.generated.WorkspaceGiveFeedback;
-import io.airbyte.api.model.generated.WorkspaceIdList;
 import io.airbyte.api.model.generated.WorkspaceIdRequestBody;
 import io.airbyte.api.model.generated.WorkspaceOrganizationInfoRead;
 import io.airbyte.api.model.generated.WorkspaceRead;
@@ -76,7 +74,6 @@
 import java.util.UUID;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import org.jetbrains.annotations.NotNull;
 import org.jooq.tools.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -612,9 +609,4 @@ private WorkspaceRead persistStandardWorkspace(final StandardWorkspace workspace
     return WorkspaceConverter.domainToApiModel(workspace);
   }
 
-  public WorkspaceIdList listActiveWorkspacesByMostRecentlyRunningJobs(@NotNull TimeWindowRequestBody timeWindowRequestBody) throws IOException {
-    final List<UUID> workspaceIds = workspaceService.listActiveWorkspacesByMostRecentlyRunningJobs(timeWindowRequestBody.getTimeWindowInHours());
-    return new WorkspaceIdList().workspaceIds(workspaceIds);
-  }
-
 }

airbyte-commons-server/src/main/java/io/airbyte/commons/server/support/AuthNettyServerCustomizer.java

@@ -32,8 +32,9 @@ public class AuthNettyServerCustomizer implements BeanCreatedEventListener<Regis
   private final Integer maxHeaderSize;
   private final Integer maxChunkSize;
 
+  @SuppressWarnings("LineLength")
   public AuthNettyServerCustomizer(final AuthorizationServerHandler authorizationServerHandler,
-                                   @Value("${micronaut.server.netty.aggregator.max-content-length}") final Integer aggregatorMaxContentLength,
+                                   @Value("${micronaut.server.netty.aggregator.max-content-length:52428800}") final Integer aggregatorMaxContentLength,
                                    @Value("${micronaut.server.netty.max-initial-line-length:4096}") final Integer maxInitialLineLength,
                                    @Value("${micronaut.server.netty.max-header-size:8192}") final Integer maxHeaderSize,
                                    @Value("${micronaut.server.netty.max-chunk-size:8192}") final Integer maxChunkSize) {

airbyte-data/src/main/java/io/airbyte/data/services/WorkspaceService.java

@@ -5,7 +5,6 @@
 package io.airbyte.data.services;
 
 import io.airbyte.config.StandardWorkspace;
-import io.airbyte.config.WorkspaceServiceAccount;
 import io.airbyte.data.ConfigNotFoundException;
 import io.airbyte.data.services.shared.ResourcesQueryPaginated;
 import io.airbyte.data.services.shared.StandardSyncQuery;
@@ -52,12 +51,6 @@ StandardWorkspace getStandardWorkspaceNoSecrets(UUID workspaceId, boolean includ
 
   int countDestinationsForWorkspace(UUID workspaceId) throws IOException;
 
-  WorkspaceServiceAccount getWorkspaceServiceAccountNoSecrets(UUID workspaceId) throws IOException, ConfigNotFoundException;
-
-  void writeWorkspaceServiceAccountNoSecrets(WorkspaceServiceAccount workspaceServiceAccount) throws IOException;
-
-  String getDataplaneGroupNameForWorkspace(UUID workspaceId) throws IOException;
-
   boolean getWorkspaceHasAlphaOrBetaConnector(UUID workspaceId) throws IOException;
 
   List<UUID> listWorkspaceActiveSyncIds(final StandardSyncQuery standardSyncQuery) throws IOException;

airbyte-data/src/main/java/io/airbyte/data/services/impls/jooq/WorkspaceServiceJooqImpl.java

@@ -9,9 +9,7 @@
 import static io.airbyte.db.instance.configs.jooq.generated.Tables.ACTOR_DEFINITION_VERSION;
 import static io.airbyte.db.instance.configs.jooq.generated.Tables.ACTOR_DEFINITION_WORKSPACE_GRANT;
 import static io.airbyte.db.instance.configs.jooq.generated.Tables.CONNECTION;
-import static io.airbyte.db.instance.configs.jooq.generated.Tables.DATAPLANE_GROUP;
 import static io.airbyte.db.instance.configs.jooq.generated.Tables.WORKSPACE;
-import static io.airbyte.db.instance.configs.jooq.generated.Tables.WORKSPACE_SERVICE_ACCOUNT;
 import static io.airbyte.db.instance.jobs.jooq.generated.Tables.JOBS;
 import static org.jooq.impl.DSL.asterisk;
 import static org.jooq.impl.DSL.noCondition;
@@ -28,7 +26,6 @@
 import io.airbyte.config.SourceConnection;
 import io.airbyte.config.StandardSync;
 import io.airbyte.config.StandardWorkspace;
-import io.airbyte.config.WorkspaceServiceAccount;
 import io.airbyte.config.secrets.SecretsRepositoryReader;
 import io.airbyte.config.secrets.SecretsRepositoryWriter;
 import io.airbyte.config.secrets.persistence.RuntimeSecretPersistence;
@@ -53,14 +50,12 @@
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.time.OffsetDateTime;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.jooq.Condition;
-import org.jooq.DSLContext;
 import org.jooq.JSONB;
 import org.jooq.JoinType;
 import org.jooq.Record;
@@ -413,64 +408,6 @@ public int countDestinationsForWorkspace(final UUID workspaceId) throws IOExcept
         .andNot(ACTOR.TOMBSTONE)).fetchOne().into(int.class);
   }
 
-  /**
-   * Get workspace service account without secrets.
-   *
-   * @param workspaceId workspace id
-   * @return workspace service account
-   * @throws ConfigNotFoundException if the config does not exist
-   * @throws IOException if there is an issue while interacting with db.
-   */
-  @Override
-  public WorkspaceServiceAccount getWorkspaceServiceAccountNoSecrets(final UUID workspaceId) throws IOException, ConfigNotFoundException {
-    // breaking the pattern of doing a list query, because we never want to list this resource without
-    // scoping by workspace id.
-    return database.query(ctx -> ctx.select(asterisk()).from(WORKSPACE_SERVICE_ACCOUNT)
-        .where(WORKSPACE_SERVICE_ACCOUNT.WORKSPACE_ID.eq(workspaceId))
-        .fetch())
-        .map(DbConverter::buildWorkspaceServiceAccount)
-        .stream()
-        .findFirst()
-        .orElseThrow(() -> new ConfigNotFoundException(ConfigNotFoundType.WORKSPACE_SERVICE_ACCOUNT, workspaceId));
-  }
-
-  /**
-   * Write workspace service account with no secrets.
-   *
-   * @param workspaceServiceAccount workspace service account
-   * @throws IOException if there is an issue while interacting with db.
-   */
-  @Override
-  public void writeWorkspaceServiceAccountNoSecrets(final WorkspaceServiceAccount workspaceServiceAccount) throws IOException {
-    database.transaction(ctx -> {
-      writeWorkspaceServiceAccount(Collections.singletonList(workspaceServiceAccount), ctx);
-      return null;
-    });
-  }
-
-  /**
-   * Get dataplane group name for the workspace.
-   *
-   * @param workspaceId workspace id
-   * @return dataplaneGroupName
-   * @throws IOException exception while interacting with the db
-   */
-  @Override
-  public String getDataplaneGroupNameForWorkspace(final UUID workspaceId) throws IOException {
-    final List<String> dataplaneGroupName = database.query(ctx -> ctx.select(DATAPLANE_GROUP.NAME)
-        .from(WORKSPACE)
-        .join(DATAPLANE_GROUP)
-        .on(WORKSPACE.DATAPLANE_GROUP_ID.eq(DATAPLANE_GROUP.ID)))
-        .where(WORKSPACE.ID.eq(workspaceId))
-        .fetchInto(String.class);
-
-    if (dataplaneGroupName.isEmpty()) {
-      throw new RuntimeException(String.format("Dataplane group name wasn't resolved for workspaceId %s",
-          workspaceId));
-    }
-    return dataplaneGroupName.getFirst();
-  }
-
   /**
    * Specialized query for efficiently determining eligibility for the Free Connector Program. If a
    * workspace has at least one Alpha or Beta connector, users of that workspace will be prompted to
@@ -540,43 +477,6 @@ public List<StandardWorkspace> listStandardWorkspacesWithIds(final List<UUID> wo
     return listWorkspaceQuery(Optional.of(workspaceIds), includeTombstone).toList();
   }
 
-  /**
-   * Write workspace service account.
-   *
-   * @param configs list of workspace service account
-   * @param ctx database context
-   */
-  private void writeWorkspaceServiceAccount(final List<WorkspaceServiceAccount> configs, final DSLContext ctx) {
-    final OffsetDateTime timestamp = OffsetDateTime.now();
-    configs.forEach((workspaceServiceAccount) -> {
-      final boolean isExistingConfig = ctx.fetchExists(select()
-          .from(WORKSPACE_SERVICE_ACCOUNT)
-          .where(WORKSPACE_SERVICE_ACCOUNT.WORKSPACE_ID.eq(workspaceServiceAccount.getWorkspaceId())));
-
-      if (isExistingConfig) {
-        ctx.update(WORKSPACE_SERVICE_ACCOUNT)
-            .set(WORKSPACE_SERVICE_ACCOUNT.WORKSPACE_ID, workspaceServiceAccount.getWorkspaceId())
-            .set(WORKSPACE_SERVICE_ACCOUNT.SERVICE_ACCOUNT_ID, workspaceServiceAccount.getServiceAccountId())
-            .set(WORKSPACE_SERVICE_ACCOUNT.SERVICE_ACCOUNT_EMAIL, workspaceServiceAccount.getServiceAccountEmail())
-            .set(WORKSPACE_SERVICE_ACCOUNT.JSON_CREDENTIAL, JSONB.valueOf(Jsons.serialize(workspaceServiceAccount.getJsonCredential())))
-            .set(WORKSPACE_SERVICE_ACCOUNT.HMAC_KEY, JSONB.valueOf(Jsons.serialize(workspaceServiceAccount.getHmacKey())))
-            .set(WORKSPACE_SERVICE_ACCOUNT.UPDATED_AT, timestamp)
-            .where(WORKSPACE_SERVICE_ACCOUNT.WORKSPACE_ID.eq(workspaceServiceAccount.getWorkspaceId()))
-            .execute();
-      } else {
-        ctx.insertInto(WORKSPACE_SERVICE_ACCOUNT)
-            .set(WORKSPACE_SERVICE_ACCOUNT.WORKSPACE_ID, workspaceServiceAccount.getWorkspaceId())
-            .set(WORKSPACE_SERVICE_ACCOUNT.SERVICE_ACCOUNT_ID, workspaceServiceAccount.getServiceAccountId())
-            .set(WORKSPACE_SERVICE_ACCOUNT.SERVICE_ACCOUNT_EMAIL, workspaceServiceAccount.getServiceAccountEmail())
-            .set(WORKSPACE_SERVICE_ACCOUNT.JSON_CREDENTIAL, JSONB.valueOf(Jsons.serialize(workspaceServiceAccount.getJsonCredential())))
-            .set(WORKSPACE_SERVICE_ACCOUNT.HMAC_KEY, JSONB.valueOf(Jsons.serialize(workspaceServiceAccount.getHmacKey())))
-            .set(WORKSPACE_SERVICE_ACCOUNT.CREATED_AT, timestamp)
-            .set(WORKSPACE_SERVICE_ACCOUNT.UPDATED_AT, timestamp)
-            .execute();
-      }
-    });
-  }
-
   /**
    * Returns source with a given id. Does not contain secrets. To hydrate with secrets see { @link
    * SourceService#getSourceConnectionWithSecrets(final UUID sourceId) }.

airbyte-server/src/main/kotlin/io/airbyte/server/apis/controllers/WorkspaceApiController.kt

@@ -13,13 +13,11 @@ import io.airbyte.api.model.generated.PermissionCheckRead
 import io.airbyte.api.model.generated.PermissionCheckRequest
 import io.airbyte.api.model.generated.PermissionType
 import io.airbyte.api.model.generated.SlugRequestBody
-import io.airbyte.api.model.generated.TimeWindowRequestBody
 import io.airbyte.api.model.generated.WorkspaceCreate
 import io.airbyte.api.model.generated.WorkspaceCreateWithId
 import io.airbyte.api.model.generated.WorkspaceGetDbtJobsRequest
 import io.airbyte.api.model.generated.WorkspaceGetDbtJobsResponse
 import io.airbyte.api.model.generated.WorkspaceGiveFeedback
-import io.airbyte.api.model.generated.WorkspaceIdList
 import io.airbyte.api.model.generated.WorkspaceIdRequestBody
 import io.airbyte.api.model.generated.WorkspaceOrganizationInfoRead
 import io.airbyte.api.model.generated.WorkspaceRead
@@ -234,13 +232,6 @@ open class WorkspaceApiController(
     @Body request: ListWorkspacesByUserRequestBody,
   ): WorkspaceReadList? = execute { workspacesHandler.listWorkspacesByUser(request) }
 
-  @Post("/list_workspaces_by_most_recently_running_jobs")
-  @Secured(AuthRoleConstants.ADMIN)
-  @ExecuteOn(AirbyteTaskExecutors.IO)
-  override fun listActiveWorkspacesByMostRecentlyRunningJobs(
-    @Body timeWindowRequestBody: TimeWindowRequestBody,
-  ): WorkspaceIdList = throw ApiNotImplementedInOssProblem()
-
   @Post("/get_available_dbt_jobs")
   @Secured(AuthRoleConstants.WORKSPACE_EDITOR, AuthRoleConstants.ORGANIZATION_EDITOR)
   @ExecuteOn(AirbyteTaskExecutors.IO)