diff --git a/lib/dl_connector_trino/dl_connector_trino/formula/constants.py b/lib/dl_connector_trino/dl_connector_trino/formula/constants.py index 9146fac33..e8cc4b234 100644 --- a/lib/dl_connector_trino/dl_connector_trino/formula/constants.py +++ b/lib/dl_connector_trino/dl_connector_trino/formula/constants.py @@ -9,5 +9,5 @@ class TrinoDialect(DialectNamespace): - TRINO_468 = simple_combo(name=DIALECT_NAME_TRINO, version=(468,)) - TRINO = TRINO_468 + TRINO_471 = simple_combo(name=DIALECT_NAME_TRINO, version=(471,)) + TRINO = TRINO_471 diff --git a/lib/dl_connector_trino/dl_connector_trino_tests/db/config.py b/lib/dl_connector_trino/dl_connector_trino_tests/db/config.py index 57e5cf3f3..02333ce4b 100644 --- a/lib/dl_connector_trino/dl_connector_trino_tests/db/config.py +++ b/lib/dl_connector_trino/dl_connector_trino_tests/db/config.py @@ -54,12 +54,12 @@ class CoreJwtConnectionSettings(CoreSslConnectionSettings): DB_URLS = { - D.TRINO_468: f"trino://datalens@" f'{get_test_container_hostport("trino-no-auth", fallback_port=21123).as_pair()}', - (D.TRINO_468, "ssl"): f"trino://trino_user@" + D.TRINO: f"trino://datalens@" f'{get_test_container_hostport("trino-no-auth", fallback_port=21123).as_pair()}', + (D.TRINO, "ssl"): f"trino://trino_user@" f'{get_test_container_hostport("trino-tls-nginx", fallback_port=21124).as_pair()}', } -DB_CORE_URL = DB_URLS[D.TRINO_468] -DB_CORE_SSL_URL = DB_URLS[(D.TRINO_468, "ssl")] +DB_CORE_URL = DB_URLS[D.TRINO] +DB_CORE_SSL_URL = DB_URLS[(D.TRINO, "ssl")] API_TEST_CONFIG = ApiTestEnvironmentConfiguration( api_connector_ep_names=["trino"], diff --git a/lib/dl_connector_trino/docker-compose.yml b/lib/dl_connector_trino/docker-compose.yml index fc67b7f17..a5b72d01f 100644 --- a/lib/dl_connector_trino/docker-compose.yml +++ b/lib/dl_connector_trino/docker-compose.yml @@ -1,19 +1,19 @@ services: trino-no-auth: - # image: "trinodb/trino:468" + # image: "trinodb/trino:471" build: context: docker-compose - dockerfile: Dockerfile.engine-trino-no-auth-468 + dockerfile: Dockerfile.engine-trino-no-auth-471 depends_on: - db-mysql-8-0 ports: - "21123:8080" trino: - # image: "trinodb/trino:468" + # image: "trinodb/trino:471" build: context: docker-compose - dockerfile: Dockerfile.engine-trino-468 + dockerfile: Dockerfile.engine-trino-471 depends_on: - db-mysql-8-0 diff --git a/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-468 b/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-471 similarity index 70% rename from lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-468 rename to lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-471 index 71af7de19..93a393f18 100644 --- a/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-468 +++ b/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-471 @@ -1,4 +1,4 @@ -FROM trinodb/trino:468@sha256:a2b6d3d46c2776c9c1ec3dcdac170d19f98dc538f2c9f2c454f2a364e7f37b87 +FROM trinodb/trino:471@sha256:23b08b7d42978e12493a271d49288ecb31aa36bc3fcf736cbf0e9960698f7f01 COPY trino/config/* /etc/trino/ COPY trino/catalog/* /etc/trino/catalog/ diff --git a/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-no-auth-468 b/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-no-auth-471 similarity index 70% rename from lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-no-auth-468 rename to lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-no-auth-471 index 41ee87925..b7f705ff0 100644 --- a/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-no-auth-468 +++ b/lib/dl_connector_trino/docker-compose/Dockerfile.engine-trino-no-auth-471 @@ -1,4 +1,4 @@ -FROM trinodb/trino:468@sha256:a2b6d3d46c2776c9c1ec3dcdac170d19f98dc538f2c9f2c454f2a364e7f37b87 +FROM trinodb/trino:471@sha256:23b08b7d42978e12493a271d49288ecb31aa36bc3fcf736cbf0e9960698f7f01 COPY trino/no_auth_config/* /etc/trino/ COPY trino/catalog/* /etc/trino/catalog/