Merge pull request #41 from dacort/feature/cn-endpoints

Add support for cn regions

src/metabase/driver/athena.clj

@@ -48,11 +48,18 @@
 
 ;;; ---------------------------------------------- sql-jdbc.connection -----------------------------------------------
 
+(defn endpoint-for-region
+  "Returns the endpoint URL for a specific region"
+  [region]
+  (cond
+    (str/starts-with? region "cn-") ".amazonaws.com.cn"
+    :else ".amazonaws.com"))
+
 (defmethod sql-jdbc.conn/connection-details->spec :athena [_ {:keys [region access_key secret_key s3_staging_dir workgroup db], :as details}]
   (-> (merge
        {:classname        "com.simba.athena.jdbc.Driver"
         :subprotocol      "awsathena"
-        :subname          (str "//athena." region ".amazonaws.com:443")
+        :subname          (str "//athena." region (endpoint-for-region region) ":443")
         :user             access_key
         :password         secret_key
         :s3_staging_dir   s3_staging_dir

test_unit/metabase/driver/athena_test.clj

@@ -0,0 +1,21 @@
+(ns metabase.driver.athena-test
+  (:require [clojure.test :refer :all]
+            [metabase.driver.athena :refer [endpoint-for-region]]))
+
+(deftest endpoint
+  (testing "AWS Endpoint URL"
+    (is (=
+         ".amazonaws.com"
+         (endpoint-for-region "us-east-1")))
+
+    (is (=
+         ".amazonaws.com"
+         (endpoint-for-region "us-west-2")))
+
+    (is (=
+         ".amazonaws.com.cn"
+         (endpoint-for-region "cn-north-1")))
+
+    (is (=
+         ".amazonaws.com.cn"
+         (endpoint-for-region "cn-northwest-1")))))