From aaf7aa5a030332c9be0c6c7846776e10eb11a007 Mon Sep 17 00:00:00 2001
From: Luigi Dell'Aquila <luigi.dellaquila@gmail.com>
Date: Tue, 26 Jul 2022 10:54:59 +0200
Subject: [PATCH] Update Tableau connector to use connection dialog v2 (#88462)

---
 docs/changelog/88462.yaml                     |  5 ++++
 .../tableau/connector/connection-dialog.tcd   | 11 -------
 .../tableau/connector/connectionFields.xml    | 30 +++++++++++++++++++
 .../tableau/connector/connectionMetadata.xml  | 14 +++++++++
 .../tableau/connector/connectionProperties.js |  2 +-
 .../tableau/connector/connectionResolver.tdr  |  5 ++--
 .../connectors/tableau/connector/manifest.xml |  3 +-
 .../plugin/sql/connectors/tableau/package.sh  |  2 +-
 .../sql/connectors/tableau/setup.py.diff      |  6 ++--
 9 files changed, 58 insertions(+), 20 deletions(-)
 create mode 100644 docs/changelog/88462.yaml
 delete mode 100644 x-pack/plugin/sql/connectors/tableau/connector/connection-dialog.tcd
 create mode 100644 x-pack/plugin/sql/connectors/tableau/connector/connectionFields.xml
 create mode 100644 x-pack/plugin/sql/connectors/tableau/connector/connectionMetadata.xml

diff --git a/docs/changelog/88462.yaml b/docs/changelog/88462.yaml
new file mode 100644
index 000000000000..f391ee08822f
--- /dev/null
+++ b/docs/changelog/88462.yaml
@@ -0,0 +1,5 @@
+pr: 88462
+summary: Update Tableau connector to use connection dialog v2
+area: SQL
+type: enhancement
+issues: []
diff --git a/x-pack/plugin/sql/connectors/tableau/connector/connection-dialog.tcd b/x-pack/plugin/sql/connectors/tableau/connector/connection-dialog.tcd
deleted file mode 100644
index 48d147b1aaae..000000000000
--- a/x-pack/plugin/sql/connectors/tableau/connector/connection-dialog.tcd
+++ /dev/null
@@ -1,11 +0,0 @@
-<connection-dialog class='elasticsearch-jdbc'>
-  <connection-config>
-    <authentication-mode value='Basic' />
-    <authentication-options>
-      <option name="UsernameAndPassword" default="true" />
-    </authentication-options>
-    <port-prompt value="Port: " default="9200" />
-    <show-ssl-checkbox value="true" />
-    <warehouse-prompt value="Additional settings" optional="true" />
-  </connection-config>
-</connection-dialog>
diff --git a/x-pack/plugin/sql/connectors/tableau/connector/connectionFields.xml b/x-pack/plugin/sql/connectors/tableau/connector/connectionFields.xml
new file mode 100644
index 000000000000..a55edf92ee04
--- /dev/null
+++ b/x-pack/plugin/sql/connectors/tableau/connector/connectionFields.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+  ~ or more contributor license agreements. Licensed under the Elastic License
+  ~ 2.0; you may not use this file except in compliance with the Elastic License
+  ~ 2.0.
+  -->
+
+<connection-fields>
+
+    <field name="server" label="Server" category="endpoint" value-type="string" />
+
+    <field name="port" label="Port" category="endpoint" value-type="string" default-value="9200"/>
+
+    <field name="authentication" label="Authentication" category="authentication" value-type="string" editable="false" default-value="auth-user-pass" />
+
+    <field name="username" label="Username" category="authentication" value-type="string" />
+    <field name="password" label="Password" category="authentication" value-type="string" secure="true" />
+
+    <field name="sslmode" label="Require SSL" value-type="boolean" category="general" default-value="" >
+        <boolean-options>
+            <false-value value="" />
+            <true-value value="require" />
+        </boolean-options>
+    </field>
+
+    <field name="vendor1" value-type="string" category="general" label="Additional settings" optional="true"/>
+
+</connection-fields>
diff --git a/x-pack/plugin/sql/connectors/tableau/connector/connectionMetadata.xml b/x-pack/plugin/sql/connectors/tableau/connector/connectionMetadata.xml
new file mode 100644
index 000000000000..d7bf1b3e73cb
--- /dev/null
+++ b/x-pack/plugin/sql/connectors/tableau/connector/connectionMetadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+  ~ or more contributor license agreements. Licensed under the Elastic License
+  ~ 2.0; you may not use this file except in compliance with the Elastic License
+  ~ 2.0.
+  -->
+
+<connection-metadata>
+    <database enabled='true' label='Database' />
+    <schema enabled='false' label="Schema" />
+    <table enabled='true' label="Table" />
+</connection-metadata>
diff --git a/x-pack/plugin/sql/connectors/tableau/connector/connectionProperties.js b/x-pack/plugin/sql/connectors/tableau/connector/connectionProperties.js
index c3defb2721aa..1bc75eb45c5b 100644
--- a/x-pack/plugin/sql/connectors/tableau/connector/connectionProperties.js
+++ b/x-pack/plugin/sql/connectors/tableau/connector/connectionProperties.js
@@ -4,7 +4,7 @@
     props["user"] = attr["username"];
     props["password"] = attr["password"];
 
-    var extraProps = attr[connectionHelper.attributeWarehouse];
+    var extraProps = attr[connectionHelper.attributeVendor1];
     if (extraProps != null && extraProps.trim().length > 0) {
         // allow `&` and white-space as attribue-value pair delimiters
         var avps = extraProps.trim().split(/[\s&]/);
diff --git a/x-pack/plugin/sql/connectors/tableau/connector/connectionResolver.tdr b/x-pack/plugin/sql/connectors/tableau/connector/connectionResolver.tdr
index adb12135ffb3..ee125ac3532c 100644
--- a/x-pack/plugin/sql/connectors/tableau/connector/connectionResolver.tdr
+++ b/x-pack/plugin/sql/connectors/tableau/connector/connectionResolver.tdr
@@ -7,14 +7,13 @@
     <connection-normalizer>
       <required-attributes>
         <attribute-list>
-          <attr>class</attr>
           <attr>server</attr>
           <attr>port</attr>
+          <attr>authentication</attr>
           <attr>username</attr>
           <attr>password</attr>
-          <attr>dbname</attr>
           <attr>sslmode</attr>
-          <attr>warehouse</attr>
+          <attr>vendor1</attr>
         </attribute-list>
       </required-attributes>
     </connection-normalizer>
diff --git a/x-pack/plugin/sql/connectors/tableau/connector/manifest.xml b/x-pack/plugin/sql/connectors/tableau/connector/manifest.xml
index c87e6575b3fa..f3651c6f7dc0 100644
--- a/x-pack/plugin/sql/connectors/tableau/connector/manifest.xml
+++ b/x-pack/plugin/sql/connectors/tableau/connector/manifest.xml
@@ -32,7 +32,8 @@
       <customization name="CAP_SUPPORTS_SPLIT_FROM_RIGHT" value="no"/>
     </customizations>
   </connection-customization>
-  <connection-dialog file='connection-dialog.tcd'/>
+  <connection-fields file='connectionFields.xml'/>
+  <connection-metadata file='connectionMetadata.xml'/>
   <connection-resolver file="connectionResolver.tdr"/>
   <dialect file='dialect.tdd'/>
 </connector-plugin>
diff --git a/x-pack/plugin/sql/connectors/tableau/package.sh b/x-pack/plugin/sql/connectors/tableau/package.sh
index 2e18baeeb4c2..2e936af4343b 100755
--- a/x-pack/plugin/sql/connectors/tableau/package.sh
+++ b/x-pack/plugin/sql/connectors/tableau/package.sh
@@ -12,7 +12,7 @@ set -e
 TSA_URL=http://timestamp.digicert.com
 
 TAB_SDK_REPO=https://github.com/tableau/connector-plugin-sdk
-TAB_SDK_TAG="tdvt-2.1.9"
+TAB_SDK_TAG="tdvt-2.6.1"
 
 MY_NAME="Packager for Elastic's Tableau connector to Elasticsearch"
 MY_FILE=$(basename $0)
diff --git a/x-pack/plugin/sql/connectors/tableau/setup.py.diff b/x-pack/plugin/sql/connectors/tableau/setup.py.diff
index 83153176c4fe..fef89c09cb4a 100644
--- a/x-pack/plugin/sql/connectors/tableau/setup.py.diff
+++ b/x-pack/plugin/sql/connectors/tableau/setup.py.diff
@@ -1,13 +1,13 @@
 diff --git a/connector-packager/setup.py b/connector-packager/setup.py
-index 1601492..eb1cc27 100644
+index e84c8a0..ceab20f 100644
 --- a/connector-packager/setup.py
 +++ b/connector-packager/setup.py
 @@ -16,7 +16,7 @@ setup(
      description='A Python module for packaging a Tableau connector.',
      test_suite='tests',
      python_requires='>3.7',
--    install_requires=['xmlschema', 'defusedxml'],
-+    install_requires=['elementpath==2.4.0', 'xmlschema==1.9.2', 'defusedxml==0.7.1'],
+-    install_requires=['xmlschema', 'defusedxml', 'packaging'],
++    install_requires=['elementpath==3.0.0', 'xmlschema==2.0.1', 'defusedxml==0.7.1', 'packaging==21.3'],
      tests_require=['six'],
      include_package_data=True
  )