This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 12720ae4135048b1300440991fb3b5d10fc5d8f7 Author: Joao Boto <[email protected]> AuthorDate: Tue Jan 31 16:45:34 2023 +0100 [FLINK-30790] Remove DockerImageVersions --- .../jdbc/catalog/MySql56CatalogITCase.java | 5 +-- .../jdbc/catalog/MySql57CatalogITCase.java | 5 +-- .../connector/jdbc/catalog/MySqlCatalogITCase.java | 4 +- .../jdbc/databases/mysql/MySqlDatabase.java | 8 ++-- .../jdbc/databases/oracle/OracleDatabase.java | 6 ++- .../jdbc/databases/postgres/PostgresDatabase.java | 8 ++-- .../databases/sqlserver/SqlServerDatabase.java | 11 +++++- .../sqlserver/SqlServerTableSinkITCase.java | 3 -- .../sqlserver/SqlServerTableSourceITCase.java | 3 -- .../connector/jdbc/test/DockerImageVersions.java | 45 ---------------------- 10 files changed, 28 insertions(+), 70 deletions(-) diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql56CatalogITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql56CatalogITCase.java index 3a1c554..fb553c6 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql56CatalogITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql56CatalogITCase.java @@ -18,7 +18,7 @@ package org.apache.flink.connector.jdbc.catalog; -import org.apache.flink.connector.jdbc.test.DockerImageVersions; +import org.apache.flink.connector.jdbc.databases.mysql.MySqlDatabase; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Container; @@ -29,8 +29,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; public class MySql56CatalogITCase extends MySqlCatalogTestBase { @Container - private static final MySQLContainer<?> CONTAINER = - createContainer(DockerImageVersions.MYSQL_5_6); + private static final MySQLContainer<?> CONTAINER = createContainer(MySqlDatabase.MYSQL_5_6); @Override protected String getDatabaseUrl() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql57CatalogITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql57CatalogITCase.java index 350bea8..9d0edcf 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql57CatalogITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySql57CatalogITCase.java @@ -18,7 +18,7 @@ package org.apache.flink.connector.jdbc.catalog; -import org.apache.flink.connector.jdbc.test.DockerImageVersions; +import org.apache.flink.connector.jdbc.databases.mysql.MySqlDatabase; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Container; @@ -29,8 +29,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; public class MySql57CatalogITCase extends MySqlCatalogTestBase { @Container - private static final MySQLContainer<?> CONTAINER = - createContainer(DockerImageVersions.MYSQL_5_7); + private static final MySQLContainer<?> CONTAINER = createContainer(MySqlDatabase.MYSQL_5_7); @Override protected String getDatabaseUrl() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogITCase.java index 73b5acf..3480fa7 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/catalog/MySqlCatalogITCase.java @@ -18,7 +18,7 @@ package org.apache.flink.connector.jdbc.catalog; -import org.apache.flink.connector.jdbc.test.DockerImageVersions; +import org.apache.flink.connector.jdbc.databases.mysql.MySqlDatabase; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Container; @@ -29,7 +29,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; public class MySqlCatalogITCase extends MySqlCatalogTestBase { @Container - private static final MySQLContainer<?> CONTAINER = createContainer(DockerImageVersions.MYSQL); + private static final MySQLContainer<?> CONTAINER = createContainer(MySqlDatabase.MYSQL_8_0); @Override protected String getDatabaseUrl() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlDatabase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlDatabase.java index f8e70a9..6e8c69e 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlDatabase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/mysql/MySqlDatabase.java @@ -19,7 +19,6 @@ package org.apache.flink.connector.jdbc.databases.mysql; import org.apache.flink.connector.jdbc.databases.DatabaseMetadata; import org.apache.flink.connector.jdbc.databases.DatabaseTest; -import org.apache.flink.connector.jdbc.test.DockerImageVersions; import org.apache.flink.util.ExceptionUtils; import org.slf4j.Logger; @@ -41,9 +40,12 @@ import static org.apache.flink.util.Preconditions.checkArgument; @Testcontainers public interface MySqlDatabase extends DatabaseTest { + String MYSQL_5_6 = "mysql:5.6.51"; + String MYSQL_5_7 = "mysql:5.7.41"; + String MYSQL_8_0 = "mysql:8.0.32"; + @Container - MySqlXaContainer CONTAINER = - new MySqlXaContainer(DockerImageVersions.MYSQL).withLockWaitTimeout(50_000L); + MySqlXaContainer CONTAINER = new MySqlXaContainer(MYSQL_8_0).withLockWaitTimeout(50_000L); @Override default DatabaseMetadata getMetadata() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java index 70e503e..13269d2 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/oracle/OracleDatabase.java @@ -19,7 +19,6 @@ package org.apache.flink.connector.jdbc.databases.oracle; import org.apache.flink.connector.jdbc.databases.DatabaseMetadata; import org.apache.flink.connector.jdbc.databases.DatabaseTest; -import org.apache.flink.connector.jdbc.test.DockerImageVersions; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.OracleContainer; @@ -30,9 +29,12 @@ import org.testcontainers.junit.jupiter.Testcontainers; @Testcontainers public interface OracleDatabase extends DatabaseTest { + String ORACLE_18 = "gvenzl/oracle-xe:18.4.0-slim-faststart"; + String ORACLE_21 = "gvenzl/oracle-xe:21.3.0-slim-faststart"; + @Container JdbcDatabaseContainer<?> CONTAINER = - new OracleContainer(DockerImageVersions.ORACLE) + new OracleContainer(ORACLE_21) .withStartupTimeoutSeconds(240) .withConnectTimeoutSeconds(120); diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresDatabase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresDatabase.java index 93e0fe3..65b26f1 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresDatabase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/postgres/PostgresDatabase.java @@ -19,7 +19,6 @@ package org.apache.flink.connector.jdbc.databases.postgres; import org.apache.flink.connector.jdbc.databases.DatabaseMetadata; import org.apache.flink.connector.jdbc.databases.DatabaseTest; -import org.apache.flink.connector.jdbc.test.DockerImageVersions; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; @@ -32,11 +31,12 @@ import static org.apache.flink.util.Preconditions.checkArgument; @Testcontainers public interface PostgresDatabase extends DatabaseTest { + String POSTGRES_9 = "postgres:9.6.24"; + String POSTGRES_15 = "postgres:15.1"; + @Container PostgreSQLContainer<?> CONTAINER = - new PostgresXaContainer(DockerImageVersions.POSTGRES) - .withMaxConnections(10) - .withMaxTransactions(50); + new PostgresXaContainer(POSTGRES_15).withMaxConnections(10).withMaxTransactions(50); @Override default DatabaseMetadata getMetadata() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerDatabase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerDatabase.java index 9f01f5c..2f0d4a6 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerDatabase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/databases/sqlserver/SqlServerDatabase.java @@ -19,19 +19,26 @@ package org.apache.flink.connector.jdbc.databases.sqlserver; import org.apache.flink.connector.jdbc.databases.DatabaseMetadata; import org.apache.flink.connector.jdbc.databases.DatabaseTest; -import org.apache.flink.connector.jdbc.test.DockerImageVersions; import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.utility.DockerImageName; /** A SqlServer database for testing. * */ @Testcontainers public interface SqlServerDatabase extends DatabaseTest { + DockerImageName MSSQL_AZURE_SQL_EDGE = + DockerImageName.parse("mcr.microsoft.com/azure-sql-edge") + .asCompatibleSubstituteFor("mcr.microsoft.com/mssql/server"); + + String MSSQL_SERVER_2017 = "mcr.microsoft.com/mssql/server:2017-CU12"; + String MSSQL_SERVER_2019 = "mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04"; + @Container MSSQLServerContainer<?> CONTAINER = - new MSSQLServerContainer<>(DockerImageVersions.MSSQL_SERVER).acceptLicense(); + new MSSQLServerContainer<>(MSSQL_AZURE_SQL_EDGE).acceptLicense(); @Override default DatabaseMetadata getMetadata() { diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java index 42daf51..f5101fc 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSinkITCase.java @@ -49,8 +49,6 @@ import org.apache.flink.types.Row; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import java.math.BigDecimal; import java.sql.Connection; @@ -69,7 +67,6 @@ import static org.apache.flink.table.api.Expressions.$; import static org.apache.flink.table.factories.utils.FactoryMocks.createTableSink; /** The Table Sink ITCase for {@link SqlServerDialect}. */ -@DisabledOnOs(OS.MAC) class SqlServerTableSinkITCase extends AbstractTestBase implements SqlServerDatabase { public static final String OUTPUT_TABLE1 = "dynamicSinkForUpsert"; diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSourceITCase.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSourceITCase.java index a3253ca..91da3ce 100644 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSourceITCase.java +++ b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/dialect/sqlserver/SqlServerTableSourceITCase.java @@ -30,8 +30,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.OS; import java.sql.Connection; import java.sql.DriverManager; @@ -45,7 +43,6 @@ import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; /** The Table Source ITCase for {@link SqlServerDialect}. */ -@DisabledOnOs(OS.MAC) class SqlServerTableSourceITCase extends AbstractTestBase implements SqlServerDatabase { private static final String INPUT_TABLE = "sql_test_table"; diff --git a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/test/DockerImageVersions.java b/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/test/DockerImageVersions.java deleted file mode 100644 index 22451f7..0000000 --- a/flink-connector-jdbc/src/test/java/org/apache/flink/connector/jdbc/test/DockerImageVersions.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.flink.connector.jdbc.test; - -/** - * Utility class for defining the image names and versions of Docker containers used during the Java - * tests. The names/versions are centralised here in order to make testing version updates easier, - * as well as to provide a central file to use as a key when caching testing Docker files. - */ -public class DockerImageVersions { - - public static final String MSSQL_SERVER_2017 = "mcr.microsoft.com/mssql/server:2017-CU12"; - public static final String MSSQL_SERVER_2019 = - "mcr.microsoft.com/mssql/server:2019-GA-ubuntu-16.04"; - - public static final String MSSQL_SERVER = MSSQL_SERVER_2019; - - public static final String MYSQL_5_6 = "mysql:5.6.51"; - public static final String MYSQL_5_7 = "mysql:5.7.41"; - public static final String MYSQL_8_0 = "mysql:8.0.32"; - public static final String MYSQL = MYSQL_8_0; - - public static final String ORACLE_18 = "gvenzl/oracle-xe:18.4.0-slim-faststart"; - public static final String ORACLE_21 = "gvenzl/oracle-xe:21.3.0-slim-faststart"; - public static final String ORACLE = ORACLE_21; - - public static final String POSTGRES_9 = "postgres:9.6.24"; - public static final String POSTGRES_15 = "postgres:15.1"; - public static final String POSTGRES = POSTGRES_15; -}
