The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Bump Athena JDBC driver to 3.8.2 (#84799)
Rodrigo López Datobb036b7ed2a0
diff --git a/bin/athena.bb b/bin/athena.bbindex 3a76155460b..8ff39160f31 100755--- a/bin/athena.bb+++ b/bin/athena.bb@@ -25,7 +25,9 @@(def s3-bucket "s3://metabase-maven-downloads/")(def maven-base-url "https://s3.amazonaws.com/metabase-maven-downloads/")-(def athena-downloads-url "https://s3.amazonaws.com/athena-downloads/")+;; AWS moved the driver downloads here as of 3.8.2; the old athena-downloads bucket+;; stops at 3.8.1. The new bucket does not allow listing, so URLs are built by hand.+(def athena-downloads-url "https://aws-analytics-downloads-us-east-1.s3.us-east-1.amazonaws.com/athena/JDBC/")(defn find-pred [z p?](->> (iterate z/next z)@@ -118,30 +120,21 @@(create-sha1 pom-name)))(defn download-uber-jar [version]- (let [base-url athena-downloads-url- downloads (x/parse (io/reader base-url))- z (z/xml-zip downloads)- jar-file (-> z- (find-pred (every-pred- (tag= (keyword "xmlns.http%3A%2F%2Fs3.amazonaws.com%2Fdoc%2F2006-03-01%2F" "Key"))- (content= #(str/ends-with? % (str version "-with-dependencies.jar")))))- z/node- :content- str/join)+ (let [jar-url (str athena-downloads-url version "/athena-jdbc-" version "-with-dependencies.jar")local-name (jar-file-name "athena-jdbc" version)]- (println jar-file "=>" local-name)- (p/shell "curl --progress-bar -o " local-name (str base-url jar-file))+ (println jar-url "=>" local-name)+ (p/shell "curl --progress-bar --fail -o" local-name jar-url)(generate-pom "athena-jdbc" version)local-name))(defn download-lean-zip"Downloads and extracts the lean zip, returning the zip-file path for cleanup."[version]- (let [zip-url (str athena-downloads-url "drivers/JDBC/" version+ (let [zip-url (str athena-downloads-url version"/athena-jdbc-" version "-lean-jar-and-separate-dependencies-jars.zip")zip-file (str "athena-jdbc-thin-" version ".zip")](println zip-url "=>" zip-file)- (p/shell "curl --progress-bar -o" zip-file zip-url)+ (p/shell "curl --progress-bar --fail -o" zip-file zip-url)zip-file))(defn download-thin-jar [version]diff --git a/modules/drivers/athena/deps.edn b/modules/drivers/athena/deps.ednindex 1c2a939f1a8..cde78bac941 100644--- a/modules/drivers/athena/deps.edn+++ b/modules/drivers/athena/deps.edn@@ -9,7 +9,7 @@;; https://github.com/metabase/metabase/actions/workflows/athena.yml;; new versions of athena-jdbc appear here:;; https://docs.aws.amazon.com/athena/latest/ug/jdbc-v3-driver.html#jdbc-v3-driver-download-uber-jar- {com.metabase/athena-jdbc-thin {:mvn/version "3.7.0"+ {com.metabase/athena-jdbc-thin {:mvn/version "3.8.2":exclusions [software.amazon.awssdk/athena-streaming]};; not on Maven Central; published to our private maven by the athena workflowcom.metabase/athena-streaming {:mvn/version "2.0"}diff --git a/modules/drivers/athena/src/metabase/driver/athena.clj b/modules/drivers/athena/src/metabase/driver/athena.cljindex 1cf20c102c1..dac899dc86d 100644--- a/modules/drivers/athena/src/metabase/driver/athena.clj+++ b/modules/drivers/athena/src/metabase/driver/athena.clj@@ -34,7 +34,9 @@[_driver]["AthenaEndpoint" "AthenaStreamingEndpoint" "S3Endpoint" "StsEndpoint" "LakeFormationEndpoint""SsoAdminEndpoint" "SsoOidcEndpoint" "SsoLoginUrl" "IdentityCenterIssuerUrl" "IdpHostName"- "IdpWellKnownConfigurationUrl" "DataZoneEndpointOverride" "ProxyHost"])+ "IdpWellKnownConfigurationUrl" "DataZoneEndpointOverride" "ProxyHost"+ ;; added by the 3.8.2 client+ "GlueEndpoint" "SsoEndpoint" "SsoStartUrl"])(defmethod driver/non-host-parameters :athena[_driver]