Merge pull request #134 from elliottmurray/multiple-custom-provider-header

Added multiple click options for custom headers

Author: elliottmurray

pact/verify.py

@@ -77,8 +77,9 @@
     default='',
     help='Retrieve the latest pacts for this provider')
 @click.option(
-    'header', '--custom-provider-header',
+    'headers', '--custom-provider-header',
     envvar='CUSTOM_PROVIDER_HEADER',
+    multiple=True,
     help='Header to add to provider state set up and '
          'pact verification requests. '
          'eg \'Authorization: Basic cGFjdDpwYWN0\'. '
@@ -105,7 +106,7 @@
     help='Toggle verbose logging, defaults to False.')
 def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
          username, broker_base_url, consumer_version_tag, provider_version_tag,
-         password, token, provider, header, timeout, provider_app_version,
+         password, token, provider, headers, timeout, provider_app_version,
          publish_verification_results, verbose):
     """
     Verify one or more contracts against a provider service.
@@ -150,30 +151,22 @@ def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
         '--pact-broker-base-url': broker_base_url,
         '--provider': provider,
         '--broker-password': password,
-        '--broker-token': token,
-        '--custom-provider-header': header,
+        '--broker-token': token
     }
 
     command = [VERIFIER_PATH]
     command.extend(all_pact_urls)
     command.extend(['{}={}'.format(k, v) for k, v in options.items() if v])
 
     for tag in consumer_version_tag:
-        command.extend(['--consumer-version-tag', tag])
+        command.extend(["--consumer-version-tag={}".format(tag)])
     for tag in provider_version_tag:
-        command.extend(['--provider-version-tag', tag])
+        command.extend(["--provider-version-tag={}".format(tag)])
+    for header in headers:
+        command.extend(["--custom-provider-header={}".format(header)])
 
     if publish_verification_results:
-        if not provider_app_version:
-            click.echo(
-                error
-                + 'Provider application version is required '
-                + 'to publish verification results to broker'
-            )
-            raise click.Abort()
-        command.extend(["--provider-app-version",
-                        provider_app_version,
-                        "--publish-verification-results"])
+        publish_results(error, provider_app_version, command)
 
     if verbose:
         command.extend(['--verbose'])
@@ -188,6 +181,20 @@ def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
     sys.exit(p.returncode)
 
 
+def publish_results(error, provider_app_version, command):
+    """Publish results to broker."""
+    if not provider_app_version:
+        click.echo(
+            error
+            + 'Provider application version is required '
+            + 'to publish verification results to broker'
+        )
+        raise click.Abort()
+    command.extend(["--provider-app-version",
+                   provider_app_version,
+                   "--publish-verification-results"])
+
+
 def broker_not_provided(broker_base_url, provider):
     """Check if broker not provided."""
     return (broker_base_url == '' or provider == '')

tests/test_verify.py

@@ -60,6 +60,7 @@ def setUp(self):
     def assertProcess(self, *expected):
         self.assertEqual(self.mock_Popen.call_count, 1)
         call = self.mock_Popen.mock_calls[0]
+
         actual = call[1][0]
         self.assertEqual(actual[0], VERIFIER_PATH)
         self.assertEqual(len(actual), len(expected) + 1)
@@ -148,6 +149,8 @@ def test_all_url_options(self):
             './pacts/consumer-provider2.json',
             '--pact-url=./pacts/consumer-provider3.json',
             '--pact-url=./pacts/consumer-provider4.json',
+            '--custom-provider-header=Authorization: Basic cGFj',
+            '--custom-provider-header=CustomHeader: somevalue',
             '--provider-states-setup-url=http://localhost/provider-states/set',
             '--pact-broker-username=user',
             '--pact-broker-password=pass',
@@ -168,6 +171,8 @@ def test_all_url_options(self):
             './pacts/consumer-provider4.json',
             './pacts/consumer-provider.json',
             './pacts/consumer-provider2.json',
+            '--custom-provider-header=Authorization: Basic cGFj',
+            '--custom-provider-header=CustomHeader: somevalue',
             '--provider-base-url=http://localhost',
             '--provider-states-setup-url=http://localhost/provider-states/set',
             '--broker-username=user',
@@ -204,10 +209,10 @@ def test_all_broker_options(self):
         self.assertEqual(self.mock_Popen.call_count, 1)
         self.assertProcess(
             '--pact-broker-base-url=http://localhost/broker',
-            '--consumer-version-tag', 'prod',
-            '--consumer-version-tag', 'dev',
-            '--provider-version-tag', 'dev',
-            '--provider-version-tag', 'qa',
+            '--consumer-version-tag=prod',
+            '--consumer-version-tag=dev',
+            '--provider-version-tag=dev',
+            '--provider-version-tag=qa',
             '--provider=provider_app',
             '--provider-base-url=http://localhost',
             '--provider-states-setup-url=http://localhost/provider-states/set',