remove import / export handler (#16403)

airbytehq · Sep 29, 2022 · 1e2f701 · 1e2f701
1 parent 65a35b9
commit 1e2f701
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 1,765 deletions.
diff --git a/.env b/.env
@@ -94,7 +94,6 @@ WORKFLOW_FAILURE_RESTART_DELAY_SECONDS=
 
 ### FEATURE FLAGS ###
 AUTO_DISABLE_FAILING_CONNECTIONS=false
-EXPOSE_SECRETS_IN_EXPORT=false
 FORCE_MIGRATE_SECRET_STORE=false
 
 ### MONITORING FLAGS ###

diff --git a/airbyte-bootloader/src/main/java/io/airbyte/bootloader/BootloaderApp.java b/airbyte-bootloader/src/main/java/io/airbyte/bootloader/BootloaderApp.java
@@ -191,7 +191,6 @@ private static Database getConfigDatabase(final DSLContext dslContext) throws IO
 
   private static ConfigPersistence getConfigPersistence(final Database configDatabase) throws IOException {
     final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
-        .maskSecrets(true)
         .copySecrets(true)
         .build();
 

diff --git a/airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderAppTest.java b/airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderAppTest.java
@@ -170,7 +170,6 @@ void testBootloaderAppRunSecretMigration() throws Exception {
 
     final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
         .copySecrets(true)
-        .maskSecrets(true)
         .build();
 
     try (val configsDslContext = DSLContextFactory.create(configsDataSource, SQLDialect.POSTGRES);

diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/features/EnvVariableFeatureFlags.java b/airbyte-commons/src/main/java/io/airbyte/commons/features/EnvVariableFeatureFlags.java
@@ -21,11 +21,6 @@ public boolean autoDisablesFailingConnections() {
     return Boolean.parseBoolean(System.getenv("AUTO_DISABLE_FAILING_CONNECTIONS"));
   }
 
-  @Override
-  public boolean exposeSecretsInExport() {
-    return Boolean.parseBoolean(System.getenv("EXPOSE_SECRETS_IN_EXPORT"));
-  }
-
   @Override
   public boolean forceSecretMigration() {
     return Boolean.parseBoolean(System.getenv("FORCE_MIGRATE_SECRET_STORE"));

diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/features/FeatureFlags.java b/airbyte-commons/src/main/java/io/airbyte/commons/features/FeatureFlags.java
@@ -12,8 +12,6 @@ public interface FeatureFlags {
 
   boolean autoDisablesFailingConnections();
 
-  boolean exposeSecretsInExport();
-
   boolean forceSecretMigration();
 
   boolean useStreamCapableState();

diff --git a/...tence/src/main/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessor.java b/...tence/src/main/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessor.java
@@ -27,10 +27,7 @@
 public class JsonSecretsProcessor {
 
   @Builder.Default
-  final private boolean maskSecrets = true;
-
-  @Builder.Default
-  final private boolean copySecrets = true;
+  final private Boolean copySecrets = false;
 
   protected static final JsonSchemaValidator VALIDATOR = new JsonSchemaValidator();
 
@@ -54,18 +51,14 @@ public class JsonSecretsProcessor {
    * @param obj Object containing potentially secret fields
    */
   public JsonNode prepareSecretsForOutput(final JsonNode obj, final JsonNode schema) {
-    if (maskSecrets) {
-      // todo (cgardens) this is not safe. should throw.
-      // if schema is an object and has a properties field
-      if (!isValidJsonSchema(schema)) {
-        log.error("The schema is not valid, the secret can't be hidden");
-        return obj;
-      }
-
-      return maskAllSecrets(obj, schema);
+    // todo (cgardens) this is not safe. should throw.
+    // if schema is an object and has a properties field
+    if (!isValidJsonSchema(schema)) {
+      log.error("The schema is not valid, the secret can't be hidden");
+      return obj;
     }
 
-    return obj;
+    return maskAllSecrets(obj, schema);
   }
 
   /**

diff --git a/...e/src/test/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessorTest.java b/...e/src/test/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessorTest.java
@@ -198,7 +198,6 @@ class JsonSecretsProcessorTest {
   public void setup() {
     processor = JsonSecretsProcessor.builder()
         .copySecrets(true)
-        .maskSecrets(true)
         .build();
   }
 
@@ -502,7 +501,6 @@ class NoOpTest {
     public void setup() {
       processor = JsonSecretsProcessor.builder()
           .copySecrets(false)
-          .maskSecrets(false)
           .build();
     }
 
@@ -568,7 +566,7 @@ void testSecretScenario(final String folder, final boolean partial) throws IOExc
       final InputStream inputIs = getClass().getClassLoader().getResourceAsStream(inputFilePath);
       final JsonNode input = objectMapper.readTree(inputIs);
 
-      final String expectedFilePath = folder + (partial ? "/partial_config.json" : "/full_config.json");
+      final String expectedFilePath = folder + "/expected.json";
       final InputStream expectedIs = getClass().getClassLoader().getResourceAsStream(expectedFilePath);
       final JsonNode expected = objectMapper.readTree(expectedIs);
 

diff --git a/airbyte-server/src/main/java/io/airbyte/server/ConfigDumpExporter.java b/airbyte-server/src/main/java/io/airbyte/server/ConfigDumpExporter.java