Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update TACO files #213

Merged
merged 7 commits into from
Dec 14, 2022
Merged

Update TACO files #213

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f2e7d3d
update taco files
xiazcy Nov 23, 2022
9818c52
add string localization
xiazcy Nov 23, 2022
2b4424e
add string localization resource file
xiazcy Nov 23, 2022
2c1696b
Update tableau-connector/src/connection-fields.xml
xiazcy Nov 24, 2022
43fd8e8
Update tableau-connector/src/resources-en_US.xml
xiazcy Nov 24, 2022
9446f64
Added Extract Only CAP_EXTRACT_ONLY - https://tableau.github.io/conne…
Dec 11, 2022
33b680d
Update tableau-connector/src/connection-fields.xml
xiazcy Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions tableau-connector/src/connection-fields.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,69 +2,72 @@

<connection-fields>

<field name="server" label="Neptune Endpoint" category="endpoint" value-type="string">
<field name="server" label="@string/server_endpoint/" category="endpoint" value-type="string">
<validation-rule reg-exp="^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"/>
</field>

<field name="port" label="Port" category="endpoint" value-type="string" default-value="8182"/>
<field name="port" label="@string/port/" category="endpoint" value-type="string" default-value="8182">
<!-- Validates that port range is from 1 to 65535. -->
xiazcy marked this conversation as resolved.
Show resolved Hide resolved
<validation-rule reg-exp="^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$"/>
xiazcy marked this conversation as resolved.
Show resolved Hide resolved
</field>

<field name="authentication" label="Use IAM Authentication" category="authentication" value-type="boolean" default-value="auth-user" >
<field name="authentication" label="@string/auth_label_iam/" category="authentication" value-type="boolean" default-value="auth-user" >
<boolean-options>
<false-value value="auth-none" />
<true-value value="auth-user" />
</boolean-options>
</field>

<field name="v-service-region" label="Service Region" value-type="string" category="general">
<field name="v-service-region" label="@string/auth_label_region/" value-type="string" category="authentication">
<conditions>
<condition field="authentication" value="auth-user" />
</conditions>
<validation-rule reg-exp="^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"/>
</field>

<field name="sslmode" label="Require SSL" value-type="boolean" category="general" default-value="require" >
<field name="sslmode" label="@string/auth_label_ssl/" value-type="boolean" category="authentication" default-value="require" >
<boolean-options>
<false-value value="" />
<true-value value="require" />
</boolean-options>
</field>

<field name="v-additional-properties" label="Additional Connection Options" category="general" value-type="string" default-value="" optional="true"/>
<field name="v-additional-properties" label="@string/additional_conn_options/" category="general" value-type="string" default-value="" optional="true"/>


<!-- Advanced tab. -->
<field name="v-ssh-tunnel" label="Enable SSH Tunnel" value-type="boolean" category="advanced" optional="true" default-value="false">
<field name="v-ssh-tunnel" label="@string/enable_ssh_tunnel/" value-type="boolean" category="advanced" optional="true" default-value="false">
<boolean-options>
<false-value value="false" />
<true-value value="true" />
</boolean-options>
</field>

<field name="v-ssh-user" label="SSH User" value-type="string" category="advanced" optional="true" default-value="">
<field name="v-ssh-user" label="@string/ssh_user/" value-type="string" category="advanced" optional="true" default-value="">
<conditions>
<condition field="v-ssh-tunnel" value="true" />
</conditions>
</field>

<field name="v-ssh-host" label="SSH Hostname" value-type="string" category="advanced" optional="true" default-value="">
<field name="v-ssh-host" label="@string/ssh_hostname/" value-type="string" category="advanced" optional="true" default-value="">
<conditions>
<condition field="v-ssh-tunnel" value="true" />
</conditions>
</field>

<field name="v-ssh-priv-key-filename" label="SSH Private Key File" value-type="file" category="advanced" optional="true" default-value="">
<field name="v-ssh-priv-key-filename" label="@string/ssh_private_key_file/" value-type="file" category="advanced" optional="true" default-value="">
<conditions>
<condition field="v-ssh-tunnel" value="true" />
</conditions>
</field>

