🐞 Destination databricks: update jdbc driver to patch log4j

.github/workflows/publish-command.yml

@@ -66,6 +66,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: ${{github.event.pull_request.head.repo.full_name}} # always use the branch's repository
+      - name: Install Unzip for Databricks
+        if: github.event.inputs.connector == 'connectors/destination-databricks'
+        run: |
+          apt-get update && apt-get install -y unzip
       - name: Install Java
         uses: actions/setup-java@v1
         with:

.github/workflows/test-command.yml

@@ -61,6 +61,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: ${{ github.event.inputs.repo }}
+      - name: Install Unzip for Databricks
+        if: github.event.inputs.connector == 'connectors/destination-databricks'
+        run: |
+          apt-get update && apt-get install -y unzip
       - name: Install Java
         uses: actions/setup-java@v1
         with:

airbyte-config/init/src/main/resources/seed/source_specs.yaml

@@ -1985,7 +1985,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-github:0.2.9"
+- dockerImage: "airbyte/source-github:0.2.10"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/github"
     connectionSpecification:

airbyte-integrations/builds.md

@@ -114,7 +114,7 @@
 | BigQuery   | [![destination-bigquery](https://img.shields.io/endpoint?url=https%3A%2F%2Fdnsgjos7lj2fu.cloudfront.net%2Ftests%2Fsummary%2Fdestination-bigquery%2Fbadge.json)](https://dnsgjos7lj2fu.cloudfront.net/tests/summary/destination-bigquery) |
 | ClickHouse   | [![destination-clickhouse](https://img.shields.io/endpoint?url=https%3A%2F%2Fdnsgjos7lj2fu.cloudfront.net%2Ftests%2Fsummary%2Fdestination-clickhouse%2Fbadge.json)](https://dnsgjos7lj2fu.cloudfront.net/tests/summary/destination-clickhouse) |
 | Cassandra   | [![destination-cassandra](https://img.shields.io/endpoint?url=https%3A%2F%2Fdnsgjos7lj2fu.cloudfront.net%2Ftests%2Fsummary%2Fdestination-cassandra%2Fbadge.json)](https://dnsgjos7lj2fu.cloudfront.net/tests/summary/destination-cassandra) |
-| Databricks | (Temporarily Not Available) |
+| Databricks | [![destination-databricks](https://img.shields.io/endpoint?url=https%3A%2F%2Fdnsgjos7lj2fu.cloudfront.net%2Ftests%2Fsummary%2Fdestination-databricks%2Fbadge.json)](https://dnsgjos7lj2fu.cloudfront.net/tests/summary/destination-databricks) |
 | Dev Null   | [![destination-dev-null](https://img.shields.io/endpoint?url=https%3A%2F%2Fdnsgjos7lj2fu.cloudfront.net%2Ftests%2Fsummary%2Fdestination-dev-null%2Fbadge.json)](https://dnsgjos7lj2fu.cloudfront.net/tests/summary/destination-dev-null) |
 | Elasticsearch | (Temporarily Not Available) |
 | End-to-End Testing   | [![destination-e2e-test](https://img.shields.io/endpoint?url=https%3A%2F%2Fdnsgjos7lj2fu.cloudfront.net%2Ftests%2Fsummary%2Fdestination-e2e-test%2Fbadge.json)](https://dnsgjos7lj2fu.cloudfront.net/tests/summary/destination-e2e-test) |

airbyte-integrations/connectors/destination-databricks/README.md

@@ -6,6 +6,8 @@ For information about how to use this connector within Airbyte, see [the User Do
 ## Databricks JDBC Driver
 This connector requires a JDBC driver to connect to Databricks cluster. The driver is developed by Simba. Before downloading and using this driver, you must agree to the [JDBC ODBC driver license](https://databricks.com/jdbc-odbc-driver-license). This means that you can only use this driver to connector third party applications to Apache Spark SQL within a Databricks offering using the ODBC and/or JDBC protocols. The driver can be downloaded from [here](https://databricks.com/spark/jdbc-drivers-download).
 
+The CI downloads the JDBC driver in [this script](https://github.com/airbytehq/airbyte/blob/master/tools/lib/databricks.sh).
+
 This is currently a private connector that is only available in Airbyte Cloud. To build and publish this connector, first download the driver and put it under the `lib` directory. Please do not publish this connector publicly.  We are working on a solution to publicize it.
 
 ## Local development

airbyte-integrations/connectors/destination-databricks/src/test-integration/java/io/airbyte/integrations/destination/databricks/DatabricksDestinationAcceptanceTest.java

@@ -127,13 +127,17 @@ protected void tearDown(final TestDestinationEnv testEnv) throws SQLException {
           .deleteObjects(new DeleteObjectsRequest(s3Config.getBucketName()).withKeys(keysToDelete));
       LOGGER.info("Deleted {} file(s).", result.getDeletedObjects().size());
     }
+    s3Client.shutdown();
 
     // clean up database
     LOGGER.info("Dropping database schema {}", databricksConfig.getDatabaseSchema());
-    final Database database = getDatabase(databricksConfig);
-    // we cannot use jooq dropSchemaIfExists method here because there is no proper dialect for
-    // Databricks, and it incorrectly quotes the schema name
-    database.query(ctx -> ctx.execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE;", databricksConfig.getDatabaseSchema())));
+    try (final Database database = getDatabase(databricksConfig)) {
+      // we cannot use jooq dropSchemaIfExists method here because there is no proper dialect for
+      // Databricks, and it incorrectly quotes the schema name
+      database.query(ctx -> ctx.execute(String.format("DROP SCHEMA IF EXISTS %s CASCADE;", databricksConfig.getDatabaseSchema())));
+    } catch (final Exception e) {
+      throw new SQLException(e);
+    }
   }
 
   private static Database getDatabase(final DatabricksDestinationConfig databricksConfig) {

airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java

@@ -148,6 +148,7 @@ private static void closeAsOneTransaction(final List<StreamCopier> streamCopiers
       for (final var copier : streamCopiers) {
         copier.removeFileAndDropTmpTable();
       }
+      db.close();
     }
     if (firstException != null) {
       throw firstException;

airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyDestination.java

@@ -54,10 +54,9 @@ public AirbyteConnectionStatus check(final JsonNode config) {
           .withMessage("Could not connect to the staging persistence with the provided configuration. \n" + e.getMessage());
     }
 
-    try {
+    try (final JdbcDatabase database = getDatabase(config)) {
       final var nameTransformer = getNameTransformer();
       final var outputSchema = nameTransformer.convertStreamName(config.get(schemaFieldName).asText());
-      final JdbcDatabase database = getDatabase(config);
       AbstractJdbcDestination.attemptSQLCreateAndDropTableOperations(outputSchema, database, nameTransformer, getSqlOperations());
 
       return new AirbyteConnectionStatus().withStatus(AirbyteConnectionStatus.Status.SUCCEEDED);

airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java

@@ -77,7 +77,7 @@ public StandardCheckConnectionOutput run(final StandardCheckConnectionInput inpu
         LOGGER.debug("Check connection job received output: {}", output);
         return output;
       } else {
-        throw new WorkerException("Error while getting checking connection.");
+        throw new WorkerException(String.format("Error checking connection, status: %s, exit code: %d", status, exitCode));
       }
 
     } catch (final Exception e) {

tools/bin/ci_integration_test.sh

@@ -3,13 +3,15 @@
 set -e
 
 . tools/lib/lib.sh
+. tools/lib/databricks.sh
 
 # runs integration tests for an integration name
 
 connector="$1"
 all_integration_tests=$(./gradlew integrationTest --dry-run | grep 'integrationTest SKIPPED' | cut -d: -f 4)
 run() {
 if [[ "$connector" == "all" ]] ; then
+  _get_databricks_jdbc_driver
   echo "Running: ./gradlew --no-daemon --scan integrationTest"
   ./gradlew --no-daemon --scan integrationTest
 else
@@ -34,6 +36,10 @@ else
     integrationTestCommand=":airbyte-integrations:connectors:$connector:integrationTest"
   fi
   if [ -n "$selected_integration_test" ] ; then
+    if [[ "$selected_integration_test" == *"databricks"* ]] ; then
+      _get_databricks_jdbc_driver
+    fi
+
     echo "Running: ./gradlew --no-daemon --scan $integrationTestCommand"
     ./gradlew --no-daemon --scan "$integrationTestCommand"
   else

tools/integrations/manage.sh

@@ -4,6 +4,7 @@ set -e
 set -x
 
 . tools/lib/lib.sh
+. tools/lib/databricks.sh
 
 USAGE="
 Usage: $(basename "$0") <cmd>
@@ -37,6 +38,11 @@ cmd_build() {
   [ -d "$path" ] || error "Path must be the root path of the integration"
 
   local run_tests=$1; shift || run_tests=true
+
+  if [[ "airbyte-integrations/connectors/destination-databricks" == "${path}" ]]; then
+    _get_databricks_jdbc_driver
+  fi
+
   echo "Building $path"
   ./gradlew --no-daemon "$(_to_gradle_path "$path" clean)"
   ./gradlew --no-daemon "$(_to_gradle_path "$path" build)"

tools/lib/databricks.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+. tools/lib/lib.sh
+
+# Whoever runs this script must accept the following terms & conditions:
+# https://databricks.com/jdbc-odbc-driver-license
+_get_databricks_jdbc_driver() {
+  local driver_zip="SimbaSparkJDBC42-2.6.21.1039.zip"
+  local driver_file="SparkJDBC42.jar"
+  local driver_url="https://databricks-bi-artifacts.s3.us-east-2.amazonaws.com/simbaspark-drivers/jdbc/2.6.21/${driver_zip}"
+  local connector_path="airbyte-integrations/connectors/destination-databricks"
+
+  if [[ -f "${connector_path}/lib/${driver_file}" ]] ; then
+    echo "[Databricks] Spark JDBC driver already exists"
+  else
+    echo "[Databricks] Downloading Spark JDBC driver..."
+    curl -o "${connector_path}/lib/${driver_zip}" "${driver_url}"
+
+    echo "[Databricks] Extracting Spark JDBC driver..."
+    unzip "${connector_path}/lib/${driver_zip}" "${driver_file}"
+    mv "${driver_file}" "${connector_path}/lib/"
+    rm "${connector_path}/lib/${driver_zip}"
+  fi
+}