Move tunneling CLI changes from master to dev mode (#424)

* revert tunneling changes, keep tox split

* keep whitespace and tox-related split

Author: deka108

databricks_cli/clusters/cli.py

@@ -20,7 +20,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import sys
 import time
 from datetime import datetime
 from json import loads as json_loads
@@ -331,41 +330,6 @@ def cluster_events_cli(api_client, cluster_id, start_time, end_time, order, even
         click.echo(tabulate(_cluster_events_to_table(events_json), tablefmt='plain'))
 
 
-@click.command(context_settings=CONTEXT_SETTINGS)
-@click.option('--cluster-id', cls=OneOfOption, one_of=CLUSTER_OPTIONS,
-              type=ClusterIdClickType(), default=None, help=ClusterIdClickType.help)
-@click.option('--cluster-name', cls=OneOfOption, one_of=CLUSTER_OPTIONS,
-              type=ClusterIdClickType(), default=None, help=ClusterIdClickType.help)
-@click.option('--local-port', type=click.INT,
-              help="The local port to use for the local tunneling server")
-@click.option('--debug', '-d', is_flag=True, help="Run the tunnel in debug mode")
-@profile_option
-@eat_exceptions
-@provide_api_client
-def tunnel_cli(api_client, cluster_id, cluster_name, local_port, debug):
-    """
-    [Alpha] Start a secure TCP tunnel to a cluster over Databricks' identity proxy.
-    """
-    if sys.version_info < (3, 6):
-        raise RuntimeError("The tunneling command is not supported on Python version < 3.6")
-    if not api_client.token:
-        raise RuntimeError("The tunneling cli only supports personal token authentication.")
-
-    if cluster_id:
-        pass
-    elif cluster_name:
-        cluster = ClusterApi(api_client).get_cluster_by_name(cluster_name)
-        cluster_id = cluster["cluster_id"]
-    else:
-        raise RuntimeError('cluster_name and cluster_id must not be empty!')
-
-    # TODO(tunneling-cli): move this up once we support python3 only
-    from databricks_cli.tunnel.api import TunnelApi
-
-    click.echo("Starting a secure tunnel to cluster with ID: {}...".format(cluster_id))
-    TunnelApi(api_client, cluster_id, debug=debug).start_tunneling(local_port=local_port)
-
-
 @click.group(context_settings=CONTEXT_SETTINGS,
              short_help='Utility to interact with Databricks clusters.')
 @click.option('--version', '-v', is_flag=True, callback=print_version_callback,
@@ -393,4 +357,3 @@ def clusters_group():  # pragma: no cover
 clusters_group.add_command(spark_versions_cli, name='spark-versions')
 clusters_group.add_command(permanent_delete_cli, name='permanent-delete')
 clusters_group.add_command(cluster_events_cli, name='events')
-clusters_group.add_command(tunnel_cli, name='tunnel')

databricks_cli/commands/__init__.py

@@ -104,17 +104,14 @@ def __init__(self, user=None, password=None, host=None, token=None,
         self.verify = verify
         self.api_version = api_version
         self.jobs_api_version = jobs_api_version
-        self.host = host
-        self.token = token
 
     def close(self):
         """Close the client"""
         pass
 
     # helper functions starting here
 
-    def perform_query(self, method, path, data={}, headers=None, files=None, version=None,
-                      return_raw_response=False):
+    def perform_query(self, method, path, data = {}, headers = None, files=None, version=None):
         """set up connection and perform query"""
         if headers is None:
             headers = self.default_headers
@@ -147,8 +144,6 @@ def perform_query(self, method, path, data={}, headers=None, files=None, version
             except ValueError:
                 pass
             raise requests.exceptions.HTTPError(message, response=e.response)
-        if return_raw_response:
-            return resp
         return resp.json()
 
 

databricks_cli/commands/api.py

@@ -22,7 +22,6 @@
 # limitations under the License.
 
 API_VERSION = '2.0'
-OLD_API_VERSION = '1.2'
 
 # Available API versions
 API_VERSIONS = ['2.0', '2.1']