<field name="v-ssh-priv-key-passphrase" label="SSH Private Key File Passphrase" value-type="string" category="advanced" optional="true" default-value="">
<field name="v-ssh-priv-key-passphrase" label="@string/ssh_private_key_file_passphrase/" value-type="string" category="advanced" optional="true" default-value="">
<conditions>
<condition field="v-ssh-tunnel" value="true" />
</conditions>
</field>

<field name="v-ssh-strict-host-key-check" label="SSH Strict Host Key Check (disabling option is less secure)" value-type="boolean" category="advanced" optional="true" default-value="true">
<field name="v-ssh-strict-host-key-check" label="@string/ssh_strict_host_key_check/" value-type="boolean" category="advanced" optional="true" default-value="true">
<conditions>
<condition field="v-ssh-tunnel" value="true" />
</conditions>
Expand All @@ -74,7 +77,7 @@
</boolean-options>
</field>

<field name="v-ssh-known-hosts-file" label="SSH Known Hosts File" value-type="file" category="advanced" optional="true" default-value="~/.ssh/known_hosts">
<field name="v-ssh-known-hosts-file" label="@string/ssh_known_hosts_file/" value-type="file" category="advanced" optional="true" default-value="~/.ssh/known_hosts">
<conditions>
<condition field="v-ssh-strict-host-key-check" value="true" />
</conditions>
Expand Down
3 changes: 0 additions & 3 deletions tableau-connector/src/connectionBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
(function dsbuilder(attr){
logging.log("entering urlBuilder");

var urlBuilder = "jdbc:neptune:sqlgremlin://" + attr["server"] + ";port=" + attr["port"];

var additionalOptions = attr['v-additional-properties'];
if (additionalOptions) {
urlBuilder += ";" + additionalOptions;
}

logging.log("urlBuilder: " + urlBuilder);
return [urlBuilder];
})
6 changes: 0 additions & 6 deletions tableau-connector/src/connectionProperties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 = {};

Expand Down Expand Up @@ -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]));
}

Expand All @@ -56,6 +51,5 @@
}
}

logging.log("formattedParams: " + formattedParams);
return formattedParams;
})
2 changes: 1 addition & 1 deletion tableau-connector/src/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>

<connector-plugin class='neptune-jdbc' superclass='jdbc' plugin-version='1.13.0.0' name='Amazon Neptune' version='18.1' min-version-tableau='2020.3'>
<connector-plugin class='neptune-jdbc' superclass='jdbc' plugin-version='1.13.0.0' name='@string/amazon_neptune/' version='18.1' min-version-tableau='2020.3'>
<vendor-information>
<company name="Amazon Web Services"/>
<support-link url="https://github.com/aws/amazon-neptune-jdbc-driver/issues"/>
Expand Down
20 changes: 20 additions & 0 deletions tableau-connector/src/resources-en_US.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<string name="amazon_neptune">Amazon Neptune</string>

<string name="server_endpoint">Neptune Endpoint</string>
<string name="port">Port</string>
<string name="auth_label_iam">Use IAM Authentication</string>
<string name="auth_label_region">Service Region</string>
<string name="auth_label_ssl">Require SSL</string>
<string name="additional_conn_options">Additional Connection Options</string>

<string name="enable_ssh_tunnel">Enable SSH Tunnel</string>
<string name="ssh_user">SSH User</string>
<string name="ssh_hostname">SSH Hostname</string>
<string name="ssh_private_key_file">SSH Private Key File</string>
<string name="ssh_private_key_file_passphrase">SSH Private Key File Passphrase</string>
<string name="ssh_strict_host_key_check">SSH Strict Host Key Check (disabling option is less secure)</string>
<string name="ssh_known_hosts_file">SSH Known Hosts File</string>
</resources>
xiazcy marked this conversation as resolved.
Show resolved Hide resolved
xiazcy marked this conversation as resolved.
Show resolved Hide resolved