feat(cli): add consumer-version-selector option

Author: alecgerona

pact/cli/verify.py

@@ -37,18 +37,26 @@
 @click.option(
     'username', '--pact-broker-username',
     envvar='PACT_BROKER_USERNAME',
-    help='Username for Pact Broker basic authentication.')
+    help='Username for Pact Broker basic authentication. Can also be specified'
+         ' via the environment variable PACT_BROKER_USERNAME')
 @click.option(
     'broker_base_url', '--pact-broker-url',
     default='',
     envvar='PACT_BROKER_BASE_URL',
-    help='Base URl for the Pact Broker instance to publish pacts to.')
+    help='Base URl for the Pact Broker instance to publish pacts to. Can also be specified'
+         ' via the environment variable PACT_BROKER_BASE_URL')
 @click.option(
     'consumer_version_tag', '--consumer-version-tag',
     default='',
     multiple=True,
     help='Retrieve the latest pacts with this consumer version tag. '
-         'Used in conjunction with --provider.')
+         'Used in conjunction with --provider. May be specified multiple times.')
+@click.option(
+    'consumer_version_selector', '--consumer-version-selector',
+    default='',
+    multiple=True,
+    help='Retrieve the latest pacts with this consumer version selector. '
+         'Used in conjunction with --provider. May be specified multiple times.')
 @click.option(
     'provider_version_tag', '--provider-version-tag',
     default='',
@@ -80,7 +88,7 @@
 @click.option(
     'timeout', '-t', '--timeout',
     default=30,
-    help='The duration in seconds we should wait to confirm verification'
+    help='The duration in seconds we should wait to confirm that the verification'
          ' process was successful. Defaults to 30.',
     type=int)
 @click.option(
@@ -107,9 +115,9 @@
     'log_level', '--log-level',
     help='The logging level.')
 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, headers, timeout, provider_app_version,
-         publish_verification_results, verbose, log_dir, log_level):
+         username, broker_base_url, consumer_version_tag, consumer_version_selector,
+         provider_version_tag, password, token, provider, headers, timeout,
+         provider_app_version, publish_verification_results, verbose, log_dir, log_level):
     """
     Verify one or more contracts against a provider service.
 
@@ -162,6 +170,7 @@ def main(pacts, base_url, pact_url, pact_urls, states_url, states_setup_url,
         'timeout': timeout,
         'verbose': verbose,
         'consumer_tags': list(consumer_version_tag),
+        'consumer_selectors': list(consumer_version_selector),
         'provider_tags': list(provider_version_tag),
         'provider_states_setup_url': states_setup_url
     }

pact/verify_wrapper.py

@@ -175,6 +175,8 @@ def call_verify(self, *pacts, provider_base_url, provider, **kwargs):
             command.extend(['{}={}'.format('--custom-provider-header', header)])
         for tag in kwargs.get('consumer_tags', []):
             command.extend(["--consumer-version-tag={}".format(tag)])
+        for tag in kwargs.get('consumer_selectors', []):
+            command.extend(["--consumer-version-selector={}".format(tag)])
         for tag in kwargs.get('provider_tags', []):
             command.extend(["--provider-version-tag={}".format(tag)])
 

tests/cli/test_verify.py

@@ -259,6 +259,8 @@ def test_all_broker_options(self, mock_wrapper):
             '--pact-broker-url=http://localhost/broker',
             '--consumer-version-tag=prod',
             '--consumer-version-tag=dev',
+            '--consumer-version-selector={"tag": "master", "latest": true}',
+            '--consumer-version-selector={"tag": "staging", "latest": true}',
             '--provider-version-tag=dev',
             '--provider-version-tag=qa',
             '--provider-base-url=http://localhost',
@@ -284,6 +286,8 @@ def test_all_broker_options(self, mock_wrapper):
                                 broker_token='token',
                                 broker_url='http://localhost/broker',
                                 consumer_tags=['prod', 'dev'],
+                                consumer_selectors=['{"tag": "master", "latest": true}',
+                                                    '{"tag": "staging", "latest": true}'],
                                 provider_tags=['dev', 'qa'],
                                 provider_app_version='1.2.3',
                                 # custom_provider_header=['Authorization: Basic cGFj', 'CustomHeader: somevalue'],