Remove the bulk actions from ConfigPersistence (#18800)

Author: cgardens

airbyte-bootloader/src/main/java/io/airbyte/bootloader/BootloaderApp.java

@@ -23,7 +23,6 @@
 import io.airbyte.config.persistence.DatabaseConfigPersistence;
 import io.airbyte.config.persistence.SecretsRepositoryReader;
 import io.airbyte.config.persistence.SecretsRepositoryWriter;
-import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
 import io.airbyte.config.persistence.split_secrets.SecretPersistence;
 import io.airbyte.config.persistence.split_secrets.SecretsHydrator;
 import io.airbyte.db.Database;
@@ -195,11 +194,7 @@ private static Database getConfigDatabase(final DSLContext dslContext) throws IO
   }
 
   private static ConfigPersistence getConfigPersistence(final Database configDatabase) throws IOException {
-    final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
-        .copySecrets(true)
-        .build();
-
-    return DatabaseConfigPersistence.createWithValidation(configDatabase, jsonSecretsProcessor);
+    return DatabaseConfigPersistence.createWithValidation(configDatabase);
   }
 
   private static DefinitionsProvider getLocalDefinitionsProvider() throws IOException {

airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderAppTest.java

@@ -30,7 +30,6 @@
 import io.airbyte.config.persistence.DatabaseConfigPersistence;
 import io.airbyte.config.persistence.SecretsRepositoryReader;
 import io.airbyte.config.persistence.SecretsRepositoryWriter;
-import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
 import io.airbyte.config.persistence.split_secrets.LocalTestingSecretPersistence;
 import io.airbyte.config.persistence.split_secrets.RealSecretsHydrator;
 import io.airbyte.config.persistence.split_secrets.SecretPersistence;
@@ -173,10 +172,6 @@ void testBootloaderAppRunSecretMigration() throws Exception {
 
     val mockedFeatureFlags = mock(FeatureFlags.class);
 
-    final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
-        .copySecrets(true)
-        .build();
-
     try (val configsDslContext = DSLContextFactory.create(configsDataSource, SQLDialect.POSTGRES);
         val jobsDslContext = DSLContextFactory.create(configsDataSource, SQLDialect.POSTGRES)) {
 
@@ -186,7 +181,7 @@ void testBootloaderAppRunSecretMigration() throws Exception {
       val configDatabase = new ConfigsDatabaseTestProvider(configsDslContext, configsFlyway).create(false);
       val jobDatabase = new JobsDatabaseTestProvider(jobsDslContext, jobsFlyway).create(false);
 
-      val configPersistence = new DatabaseConfigPersistence(configDatabase, jsonSecretsProcessor);
+      val configPersistence = new DatabaseConfigPersistence(configDatabase);
       val configRepository = new ConfigRepository(configPersistence, configDatabase);
       val jobsPersistence = new DefaultJobPersistence(jobDatabase);
 

airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/ClassEnforcingConfigPersistence.java

@@ -4,14 +4,12 @@
 
 package io.airbyte.config.persistence;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.config.AirbyteConfig;
 import io.airbyte.config.ConfigWithMetadata;
 import io.airbyte.validation.json.JsonValidationException;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 /**
  * We are moving migrating away from this interface entirely. Use ConfigRepository instead.
@@ -34,8 +32,4 @@ <T> ConfigWithMetadata<T> getConfigWithMetadata(AirbyteConfig configType, String
 
   void deleteConfig(AirbyteConfig configType, String configId) throws ConfigNotFoundException, IOException;
 
-  void replaceAllConfigs(Map<AirbyteConfig, Stream<?>> configs, boolean dryRun) throws IOException;
-
-  Map<String, Stream<JsonNode>> dumpConfigs() throws IOException;
-
 }

airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/ConfigPersistence.java

@@ -19,7 +19,6 @@
 import static org.jooq.impl.DSL.noCondition;
 import static org.jooq.impl.DSL.select;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
 import com.google.common.collect.Sets;
@@ -30,7 +29,6 @@
 import io.airbyte.commons.version.AirbyteProtocolVersion;
 import io.airbyte.config.ActorCatalog;
 import io.airbyte.config.ActorCatalogFetchEvent;
-import io.airbyte.config.AirbyteConfig;
 import io.airbyte.config.ConfigSchema;
 import io.airbyte.config.DestinationConnection;
 import io.airbyte.config.DestinationOAuthParameter;
@@ -70,7 +68,6 @@
 import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.apache.commons.lang3.ArrayUtils;
 import org.jooq.Condition;
 import org.jooq.DSLContext;
@@ -1135,33 +1132,6 @@ public int countDestinationsForWorkspace(final UUID workspaceId) throws IOExcept
         .andNot(ACTOR.TOMBSTONE)).fetchOne().into(int.class);
   }
 
-  /**
-   * MUST NOT ACCEPT SECRETS - Package private so that secrets are not accidentally passed in. Should
-   * only be called from { @link SecretsRepositoryWriter }
-   *
-   * Takes as inputs configurations that it then uses to overwrite the contents of the existing Config
-   * Database.
-   *
-   * @param configs - configurations to load.
-   * @param dryRun - whether to test run of the load
-   * @throws IOException - you never know when you IO.
-   */
-  void replaceAllConfigsNoSecrets(final Map<AirbyteConfig, Stream<?>> configs, final boolean dryRun) throws IOException {
-    persistence.replaceAllConfigs(configs, dryRun);
-  }
-
-  /**
-   * Dumps all configurations in the Config Database. Note: It will not contain secrets as the Config
-   * Database does not contain connector configurations that include secrets. In order to hydrate with
-   * secrets see { @link SecretsRepositoryReader#dumpConfigs() }.
-   *
-   * @return all configurations in the Config Database
-   * @throws IOException - you never know when you IO
-   */
-  public Map<String, Stream<JsonNode>> dumpConfigsNoSecrets() throws IOException {
-    return persistence.dumpConfigs();
-  }
-
   /**
    * The following methods are present to allow the JobCreationAndStatusUpdateActivity class to emit
    * metrics without exposing the underlying database connection.