From 6139578177ff85432d2b0cee43a279e5da6d349a Mon Sep 17 00:00:00 2001
From: metamben <103100869+metamben@users.noreply.github.com>
Date: Tue, 17 Jan 2023 18:46:46 +0300
Subject: [PATCH] Enable connecting to Oracle DBs using SSL cert auth (#27709)
Also point out that PKCS12 (.p12) keystores are now supported.
---
.../oracle/resources-ee/metabase-plugin.yaml | 16 ++++++++++------
.../oracle/resources/metabase-plugin.yaml | 16 ++++++++++------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/modules/drivers/oracle/resources-ee/metabase-plugin.yaml b/modules/drivers/oracle/resources-ee/metabase-plugin.yaml
index 695e7d5bbc4..0329057de4b 100644
--- a/modules/drivers/oracle/resources-ee/metabase-plugin.yaml
+++ b/modules/drivers/oracle/resources-ee/metabase-plugin.yaml
@@ -18,8 +18,12 @@ driver:
- name: service-name
display-name: Oracle service name
placeholder: Optional TNS alias
- - user
- - password
+ - merge:
+ - user
+ - required: false
+ - merge:
+ - password
+ - required: false
- cloud-ip-address-info
- ssl
- name: ssl-use-keystore
@@ -28,10 +32,10 @@ driver:
visible-if:
ssl: true
- name: ssl-keystore
- display-name: Keystore
+ display-name: Keystore (PKCS12 or JKS)
type: secret
secret-kind: keystore
- placeholder: /path/to/keystore.jks
+ placeholder: /path/to/keystore
visible-if:
ssl-use-keystore: true
- name: ssl-keystore-password
@@ -47,10 +51,10 @@ driver:
visible-if:
ssl: true
- name: ssl-truststore
- display-name: Truststore
+ display-name: Truststore (PKCS12 or JKS)
type: secret
secret-kind: keystore
- placeholder: /path/to/truststore.jks
+ placeholder: /path/to/truststore
visible-if:
ssl-use-truststore: true
- name: ssl-truststore-password
diff --git a/modules/drivers/oracle/resources/metabase-plugin.yaml b/modules/drivers/oracle/resources/metabase-plugin.yaml
index f11d2e02c85..e56c22dc4d0 100644
--- a/modules/drivers/oracle/resources/metabase-plugin.yaml
+++ b/modules/drivers/oracle/resources/metabase-plugin.yaml
@@ -24,8 +24,12 @@ driver:
- name: service-name
display-name: Oracle service name
placeholder: Optional TNS alias
- - user
- - password
+ - merge:
+ - user
+ - required: false
+ - merge:
+ - password
+ - required: false
- cloud-ip-address-info
- ssl
- name: ssl-use-keystore
@@ -34,10 +38,10 @@ driver:
visible-if:
ssl: true
- name: ssl-keystore
- display-name: Keystore
+ display-name: Keystore (PKCS12 or JKS)
type: secret
secret-kind: keystore
- placeholder: /path/to/keystore.jks
+ placeholder: /path/to/keystore
visible-if:
ssl-use-keystore: true
- name: ssl-keystore-password
@@ -53,10 +57,10 @@ driver:
visible-if:
ssl: true
- name: ssl-truststore
- display-name: Truststore
+ display-name: Truststore (PKCS12 or JKS)
type: secret
secret-kind: keystore
- placeholder: /path/to/truststore.jks
+ placeholder: /path/to/truststore
visible-if:
ssl-use-truststore: true
- name: ssl-truststore-password
--
GitLab