Skip to content

Commit

Permalink
#48: Adapt manifest for partner drivers (#49)
Browse files Browse the repository at this point in the history
* Upgrade to metabase 0.43.4

* #48: Update version, add changelog entry

* #48: Adapt manifest as required for partner drivers

* Adapt test to avoid sporadic test failures

FAIL in metabase.api.session-test/failure-threshold-per-request-source (session_test.clj:180)
The same as above, but ensure that throttling is done on a per request source basis.
expected: #"^Too many attempts! You must wait 1\d seconds before trying again\.$"
  actual: "Too many attempts! You must wait 9 seconds before trying again."
  • Loading branch information
kaklakariada authored Jul 11, 2022
1 parent 97b872c commit 4079f10
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
cancel-in-progress: true
runs-on: ubuntu-latest
env:
METABASE_TAG: v0.43.3
METABASE_TAG: v0.43.4
steps:
- name: Checkout the repository
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
cancel-in-progress: true
runs-on: ubuntu-latest
env:
METABASE_TAG: v0.43.3
METABASE_TAG: v0.43.4
steps:
- name: Checkout the repository
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ The Exasol Driver for Metabase is an adapter, that allows you to query data from

## Runtime Dependencies

To use the Exasol Driver, you need Metabase Version 0.43.1 or later.
To use the Exasol Driver, you need Metabase Version 0.43.4 or later.

Follow the [Metabase installation guide](https://www.metabase.com/docs/latest/operations-guide/installing-metabase.html) to download and install Metabase.
6 changes: 3 additions & 3 deletions doc/changes/changes_1.0.2.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# metabase-driver 1.0.2, released 2022-??-??
# metabase-driver 1.0.2, released 2022-07-11

Code name: Adapt to Metabase 0.43.3
Code name: Adapt to Metabase 0.43.4 and prepare Manifest for partner driver.

## Summary

In this release we tested the driver with Metabase version 0.43.3. This release was only tested with Metabase 0.43.3. If you use an older version of Metabase please use metabase-driver 1.0.0.
In this release we updated the driver manifest to conform to Metabase's requirements for partner drivers. We also tested the driver with Metabase version 0.43.4. This release was only tested with Metabase 0.43.4. If you use an older version of Metabase please use metabase-driver 1.0.0.

## Refactoring

Expand Down
2 changes: 1 addition & 1 deletion doc/developer_guide/developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ clojure --version
git clone https://github.com/metabase/metabase.git
cd metabase
git fetch --all --tags
export METABASE_VERSION=0.43.3
export METABASE_VERSION=0.43.4
git checkout "tags/v${METABASE_VERSION}" -b "v${METABASE_VERSION}-branch"
# Build (this will take ~15min)
./bin/build
Expand Down
7 changes: 6 additions & 1 deletion resources/metabase-plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Complete list of options here: https://github.com/metabase/metabase/wiki/Metabase-Plugin-Manifest-Reference
info:
name: Metabase Exasol Driver
version: 1.0.1
version: 1.0.2
description: Allows Metabase to connect to Exasol databases.
contact-info:
name: Exasol AG
address: support@exasol.com
dependencies:
- class: com.exasol.jdbc.EXADriver
message: >
Expand All @@ -26,6 +29,8 @@ driver:
required: false
- user
- password
- advanced-options-start
- default-advanced-options
connection-properties-include-tunnel-config: true
init:
- step: load-namespace
Expand Down
15 changes: 14 additions & 1 deletion scripts/exclude_tests.diff
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
diff --git a/test/metabase/api/session_test.clj b/test/metabase/api/session_test.clj
index 1e09d159be..b313972078 100644
--- a/test/metabase/api/session_test.clj
+++ b/test/metabase/api/session_test.clj
@@ -177,7 +178,7 @@
:body
json/parse-string
(get-in ["errors" "username"])))]
- (is (re= #"^Too many attempts! You must wait 1\d seconds before trying again\.$"
+ (is (re= #"^Too many attempts! You must wait (9|1\d) seconds before trying again\.$"
(error)))
(is (re= #"^Too many attempts! You must wait 4\d seconds before trying again\.$"
(error)))))))
diff --git a/test/metabase/api/table_test.clj b/test/metabase/api/table_test.clj
index 495be5d570..36620d487e 100644
--- a/test/metabase/api/table_test.clj
Expand Down Expand Up @@ -25,7 +38,7 @@ index 018ec0446b..accbb02ed1 100644
(= driver/*driver* :presto)
"2018-04-18"
diff --git a/test/metabase/driver/sql_jdbc/connection_test.clj b/test/metabase/driver/sql_jdbc/connection_test.clj
index f05ebd53a0..ff03a1b63c 100644
index f05ebd53a0..1e8150181a 100644
--- a/test/metabase/driver/sql_jdbc/connection_test.clj
+++ b/test/metabase/driver/sql_jdbc/connection_test.clj
@@ -1,5 +1,6 @@
Expand Down
2 changes: 1 addition & 1 deletion test/metabase/driver/exasol_unit_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
(testing "Driver version read from existing resource"
(is (not (str/blank? (exasol/get-driver-version)))))
(testing "Driver version read from existing resource equal to expected version"
(is (= "1.0.1" (exasol/get-driver-version)))))
(is (= "1.0.2" (exasol/get-driver-version)))))

(deftest humanize-connection-error-message-test
(testing "Driver translates connection error message"
Expand Down

0 comments on commit 4079f10

Please sign in to comment.