Merge branch 'master' into pyasi_add_matcher_regexes

Author: pyasi

CHANGELOG.md

@@ -1,3 +1,26 @@
+### 0.22.0
+  * d112a4a - Merge pull request #134 from elliottmurray/multiple-custom-provider-header (Elliott Murray, Mon May 11 16:32:49 2020 +0100)
+  * 58f8e6b - Fix some style issues (Elliott Murray, Wed Apr 29 12:35:00 2020 +0100)
+  * bf9bc2d - Added multiple click options for custom headers (Elliott Murray, Tue Apr 28 18:14:02 2020 +0100)
+  * 254ffc5 - Merge pull request #130 from elliottmurray/examples (Elliott Murray, Sat May 9 18:02:46 2020 +0100)
+  * 3898aee - Created examples folder (Elliott Murray, Thu Apr 2 14:03:17 2020 +0100)
+  * b859443 - Merge pull request #129 from elliottmurray/docker (Elliott Murray, Sat May 9 17:54:01 2020 +0100)
+  * 9b83da7 - Added bash to containers (Elliott Murray, Fri Apr 10 11:52:43 2020 +0100)
+  * 73db8fc - Remove subprocess requirement (Elliott Murray, Fri Apr 10 11:32:38 2020 +0100)
+  * f3315a1 - Added 38 and created build helper script (Elliott Murray, Wed Apr 1 17:11:06 2020 +0100)
+  * e7743de - Some readme and python37 (Elliott Murray, Wed Apr 1 14:25:20 2020 +0100)
+  * 515aeb2 - Tweaked the run script (Elliott Murray, Wed Apr 1 12:57:02 2020 +0100)
+  * 5a6acaf - Merge pull request #131 from elliottmurray/python38 (Elliott Murray, Sat May 9 17:47:13 2020 +0100)
+  * bb921eb - Updated to 3.8 (Elliott Murray, Sat Apr 4 16:39:18 2020 +0100)
+  * 12108c4 - Merge pull request #132 from pyasi/pyasi_test_refactor (Elliott Murray, Sat May 9 17:33:59 2020 +0100)
+  * 48ad173 - Merge pull request #135 from m-aciek/master (Elliott Murray, Sat May 9 17:21:52 2020 +0100)
+  * 6948482 - Merge pull request #136 from pact-foundation/chore/upgrade-to-pact-ruby-standalone-1-84-0 (Elliott Murray, Sat May 9 15:13:07 2020 +0100)
+  * 14603ac - feat: update standalone to 1.84.0 (Beth Skurrie, Sat May 2 09:43:30 2020 +1000)
+  * 410caf1 - chore: add script to create a PR to update the pact-ruby-standalone version (Beth Skurrie, Sat May 2 09:42:55 2020 +1000)
+  * b5af1fc - Fix missing normalization of consumer name while publishing pact (Maciej Olko, Thu Apr 30 08:50:17 2020 +0200)
+  * 5785782 - Move tests to standard tests dir (Peter Yasi, Fri Apr 17 14:03:04 2020 -0400)
+  * 88ea23d - docs: update RELEASING.md (Beth Skurrie, Tue Feb 18 10:46:11 2020 +1100)
+
 ### 0.21.0
 * 6352dda - feat: update to pact-ruby-standalone-1.79.0 (#127) (Beth Skurrie, Tue Feb 18 10:25:59 2020 +1100)
 * 758d6ea - Converting to kwargs (Elliott Murray, Sat Feb 1 16:24:49 2020 +1100)

pact/__version__.py

@@ -1,3 +1,3 @@
 """Pact version info."""
 
-__version__ = '0.21.0'
+__version__ = '0.22.0'

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',