Env-configs: make REMOTE_CONNECTOR_CATALOG_URL optional (#16346)

airbytehq · Sep 7, 2022 · 086d33e · 086d33e
1 parent d105177
commit 086d33e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/airbyte-config/config-models/src/main/java/io/airbyte/config/Configs.java b/airbyte-config/config-models/src/main/java/io/airbyte/config/Configs.java
@@ -11,6 +11,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -74,8 +75,10 @@ public interface Configs {
 
   /**
    * Defines the URL to pull the remote connector catalog from.
+   *
+   * @return
    */
-  URI getRemoteConnectorCatalogUrl();
+  Optional<URI> getRemoteConnectorCatalogUrl();
 
   // Docker Only
 

diff --git a/airbyte-config/config-models/src/main/java/io/airbyte/config/EnvConfigs.java b/airbyte-config/config-models/src/main/java/io/airbyte/config/EnvConfigs.java
@@ -327,9 +327,13 @@ public Path getWorkspaceRoot() {
   }
 
   @Override
-  public URI getRemoteConnectorCatalogUrl() {
-    // Default to reuse the job database
-    return URI.create(getEnsureEnv(REMOTE_CONNECTOR_CATALOG_URL));
+  public Optional<URI> getRemoteConnectorCatalogUrl() {
+    final String remoteConnectorCatalogUrl = getEnvOrDefault(REMOTE_CONNECTOR_CATALOG_URL, null);
+    if (remoteConnectorCatalogUrl != null) {
+      return Optional.of(URI.create(remoteConnectorCatalogUrl));
+    } else {
+      return Optional.empty();
+    }
   }
 
   // Docker Only

diff --git a/airbyte-config/config-models/src/test/java/io/airbyte/config/EnvConfigsTest.java b/airbyte-config/config-models/src/test/java/io/airbyte/config/EnvConfigsTest.java
@@ -10,10 +10,12 @@
 import io.airbyte.config.Configs.DeploymentMode;
 import io.airbyte.config.Configs.JobErrorReportingStrategy;
 import io.airbyte.config.Configs.WorkerEnvironment;
+import java.net.URI;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -469,4 +471,16 @@ void testAllJobEnvMapRetrieval() {
     assertEquals(expected, config.getJobDefaultEnvMap());
   }
 
+  @Test
+  void testRemoteConnectorCatalogUrl() {
+    envMap.put(EnvConfigs.REMOTE_CONNECTOR_CATALOG_URL, null);
+    assertEquals(Optional.empty(), config.getRemoteConnectorCatalogUrl());
+
+    envMap.put(EnvConfigs.REMOTE_CONNECTOR_CATALOG_URL, "");
+    assertEquals(Optional.empty(), config.getRemoteConnectorCatalogUrl());
+
+    envMap.put(EnvConfigs.REMOTE_CONNECTOR_CATALOG_URL, "https://airbyte.com");
+    assertEquals(Optional.of(URI.create("https://airbyte.com")), config.getRemoteConnectorCatalogUrl());
+  }
+
 }
diff --git a/...it/src/main/java/io/airbyte/config/init/DefinitionProviderToConfigPersistenceAdapter.java b/...it/src/main/java/io/airbyte/config/init/DefinitionProviderToConfigPersistenceAdapter.java
@@ -98,7 +98,10 @@ public Map<String, Stream<JsonNode>> dumpConfigs() throws IOException {
   @Override
   public void loadData(ConfigPersistence seedPersistence) throws IOException {
     throw new UnsupportedOperationException(PERSISTENCE_READ_ONLY_ERROR_MSG);
+  }
 
+  public DefinitionsProvider getDefinitionsProvider() {
+    return definitionsProvider;
   }
 
 }