fix passing version has headers (#396)

Author: KoningJasper

databricks_cli/jobs/cli.py

@@ -179,7 +179,7 @@ def delete_cli(api_client, job_id, version):
     Deletes the specified job.
     """
     check_version(api_client, version)
-    JobsApi(api_client).delete_job(job_id, version)
+    JobsApi(api_client).delete_job(job_id, version=version)
 
 
 @click.command(context_settings=CONTEXT_SETTINGS)
@@ -195,7 +195,7 @@ def get_cli(api_client, job_id, version):
     Describes the metadata for a job.
     """
     check_version(api_client, version)
-    click.echo(pretty_format(JobsApi(api_client).get_job(job_id, version)))
+    click.echo(pretty_format(JobsApi(api_client).get_job(job_id, version=version)))
 
 
 @click.command(context_settings=CONTEXT_SETTINGS)
@@ -230,7 +230,7 @@ def run_now_cli(api_client, job_id, jar_params, notebook_params, python_params,
     python_params = json_loads(python_params) if python_params else None
     spark_submit_params = json_loads(spark_submit_params) if spark_submit_params else None
     res = JobsApi(api_client).run_now(
-        job_id, jar_params_json, notebook_params_json, python_params, spark_submit_params, version)
+        job_id, jar_params_json, notebook_params_json, python_params, spark_submit_params, version=version)
     click.echo(pretty_format(res))
 
 

databricks_cli/sdk/api_client.py

@@ -124,15 +124,15 @@ def perform_query(self, method, path, data = {}, headers = None, files=None, ver
             warnings.simplefilter("ignore", exceptions.InsecureRequestWarning)
             if method == 'GET':
                 translated_data = {k: _translate_boolean_to_query_param(data[k]) for k in data}
-                resp = self.session.request(method, self.get_url(path), params = translated_data,
+                resp = self.session.request(method, self.get_url(path, version=version), params = translated_data,
                                             verify = self.verify, headers = headers)
             else:
                 if files is None:
-                    resp = self.session.request(method, self.get_url(path), data = json.dumps(data),
+                    resp = self.session.request(method, self.get_url(path, version=version), data = json.dumps(data),
                                                 verify = self.verify, headers = headers)
                 else:
                     # Multipart file upload
-                    resp = self.session.request(method, self.get_url(path), files = files, data = data,
+                    resp = self.session.request(method, self.get_url(path, version=version), files = files, data = data,
                                                 verify = self.verify, headers = headers)
         try:
             resp.raise_for_status()

tests/jobs/test_cli.py

@@ -297,6 +297,23 @@ def test_list_limit(jobs_api_mock):
     assert jobs_api_mock.list_jobs.call_args[1]['version'] == '2.1'
 
 
+@provide_conf
+def test_get_job_21(jobs_api_mock):
+    with mock.patch('databricks_cli.jobs.cli.click.echo') as echo_mock:
+        jobs_api_mock.get_job.return_value = LIST_21_RETURN['jobs'][0]
+        runner = CliRunner()
+        runner.invoke(cli.get_cli, ['--job-id', '1', '--version', '2.1'])
+        assert jobs_api_mock.get_job.call_args == mock.call('1', version='2.1')
+        assert echo_mock.call_args[0][0] == pretty_format(LIST_21_RETURN['jobs'][0])
+
+
+@provide_conf
+def test_delete_job_21(jobs_api_mock):
+    runner = CliRunner()
+    runner.invoke(cli.delete_cli, ['--job-id', '1', '--version', '2.1'])
+    assert jobs_api_mock.delete_job.call_args == mock.call('1', version='2.1')
+
+
 @provide_conf
 def test_check_version():
     # Without calling `databricks jobs configure --version=2.1`