[17495] Source-oracle: fixed build and integration test (airbytehq#17769

)

* [17495] Source-oracle: fixed build and integration test

airbyte-integrations/connectors/source-oracle-strict-encrypt/build.gradle

@@ -30,6 +30,7 @@ dependencies {
     testImplementation libs.connectors.source.testcontainers.oracle.xe
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
+    integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-oracle-strict-encrypt')
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)

airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleContainer.java → airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/AirbyteOracleTestContainer.java

@@ -17,7 +17,7 @@
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
+public class AirbyteOracleTestContainer extends JdbcDatabaseContainer<AirbyteOracleTestContainer> {
 
   public static final String NAME = "oracle";
   private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe");
@@ -49,21 +49,21 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
   private String password = APP_USER_PASSWORD;
   private boolean usingSid = false;
 
-  public OracleContainer() {
+  public AirbyteOracleTestContainer() {
     this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
   }
 
-  public OracleContainer(final String dockerImageName) {
+  public AirbyteOracleTestContainer(final String dockerImageName) {
     this(DockerImageName.parse(dockerImageName));
   }
 
-  public OracleContainer(final DockerImageName dockerImageName) {
+  public AirbyteOracleTestContainer(final DockerImageName dockerImageName) {
     super(dockerImageName);
     dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
     preconfigure();
   }
 
-  public OracleContainer(final Future<String> dockerImageName) {
+  public AirbyteOracleTestContainer(final Future<String> dockerImageName) {
     super(dockerImageName);
     preconfigure();
   }
@@ -120,7 +120,7 @@ protected boolean isUsingSid() {
   }
 
   @Override
-  public OracleContainer withUsername(final String username) {
+  public AirbyteOracleTestContainer withUsername(final String username) {
     if (StringUtils.isEmpty(username)) {
       throw new IllegalArgumentException("Username cannot be null or empty");
     }
@@ -132,7 +132,7 @@ public OracleContainer withUsername(final String username) {
   }
 
   @Override
-  public OracleContainer withPassword(final String password) {
+  public AirbyteOracleTestContainer withPassword(final String password) {
     if (StringUtils.isEmpty(password)) {
       throw new IllegalArgumentException("Password cannot be null or empty");
     }
@@ -141,7 +141,7 @@ public OracleContainer withPassword(final String password) {
   }
 
   @Override
-  public OracleContainer withDatabaseName(final String databaseName) {
+  public AirbyteOracleTestContainer withDatabaseName(final String databaseName) {
     if (StringUtils.isEmpty(databaseName)) {
       throw new IllegalArgumentException("Database name cannot be null or empty");
     }
@@ -154,13 +154,13 @@ public OracleContainer withDatabaseName(final String databaseName) {
     return self();
   }
 
-  public OracleContainer usingSid() {
+  public AirbyteOracleTestContainer usingSid() {
     this.usingSid = true;
     return self();
   }
 
   @Override
-  public OracleContainer withUrlParam(final String paramName, final String paramValue) {
+  public AirbyteOracleTestContainer withUrlParam(final String paramName, final String paramValue) {
     throw new UnsupportedOperationException("The Oracle Database driver does not support this");
   }
 

airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptJdbcSourceAcceptanceTest.java → airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptJdbcSourceAcceptanceTest.java

@@ -53,12 +53,11 @@
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.OracleContainer;
 
 class OracleStrictEncryptJdbcSourceAcceptanceTest extends JdbcSourceAcceptanceTest {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(OracleStrictEncryptJdbcSourceAcceptanceTest.class);
-  private static OracleContainer ORACLE_DB;
+  private static AirbyteOracleTestContainer ORACLE_DB;
 
   @BeforeAll
   static void init() {
@@ -86,7 +85,10 @@ static void init() {
     CREATE_TABLE_WITH_NULLABLE_CURSOR_TYPE_QUERY = "CREATE TABLE %s (%s VARCHAR(20))";
     INSERT_TABLE_WITH_NULLABLE_CURSOR_TYPE_QUERY = "INSERT INTO %s VALUES('Hello world :)')";
 
-    ORACLE_DB = new OracleContainer("epiclabs/docker-oracle-xe-11g")
+    ORACLE_DB = new AirbyteOracleTestContainer()
+        .withUsername("test")
+        .withPassword("oracle")
+        .usingSid()
         .withEnv("NLS_DATE_FORMAT", "YYYY-MM-DD")
         .withEnv("RELAX_SECURITY", "1");
     ORACLE_DB.start();

airbyte-integrations/connectors/source-oracle-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/oracle_strict_encrypt/OracleStrictEncryptSourceAcceptanceTest.java

@@ -33,12 +33,12 @@ public class OracleStrictEncryptSourceAcceptanceTest extends SourceAcceptanceTes
   private static final String STREAM_NAME = "JDBC_SPACE.ID_AND_NAME";
   private static final String STREAM_NAME2 = "JDBC_SPACE.STARSHIPS";
 
-  protected OracleContainer container;
+  protected AirbyteOracleTestContainer container;
   protected JsonNode config;
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    container = new OracleContainer()
+    container = new AirbyteOracleTestContainer()
         .withUsername("test")
         .withPassword("oracle")
         .usingSid();;

airbyte-integrations/connectors/source-oracle/build.gradle

@@ -30,6 +30,7 @@ dependencies {
     testImplementation libs.connectors.source.testcontainers.oracle.xe
 
     integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
+    integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-oracle')
 
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)

airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/AbstractSshOracleSourceAcceptanceTest.java

@@ -36,7 +36,7 @@ public abstract class AbstractSshOracleSourceAcceptanceTest extends SourceAccept
   private static final String STREAM_NAME2 = "JDBC_SPACE.STARSHIPS";
   private static final Network network = Network.newNetwork();
   private final SshBastionContainer sshBastionContainer = new SshBastionContainer();
-  private OracleContainer db;
+  private AirbyteOracleTestContainer db;
 
   private JsonNode config;
 
@@ -90,7 +90,7 @@ private void startTestContainers() {
   }
 
   private void initAndStartJdbcContainer() {
-    db = new OracleContainer()
+    db = new AirbyteOracleTestContainer()
         .withUsername("test")
         .withPassword("oracle")
         .usingSid()
@@ -108,7 +108,7 @@ protected ConnectorSpecification getSpec() throws Exception {
     return SshHelpers.getSpecAndInjectSsh();
   }
 
-  public ImmutableMap.Builder<Object, Object> getBasicOracleDbConfigBuider(final OracleContainer db) {
+  public ImmutableMap.Builder<Object, Object> getBasicOracleDbConfigBuider(final AirbyteOracleTestContainer db) {
     return ImmutableMap.builder()
         .put("host", Objects.requireNonNull(db.getContainerInfo().getNetworkSettings()
             .getNetworks()

airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleContainer.java → airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/AirbyteOracleTestContainer.java

@@ -17,7 +17,7 @@
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.DockerImageName;
 
-public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
+public class AirbyteOracleTestContainer extends JdbcDatabaseContainer<AirbyteOracleTestContainer> {
 
   public static final String NAME = "oracle";
   private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("gvenzl/oracle-xe");
@@ -49,21 +49,21 @@ public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
   private String password = APP_USER_PASSWORD;
   private boolean usingSid = false;
 
-  public OracleContainer() {
+  public AirbyteOracleTestContainer() {
     this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
   }
 
-  public OracleContainer(final String dockerImageName) {
+  public AirbyteOracleTestContainer(final String dockerImageName) {
     this(DockerImageName.parse(dockerImageName));
   }
 
-  public OracleContainer(final DockerImageName dockerImageName) {
+  public AirbyteOracleTestContainer(final DockerImageName dockerImageName) {
     super(dockerImageName);
     dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
     preconfigure();
   }
 
-  public OracleContainer(final Future<String> dockerImageName) {
+  public AirbyteOracleTestContainer(final Future<String> dockerImageName) {
     super(dockerImageName);
     preconfigure();
   }
@@ -120,7 +120,7 @@ protected boolean isUsingSid() {
   }
 
   @Override
-  public OracleContainer withUsername(final String username) {
+  public AirbyteOracleTestContainer withUsername(final String username) {
     if (StringUtils.isEmpty(username)) {
       throw new IllegalArgumentException("Username cannot be null or empty");
     }
@@ -132,7 +132,7 @@ public OracleContainer withUsername(final String username) {
   }
 
   @Override
-  public OracleContainer withPassword(final String password) {
+  public AirbyteOracleTestContainer withPassword(final String password) {
     if (StringUtils.isEmpty(password)) {
       throw new IllegalArgumentException("Password cannot be null or empty");
     }
@@ -141,7 +141,7 @@ public OracleContainer withPassword(final String password) {
   }
 
   @Override
-  public OracleContainer withDatabaseName(final String databaseName) {
+  public AirbyteOracleTestContainer withDatabaseName(final String databaseName) {
     if (StringUtils.isEmpty(databaseName)) {
       throw new IllegalArgumentException("Database name cannot be null or empty");
     }
@@ -154,13 +154,13 @@ public OracleContainer withDatabaseName(final String databaseName) {
     return self();
   }
 
-  public OracleContainer usingSid() {
+  public AirbyteOracleTestContainer usingSid() {
     this.usingSid = true;
     return self();
   }
 
   @Override
-  public OracleContainer withUrlParam(final String paramName, final String paramValue) {
+  public AirbyteOracleTestContainer withUrlParam(final String paramName, final String paramValue) {
     throw new UnsupportedOperationException("The Oracle Database driver does not support this");
   }
 

airbyte-integrations/connectors/source-oracle/src/test/java/io/airbyte/integrations/source/oracle/OracleJdbcSourceAcceptanceTest.java → airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleJdbcSourceAcceptanceTest.java

@@ -55,14 +55,13 @@
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.OracleContainer;
 
 class OracleJdbcSourceAcceptanceTest extends JdbcSourceAcceptanceTest {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(OracleJdbcSourceAcceptanceTest.class);
   protected static final String USERNAME_WITHOUT_PERMISSION = "new_user";
   protected static final String PASSWORD_WITHOUT_PERMISSION = "new_password";
-  private static OracleContainer ORACLE_DB;
+  private static AirbyteOracleTestContainer ORACLE_DB;
 
   @BeforeAll
   static void init() {
@@ -91,8 +90,12 @@ static void init() {
     CREATE_TABLE_WITH_NULLABLE_CURSOR_TYPE_QUERY = "CREATE TABLE %s (%s VARCHAR(20))";
     INSERT_TABLE_WITH_NULLABLE_CURSOR_TYPE_QUERY = "INSERT INTO %s VALUES('Hello world :)')";
 
-    ORACLE_DB = new OracleContainer("epiclabs/docker-oracle-xe-11g")
+    ORACLE_DB = new AirbyteOracleTestContainer()
         .withEnv("NLS_DATE_FORMAT", "YYYY-MM-DD")
+        .withEnv("RELAX_SECURITY", "1")
+        .withUsername("TEST_ORA")
+        .withPassword("oracle")
+        .usingSid()
         .withEnv("RELAX_SECURITY", "1");
     ORACLE_DB.start();
   }
@@ -398,8 +401,10 @@ void testCheckIncorrectPasswordFailure() throws Exception {
     ((ObjectNode) config).put(JdbcUtils.USERNAME_KEY, "locked_user");
     ((ObjectNode) config).put(JdbcUtils.PASSWORD_KEY, "fake");
     final AirbyteConnectionStatus status = source.check(config);
+
     Assertions.assertEquals(AirbyteConnectionStatus.Status.FAILED, status.getStatus());
-    assertTrue(status.getMessage().contains("State code: 99999; Error code: 28000;"));
+    assertEquals("State code: 72000; Error code: 1017; Message: ORA-01017: invalid username/password; logon denied\n",
+        status.getMessage());
   }
 
   @Test

airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceAcceptanceTest.java

@@ -31,12 +31,12 @@ public class OracleSourceAcceptanceTest extends SourceAcceptanceTest {
   private static final String STREAM_NAME = "JDBC_SPACE.ID_AND_NAME";
   private static final String STREAM_NAME2 = "JDBC_SPACE.STARSHIPS";
 
-  protected OracleContainer container;
+  protected AirbyteOracleTestContainer container;
   protected JsonNode config;
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    container = new OracleContainer()
+    container = new AirbyteOracleTestContainer()
         .withUsername("test")
         .withPassword("oracle")
         .usingSid();

airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceDatatypeTest.java

@@ -25,19 +25,21 @@
 import org.jooq.DSLContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.OracleContainer;
 
 public class OracleSourceDatatypeTest extends AbstractSourceDatabaseTypeTest {
 
-  private OracleContainer container;
+  private AirbyteOracleTestContainer container;
   private JsonNode config;
   private DSLContext dslContext;
 
   private static final Logger LOGGER = LoggerFactory.getLogger(OracleSourceDatatypeTest.class);
 
   @Override
   protected Database setupDatabase() throws Exception {
-    container = new OracleContainer("epiclabs/docker-oracle-xe-11g")
+    container = new AirbyteOracleTestContainer()
+        .withUsername("TEST_ORA")
+        .withPassword("oracle")
+        .usingSid()
         .withEnv("RELAX_SECURITY", "1");
     container.start();
 
@@ -64,7 +66,7 @@ protected Database setupDatabase() throws Exception {
     final Database database = new Database(dslContext);
     LOGGER.warn("config: " + config);
 
-    database.query(ctx -> ctx.fetch("CREATE USER test IDENTIFIED BY test DEFAULT TABLESPACE USERS QUOTA UNLIMITED ON USERS"));
+    database.query(ctx -> ctx.fetch("CREATE USER TEST IDENTIFIED BY TEST DEFAULT TABLESPACE USERS QUOTA UNLIMITED ON USERS"));
 
     return database;
   }
@@ -286,11 +288,11 @@ protected void initTests() {
                 "<config>1</config>\n" +
                 "<config>2</config>\n" +
                 "</list_configuration>')")
-            .addExpectedValues("<?xml version = '1.0' encoding = 'UTF-8'?>" +
-                "<list_configuration>\n" +
-                "   <config>1</config>\n" +
-                "   <config>2</config>\n" +
-                "</list_configuration>")
+            .addExpectedValues("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                + "<list_configuration>\n"
+                + "  <config>1</config>\n"
+                + "  <config>2</config>\n"
+                + "</list_configuration>\n")
             .build());
   }
 

airbyte-integrations/connectors/source-oracle/src/test/java/io/airbyte/integrations/source/oracle/OracleSourceTest.java → airbyte-integrations/connectors/source-oracle/src/test-integration/java/io/airbyte/integrations/source/oracle/OracleSourceTest.java

@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.OracleContainer;
 
 class OracleSourceTest {
 
@@ -48,18 +47,23 @@ class OracleSourceTest {
           Field.of("NAME", JsonSchemaType.STRING),
           Field.of("IMAGE", JsonSchemaType.STRING))
           .withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL))));
+
   private static final ConfiguredAirbyteCatalog CONFIGURED_CATALOG = CatalogHelpers.toDefaultConfiguredCatalog(CATALOG);
   private static final Set<AirbyteMessage> ASCII_MESSAGES = Sets.newHashSet(createRecord(STREAM_NAME,
       map("ID", new BigDecimal("1.0"), "NAME", "user", "IMAGE", "last_summer.png".getBytes(StandardCharsets.UTF_8))));
 
-  private static OracleContainer ORACLE_DB;
+  private static AirbyteOracleTestContainer ORACLE_DB;
 
   private static JsonNode config;
 
   @BeforeAll
   static void init() {
-    ORACLE_DB = new OracleContainer("epiclabs/docker-oracle-xe-11g")
+    ORACLE_DB = new AirbyteOracleTestContainer()
+        .withUsername("TEST_ORA")
+        .withPassword("oracle")
+        .usingSid()
         .withEnv("RELAX_SECURITY", "1");
+
     ORACLE_DB.start();
   }
 
@@ -97,16 +101,6 @@ void setup() throws Exception {
     }
   }
 
-  private JsonNode getConfig(final OracleContainer oracleDb) {
-    return Jsons.jsonNode(ImmutableMap.builder()
-        .put("host", oracleDb.getHost())
-        .put("port", oracleDb.getFirstMappedPort())
-        .put("sid", oracleDb.getSid())
-        .put("username", oracleDb.getUsername())
-        .put("password", oracleDb.getPassword())
-        .build());
-  }
-
   @AfterAll
   static void cleanUp() {
     ORACLE_DB.close();