Rbroughan/remove standard sync output client (#12106)

airbytehq · Apr 12, 2024 · e4eb8c1 · e4eb8c1
1 parent b702635
commit e4eb8c1
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 347 deletions.
diff --git a/...ker/src/main/kotlin/io/airbyte/workers/storage/activities/StandardSyncOutputComparator.kt b/...ker/src/main/kotlin/io/airbyte/workers/storage/activities/StandardSyncOutputComparator.kt
diff --git a/...rc/main/kotlin/io/airbyte/workers/storage/activities/payloads/StandardSyncOutputClient.kt b/...rc/main/kotlin/io/airbyte/workers/storage/activities/payloads/StandardSyncOutputClient.kt
diff --git a/...src/test/kotlin/io/airbyte/workers/storage/activities/ActivityPayloadStorageClientTest.kt b/...src/test/kotlin/io/airbyte/workers/storage/activities/ActivityPayloadStorageClientTest.kt
@@ -28,12 +28,11 @@ class ActivityPayloadStorageClientTest {
 
   private lateinit var client: ActivityPayloadStorageClient
 
-  private lateinit var comparator: StandardSyncOutputComparator
+  private var comparator = NaiveEqualityComparator<StandardSyncOutput>()
 
   @BeforeEach
   fun setup() {
     client = ActivityPayloadStorageClient(storageClientRaw, serde, metricClient)
-    comparator = StandardSyncOutputComparator()
 
     every { metricClient.count(any(), any(), *anyVararg()) } returns Unit
 

diff --git a/...est/kotlin/io/airbyte/workers/storage/activities/paylaods/StandardSyncOutputClientTest.kt b/...est/kotlin/io/airbyte/workers/storage/activities/paylaods/StandardSyncOutputClientTest.kt
diff --git a/airbyte-config/config-models/src/main/resources/types/StandardSyncOutput.yaml b/airbyte-config/config-models/src/main/resources/types/StandardSyncOutput.yaml
@@ -22,7 +22,5 @@ properties:
     type: array
     items:
       "$ref": FailureReason.yaml
-  uri:
-    "$ref": ActivityPayloadURI.yaml
   catalogUri:
     "$ref": ActivityPayloadURI.yaml
diff --git a/airbyte-featureflag/src/main/kotlin/FlagDefinitions.kt b/airbyte-featureflag/src/main/kotlin/FlagDefinitions.kt
@@ -198,10 +198,6 @@ object EnforceMutexKeyOnCreate : Temporary<Boolean>(key = "platform.enforce-mute
 
 object ActivateRefreshes : Temporary<Boolean>(key = "platform.activate-refreshes", default = false)
 
-object WriteReplicationOutputToObjectStorage : Temporary<Boolean>(key = "platform.write-replication-output-to-object-storage", default = false)
-
-object ReadReplicationOutputFromObjectStorage : Temporary<Boolean>(key = "platform.read-replication-output-from-object-storage", default = false)
-
 object WriteOutputCatalogToObjectStorage : Temporary<Boolean>(key = "platform.write-output-catalog-to-object-storage", default = false)
 
 object NullOutputCatalogOnSyncOutput : Temporary<Boolean>(key = "platform.null-output-catalog-on-sync-output", default = false)

diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/CloudStorageBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/CloudStorageBeanFactory.java
@@ -6,15 +6,13 @@
 
 import io.airbyte.commons.json.JsonSerde;
 import io.airbyte.config.State;
-import io.airbyte.featureflag.FeatureFlagClient;
 import io.airbyte.metrics.lib.MetricClient;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
 import io.airbyte.workers.storage.DocumentType;
 import io.airbyte.workers.storage.StorageClient;
 import io.airbyte.workers.storage.StorageClientFactory;
 import io.airbyte.workers.storage.activities.ActivityPayloadStorageClient;
 import io.airbyte.workers.storage.activities.OutputStorageClient;
-import io.airbyte.workers.storage.activities.payloads.StandardSyncOutputClient;
 import io.micronaut.context.annotation.Factory;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
@@ -74,17 +72,6 @@ public ActivityPayloadStorageClient activityPayloadStorageClient(
         metricClient);
   }
 
-  @Singleton
-  public StandardSyncOutputClient standardSyncOutputClient(
-                                                           final ActivityPayloadStorageClient payloadStorageClient,
-                                                           final FeatureFlagClient featureFlagClient,
-                                                           final MetricClient metricClient) {
-    return new StandardSyncOutputClient(
-        payloadStorageClient,
-        metricClient,
-        featureFlagClient);
-  }
-
   @Singleton
   @Named("outputStateClient")
   public OutputStorageClient<State> outputStateClient(