Fix redshift and oracle acceptance tests (#10855)

* parse jdbc parameters * Also fix redshift * other oracle source acceptance test * This is & now * This is & now * This is & now * This is & now * This is & now * also update nne * increase sleep to 11 seconds * Bump to 15 seconds * gradlew format * try to reformat * gradlew format * Run ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates --scan * reset to master * Revert "reset to master" This reverts commit d6141ed.
airbytehq · Mar 5, 2022 · adea13c · adea13c
1 parent f77fa8b
commit adea13c
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 25 deletions.
diff --git a/...ons/bases/base-java/src/test/java/io/airbyte/integrations/base/IntegrationRunnerTest.java b/...ons/bases/base-java/src/test/java/io/airbyte/integrations/base/IntegrationRunnerTest.java
@@ -310,8 +310,8 @@ void testInterruptOrphanThreadFailure() {
         3, TimeUnit.SECONDS,
         10, TimeUnit.SECONDS));
     try {
-      TimeUnit.SECONDS.sleep(10);
-    } catch (Exception e) {
+      TimeUnit.SECONDS.sleep(15);
+    } catch (final Exception e) {
       throw new RuntimeException(e);
     }
     final List<Thread> runningThreads = ThreadUtils.getAllThreads().stream()
@@ -337,8 +337,8 @@ void testNoInterruptOrphanThreadFailure() {
         3, TimeUnit.SECONDS,
         10, TimeUnit.SECONDS));
     try {
-      TimeUnit.SECONDS.sleep(10);
-    } catch (Exception e) {
+      TimeUnit.SECONDS.sleep(15);
+    } catch (final Exception e) {
       throw new RuntimeException(e);
     }
     final List<Thread> runningThreads = ThreadUtils.getAllThreads().stream()
