Trino version bump to resolve CVEs. Upgrade requires connection name … (

#1739) * Trino version bump to resolve CVEs. Upgrade requires connection name to change from hive-hadoop2 -> hive. * Continuation of trino upgrade to resolve cves. * More config fixes for trino upgrade work. * Continuation of trino upgrade changes. Adjust unit test to new error message. * format * test error message fix --------- Co-authored-by: Rob Seward (SOM) <[email protected]> Co-authored-by: Ian Abbott <[email protected]>
UrbanOS-Public · Jan 27, 2025 · 1b03ae3 · 1b03ae3
1 parent 02055f8
commit 1b03ae3
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,4 +34,8 @@ node_modules/
 
 compaction-test-fixtures/
 
-apps/reaper/12345-6789
+# emacs editor files
+*~
+[#]*[#]
+
+apps/reaper/12345-6789
diff --git a/apps/andi/test/integration/hive.properties b/apps/andi/test/integration/hive.properties
@@ -1,11 +1,11 @@
-connector.name=hive-hadoop2
+connector.name=hive
 hive.metastore.uri=thrift://metastore:8000
 hive.metastore.username=hive
-hive.metastore-timeout=360m
-hive.allow-drop-table=true
-hive.allow-rename-table=true
-hive.s3.aws-access-key=minioadmin
-hive.s3.aws-secret-key=minioadmin
-hive.s3.path-style-access=true
-hive.s3.endpoint=http://minio:9000
-hive.s3.ssl.enabled=false
+hive.metastore.thrift.client.connect-timeout=360m
+hive.metastore.thrift.client.read-timeout=360m
+fs.native-s3.enabled=true
+s3.aws-access-key=minioadmin
+s3.aws-secret-key=minioadmin
+s3.region=ignored-with-minio
+s3.path-style-access=true
+s3.endpoint=http://minio:9000
diff --git a/apps/discovery_api/test/integration/discovery_api/data/query_test.exs b/apps/discovery_api/test/integration/discovery_api/data/query_test.exs
@@ -311,7 +311,7 @@ defmodule DiscoveryApi.Data.QueryTest do
 
       assert %{
                "message" =>
-                 "Syntax Error: Invalid X-Trino-Prepared-Statement header: line 1:43: mismatched input 'FORM'. Expecting: ',', 'EXCEPT', 'FETCH', 'FROM', 'GROUP', 'HAVING', 'INTERSECT', 'LIMIT', 'OFFSET', 'ORDER', 'UNION', 'WHERE', 'WINDOW', <EOF>"
+                 "Syntax Error: Error 400 Bad Request: Invalid X-Trino-Prepared-Statement header: line 1:43: mismatched input 'FORM'. Expecting: ',', 'EXCEPT', 'FETCH', 'FROM', 'GROUP', 'HAVING', 'INTERSECT', 'LIMIT', 'OFFSET', 'ORDER', 'UNION', 'WHERE', 'WINDOW', <EOF>"
              } ==
                plain_text_post(conn, "/api/v1/query", request_body)
                |> response(400)
@@ -524,7 +524,7 @@ defmodule DiscoveryApi.Data.QueryTest do
 
       assert %{
                "message" =>
-                 "Syntax Error: Invalid X-Trino-Prepared-Statement header: line 3:3: mismatched input 'DROP'. Expecting: ',', '.', 'AS', 'CROSS', 'EXCEPT', 'FETCH', 'FOR', 'FULL', 'GROUP', 'HAVING', 'INNER', 'INTERSECT', 'JOIN', 'LEFT', 'LIMIT', 'MATCH_RECOGNIZE', 'NATURAL', 'OFFSET', 'ORDER', 'RIGHT', 'TABLESAMPLE', 'UNION', 'WHERE', 'WINDOW', <EOF>, <identifier>"
+                 "Syntax Error: Error 400 Bad Request: Invalid X-Trino-Prepared-Statement header: line 3:3: mismatched input 'DROP'. Expecting: ',', '.', 'AS', 'CROSS', 'EXCEPT', 'FETCH', 'FOR', 'FULL', 'GROUP', 'HAVING', 'INNER', 'INTERSECT', 'JOIN', 'LEFT', 'LIMIT', 'MATCH_RECOGNIZE', 'NATURAL', 'OFFSET', 'ORDER', 'RIGHT', 'TABLESAMPLE', 'UNION', 'WHERE', 'WINDOW', <EOF>, <identifier>"
              } ==
                plain_text_post(conn, "/api/v1/query", request_body)
                |> response(400)

diff --git a/apps/discovery_api/test/integration/docker-compose.yaml b/apps/discovery_api/test/integration/docker-compose.yaml
@@ -64,7 +64,7 @@ services:
     - metastore
     - minio
     platform: linux/amd64
-    image: trinodb/trino:389
+    image: quay.io/urbanos/ubi-trino:468-015
     ports:
     - "8080:8080"
     healthcheck:

diff --git a/apps/discovery_api/test/integration/hive.properties b/apps/discovery_api/test/integration/hive.properties
@@ -1,11 +1,11 @@
-connector.name=hive-hadoop2
+connector.name=hive
 hive.metastore.uri=thrift://metastore:8000
 hive.metastore.username=hive
-hive.metastore-timeout=360m
-hive.allow-drop-table=true
-hive.allow-rename-table=true
-hive.s3.aws-access-key=minioadmin
-hive.s3.aws-secret-key=minioadmin
-hive.s3.path-style-access=true
-hive.s3.endpoint=http://minio:9000
-hive.s3.ssl.enabled=false
+hive.metastore.thrift.client.connect-timeout=360m
+hive.metastore.thrift.client.read-timeout=360m
+fs.native-s3.enabled=true
+s3.aws-access-key=minioadmin
+s3.aws-secret-key=minioadmin
+s3.region=ignored-with-minio
+s3.path-style-access=true
+s3.endpoint=http://minio:9000
diff --git a/apps/e2e/test/docker-compose.yml b/apps/e2e/test/docker-compose.yml
@@ -57,7 +57,7 @@ services:
     depends_on:
     - metastore
     - minio
-    image: quay.io/urbanos/ubi-trino:458-015
+    image: quay.io/urbanos/ubi-trino:468-015
     ports:
     - "8080:8080"
     healthcheck:

diff --git a/apps/forklift/docker-compose.yml b/apps/forklift/docker-compose.yml
@@ -52,7 +52,7 @@ services:
     depends_on:
     - metastore
     - minio
-    image: trinodb/trino:389
+    image: quay.io/urbanos/ubi-trino:468-015
     ports:
     - "8080:8080"
     healthcheck:

diff --git a/apps/forklift/test/integration/hive.properties b/apps/forklift/test/integration/hive.properties
@@ -1,11 +1,11 @@
-connector.name=hive-hadoop2
+connector.name=hive
 hive.metastore.uri=thrift://metastore:8000
 hive.metastore.username=hive
-hive.metastore-timeout=360m
-hive.allow-drop-table=true
-hive.allow-rename-table=true
-hive.s3.aws-access-key=minioadmin
-hive.s3.aws-secret-key=minioadmin
-hive.s3.path-style-access=true
-hive.s3.endpoint=http://minio:9000
-hive.s3.ssl.enabled=false
+hive.metastore.thrift.client.connect-timeout=360m
+hive.metastore.thrift.client.read-timeout=360m
+fs.native-s3.enabled=true
+s3.aws-access-key=minioadmin
+s3.aws-secret-key=minioadmin
+s3.region=ignored-with-minio
+s3.path-style-access=true
+s3.endpoint=http://minio:9000
diff --git a/apps/pipeline/docker-compose.yml b/apps/pipeline/docker-compose.yml
@@ -52,7 +52,7 @@ services:
     depends_on:
     - metastore
     - minio
-    image: trinodb/trino:389
+    image: quay.io/urbanos/ubi-trino:468-015
     platform: linux/amd64
     ports:
     - "8080:8080"

diff --git a/apps/pipeline/test/integration/hive.properties b/apps/pipeline/test/integration/hive.properties
@@ -1,11 +1,11 @@
-connector.name=hive-hadoop2
+connector.name=hive
 hive.metastore.uri=thrift://metastore:8000
 hive.metastore.username=hive
-hive.metastore-timeout=360m
-hive.allow-drop-table=true
-hive.allow-rename-table=true
-hive.s3.aws-access-key=minioadmin
-hive.s3.aws-secret-key=minioadmin
-hive.s3.path-style-access=true
-hive.s3.endpoint=http://minio:9000
-hive.s3.ssl.enabled=false
+hive.metastore.thrift.client.connect-timeout=360m
+hive.metastore.thrift.client.read-timeout=360m
+fs.native-s3.enabled=true
+s3.aws-access-key=minioadmin
+s3.aws-secret-key=minioadmin
+s3.region=ignored-with-minio
+s3.path-style-access=true
+s3.endpoint=http://minio:9000
diff --git a/apps/reaper/test/integration/hive.properties b/apps/reaper/test/integration/hive.properties
@@ -1,11 +1,11 @@
-connector.name=hive-hadoop2
+connector.name=hive
 hive.metastore.uri=thrift://metastore:8000
 hive.metastore.username=hive
-hive.metastore-timeout=360m
-hive.allow-drop-table=true
-hive.allow-rename-table=true
-hive.s3.aws-access-key=minioadmin
-hive.s3.aws-secret-key=minioadmin
-hive.s3.path-style-access=true
-hive.s3.endpoint=http://minio:9000
-hive.s3.ssl.enabled=false
+hive.metastore.thrift.client.connect-timeout=360m
+hive.metastore.thrift.client.read-timeout=360m
+fs.native-s3.enabled=true
+s3.aws-access-key=minioadmin
+s3.aws-secret-key=minioadmin
+s3.region=ignored-with-minio
+s3.path-style-access=true
+s3.endpoint=http://minio:9000