From f2e7d3d84d13cc3db20ad3552e07d5c976f8d2e8 Mon Sep 17 00:00:00 2001 From: Yang Xia <55853655+xiazcy@users.noreply.github.com> Date: Wed, 23 Nov 2022 13:56:13 -0800 Subject: [PATCH 1/7] update taco files --- tableau-connector/src/connection-fields.xml | 9 ++++++--- tableau-connector/src/connectionBuilder.js | 3 --- tableau-connector/src/connectionProperties.js | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/tableau-connector/src/connection-fields.xml b/tableau-connector/src/connection-fields.xml index 242fc72a..f2e57d09 100644 --- a/tableau-connector/src/connection-fields.xml +++ b/tableau-connector/src/connection-fields.xml @@ -6,7 +6,10 @@ - + + + + @@ -15,14 +18,14 @@ - + - + diff --git a/tableau-connector/src/connectionBuilder.js b/tableau-connector/src/connectionBuilder.js index 12b2793e..549dde6a 100644 --- a/tableau-connector/src/connectionBuilder.js +++ b/tableau-connector/src/connectionBuilder.js @@ -1,6 +1,4 @@ (function dsbuilder(attr){ - logging.log("entering urlBuilder"); - var urlBuilder = "jdbc:neptune:sqlgremlin://" + attr["server"] + ";port=" + attr["port"]; var additionalOptions = attr['v-additional-properties']; @@ -8,6 +6,5 @@ urlBuilder += ";" + additionalOptions; } - logging.log("urlBuilder: " + urlBuilder); return [urlBuilder]; }) diff --git a/tableau-connector/src/connectionProperties.js b/tableau-connector/src/connectionProperties.js index 31380ef2..cd37ca73 100644 --- a/tableau-connector/src/connectionProperties.js +++ b/tableau-connector/src/connectionProperties.js @@ -1,5 +1,4 @@ (function propertiesbuilder(attr) { - logging.log("entering propertiesBuilder"); const SSH_USER="sshUser" const SSH_HOST="sshHost" const SSH_PRIV_KEY_FILE="sshPrivateKeyFile" @@ -10,9 +9,6 @@ const USE_ENCRYPTION_KEY = "enableSsl"; const SERVICE_REGION_KEY = "serviceRegion"; - var strJSON = JSON.stringify(attr); - logging.log("connectionProperties attr:" + strJSON); - // This script is only needed if you are using a JDBC driver. var params = {}; @@ -43,7 +39,6 @@ // Format the attributes as 'key=value'. By default some values are escaped or wrapped in curly braces to follow the JDBC standard, but you can also do it here if needed. var formattedParams = []; for (var key in params) { - formattedParams.push(connectionHelper.formatKeyValuePair(key, params[key])); } @@ -56,6 +51,5 @@ } } - logging.log("formattedParams: " + formattedParams); return formattedParams; }) From 9818c525d350ca2575dc35119cf589387cca59d8 Mon Sep 17 00:00:00 2001 From: Yang Xia <55853655+xiazcy@users.noreply.github.com> Date: Wed, 23 Nov 2022 15:11:20 -0800 Subject: [PATCH 2/7] add string localization --- tableau-connector/src/connection-fields.xml | 26 ++++++++++----------- tableau-connector/src/manifest.xml | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tableau-connector/src/connection-fields.xml b/tableau-connector/src/connection-fields.xml index f2e57d09..61eb5780 100644 --- a/tableau-connector/src/connection-fields.xml +++ b/tableau-connector/src/connection-fields.xml @@ -2,72 +2,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -77,7 +77,7 @@ - + diff --git a/tableau-connector/src/manifest.xml b/tableau-connector/src/manifest.xml index ce7267f9..2c2643a5 100644 --- a/tableau-connector/src/manifest.xml +++ b/tableau-connector/src/manifest.xml @@ -1,6 +1,6 @@ - + From 2b4424eea6664286e4267fe0276f6c3e51e20c62 Mon Sep 17 00:00:00 2001 From: Yang Xia <55853655+xiazcy@users.noreply.github.com> Date: Wed, 23 Nov 2022 15:25:24 -0800 Subject: [PATCH 3/7] add string localization resource file --- tableau-connector/src/connection-fields.xml | 26 ++++++++++----------- tableau-connector/src/manifest.xml | 2 +- tableau-connector/src/resources-en_US.xml | 20 ++++++++++++++++ 3 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 tableau-connector/src/resources-en_US.xml diff --git a/tableau-connector/src/connection-fields.xml b/tableau-connector/src/connection-fields.xml index 61eb5780..93480859 100644 --- a/tableau-connector/src/connection-fields.xml +++ b/tableau-connector/src/connection-fields.xml @@ -2,72 +2,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -77,7 +77,7 @@ - + diff --git a/tableau-connector/src/manifest.xml b/tableau-connector/src/manifest.xml index 2c2643a5..1a51f811 100644 --- a/tableau-connector/src/manifest.xml +++ b/tableau-connector/src/manifest.xml @@ -1,6 +1,6 @@ - + diff --git a/tableau-connector/src/resources-en_US.xml b/tableau-connector/src/resources-en_US.xml new file mode 100644 index 00000000..f7c23b6f --- /dev/null +++ b/tableau-connector/src/resources-en_US.xml @@ -0,0 +1,20 @@ + + + + Amazon Neptune + + Neptune Endpoint + Port + Use IAM Authentication + Service Region + Require SSL + Additional Connection Options + + Enable SSH Tunnel + SSH User + SSH Hostname + SSH Private Key File + SSH Private Key File Passphrase + SSH Strict Host Key Check (disabling option is less secure) + SSH Known Hosts File + \ No newline at end of file From 2c1696b7ce934ee9e84edd2f79c4ab04b29ff381 Mon Sep 17 00:00:00 2001 From: Yang Xia <55853655+xiazcy@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:27:33 -0800 Subject: [PATCH 4/7] Update tableau-connector/src/connection-fields.xml Co-authored-by: Lyndon Bauto --- tableau-connector/src/connection-fields.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tableau-connector/src/connection-fields.xml b/tableau-connector/src/connection-fields.xml index 93480859..f1ea91c4 100644 --- a/tableau-connector/src/connection-fields.xml +++ b/tableau-connector/src/connection-fields.xml @@ -7,7 +7,7 @@ - + From 43fd8e8646d31babbd5b81ceb695b1bfd6ce109a Mon Sep 17 00:00:00 2001 From: Yang Xia <55853655+xiazcy@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:28:17 -0800 Subject: [PATCH 5/7] Update tableau-connector/src/resources-en_US.xml --- tableau-connector/src/resources-en_US.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tableau-connector/src/resources-en_US.xml b/tableau-connector/src/resources-en_US.xml index f7c23b6f..00d7e9c6 100644 --- a/tableau-connector/src/resources-en_US.xml +++ b/tableau-connector/src/resources-en_US.xml @@ -17,4 +17,4 @@ SSH Private Key File Passphrase SSH Strict Host Key Check (disabling option is less secure) SSH Known Hosts File - \ No newline at end of file + From 9446f64ddd374d3599e91d910de6cd87c7fee244 Mon Sep 17 00:00:00 2001 From: Alexey Temnikov Date: Sun, 11 Dec 2022 14:29:07 -0800 Subject: [PATCH 6/7] Added Extract Only CAP_EXTRACT_ONLY - https://tableau.github.io/connector-plugin-sdk/docs/capabilities.html --- tableau-connector/src/manifest.xml | 1 + tableau-connector/src/resources-en_US.xml | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tableau-connector/src/manifest.xml b/tableau-connector/src/manifest.xml index 1a51f811..7859f229 100644 --- a/tableau-connector/src/manifest.xml +++ b/tableau-connector/src/manifest.xml @@ -45,6 +45,7 @@ + diff --git a/tableau-connector/src/resources-en_US.xml b/tableau-connector/src/resources-en_US.xml index 00d7e9c6..345adf68 100644 --- a/tableau-connector/src/resources-en_US.xml +++ b/tableau-connector/src/resources-en_US.xml @@ -2,14 +2,12 @@ Amazon Neptune - Neptune Endpoint Port Use IAM Authentication Service Region Require SSL Additional Connection Options - Enable SSH Tunnel SSH User SSH Hostname From 33b680df2f862cb21c89f035f97cfccf052e14f8 Mon Sep 17 00:00:00 2001 From: Yang Xia <55853655+xiazcy@users.noreply.github.com> Date: Wed, 14 Dec 2022 10:45:34 -0800 Subject: [PATCH 7/7] Update tableau-connector/src/connection-fields.xml --- tableau-connector/src/connection-fields.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tableau-connector/src/connection-fields.xml b/tableau-connector/src/connection-fields.xml index f1ea91c4..880f69bd 100644 --- a/tableau-connector/src/connection-fields.xml +++ b/tableau-connector/src/connection-fields.xml @@ -8,7 +8,7 @@ - +