Remove Integrations.java and initially persisted specs (#535)

airbytehq · Oct 9, 2020 · 8e2d973 · 8e2d973
1 parent 6ceb3d2
commit 8e2d973
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 301 deletions.
diff --git a/...ces/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json b/...ces/config/DESTINATION_CONNECTION_SPECIFICATION/8442ee76-cc1d-419a-bd8b-859a090366d4.json
diff --git a/...ces/config/DESTINATION_CONNECTION_SPECIFICATION/a6655e6a-838c-4ecb-a28f-ffdcd27ec710.json b/...ces/config/DESTINATION_CONNECTION_SPECIFICATION/a6655e6a-838c-4ecb-a28f-ffdcd27ec710.json
diff --git a/...ces/config/DESTINATION_CONNECTION_SPECIFICATION/e28a1a10-214a-4051-8cf4-79b6f88719cd.json b/...ces/config/DESTINATION_CONNECTION_SPECIFICATION/e28a1a10-214a-4051-8cf4-79b6f88719cd.json
diff --git a/...esources/config/SOURCE_CONNECTION_SPECIFICATION/2168516a-5c9a-4582-90dc-5e3a01e3f607.json b/...esources/config/SOURCE_CONNECTION_SPECIFICATION/2168516a-5c9a-4582-90dc-5e3a01e3f607.json
diff --git a/...esources/config/SOURCE_CONNECTION_SPECIFICATION/37eb2ebf-0899-4b22-aba8-8537ec88b5a8.json b/...esources/config/SOURCE_CONNECTION_SPECIFICATION/37eb2ebf-0899-4b22-aba8-8537ec88b5a8.json
diff --git a/...esources/config/SOURCE_CONNECTION_SPECIFICATION/dd42e77b-24ce-485d-8146-ee6c96d5b454.json b/...esources/config/SOURCE_CONNECTION_SPECIFICATION/dd42e77b-24ce-485d-8146-ee6c96d5b454.json
diff --git a/airbyte-integrations/src/main/java/io/airbyte/integrations/Integrations.java b/airbyte-integrations/src/main/java/io/airbyte/integrations/Integrations.java
diff --git a/airbyte-scheduler/build.gradle b/airbyte-scheduler/build.gradle
@@ -9,7 +9,6 @@ dependencies {
     implementation project(':airbyte-config:models')
     implementation project(':airbyte-config:persistence')
     implementation project(':airbyte-db')
-    implementation project(':airbyte-integrations')
     implementation project(':airbyte-workers')
 
     testImplementation "org.testcontainers:postgresql:1.15.0-rc2"

diff --git a/airbyte-server/build.gradle b/airbyte-server/build.gradle
@@ -18,7 +18,6 @@ dependencies {
     implementation project(':airbyte-config:persistence')
     implementation project(':airbyte-config:init')
     implementation project(':airbyte-db')
-    implementation project(':airbyte-integrations')
     implementation project(':airbyte-scheduler')
 
 }

diff --git a/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java b/airbyte-server/src/main/java/io/airbyte/server/apis/ConfigurationApi.java
@@ -116,7 +116,7 @@ public ConfigurationApi(final ConfigRepository configRepository, final Scheduler
     webBackendConnectionsHandler = new WebBackendConnectionsHandler(connectionsHandler, sourceImplementationsHandler, jobHistoryHandler);
     webBackendSourceImplementationHandler = new WebBackendSourceImplementationHandler(sourceImplementationsHandler, schedulerHandler);
     webBackendDestinationImplementationHandler = new WebBackendDestinationImplementationHandler(destinationImplementationsHandler, schedulerHandler);
-    debugInfoHandler = new DebugInfoHandler();
+    debugInfoHandler = new DebugInfoHandler(configRepository);
   }
 
   // WORKSPACE

diff --git a/airbyte-server/src/main/java/io/airbyte/server/handlers/DebugInfoHandler.java b/airbyte-server/src/main/java/io/airbyte/server/handlers/DebugInfoHandler.java
@@ -28,18 +28,25 @@
 
 import com.google.common.collect.Lists;
 import io.airbyte.api.model.DebugRead;
-import io.airbyte.integrations.Integrations;
+import io.airbyte.commons.docker.DockerUtils;
+import io.airbyte.config.persistence.ConfigRepository;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import org.apache.commons.io.IOUtils;
 
 public class DebugInfoHandler {
 
+  private ConfigRepository configRepository;
+
+  public DebugInfoHandler(ConfigRepository configRepository) {
+    this.configRepository = configRepository;
+  }
+
   public DebugRead getInfo() {
     List<Map<String, String>> integrationImages = getIntegrationImages();
     List<Map<String, String>> runningCoreImages = getRunningCoreImages();
@@ -88,10 +95,14 @@ private static List<Map<String, String>> getRunningCoreImages() {
     }
   }
 
-  private static List<Map<String, String>> getIntegrationImages() {
+  private List<Map<String, String>> getIntegrationImages() {
     try {
-      return Arrays.stream(Integrations.values())
-          .map(Integrations::getTaggedImage)
+      Stream<String> sourceImages =
+          configRepository.listStandardSources().stream().map(s -> DockerUtils.getTaggedImageName(s.getDockerRepository(), s.getDockerImageTag()));
+      Stream<String> destinationImages =
+          configRepository.listStandardDestinations().stream()
+              .map(d -> DockerUtils.getTaggedImageName(d.getDockerRepository(), d.getDockerImageTag()));
+      return Stream.concat(sourceImages, destinationImages)
           .map(image -> {
             try {
               String hash = runAndGetOutput(Lists.newArrayList("docker", "images", "--no-trunc", "--quiet", image));