Merge branch 'main' into felicity3786/JDBC

Author: felicity3786

.editorconfig

@@ -19,3 +19,6 @@ ij_java_doc_align_param_comments = false
 
 [*.yml]
 indent_size = 2
+
+[*.tsx]
+indent_size = 2

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [24]
+        java-version: [25]
     timeout-minutes: 20
     steps:
       - name: Checkout source

.java-version

@@ -1 +1 @@
-24
+25.0.1+8

docker/Dockerfile

@@ -13,31 +13,48 @@
 
 # syntax=docker/dockerfile:1
 ARG TRINO_GATEWAY_BASE_IMAGE
-FROM ${TRINO_GATEWAY_BASE_IMAGE} AS jdk-download
+ARG TRINO_GATEWAY_BUILD_IMAGE
+
+FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS jdk-download
 ARG JDK_DOWNLOAD_LINK
-ARG JDK_VERSION
-ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_VERSION}"
+ARG JDK_RELEASE_NAME
+ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_RELEASE_NAME}"
 
 RUN \
     set -xeuo pipefail && \
-    microdnf install -y tar gzip && \
+    dnf install -y tar gzip && \
     # Install JDK from the provided archive link \
     echo "Downloading JDK from ${JDK_DOWNLOAD_LINK}" && \
     mkdir -p "${JAVA_HOME}" && \
     curl -#LfS "${JDK_DOWNLOAD_LINK}" | tar -zx --strip 1 -C "${JAVA_HOME}"
 
+FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS packages
+
+RUN \
+    set -xeuo pipefail && \
+    mkdir -p /tmp/overlay/usr/libexec/ && \
+    touch /tmp/overlay/usr/libexec/grepconf.sh && \
+    chmod +x /tmp/overlay/usr/libexec/grepconf.sh && \
+    dnf update -y && \
+    dnf install --installroot /tmp/overlay --setopt install_weak_deps=false --nodocs -y \
+      less \
+      zlib `#required by java` \
+      curl-minimal grep `# required by health-check` \
+      shadow-utils `# required by useradd` \
+      tar `# required to support kubectl cp` && \
+      rm -rf /tmp/overlay/var/cache/*
+
 FROM ${TRINO_GATEWAY_BASE_IMAGE}
 WORKDIR /usr/lib/trino-gateway
 
-ARG JDK_VERSION
-ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_VERSION}"
+ARG JDK_RELEASE_NAME
+ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_RELEASE_NAME}"
 ENV PATH=$PATH:$JAVA_HOME/bin
 COPY --from=jdk-download $JAVA_HOME $JAVA_HOME
+COPY --from=packages /tmp/overlay /
 
 RUN \
     set -xeu && \
-    microdnf update -y && \
-    microdnf install -y tar less shadow-utils && \
     groupadd trino --gid 1000 && \
     useradd trino --uid 1000 --gid 1000 --create-home && \
     mkdir -p /usr/lib/trino-gateway /etc/trino-gateway && \

docker/build.sh

@@ -22,7 +22,7 @@ SOURCE_DIR="${SCRIPT_DIR}/.."
 
 ARCHITECTURES=(amd64 arm64 ppc64le)
 TRINO_GATEWAY_VERSION=
-JDK_VERSION=$(cat "${SOURCE_DIR}/.java-version")
+JDK_RELEASE_NAME=$(cat "${SOURCE_DIR}/.java-version")
 # necessary to allow version parsing from the pom file
 MVNW_VERBOSE=false
 
@@ -39,7 +39,7 @@ while getopts ":a:h:r:j:" o; do
             exit 0
             ;;
         j)
-            JDK_VERSION="${OPTARG}"
+            JDK_RELEASE_NAME="${OPTARG}"
             ;;
         *)
             usage
@@ -61,29 +61,18 @@ function check_environment() {
 }
 
 function temurin_jdk_link() {
-  JDK_VERSION="${1}"
+  JDK_RELEASE_NAME="${1}"
   ARCH="${2}"
 
-  versionsUrl="https://api.adoptium.net/v3/info/release_names?heap_size=normal&image_type=jdk&os=linux&page=0&page_size=20&project=jdk&release_type=ga&semver=false&sort_method=DEFAULT&sort_order=ASC&vendor=eclipse&version=%28${JDK_VERSION}%2C%5D"
-  if ! result=$(curl -fLs "$versionsUrl" -H 'accept: application/json'); then
-    echo >&2 "Failed to fetch release names for JDK version [${JDK_VERSION}, ) from Temurin API : $result"
-    exit 1
-  fi
-
-  if ! RELEASE_NAME=$(echo "$result" | jq -er '.releases[]' | grep "${JDK_VERSION}" | head -n 1); then
-    echo >&2 "Failed to determine release name: ${RELEASE_NAME}"
-    exit 1
-  fi
-
   case "${ARCH}" in
     arm64)
-      echo "https://api.adoptium.net/v3/binary/version/${RELEASE_NAME}/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk"
+      echo "https://api.adoptium.net/v3/binary/version/${JDK_RELEASE_NAME}/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk"
     ;;
     amd64)
-      echo "https://api.adoptium.net/v3/binary/version/${RELEASE_NAME}/linux/x64/jdk/hotspot/normal/eclipse?project=jdk"
+      echo "https://api.adoptium.net/v3/binary/version/${JDK_RELEASE_NAME}/linux/x64/jdk/hotspot/normal/eclipse?project=jdk"
     ;;
     ppc64le)
-      echo "https://api.adoptium.net/v3/binary/version/${RELEASE_NAME}/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk"
+      echo "https://api.adoptium.net/v3/binary/version/${JDK_RELEASE_NAME}/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk"
     ;;
   *)
     echo "${ARCH} is not supported for Docker image"
@@ -118,17 +107,19 @@ TAG_PREFIX="trino-gateway:${TRINO_GATEWAY_VERSION}"
 #version file is used by the Helm chart test
 echo "${TRINO_GATEWAY_VERSION}" > "${SOURCE_DIR}"/trino-gateway-version.txt
 
-TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'registry.access.redhat.com/ubi9/ubi-minimal:latest'}
+TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'redhat/ubi10-micro:latest'}
+TRINO_GATEWAY_BUILD_IMAGE=${TRINO_GATEWAY_BUILD_IMAGE:-'redhat/ubi10:latest'}
 
 for arch in "${ARCHITECTURES[@]}"; do
-    echo "🫙  Building the image for $arch with JDK ${JDK_VERSION}"
+    echo "🫙  Building the image for $arch with Temurin JDK release ${JDK_RELEASE_NAME}"
     DOCKER_BUILDKIT=1 \
     docker build \
         "${WORK_DIR}" \
         --pull \
-        --build-arg JDK_VERSION="${JDK_VERSION}" \
-        --build-arg JDK_DOWNLOAD_LINK="$(temurin_jdk_link "${JDK_VERSION}" "${arch}")" \
+        --build-arg JDK_RELEASE_NAME="${JDK_RELEASE_NAME}" \
+        --build-arg JDK_DOWNLOAD_LINK="$(temurin_jdk_link "jdk-${JDK_RELEASE_NAME}" "${arch}")" \
         --build-arg TRINO_GATEWAY_BASE_IMAGE="${TRINO_GATEWAY_BASE_IMAGE}" \
+        --build-arg TRINO_GATEWAY_BUILD_IMAGE="${TRINO_GATEWAY_BUILD_IMAGE}" \
         --platform "linux/$arch" \
         -f Dockerfile \
         -t "${TAG_PREFIX}-$arch"

docker/docker-compose.yml

@@ -18,7 +18,7 @@ services:
         type: bind
 
   postgres:
-    image: ${TRINO_GATEWAY_POSTGRES_IMAGE:-postgres}
+    image: ${TRINO_GATEWAY_POSTGRES_IMAGE:-postgres:17-alpine}
     environment:
       - PGPORT=5432
       - POSTGRES_PASSWORD=P0stG&es

docs/development.md

@@ -3,7 +3,7 @@
 ## Build requirements
 
 * Mac OS X or Linux
-* Java 24+, 64-bit
+* Java 25+, 64-bit
 * Docker
 
 #### Running Trino Gateway in your IDE
@@ -21,7 +21,7 @@ or execute the following command:
 
 #### Locally
 
-This project requires Java 24. Note that higher version of Java have not been
+This project requires Java 25. Note that higher version of Java have not been
 verified and may run into unexpected issues.
 
 Run `./mvnw clean install` to build `trino-gateway`. VM options required for
@@ -71,7 +71,6 @@ Gateway, and can help with pull request reviews and merges.
 * [:fontawesome-brands-github: oneonestar - Star Poon](https://github.com/oneonestar)
 * [:fontawesome-brands-github: vishalya - Vishal Jadhav](https://github.com/vishalya)
 * [:fontawesome-brands-github: wendigo - Mateusz Gajewski](https://github.com/wendigo)
-* [:fontawesome-brands-github: willmostly - Will Morrison](https://github.com/willmostly)
 
 ## Contributor meetings
 

docs/gateway-api.md

@@ -1,9 +1,16 @@
 # Gateway API
 
-Please note that if there are duplicate `proxyTo` URLs in the backend configuration, 
-the RoutedTo in the Query History page might not be shown correctly.
+The REST API for Trino Gateway can be used to update routing configuration for
+the Trino clusters. Note that the API calls do not perform actions on the
+clusters themselves.
 
-## Add or update a backend
+The example commands are for a Trino Gateway server running at
+`http://localhost:8080`.
+
+If there are duplicate `proxyTo` URLs in the configuration, the `Name` in the
+**Query History** page of the UI might not show correctly.
+
+## Add or update a Trino cluster
 
 ```shell
 curl -X POST http://localhost:8080/entity?entityType=GATEWAY_BACKEND \
@@ -14,9 +21,9 @@ curl -X POST http://localhost:8080/entity?entityType=GATEWAY_BACKEND \
     }'
 ```
 
-If the backend URL is different from the `proxyTo` URL (for example if they are
-internal vs. external hostnames). You can use the optional `externalUrl` field
-to override the link in the Active Backends page.
+If the Trino cluster URL is different from the `proxyTo` URL, for example if
+they are internal and external hostnames used, you can use the optional
+`externalUrl` field to override the link in the **Active Backends** page.
 
 ```shell
 curl -X POST http://localhost:8080/entity?entityType=GATEWAY_BACKEND \
@@ -28,9 +35,14 @@ curl -X POST http://localhost:8080/entity?entityType=GATEWAY_BACKEND \
     }'
 ```
 
-## Get all backends
+## List all Trino clusters
+
+```shell
+curl -X GET http://localhost:8080/entity/GATEWAY_BACKEND
+```
+
+Returns a JSON array of Trino cluster:
 
-`curl -X GET http://localhost:8080/entity/GATEWAY_BACKEND`
 ```json
 [
     {
@@ -57,25 +69,26 @@ curl -X POST http://localhost:8080/entity?entityType=GATEWAY_BACKEND \
 ]
 ```
 
-## Delete a backend
+## Delete a Trino cluster
 
 ```shell
 curl -X POST -d "trino3" http://localhost:8080/gateway/backend/modify/delete
 ```
 
-## Deactivate a backend
+## Deactivate a Trino cluster
 
 ```shell
 curl -X POST http://localhost:8080/gateway/backend/deactivate/trino-2
 ```
 
-## Get all active backends
+## List all active Trino clusters
 
 ```shell
 curl -X GET http://localhost:8080/gateway/backend/active
 ```
 
-Will return a JSON array of active Trino cluster backends:
+Returns a JSON array of active Trino clusters:
+
 ```json
 [
     {
@@ -88,18 +101,22 @@ Will return a JSON array of active Trino cluster backends:
 ]
 ```
 
-## Activate a backend
+## Activate a Trino cluster
 
 ```shell
 curl -X POST http://localhost:8080/gateway/backend/activate/trino-2
 ```
 
-## Update Routing Rules
+## Update routing rules
 
-This API can be used to programmatically update the Routing Rules.
-Rule will be updated based on the rule name.
+The API can be used to programmatically update the routing rules. Rule are
+updated based on the rule name. Storage of the rules must use a writeable file
+and the configuration 'rulesType: FILE'.
 
-For this feature to work with multiple replicas of the Trino Gateway, you will need to provide a shared storage that supports file locking for the routing rules file. If multiple replicas are used with local storage, then rules will get out of sync when updated.
+For this feature to work with multiple replicas of the Trino Gateway, you must
+provide a shared storage that supports file locking for the routing rules file.
+If multiple replicas are used with local storage, then rules get out of
+sync when updated.
 
 ```shell
 curl -X POST http://localhost:8080/webapp/updateRoutingRules \
@@ -111,20 +128,4 @@ curl -X POST http://localhost:8080/webapp/updateRoutingRules \
         "condition": "updated condition"
     }'
 ```
-### Disable Routing Rules UI
-
-You can set the `disablePages` config to disable pages on the UI.
-
-The following pages are available:
-- `dashboard`
-- `cluster`
-- `resource-group`
-- `selector`
-- `history`
-- `routing-rules`
-
-```yaml
-uiConfiguration:
-  disablePages:
-    - 'routing-rules'
-```
+