From 4e42601163d3f982b41e8489c5223a95b82e0e8e Mon Sep 17 00:00:00 2001
From: Lukas Holecek <lholecek@redhat.com>
Date: May 02 2018 15:41:23 +0000
Subject: Merge #179 `Remove unused option "resultsdb_api_url" from client.conf`


---

diff --git a/conf/client.conf.example b/conf/client.conf.example
index 233b26b..d8353a3 100644
--- a/conf/client.conf.example
+++ b/conf/client.conf.example
@@ -2,7 +2,6 @@
 # Specify OIDC or Kerberos for authentication
 auth_method=OIDC
 api_url=https://waiverdb-web-waiverdb.app.os.fedoraproject.org/api/v1.0
-resultsdb_api_url=https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0
 oidc_id_provider=https://id.fedoraproject.org/openidc/
 oidc_client_id=waiverdb-authorizer
 oidc_client_secret=notsecret
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 46f028c..d3a6054 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -32,20 +32,6 @@ auth_method=OIDC
     assert result.output == 'Error: The config option "api_url" is required\n'
 
 
-def test_misconfigured_resultdb_api_url(tmpdir):
-    p = tmpdir.join('client.conf')
-    p.write("""
-[waiverdb]
-auth_method=dummy
-api_url=http://localhost:5004/api/v1.0
-        """)
-    runner = CliRunner()
-    args = ['-C', p.strpath]
-    result = runner.invoke(waiverdb_cli, args)
-    assert result.exit_code == 1
-    assert result.output == 'Error: The config option "resultsdb_api_url" is required\n'
-
-
 def test_misconfigured_oidc_id_provider(tmpdir):
     p = tmpdir.join('client.conf')
     p.write("""
@@ -101,7 +87,6 @@ oidc_id_provider=https://id.stg.fedoraproject.org/openidc/
 oidc_client_id=waiverdb
 oidc_scopes=
     openid
-resultsdb_api_url=http://localhost:5001/api/v2.0
         """)
     runner = CliRunner()
     args = ['-C', p.strpath]
@@ -120,7 +105,6 @@ oidc_id_provider=https://id.stg.fedoraproject.org/openidc/
 oidc_client_id=waiverdb
 oidc_scopes=
     openid
-resultsdb_api_url=http://localhost:5001/api/v2.0
         """)
     runner = CliRunner()
     args = ['-C', p.strpath, '-p', 'fedora-26', '-c', 'comment']
@@ -139,7 +123,6 @@ oidc_id_provider=https://id.stg.fedoraproject.org/openidc/
 oidc_client_id=waiverdb
 oidc_scopes=
     openid
-resultsdb_api_url=http://localhost:5001/api/v2.0
         """)
     runner = CliRunner()
     args = ['-C', p.strpath, '-p', 'fedora-26', '-s', 'subject', '-c', 'comment']
@@ -158,7 +141,6 @@ oidc_id_provider=https://id.stg.fedoraproject.org/openidc/
 oidc_client_id=waiverdb
 oidc_scopes=
     openid
-resultsdb_api_url=http://localhost:5001/api/v2.0
         """)
     runner = CliRunner()
     args = ['-C', p.strpath, '-p', 'fedora-26', '-s', 'subject', '-t', 'testcase']
@@ -193,7 +175,6 @@ oidc_id_provider=https://id.stg.fedoraproject.org/openidc/
 oidc_client_id=waiverdb
 oidc_scopes=
     openid
-resultsdb_api_url=http://localhost:5001/api/v2.0
             """)
         runner = CliRunner()
         args = ['-C', p.strpath, '-p', 'Parrot', '-s', '{"subject.test": "test", "s": "t"}',
@@ -241,7 +222,6 @@ def test_gssapi_is_enabled(tmpdir):
 [waiverdb]
 auth_method=Kerberos
 api_url=http://localhost:5004/api/v1.0
-resultsdb_api_url=http://localhost:5001/api/v2.0
             """)
         runner = CliRunner()
         args = ['-C', p.strpath, '-p', 'Parrot', '-s', '{"subject.test": "test", "s": "t"}',
@@ -273,7 +253,6 @@ def test_submit_waiver_with_id(tmpdir):
 [waiverdb]
 auth_method=dummy
 api_url=http://localhost:5004/api/v1.0
-resultsdb_api_url=http://localhost:5001/api/v2.0
         """)
         runner = CliRunner()
         args = ['-C', p.strpath, '-p', 'Parrot', '-r', '123',
@@ -301,7 +280,6 @@ def test_submit_waiver_with_multiple_ids(tmpdir):
 [waiverdb]
 auth_method=dummy
 api_url=http://localhost:5004/api/v1.0
-resultsdb_api_url=http://localhost:5001/api/v2.0
         """)
         runner = CliRunner()
         args = ['-C', p.strpath, '-p', 'Parrot', '-r', '123', '-r', '456',
@@ -320,7 +298,6 @@ def test_malformed_submission_with_id_and_subject_and_testcase(tmpdir):
 [waiverdb]
 auth_method=dummy
 api_url=http://localhost:5004/api/v1.0
-resultsdb_api_url=http://localhost:5001/api/v2.0
         """)
         args = ['-C', p.strpath, '-p', 'Parrot', '-r', '123', '-s',
                 '{"subject.test": "test", "s": "t"}', '-c', "This is fine"]
@@ -347,7 +324,6 @@ def test_submit_waiver_for_original_spec_nvr_result(tmpdir):
 [waiverdb]
 auth_method=dummy
 api_url=http://localhost:5004/api/v1.0
-resultsdb_api_url=http://localhost:5001/api/v2.0
             """)
         runner = CliRunner()
         args = ['-C', p.strpath, '-p', 'Parrot', '-r', '123',
diff --git a/waiverdb/cli.py b/waiverdb/cli.py
index 2792df5..493cfba 100644
--- a/waiverdb/cli.py
+++ b/waiverdb/cli.py
@@ -31,8 +31,6 @@ def validate_config(config):
     for required_config in required_configs:
         if not config.has_option('waiverdb', required_config):
             raise click.ClickException(config_error.format(required_config))
-    if not config.has_option('waiverdb', 'resultsdb_api_url'):
-        raise click.ClickException(config_error.format('resultsdb_api_url'))
 
 
 def check_response(resp, data, result_id=None):