@@ -356,7 +356,7 @@ private void startSleepingThread(final List<Exception> caughtExceptions, final b
       for (int tries = 0; tries < 3; tries++) {
         try {
           TimeUnit.MINUTES.sleep(5);
-        } catch (Exception e) {
+        } catch (final Exception e) {
           LOGGER.info("Caught Exception", e);
           caughtExceptions.add(e);
           if (!ignoreInterrupt) {

diff --git a/...nation-scaffold-destination-python/destination_scaffold_destination_python/destination.py b/...nation-scaffold-destination-python/destination_scaffold_destination_python/destination.py
@@ -3,16 +3,19 @@
 #
 
 
-from typing import Any, Iterable, Mapping
+from typing import Mapping, Any, Iterable
 
 from airbyte_cdk import AirbyteLogger
 from airbyte_cdk.destinations import Destination
-from airbyte_cdk.models import AirbyteConnectionStatus, AirbyteMessage, ConfiguredAirbyteCatalog, Status
+from airbyte_cdk.models import AirbyteConnectionStatus, ConfiguredAirbyteCatalog, AirbyteMessage, Status
 
 
 class DestinationScaffoldDestinationPython(Destination):
     def write(
-        self, config: Mapping[str, Any], configured_catalog: ConfiguredAirbyteCatalog, input_messages: Iterable[AirbyteMessage]
+            self,
+            config: Mapping[str, Any],
+            configured_catalog: ConfiguredAirbyteCatalog,
+            input_messages: Iterable[AirbyteMessage]
     ) -> Iterable[AirbyteMessage]:
 
         """
@@ -51,3 +54,6 @@ def check(self, logger: AirbyteLogger, config: Mapping[str, Any]) -> AirbyteConn
             return AirbyteConnectionStatus(status=Status.SUCCEEDED)
         except Exception as e:
             return AirbyteConnectionStatus(status=Status.FAILED, message=f"An exception occurred: {repr(e)}")
+
+
+
diff --git a/airbyte-integrations/connectors/destination-scaffold-destination-python/setup.py b/airbyte-integrations/connectors/destination-scaffold-destination-python/setup.py
@@ -9,7 +9,9 @@
     "airbyte-cdk",
 ]
 
-TEST_REQUIREMENTS = ["pytest~=6.1"]
+TEST_REQUIREMENTS = [
+    "pytest~=6.1"
+]
 
 setup(
     name="destination_scaffold_destination_python",

diff --git a/...a/io/airbyte/integrations/source/oracle_strict_encrypt/OracleSourceNneAcceptanceTest.java b/...a/io/airbyte/integrations/source/oracle_strict_encrypt/OracleSourceNneAcceptanceTest.java
@@ -13,6 +13,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.Databases;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.JdbcUtils;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -38,9 +39,9 @@ public void testEncrytion() throws SQLException {
             clone.get("port").asText(),
             clone.get("sid").asText()),
         "oracle.jdbc.driver.OracleDriver",
-        "oracle.net.encryption_client=REQUIRED;" +
+        JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED&" +
             "oracle.net.encryption_types_client=( "
-            + algorithm + " )");
+            + algorithm + " )"));
 
     final String network_service_banner =
         "select network_service_banner from v$session_connect_info where sid in (select distinct sid from v$mystat)";
@@ -68,9 +69,9 @@ public void testCheckProtocol() throws SQLException {
             clone.get("port").asText(),
             clone.get("sid").asText()),
         "oracle.jdbc.driver.OracleDriver",
-        "oracle.net.encryption_client=REQUIRED;" +
+        JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED;" +
             "oracle.net.encryption_types_client=( "
-            + algorithm + " )");
+            + algorithm + " )"));
 
     final String network_service_banner = "SELECT sys_context('USERENV', 'NETWORK_PROTOCOL') as network_protocol FROM dual";
     final List<JsonNode> collect = database.query(network_service_banner).collect(Collectors.toList());

diff --git a/...te/integrations/source/oracle_strict_encrypt/OracleStrictEncryptSourceAcceptanceTest.java b/...te/integrations/source/oracle_strict_encrypt/OracleStrictEncryptSourceAcceptanceTest.java
@@ -11,6 +11,7 @@
 import io.airbyte.commons.resources.MoreResources;
 import io.airbyte.db.Databases;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.integrations.base.ssh.SshHelpers;
 import io.airbyte.integrations.standardtest.source.SourceAcceptanceTest;
 import io.airbyte.integrations.standardtest.source.TestDestinationEnv;
@@ -60,8 +61,8 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc
             config.get("port").asText(),
             config.get("sid").asText()),
         "oracle.jdbc.driver.OracleDriver",
-        "oracle.net.encryption_client=REQUIRED;" +
-            "oracle.net.encryption_types_client=( 3DES168 )");
+        JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED&" +
+            "oracle.net.encryption_types_client=( 3DES168 )"));
 
     database.execute(connection -> {
       connection.createStatement().execute("CREATE USER JDBC_SPACE IDENTIFIED BY JDBC_SPACE DEFAULT TABLESPACE USERS QUOTA UNLIMITED ON USERS");

diff --git a/...integration/java/io/airbyte/integrations/source/oracle/OracleSourceNneAcceptanceTest.java b/...integration/java/io/airbyte/integrations/source/oracle/OracleSourceNneAcceptanceTest.java
@@ -13,6 +13,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.Databases;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.JdbcUtils;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -38,9 +39,9 @@ public void testEncrytion() throws SQLException {
             clone.get("port").asText(),
             clone.get("sid").asText()),
         "oracle.jdbc.driver.OracleDriver",
-        "oracle.net.encryption_client=REQUIRED;" +
+        JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED&" +
             "oracle.net.encryption_types_client=( "
-            + algorithm + " )");
+            + algorithm + " )"));
 
     final String network_service_banner =
         "select network_service_banner from v$session_connect_info where sid in (select distinct sid from v$mystat)";
@@ -87,9 +88,9 @@ public void testCheckProtocol() throws SQLException {
             clone.get("port").asText(),
             clone.get("sid").asText()),
         "oracle.jdbc.driver.OracleDriver",
-        "oracle.net.encryption_client=REQUIRED;" +
+        JdbcUtils.parseJdbcParameters("oracle.net.encryption_client=REQUIRED&" +
             "oracle.net.encryption_types_client=( "
-            + algorithm + " )");
+            + algorithm + " )"));
 
     final String network_service_banner = "SELECT sys_context('USERENV', 'NETWORK_PROTOCOL') as network_protocol FROM dual";
     final List<JsonNode> collect = database.query(network_service_banner).collect(Collectors.toList());

diff --git a/...source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftSource.java b/...source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftSource.java
@@ -62,7 +62,7 @@ public JsonNode toDatabaseConfig(final JsonNode redshiftConfig) {
 
     addSsl(additionalProperties);
 
-    builder.put("connection_properties", String.join(";", additionalProperties));
+    builder.put("connection_properties", String.join("&", additionalProperties));
 
     return Jsons.jsonNode(builder
         .build());
@@ -74,15 +74,15 @@ private void addSsl(final List<String> additionalProperties) {
   }
 
   @Override
-  public List<TableInfo<CommonField<JDBCType>>> discoverInternal(JdbcDatabase database) throws Exception {
+  public List<TableInfo<CommonField<JDBCType>>> discoverInternal(final JdbcDatabase database) throws Exception {
     if (schemas != null && !schemas.isEmpty()) {
       // process explicitly selected (from UI) schemas
       final List<TableInfo<CommonField<JDBCType>>> internals = new ArrayList<>();
-      for (String schema : schemas) {
+      for (final String schema : schemas) {
         LOGGER.debug("Discovering schema: {}", schema);
         internals.addAll(super.discoverInternal(database, schema));
       }
-      for (TableInfo<CommonField<JDBCType>> info : internals) {
+      for (final TableInfo<CommonField<JDBCType>> info : internals) {
         LOGGER.debug("Found table (schema: {}): {}", info.getNameSpace(), info.getName());
       }
       return internals;

diff --git a/...te/integrations/io/airbyte/integration_tests/sources/RedshiftSslSourceAcceptanceTest.java b/...te/integrations/io/airbyte/integration_tests/sources/RedshiftSslSourceAcceptanceTest.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.db.Databases;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.integrations.source.redshift.RedshiftSource;
 
 public class RedshiftSslSourceAcceptanceTest extends RedshiftSourceAcceptanceTest {
@@ -21,8 +22,8 @@ protected JdbcDatabase createDatabase(final JsonNode config) {
             config.get("port").asText(),
             config.get("database").asText()),
         RedshiftSource.DRIVER_CLASS,
-        "ssl=true;" +
-            "sslfactory=com.amazon.redshift.ssl.NonValidatingFactory");
+        JdbcUtils.parseJdbcParameters("ssl=true&" +
+            "sslfactory=com.amazon.redshift.ssl.NonValidatingFactory"));
   }
 
 }