source-db2: adopt CDK 0.20.4 (#35233)

airbytehq · Feb 14, 2024 · 9a6dbac · 9a6dbac
1 parent 3b5ecfc
commit 9a6dbac
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 20 deletions.
diff --git a/airbyte-integrations/connectors/source-db2/build.gradle b/airbyte-integrations/connectors/source-db2/build.gradle
@@ -1,26 +1,13 @@
 plugins {
-    id 'application'
     id 'airbyte-java-connector'
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.13.2'
+    cdkVersionRequired = '0.20.4'
     features = ['db-sources']
     useLocalCdk = false
 }
 
-//remove once upgrading the CDK version to 0.4.x or later
-java {
-    compileTestJava {
-        options.compilerArgs.remove("-Werror")
-    }
-    compileJava {
-        options.compilerArgs.remove("-Werror")
-    }
-}
-
-airbyteJavaConnector.addCdkDependencies()
-
 application {
     mainClass = 'io.airbyte.integrations.source.db2.Db2Source'
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
@@ -30,7 +17,5 @@ dependencies {
 
     implementation group: 'com.ibm.db2', name: 'jcc', version: '11.5.5.0'
 
-    testImplementation libs.testcontainers.db2
-
-    integrationTestJavaImplementation 'org.apache.commons:commons-lang3:3.11'
+    testImplementation 'org.testcontainers:db2:1.19.4'
 }
diff --git a/airbyte-integrations/connectors/source-db2/metadata.yaml b/airbyte-integrations/connectors/source-db2/metadata.yaml
@@ -5,7 +5,7 @@ data:
   connectorSubtype: database
   connectorType: source
   definitionId: 447e0381-3780-4b46-bb62-00a4e3c8b8e2
-  dockerImageTag: 0.2.1
+  dockerImageTag: 0.2.2
   dockerRepository: airbyte/source-db2
   githubIssueLabel: source-db2
   icon: db2.svg

diff --git a/...ons/connectors/source-db2/src/main/java/io.airbyte.integrations.source.db2/Db2Source.java b/...ons/connectors/source-db2/src/main/java/io.airbyte.integrations.source.db2/Db2Source.java
@@ -95,6 +95,7 @@ public Set<String> getExcludedInternalNameSpaces() {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public Set<JdbcPrivilegeDto> getPrivilegesTableForCurrentUser(final JdbcDatabase database, final String schema) throws SQLException {
     try (final Stream<JsonNode> stream = database.unsafeQuery(getPrivileges(), sourceOperations::rowToJson)) {
       return stream.map(this::getPrivilegeDto).collect(Collectors.toSet());
@@ -170,7 +171,7 @@ private static void convertAndImportCertificate(final String certificate, final
   }
 
   private static void runProcess(final String cmd, final Runtime run) throws IOException, InterruptedException {
-    final Process pr = run.exec(cmd);
+    final Process pr = run.exec(cmd.split(" "));
     if (!pr.waitFor(30, TimeUnit.SECONDS)) {
       pr.destroy();
       throw new RuntimeException("Timeout while executing: " + cmd);

diff --git a/...a/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceDatatypeTest.java b/...a/io/airbyte/integrations/io/airbyte/integration_tests/sources/Db2SourceDatatypeTest.java
@@ -43,7 +43,6 @@ protected JsonNode getConfig() throws Exception {
 
   @Override
   protected void tearDown(final TestDestinationEnv testEnv) {
-    dslContext.close();
     container.close();
   }
 

diff --git a/docs/integrations/sources/db2.md b/docs/integrations/sources/db2.md
@@ -60,6 +60,7 @@ You can also enter your own password for the keystore, but if you don't, the pas
 
 | Version | Date       | Pull Request | Subject                                                                                                                                   |
 |:--------|:-----------| :--- |:------------------------------------------------------------------------------------------------------------------------------------------|
+| 0.2.2 | 2024-02-13 | [35233](https://github.com/airbytehq/airbyte/pull/35233) | Adopt CDK 0.20.4 |
 | 0.2.1   | 2024-01-24 | [34453](https://github.com/airbytehq/airbyte/pull/34453) | bump CDK version                                                                                                                          |
 | 0.2.0   | 2023-12-18 | [33485](https://github.com/airbytehq/airbyte/pull/33485) | Remove LEGACY state                                                                                                                       |
 | 0.1.20  | 2023-06-20 | [27212](https://github.com/airbytehq/airbyte/pull/27212) | Fix silent exception swallowing in StreamingJdbcDatabase                                                                                  |